diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/filters/SinceAuthorPerRelayFilter.kt b/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/filters/SinceAuthorPerRelayFilter.kt
index 40cce89f2..5e5aae23e 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/filters/SinceAuthorPerRelayFilter.kt
+++ b/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/filters/SinceAuthorPerRelayFilter.kt
@@ -24,6 +24,8 @@ import com.fasterxml.jackson.databind.node.JsonNodeFactory
 import com.vitorpamplona.quartz.nip01Core.HexKey
 import com.vitorpamplona.quartz.nip01Core.core.Event
 import com.vitorpamplona.quartz.nip01Core.jackson.EventMapper
+import com.vitorpamplona.quartz.nip01Core.relays.FilterMatcher
+import com.vitorpamplona.quartz.nip01Core.relays.FilterSerializer
 
 /**
  * This is a nostr filter with per-relay authors list and since parameters
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/filters/SincePerRelayFilter.kt b/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/filters/SincePerRelayFilter.kt
index e81faeefd..1bb60ef98 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/filters/SincePerRelayFilter.kt
+++ b/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/filters/SincePerRelayFilter.kt
@@ -23,6 +23,8 @@ package com.vitorpamplona.ammolite.relays.filters
 import com.fasterxml.jackson.databind.node.JsonNodeFactory
 import com.vitorpamplona.quartz.nip01Core.core.Event
 import com.vitorpamplona.quartz.nip01Core.jackson.EventMapper
+import com.vitorpamplona.quartz.nip01Core.relays.FilterMatcher
+import com.vitorpamplona.quartz.nip01Core.relays.FilterSerializer
 
 /**
  * This is a nostr filter with per-relay authors list and since parameters
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/experimental/limits/LimitProcessor.kt b/quartz/src/main/java/com/vitorpamplona/quartz/experimental/limits/LimitProcessor.kt
index 6731efd1d..b0533faad 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/experimental/limits/LimitProcessor.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/experimental/limits/LimitProcessor.kt
@@ -20,8 +20,8 @@
  */
 package com.vitorpamplona.quartz.experimental.limits
 
-import com.vitorpamplona.ammolite.relays.filters.Filter
 import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip01Core.relays.Filter
 import com.vitorpamplona.quartz.nip13Pow.getPoWRank
 import com.vitorpamplona.quartz.utils.TimeUtils
 
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/Filter.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/Filter.kt
index 4aa4da626..95522ad78 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/Filter.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/Filter.kt
@@ -18,7 +18,7 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package com.vitorpamplona.ammolite.relays.filters
+package com.vitorpamplona.quartz.nip01Core.relays
 
 import com.vitorpamplona.quartz.nip01Core.core.Event
 
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/FilterMatcher.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/FilterMatcher.kt
index d980be70b..fe1ff0319 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/FilterMatcher.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/FilterMatcher.kt
@@ -18,7 +18,7 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package com.vitorpamplona.ammolite.relays.filters
+package com.vitorpamplona.quartz.nip01Core.relays
 
 import com.vitorpamplona.quartz.nip01Core.core.Event
 
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/FilterSerializer.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/FilterSerializer.kt
index d83340c71..a59f48cc0 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/FilterSerializer.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/FilterSerializer.kt
@@ -18,7 +18,7 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package com.vitorpamplona.ammolite.relays.filters
+package com.vitorpamplona.quartz.nip01Core.relays
 
 import com.fasterxml.jackson.databind.node.JsonNodeFactory
 import com.fasterxml.jackson.databind.node.ObjectNode