diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/OkHttpWebSocket.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/OkHttpWebSocket.kt
index 3fc6c11eb2..57c2fb6a7b 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/OkHttpWebSocket.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/OkHttpWebSocket.kt
@@ -20,10 +20,10 @@
  */
 package com.vitorpamplona.amethyst.service.okhttp
 
-import com.vitorpamplona.ammolite.relays.relays.sockets.WebSocket
-import com.vitorpamplona.ammolite.relays.relays.sockets.WebSocketListener
-import com.vitorpamplona.ammolite.relays.relays.sockets.WebsocketBuilder
-import com.vitorpamplona.ammolite.relays.relays.sockets.WebsocketBuilderFactory
+import com.vitorpamplona.quartz.nip01Core.relays.sockets.WebSocket
+import com.vitorpamplona.quartz.nip01Core.relays.sockets.WebSocketListener
+import com.vitorpamplona.quartz.nip01Core.relays.sockets.WebsocketBuilder
+import com.vitorpamplona.quartz.nip01Core.relays.sockets.WebsocketBuilderFactory
 import okhttp3.Request
 import okhttp3.Response
 
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AddDMRelayListDialog.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AddDMRelayListDialog.kt
index acf1dc4449..9ab6e2b1e2 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AddDMRelayListDialog.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AddDMRelayListDialog.kt
@@ -53,7 +53,7 @@ import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer
 import com.vitorpamplona.amethyst.ui.theme.imageModifier
-import com.vitorpamplona.ammolite.relays.relays.RelayStat
+import com.vitorpamplona.quartz.nip01Core.relays.RelayStat
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AddSearchRelayListDialog.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AddSearchRelayListDialog.kt
index bc5a5f0db5..0263895f65 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AddSearchRelayListDialog.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AddSearchRelayListDialog.kt
@@ -53,7 +53,7 @@ import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer
 import com.vitorpamplona.amethyst.ui.theme.imageModifier
-import com.vitorpamplona.ammolite.relays.relays.RelayStat
+import com.vitorpamplona.quartz.nip01Core.relays.RelayStat
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AllRelayListView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AllRelayListView.kt
index cbde4d4ed5..da22b4b768 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AllRelayListView.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AllRelayListView.kt
@@ -61,7 +61,7 @@ import com.vitorpamplona.amethyst.ui.theme.RowColSpacing
 import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.grayText
 import com.vitorpamplona.ammolite.relays.Constants
-import com.vitorpamplona.ammolite.relays.relays.RelayStat
+import com.vitorpamplona.quartz.nip01Core.relays.RelayStat
 
 @Composable
 fun AllRelayListView(
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/BasicRelaySetupInfo.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/BasicRelaySetupInfo.kt
index a6f09185dc..11fcdbde40 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/BasicRelaySetupInfo.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/BasicRelaySetupInfo.kt
@@ -23,8 +23,8 @@ package com.vitorpamplona.amethyst.ui.actions.relays
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.ammolite.relays.FeedType
 import com.vitorpamplona.ammolite.relays.RelayBriefInfoCache
-import com.vitorpamplona.ammolite.relays.relays.RelayStat
 import com.vitorpamplona.quartz.nip01Core.HexKey
+import com.vitorpamplona.quartz.nip01Core.relays.RelayStat
 
 @Immutable
 data class BasicRelaySetupInfo(
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/Kind3RelayListView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/Kind3RelayListView.kt
index e2e5ca47db..85ddb78cfe 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/Kind3RelayListView.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/Kind3RelayListView.kt
@@ -94,7 +94,7 @@ import com.vitorpamplona.ammolite.relays.Constants
 import com.vitorpamplona.ammolite.relays.Constants.activeTypesGlobalChats
 import com.vitorpamplona.ammolite.relays.FeedType
 import com.vitorpamplona.ammolite.relays.RelayBriefInfoCache
-import com.vitorpamplona.ammolite.relays.relays.RelayStat
+import com.vitorpamplona.quartz.nip01Core.relays.RelayStat
 import com.vitorpamplona.quartz.nip65RelayList.RelayUrlFormatter
 import kotlinx.coroutines.launch
 
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/Kind3RelaySetupInfoProposalRow.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/Kind3RelaySetupInfoProposalRow.kt
index b0c0884a60..46f940903a 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/Kind3RelaySetupInfoProposalRow.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/Kind3RelaySetupInfoProposalRow.kt
@@ -63,7 +63,7 @@ import com.vitorpamplona.amethyst.ui.theme.ThemeComparisonColumn
 import com.vitorpamplona.amethyst.ui.theme.allGoodColor
 import com.vitorpamplona.amethyst.ui.theme.largeRelayIconModifier
 import com.vitorpamplona.ammolite.relays.COMMON_FEED_TYPES
-import com.vitorpamplona.ammolite.relays.relays.RelayStat
+import com.vitorpamplona.quartz.nip01Core.relays.RelayStat
 
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/RelayUrlEditField.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/RelayUrlEditField.kt
index 083e30b43c..39b17364da 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/RelayUrlEditField.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/RelayUrlEditField.kt
@@ -40,7 +40,7 @@ import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
 import com.vitorpamplona.amethyst.ui.theme.Size10dp
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
-import com.vitorpamplona.ammolite.relays.relays.RelayStat
+import com.vitorpamplona.quartz.nip01Core.relays.RelayStat
 import com.vitorpamplona.quartz.nip65RelayList.RelayUrlFormatter
 
 @Composable
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/NostrClient.kt b/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/NostrClient.kt
index 379eeb2003..a0f681e057 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/NostrClient.kt
+++ b/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/NostrClient.kt
@@ -21,10 +21,10 @@
 package com.vitorpamplona.ammolite.relays
 
 import android.util.Log
-import com.vitorpamplona.ammolite.relays.relays.RelayState
-import com.vitorpamplona.ammolite.relays.relays.sockets.WebsocketBuilderFactory
 import com.vitorpamplona.ammolite.service.checkNotInMainThread
 import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip01Core.relays.RelayState
+import com.vitorpamplona.quartz.nip01Core.relays.sockets.WebsocketBuilderFactory
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/NostrDataSource.kt b/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/NostrDataSource.kt
index 9431c1df8d..ab513bc8ec 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/NostrDataSource.kt
+++ b/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/NostrDataSource.kt
@@ -21,9 +21,9 @@
 package com.vitorpamplona.ammolite.relays
 
 import android.util.Log
-import com.vitorpamplona.ammolite.relays.relays.RelayState
 import com.vitorpamplona.ammolite.service.checkNotInMainThread
 import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip01Core.relays.RelayState
 import com.vitorpamplona.quartz.utils.TimeUtils
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.DelicateCoroutinesApi
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/Relay.kt b/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/Relay.kt
index dfd611544f..64007a254b 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/Relay.kt
+++ b/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/Relay.kt
@@ -20,13 +20,12 @@
  */
 package com.vitorpamplona.ammolite.relays
 
-import com.vitorpamplona.ammolite.relays.relays.RelayState
-import com.vitorpamplona.ammolite.relays.relays.SimpleClientRelay
-import com.vitorpamplona.ammolite.relays.relays.Subscription
-import com.vitorpamplona.ammolite.relays.relays.SubscriptionCollection
-import com.vitorpamplona.ammolite.relays.relays.sockets.WebsocketBuilderFactory
 import com.vitorpamplona.quartz.nip01Core.core.Event
-import com.vitorpamplona.quartz.nip01Core.relays.Filter
+import com.vitorpamplona.quartz.nip01Core.relays.RelayState
+import com.vitorpamplona.quartz.nip01Core.relays.SimpleClientRelay
+import com.vitorpamplona.quartz.nip01Core.relays.SubscriptionCollection
+import com.vitorpamplona.quartz.nip01Core.relays.filters.Filter
+import com.vitorpamplona.quartz.nip01Core.relays.sockets.WebsocketBuilderFactory
 import com.vitorpamplona.quartz.nip42RelayAuth.RelayAuthEvent
 
 enum class FeedType {
@@ -63,11 +62,12 @@ class RelaySubFilter(
 
     override fun getFilters(subscriptionId: String) = filter(subs.getSubscriptionFilters(subscriptionId))
 
-    override fun allSubscriptions(): List<Subscription> =
+    override fun allSubscriptions(): List<com.vitorpamplona.quartz.nip01Core.relays.Subscription> =
         subs.allSubscriptions().mapNotNull { filter ->
             val filters = filter(filter.value)
             if (filters.isNotEmpty()) {
-                Subscription(filter.key, filters)
+                com.vitorpamplona.quartz.nip01Core.relays
+                    .Subscription(filter.key, filters)
             } else {
                 null
             }
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/RelayPool.kt b/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/RelayPool.kt
index 5d000672bd..b228b74f58 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/RelayPool.kt
+++ b/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/RelayPool.kt
@@ -21,9 +21,9 @@
 package com.vitorpamplona.ammolite.relays
 
 import androidx.compose.runtime.Immutable
-import com.vitorpamplona.ammolite.relays.relays.RelayState
 import com.vitorpamplona.ammolite.service.checkNotInMainThread
 import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip01Core.relays.RelayState
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.channels.BufferOverflow
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/RelayStats.kt b/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/RelayStats.kt
index e98b10b94e..bd2f728db7 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/RelayStats.kt
+++ b/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/RelayStats.kt
@@ -20,7 +20,7 @@
  */
 package com.vitorpamplona.ammolite.relays
 
-import com.vitorpamplona.ammolite.relays.relays.RelayStat
+import com.vitorpamplona.quartz.nip01Core.relays.RelayStat
 
 object RelayStats {
     private val innerCache = mutableMapOf<String, RelayStat>()
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/filters/IPerRelayFilter.kt b/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/filters/IPerRelayFilter.kt
index 0233ad704b..815d6bf249 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/filters/IPerRelayFilter.kt
+++ b/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/filters/IPerRelayFilter.kt
@@ -21,7 +21,7 @@
 package com.vitorpamplona.ammolite.relays.filters
 
 import com.vitorpamplona.quartz.nip01Core.core.Event
-import com.vitorpamplona.quartz.nip01Core.relays.Filter
+import com.vitorpamplona.quartz.nip01Core.relays.filters.Filter
 
 interface IPerRelayFilter {
     fun toRelay(forRelay: String): Filter
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 d5107f20e5..99d0fd4f8b 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,9 +24,9 @@ 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.Filter
-import com.vitorpamplona.quartz.nip01Core.relays.FilterMatcher
-import com.vitorpamplona.quartz.nip01Core.relays.FilterSerializer
+import com.vitorpamplona.quartz.nip01Core.relays.filters.Filter
+import com.vitorpamplona.quartz.nip01Core.relays.filters.FilterMatcher
+import com.vitorpamplona.quartz.nip01Core.relays.filters.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 15b692c31c..486e61b82c 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,9 +23,9 @@ 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.Filter
-import com.vitorpamplona.quartz.nip01Core.relays.FilterMatcher
-import com.vitorpamplona.quartz.nip01Core.relays.FilterSerializer
+import com.vitorpamplona.quartz.nip01Core.relays.filters.Filter
+import com.vitorpamplona.quartz.nip01Core.relays.filters.FilterMatcher
+import com.vitorpamplona.quartz.nip01Core.relays.filters.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 b0533faad0..e73f1d98e0 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
@@ -21,7 +21,7 @@
 package com.vitorpamplona.quartz.experimental.limits
 
 import com.vitorpamplona.quartz.nip01Core.core.Event
-import com.vitorpamplona.quartz.nip01Core.relays.Filter
+import com.vitorpamplona.quartz.nip01Core.relays.filters.Filter
 import com.vitorpamplona.quartz.nip13Pow.getPoWRank
 import com.vitorpamplona.quartz.utils.TimeUtils
 
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/RelayStat.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/RelayStat.kt
similarity index 98%
rename from ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/RelayStat.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/RelayStat.kt
index d0212459f7..c63fa52dba 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/RelayStat.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/RelayStat.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.relays
+package com.vitorpamplona.quartz.nip01Core.relays
 
 import androidx.collection.LruCache
 import com.vitorpamplona.quartz.utils.TimeUtils
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/RelayState.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/RelayState.kt
similarity index 96%
rename from ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/RelayState.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/RelayState.kt
index 346cbc4a01..caf9fb9251 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/RelayState.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/RelayState.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.relays
+package com.vitorpamplona.quartz.nip01Core.relays
 
 enum class RelayState {
     // Websocket connected
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/SimpleClientRelay.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/SimpleClientRelay.kt
similarity index 91%
rename from ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/SimpleClientRelay.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/SimpleClientRelay.kt
index 170b612c00..50d3953902 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/SimpleClientRelay.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/SimpleClientRelay.kt
@@ -18,28 +18,27 @@
  * 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.relays
+package com.vitorpamplona.quartz.nip01Core.relays
 
 import android.util.Log
-import com.vitorpamplona.ammolite.relays.relays.commands.toClient.AuthMessage
-import com.vitorpamplona.ammolite.relays.relays.commands.toClient.ClosedMessage
-import com.vitorpamplona.ammolite.relays.relays.commands.toClient.EoseMessage
-import com.vitorpamplona.ammolite.relays.relays.commands.toClient.EventMessage
-import com.vitorpamplona.ammolite.relays.relays.commands.toClient.NoticeMessage
-import com.vitorpamplona.ammolite.relays.relays.commands.toClient.NotifyMessage
-import com.vitorpamplona.ammolite.relays.relays.commands.toClient.OkMessage
-import com.vitorpamplona.ammolite.relays.relays.commands.toClient.ToClientParser
-import com.vitorpamplona.ammolite.relays.relays.commands.toRelay.AuthCmd
-import com.vitorpamplona.ammolite.relays.relays.commands.toRelay.CloseCmd
-import com.vitorpamplona.ammolite.relays.relays.commands.toRelay.CountCmd
-import com.vitorpamplona.ammolite.relays.relays.commands.toRelay.EventCmd
-import com.vitorpamplona.ammolite.relays.relays.commands.toRelay.ReqCmd
-import com.vitorpamplona.ammolite.relays.relays.sockets.WebSocket
-import com.vitorpamplona.ammolite.relays.relays.sockets.WebSocketListener
-import com.vitorpamplona.ammolite.relays.relays.sockets.WebsocketBuilder
 import com.vitorpamplona.quartz.nip01Core.HexKey
 import com.vitorpamplona.quartz.nip01Core.core.Event
-import com.vitorpamplona.quartz.nip01Core.relays.Filter
+import com.vitorpamplona.quartz.nip01Core.relays.commands.toClient.AuthMessage
+import com.vitorpamplona.quartz.nip01Core.relays.commands.toClient.ClosedMessage
+import com.vitorpamplona.quartz.nip01Core.relays.commands.toClient.EoseMessage
+import com.vitorpamplona.quartz.nip01Core.relays.commands.toClient.EventMessage
+import com.vitorpamplona.quartz.nip01Core.relays.commands.toClient.NoticeMessage
+import com.vitorpamplona.quartz.nip01Core.relays.commands.toClient.NotifyMessage
+import com.vitorpamplona.quartz.nip01Core.relays.commands.toClient.OkMessage
+import com.vitorpamplona.quartz.nip01Core.relays.commands.toClient.ToClientParser
+import com.vitorpamplona.quartz.nip01Core.relays.commands.toRelay.AuthCmd
+import com.vitorpamplona.quartz.nip01Core.relays.commands.toRelay.CloseCmd
+import com.vitorpamplona.quartz.nip01Core.relays.commands.toRelay.CountCmd
+import com.vitorpamplona.quartz.nip01Core.relays.commands.toRelay.EventCmd
+import com.vitorpamplona.quartz.nip01Core.relays.filters.Filter
+import com.vitorpamplona.quartz.nip01Core.relays.sockets.WebSocket
+import com.vitorpamplona.quartz.nip01Core.relays.sockets.WebSocketListener
+import com.vitorpamplona.quartz.nip01Core.relays.sockets.WebsocketBuilder
 import com.vitorpamplona.quartz.nip42RelayAuth.RelayAuthEvent
 import com.vitorpamplona.quartz.utils.TimeUtils
 import com.vitorpamplona.quartz.utils.bytesUsedInMemory
@@ -313,7 +312,10 @@ class SimpleClientRelay(
         if (isConnectionStarted()) {
             if (isReady) {
                 if (filters.isNotEmpty()) {
-                    writeToSocket(ReqCmd.toJson(requestId, filters))
+                    writeToSocket(
+                        com.vitorpamplona.quartz.nip01Core.relays.commands.toRelay.ReqCmd
+                            .toJson(requestId, filters),
+                    )
                     afterEOSEPerSubscription[requestId] = false
                 }
             }
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/Subscription.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/Subscription.kt
similarity index 91%
rename from ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/Subscription.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/Subscription.kt
index 7729c73fdf..5a83bc4af8 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/Subscription.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/Subscription.kt
@@ -18,9 +18,9 @@
  * 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.relays
+package com.vitorpamplona.quartz.nip01Core.relays
 
-import com.vitorpamplona.quartz.nip01Core.relays.Filter
+import com.vitorpamplona.quartz.nip01Core.relays.filters.Filter
 import java.util.UUID
 
 class Subscription(
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/SubscriptionCollection.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/SubscriptionCollection.kt
similarity index 92%
rename from ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/SubscriptionCollection.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/SubscriptionCollection.kt
index 256803bee9..b1d4252c0c 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/SubscriptionCollection.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/SubscriptionCollection.kt
@@ -18,10 +18,10 @@
  * 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.relays
+package com.vitorpamplona.quartz.nip01Core.relays
 
 import com.vitorpamplona.quartz.nip01Core.core.Event
-import com.vitorpamplona.quartz.nip01Core.relays.Filter
+import com.vitorpamplona.quartz.nip01Core.relays.filters.Filter
 
 interface SubscriptionCollection {
     fun isActive(subscriptionId: String): Boolean
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toClient/AuthMessage.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toClient/AuthMessage.kt
similarity index 95%
rename from ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toClient/AuthMessage.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toClient/AuthMessage.kt
index f7c8b7631c..ff45dda0cb 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toClient/AuthMessage.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toClient/AuthMessage.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.relays.commands.toClient
+package com.vitorpamplona.quartz.nip01Core.relays.commands.toClient
 
 import com.fasterxml.jackson.databind.JsonNode
 
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toClient/ClosedMessage.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toClient/ClosedMessage.kt
similarity index 95%
rename from ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toClient/ClosedMessage.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toClient/ClosedMessage.kt
index 2bf0064639..12aae77f7b 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toClient/ClosedMessage.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toClient/ClosedMessage.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.relays.commands.toClient
+package com.vitorpamplona.quartz.nip01Core.relays.commands.toClient
 
 import com.fasterxml.jackson.databind.JsonNode
 
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toClient/EoseMessage.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toClient/EoseMessage.kt
similarity index 95%
rename from ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toClient/EoseMessage.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toClient/EoseMessage.kt
index 26bfdd01f7..fcc100b9b7 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toClient/EoseMessage.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toClient/EoseMessage.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.relays.commands.toClient
+package com.vitorpamplona.quartz.nip01Core.relays.commands.toClient
 
 import com.fasterxml.jackson.databind.JsonNode
 
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toClient/EventMessage.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toClient/EventMessage.kt
similarity index 96%
rename from ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toClient/EventMessage.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toClient/EventMessage.kt
index 5445f7ede1..2f5f60f874 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toClient/EventMessage.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toClient/EventMessage.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.relays.commands.toClient
+package com.vitorpamplona.quartz.nip01Core.relays.commands.toClient
 
 import com.fasterxml.jackson.databind.JsonNode
 import com.vitorpamplona.quartz.nip01Core.core.Event
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toClient/Message.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toClient/Message.kt
similarity index 94%
rename from ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toClient/Message.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toClient/Message.kt
index 3cacc747e0..a025f55286 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toClient/Message.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toClient/Message.kt
@@ -18,6 +18,6 @@
  * 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.relays.commands.toClient
+package com.vitorpamplona.quartz.nip01Core.relays.commands.toClient
 
 interface Message
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toClient/NoticeMessage.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toClient/NoticeMessage.kt
similarity index 95%
rename from ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toClient/NoticeMessage.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toClient/NoticeMessage.kt
index c362b3d4d0..7ad6a35b66 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toClient/NoticeMessage.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toClient/NoticeMessage.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.relays.commands.toClient
+package com.vitorpamplona.quartz.nip01Core.relays.commands.toClient
 
 import com.fasterxml.jackson.databind.JsonNode
 
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toClient/NotifyMessage.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toClient/NotifyMessage.kt
similarity index 95%
rename from ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toClient/NotifyMessage.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toClient/NotifyMessage.kt
index 1442bb7676..06ece97638 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toClient/NotifyMessage.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toClient/NotifyMessage.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.relays.commands.toClient
+package com.vitorpamplona.quartz.nip01Core.relays.commands.toClient
 
 import com.fasterxml.jackson.databind.JsonNode
 
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toClient/OkMessage.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toClient/OkMessage.kt
similarity index 96%
rename from ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toClient/OkMessage.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toClient/OkMessage.kt
index e823007bad..bbcdbea580 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toClient/OkMessage.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toClient/OkMessage.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.relays.commands.toClient
+package com.vitorpamplona.quartz.nip01Core.relays.commands.toClient
 
 import com.fasterxml.jackson.databind.JsonNode
 import com.vitorpamplona.quartz.nip01Core.HexKey
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toClient/ToClientParser.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toClient/ToClientParser.kt
similarity index 96%
rename from ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toClient/ToClientParser.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toClient/ToClientParser.kt
index 0d074617fa..4abf3f552f 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toClient/ToClientParser.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toClient/ToClientParser.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.relays.commands.toClient
+package com.vitorpamplona.quartz.nip01Core.relays.commands.toClient
 
 import com.vitorpamplona.quartz.nip01Core.jackson.EventMapper
 
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toRelay/AuthCmd.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toRelay/AuthCmd.kt
similarity index 96%
rename from ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toRelay/AuthCmd.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toRelay/AuthCmd.kt
index e83339182a..a9451858c1 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toRelay/AuthCmd.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toRelay/AuthCmd.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.relays.commands.toRelay
+package com.vitorpamplona.quartz.nip01Core.relays.commands.toRelay
 
 import com.fasterxml.jackson.databind.JsonNode
 import com.vitorpamplona.quartz.nip01Core.jackson.EventMapper
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toRelay/CloseCmd.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toRelay/CloseCmd.kt
similarity index 95%
rename from ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toRelay/CloseCmd.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toRelay/CloseCmd.kt
index 431c26d319..ba44bff653 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toRelay/CloseCmd.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toRelay/CloseCmd.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.relays.commands.toRelay
+package com.vitorpamplona.quartz.nip01Core.relays.commands.toRelay
 
 import com.fasterxml.jackson.databind.JsonNode
 
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toRelay/Command.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toRelay/Command.kt
similarity index 94%
rename from ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toRelay/Command.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toRelay/Command.kt
index cef2cf29e2..b68b114bf0 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toRelay/Command.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toRelay/Command.kt
@@ -18,6 +18,6 @@
  * 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.relays.commands.toRelay
+package com.vitorpamplona.quartz.nip01Core.relays.commands.toRelay
 
 interface Command
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toRelay/CountCmd.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toRelay/CountCmd.kt
similarity index 91%
rename from ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toRelay/CountCmd.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toRelay/CountCmd.kt
index 662e8772ac..b481c0ed00 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toRelay/CountCmd.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toRelay/CountCmd.kt
@@ -18,13 +18,13 @@
  * 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.relays.commands.toRelay
+package com.vitorpamplona.quartz.nip01Core.relays.commands.toRelay
 
 import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.node.ObjectNode
 import com.vitorpamplona.quartz.nip01Core.jackson.EventMapper
-import com.vitorpamplona.quartz.nip01Core.relays.Filter
-import com.vitorpamplona.quartz.nip01Core.relays.FilterDeserializer
+import com.vitorpamplona.quartz.nip01Core.relays.filters.Filter
+import com.vitorpamplona.quartz.nip01Core.relays.filters.FilterDeserializer
 import com.vitorpamplona.quartz.utils.joinToStringLimited
 
 class CountCmd(
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toRelay/EventCmd.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toRelay/EventCmd.kt
similarity index 96%
rename from ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toRelay/EventCmd.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toRelay/EventCmd.kt
index 70a91e7fca..54f33ae700 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toRelay/EventCmd.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toRelay/EventCmd.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.relays.commands.toRelay
+package com.vitorpamplona.quartz.nip01Core.relays.commands.toRelay
 
 import com.fasterxml.jackson.databind.JsonNode
 import com.vitorpamplona.quartz.nip01Core.core.Event
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toRelay/ReqCmd.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toRelay/ReqCmd.kt
similarity index 80%
rename from ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toRelay/ReqCmd.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toRelay/ReqCmd.kt
index ee9f71cc44..2e703d8605 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toRelay/ReqCmd.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toRelay/ReqCmd.kt
@@ -18,19 +18,19 @@
  * 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.relays.commands.toRelay
+package com.vitorpamplona.quartz.nip01Core.relays.commands.toRelay
 
 import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.node.ObjectNode
 import com.vitorpamplona.quartz.nip01Core.jackson.EventMapper
-import com.vitorpamplona.quartz.nip01Core.relays.Filter
-import com.vitorpamplona.quartz.nip01Core.relays.FilterDeserializer
+import com.vitorpamplona.quartz.nip01Core.relays.filters.Filter
+import com.vitorpamplona.quartz.nip01Core.relays.filters.FilterDeserializer
 import com.vitorpamplona.quartz.utils.joinToStringLimited
 
 class ReqCmd(
     val subscriptionId: String,
     val filters: List<Filter>,
-) : Command {
+) : com.vitorpamplona.quartz.nip01Core.relays.commands.toRelay.Command {
     companion object {
         const val LABEL = "REQ"
 
@@ -50,7 +50,7 @@ class ReqCmd(
             }
 
         @JvmStatic
-        fun parse(msgArray: JsonNode): ReqCmd {
+        fun parse(msgArray: JsonNode): com.vitorpamplona.quartz.nip01Core.relays.commands.toRelay.ReqCmd {
             val filters = mutableListOf<Filter>()
 
             for (i in 2 until msgArray.size()) {
@@ -60,7 +60,10 @@ class ReqCmd(
                 }
             }
 
-            return ReqCmd(msgArray.get(1).asText(), filters)
+            return com.vitorpamplona.quartz.nip01Core.relays.commands.toRelay.ReqCmd(
+                msgArray.get(1).asText(),
+                filters,
+            )
         }
     }
 }
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toRelay/ToRelayParser.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toRelay/ToRelayParser.kt
similarity index 85%
rename from ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toRelay/ToRelayParser.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toRelay/ToRelayParser.kt
index 9e0692f95f..d916d01c67 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/commands/toRelay/ToRelayParser.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/commands/toRelay/ToRelayParser.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.relays.commands.toRelay
+package com.vitorpamplona.quartz.nip01Core.relays.commands.toRelay
 
 import com.vitorpamplona.quartz.nip01Core.jackson.EventMapper
 
@@ -31,7 +31,9 @@ class ToRelayParser {
             CloseCmd.LABEL -> CloseCmd.parse(msgArray)
             CountCmd.LABEL -> CountCmd.parse(msgArray)
             EventCmd.LABEL -> EventCmd.parse(msgArray)
-            ReqCmd.LABEL -> ReqCmd.parse(msgArray)
+            com.vitorpamplona.quartz.nip01Core.relays.commands.toRelay.ReqCmd.LABEL ->
+                com.vitorpamplona.quartz.nip01Core.relays.commands.toRelay.ReqCmd
+                    .parse(msgArray)
             else -> null
         }
     }
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/Filter.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/filters/Filter.kt
similarity index 97%
rename from quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/Filter.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/filters/Filter.kt
index 95522ad786..7bd48bd03d 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/Filter.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/filters/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.quartz.nip01Core.relays
+package com.vitorpamplona.quartz.nip01Core.relays.filters
 
 import com.vitorpamplona.quartz.nip01Core.core.Event
 
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/FilterDeserializer.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/filters/FilterDeserializer.kt
similarity index 97%
rename from quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/FilterDeserializer.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/filters/FilterDeserializer.kt
index 72713181fa..08260a6d94 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/FilterDeserializer.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/filters/FilterDeserializer.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.quartz.nip01Core.relays
+package com.vitorpamplona.quartz.nip01Core.relays.filters
 
 import com.fasterxml.jackson.databind.node.ObjectNode
 
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/FilterMatcher.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/filters/FilterMatcher.kt
similarity index 97%
rename from quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/FilterMatcher.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/filters/FilterMatcher.kt
index fe1ff0319c..7a0bbb43c5 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/FilterMatcher.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/filters/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.quartz.nip01Core.relays
+package com.vitorpamplona.quartz.nip01Core.relays.filters
 
 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/filters/FilterSerializer.kt
similarity index 98%
rename from quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/FilterSerializer.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/filters/FilterSerializer.kt
index a59f48cc05..145c8798ad 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/FilterSerializer.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/filters/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.quartz.nip01Core.relays
+package com.vitorpamplona.quartz.nip01Core.relays.filters
 
 import com.fasterxml.jackson.databind.node.JsonNodeFactory
 import com.fasterxml.jackson.databind.node.ObjectNode
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/sockets/WebSocket.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/sockets/WebSocket.kt
similarity index 95%
rename from ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/sockets/WebSocket.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/sockets/WebSocket.kt
index 7583fd9c69..9fa6598bb8 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/sockets/WebSocket.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/sockets/WebSocket.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.relays.sockets
+package com.vitorpamplona.quartz.nip01Core.relays.sockets
 
 interface WebSocket {
     fun connect()
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/sockets/WebSocketListener.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/sockets/WebSocketListener.kt
similarity index 96%
rename from ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/sockets/WebSocketListener.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/sockets/WebSocketListener.kt
index 40212106a6..69dadfb1d6 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/sockets/WebSocketListener.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/sockets/WebSocketListener.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.relays.sockets
+package com.vitorpamplona.quartz.nip01Core.relays.sockets
 
 interface WebSocketListener {
     fun onOpen(
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/sockets/WebsocketBuilder.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/sockets/WebsocketBuilder.kt
similarity index 95%
rename from ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/sockets/WebsocketBuilder.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/sockets/WebsocketBuilder.kt
index a3bca0d8e8..e8fd6960ee 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/sockets/WebsocketBuilder.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/sockets/WebsocketBuilder.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.relays.sockets
+package com.vitorpamplona.quartz.nip01Core.relays.sockets
 
 interface WebsocketBuilder {
     fun build(
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/sockets/WebsocketBuilderFactory.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/sockets/WebsocketBuilderFactory.kt
similarity index 95%
rename from ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/sockets/WebsocketBuilderFactory.kt
rename to quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/sockets/WebsocketBuilderFactory.kt
index f8aa023d69..3a4a50f14d 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/relays/sockets/WebsocketBuilderFactory.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relays/sockets/WebsocketBuilderFactory.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.relays.sockets
+package com.vitorpamplona.quartz.nip01Core.relays.sockets
 
 interface WebsocketBuilderFactory {
     fun build(forceProxy: Boolean): WebsocketBuilder