refactoring android tests to match refactoring of package names

moving some nip96 stuff to quartz

quartz/src/main/java/com/vitorpamplona/quartz/CryptoUtils.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.crypto
+package com.vitorpamplona.quartz
 
 import com.vitorpamplona.quartz.nip01Core.HexKey
 import com.vitorpamplona.quartz.nip01Core.Nip01
@@ -27,6 +27,8 @@ import com.vitorpamplona.quartz.nip06KeyDerivation.Nip06
 import com.vitorpamplona.quartz.nip44Encryption.Nip44
 import com.vitorpamplona.quartz.nip44Encryption.Nip44v2
 import com.vitorpamplona.quartz.nip49PrivKeyEnc.Nip49
+import com.vitorpamplona.quartz.utils.nextBytes
+import com.vitorpamplona.quartz.utils.sha256Hash
 import fr.acinq.secp256k1.Secp256k1
 import java.security.SecureRandom
 

quartz/src/main/java/com/vitorpamplona/quartz/EventFactory.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
+package com.vitorpamplona.quartz
 
 import com.vitorpamplona.quartz.blossom.BlossomAuthorizationEvent
 import com.vitorpamplona.quartz.blossom.BlossomServersEvent
@@ -36,6 +36,8 @@ import com.vitorpamplona.quartz.experimental.nns.NNSEvent
 import com.vitorpamplona.quartz.experimental.profileGallery.ProfileGalleryEntryEvent
 import com.vitorpamplona.quartz.experimental.relationshipStatus.RelationshipStatusEvent
 import com.vitorpamplona.quartz.experimental.zapPolls.PollNoteEvent
+import com.vitorpamplona.quartz.nip01Core.HexKey
+import com.vitorpamplona.quartz.nip01Core.MetadataEvent
 import com.vitorpamplona.quartz.nip01Core.core.Event
 import com.vitorpamplona.quartz.nip02FollowList.ContactListEvent
 import com.vitorpamplona.quartz.nip03Timestamp.OtsEvent

quartz/src/main/java/com/vitorpamplona/quartz/blossom/BlossomServersEvent.kt

@@ -22,9 +22,9 @@ package com.vitorpamplona.quartz.blossom
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.ATag
-import com.vitorpamplona.quartz.nip01Core.addressables.BaseAddressableEvent
+import com.vitorpamplona.quartz.nip01Core.core.BaseAddressableEvent
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.ATag
 import com.vitorpamplona.quartz.utils.TimeUtils
 
 @Immutable

quartz/src/main/java/com/vitorpamplona/quartz/experimental/audio/AudioTrackEvent.kt

@@ -22,7 +22,7 @@ package com.vitorpamplona.quartz.experimental.audio
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.BaseAddressableEvent
+import com.vitorpamplona.quartz.nip01Core.core.BaseAddressableEvent
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
 import com.vitorpamplona.quartz.utils.TimeUtils
 

quartz/src/main/java/com/vitorpamplona/quartz/experimental/edits/PrivateOutboxRelayListEvent.kt

@@ -24,10 +24,10 @@ import android.util.Log
 import androidx.compose.runtime.Immutable
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.ATag
-import com.vitorpamplona.quartz.nip01Core.addressables.BaseAddressableEvent
+import com.vitorpamplona.quartz.nip01Core.core.BaseAddressableEvent
 import com.vitorpamplona.quartz.nip01Core.jackson.EventMapper
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.ATag
 import com.vitorpamplona.quartz.nip21UriScheme.toNostrUri
 import com.vitorpamplona.quartz.utils.TimeUtils
 import com.vitorpamplona.quartz.utils.bytesUsedInMemory

quartz/src/main/java/com/vitorpamplona/quartz/experimental/edits/TextNoteModificationEvent.kt

@@ -23,8 +23,8 @@ package com.vitorpamplona.quartz.experimental.edits
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
 import com.vitorpamplona.quartz.nip01Core.core.Event
-import com.vitorpamplona.quartz.nip01Core.events.firstTaggedEvent
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip01Core.tags.events.firstTaggedEvent
 import com.vitorpamplona.quartz.utils.TimeUtils
 
 @Immutable

quartz/src/main/java/com/vitorpamplona/quartz/experimental/interactiveStories/InteractiveStoryBaseEvent.kt

@@ -21,13 +21,13 @@
 package com.vitorpamplona.quartz.experimental.interactiveStories
 
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.ATag
-import com.vitorpamplona.quartz.nip01Core.addressables.BaseAddressableEvent
+import com.vitorpamplona.quartz.nip01Core.core.BaseAddressableEvent
 import com.vitorpamplona.quartz.nip01Core.core.firstTagValue
-import com.vitorpamplona.quartz.nip01Core.geohash.geohashMipMap
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.ATag
+import com.vitorpamplona.quartz.nip01Core.tags.geohash.geohashMipMap
 import com.vitorpamplona.quartz.nip10Notes.findHashtags
 import com.vitorpamplona.quartz.nip10Notes.findURLs
-import com.vitorpamplona.quartz.nip19Bech32Entities.parse
+import com.vitorpamplona.quartz.nip19Bech32.parse
 import com.vitorpamplona.quartz.nip30CustomEmoji.EmojiUrl
 import com.vitorpamplona.quartz.nip57Zaps.ZapSplitSetup
 import com.vitorpamplona.quartz.nip92IMeta.IMetaTag

quartz/src/main/java/com/vitorpamplona/quartz/experimental/interactiveStories/InteractiveStoryPrologueEvent.kt

@@ -21,8 +21,8 @@
 package com.vitorpamplona.quartz.experimental.interactiveStories
 
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.ATag
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.ATag
 import com.vitorpamplona.quartz.nip22Comments.RootScope
 import com.vitorpamplona.quartz.nip57Zaps.ZapSplitSetup
 import com.vitorpamplona.quartz.nip92IMeta.IMetaTag

quartz/src/main/java/com/vitorpamplona/quartz/experimental/interactiveStories/InteractiveStoryReadingStateEvent.kt

@@ -22,12 +22,12 @@ package com.vitorpamplona.quartz.experimental.interactiveStories
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.ATag
-import com.vitorpamplona.quartz.nip01Core.addressables.BaseAddressableEvent
+import com.vitorpamplona.quartz.nip01Core.core.BaseAddressableEvent
 import com.vitorpamplona.quartz.nip01Core.core.firstTag
 import com.vitorpamplona.quartz.nip01Core.core.firstTagValue
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
-import com.vitorpamplona.quartz.nip19Bech32Entities.parse
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.ATag
+import com.vitorpamplona.quartz.nip19Bech32.parse
 import com.vitorpamplona.quartz.utils.TimeUtils
 import com.vitorpamplona.quartz.utils.removeTrailingNullsAndEmptyOthers
 

quartz/src/main/java/com/vitorpamplona/quartz/experimental/interactiveStories/InteractiveStorySceneEvent.kt

@@ -21,8 +21,8 @@
 package com.vitorpamplona.quartz.experimental.interactiveStories
 
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.ATag
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.ATag
 import com.vitorpamplona.quartz.nip22Comments.RootScope
 import com.vitorpamplona.quartz.nip57Zaps.ZapSplitSetup
 import com.vitorpamplona.quartz.nip92IMeta.IMetaTag

quartz/src/main/java/com/vitorpamplona/quartz/experimental/nns/NNSEvent.kt

@@ -22,7 +22,7 @@ package com.vitorpamplona.quartz.experimental.nns
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.BaseAddressableEvent
+import com.vitorpamplona.quartz.nip01Core.core.BaseAddressableEvent
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
 import com.vitorpamplona.quartz.utils.TimeUtils
 

quartz/src/main/java/com/vitorpamplona/quartz/experimental/profileGallery/GalleryListEvent.kt

@@ -22,8 +22,8 @@ package com.vitorpamplona.quartz.experimental.profileGallery
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.ATag
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.ATag
 import com.vitorpamplona.quartz.nip51Lists.GeneralListEvent
 import com.vitorpamplona.quartz.utils.TimeUtils
 

quartz/src/main/java/com/vitorpamplona/quartz/experimental/zapPolls/PollNoteEvent.kt

@@ -22,9 +22,9 @@ package com.vitorpamplona.quartz.experimental.zapPolls
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.ATag
-import com.vitorpamplona.quartz.nip01Core.geohash.geohashMipMap
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.ATag
+import com.vitorpamplona.quartz.nip01Core.tags.geohash.geohashMipMap
 import com.vitorpamplona.quartz.nip10Notes.BaseTextNoteEvent
 import com.vitorpamplona.quartz.nip30CustomEmoji.EmojiUrl
 import com.vitorpamplona.quartz.nip57Zaps.ZapSplitSetup

quartz/src/main/java/com/vitorpamplona/quartz/lightning/Lud06.kt

@@ -21,7 +21,7 @@
 package com.vitorpamplona.quartz.lightning
 
 import android.util.Log
-import com.vitorpamplona.quartz.nip19Bech32Entities.bech32.Bech32
+import com.vitorpamplona.quartz.nip19Bech32.bech32.Bech32
 import java.util.regex.Pattern
 
 class Lud06 {

quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/EventExt.kt

@@ -21,9 +21,9 @@
 package com.vitorpamplona.quartz.nip01Core
 
 import android.util.Log
-import com.vitorpamplona.quartz.crypto.CryptoUtils
-import com.vitorpamplona.quartz.crypto.Hex
+import com.vitorpamplona.quartz.CryptoUtils
 import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.utils.Hex
 
 fun Event.generateId(): String = EventHasher.hashId(pubKey, createdAt, kind, tags, content)
 

quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/EventHasher.kt

@@ -21,8 +21,8 @@
 package com.vitorpamplona.quartz.nip01Core
 
 import com.fasterxml.jackson.databind.node.JsonNodeFactory
-import com.vitorpamplona.quartz.crypto.sha256Hash
 import com.vitorpamplona.quartz.nip01Core.jackson.EventMapper
+import com.vitorpamplona.quartz.utils.sha256Hash
 
 class EventHasher {
     companion object {

quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/EventHintBundle.kt

@@ -22,12 +22,12 @@ package com.vitorpamplona.quartz.nip01Core
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.core.Event
-import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NEvent
+import com.vitorpamplona.quartz.nip19Bech32.entities.NEvent
 import com.vitorpamplona.quartz.utils.bytesUsedInMemory
 import com.vitorpamplona.quartz.utils.pointerSizeInBytes
 
 @Immutable
-data class EventHint<T : Event>(
+data class EventHintBundle<T : Event>(
     val event: T,
 ) {
     var relay: String? = null

quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/HexKey.kt

@@ -20,7 +20,7 @@
  */
 package com.vitorpamplona.quartz.nip01Core
 
-import com.vitorpamplona.quartz.crypto.Hex
+import com.vitorpamplona.quartz.utils.Hex
 
 /** Makes the distinction between String and Hex * */
 typealias HexKey = String

quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/KeyPair.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.quartz.crypto
+package com.vitorpamplona.quartz.nip01Core
 
-import com.vitorpamplona.quartz.nip01Core.toHexKey
+import com.vitorpamplona.quartz.CryptoUtils
 
 class KeyPair(
     privKey: ByteArray? = null,

quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/Nip01.kt

@@ -20,9 +20,9 @@
  */
 package com.vitorpamplona.quartz.nip01Core
 
-import com.vitorpamplona.quartz.crypto.CryptoUtils
-import com.vitorpamplona.quartz.crypto.nextBytes
-import com.vitorpamplona.quartz.crypto.sha256Hash
+import com.vitorpamplona.quartz.CryptoUtils
+import com.vitorpamplona.quartz.utils.nextBytes
+import com.vitorpamplona.quartz.utils.sha256Hash
 import fr.acinq.secp256k1.Secp256k1
 import java.security.SecureRandom
 

quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/core/AddressableEvent.kt

@@ -18,9 +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.quartz.nip01Core.addressables
+package com.vitorpamplona.quartz.nip01Core.core
 
 import androidx.compose.runtime.Immutable
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.ATag
 
 @Immutable
 interface AddressableEvent {

quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/core/BaseAddressableEvent.kt

@@ -18,11 +18,12 @@
  * 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.addressables
+package com.vitorpamplona.quartz.nip01Core.core
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.ATag
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.dTag
 
 @Immutable
 open class BaseAddressableEvent(
@@ -35,7 +36,7 @@ open class BaseAddressableEvent(
     sig: HexKey,
 ) : Event(id, pubKey, createdAt, kind, tags, content, sig),
     AddressableEvent {
-    override fun dTag() = tags.firstOrNull { it.size > 1 && it[0] == "d" }?.get(1) ?: ""
+    override fun dTag() = tags.dTag()
 
     override fun address(relayHint: String?) = ATag(kind, pubKey, dTag(), relayHint)
 

quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/jackson/EventManualDeserializer.kt

@@ -21,7 +21,7 @@
 package com.vitorpamplona.quartz.nip01Core.jackson
 
 import com.fasterxml.jackson.databind.JsonNode
-import com.vitorpamplona.quartz.nip01Core.EventFactory
+import com.vitorpamplona.quartz.EventFactory
 import com.vitorpamplona.quartz.nip01Core.core.Event
 
 class EventManualDeserializer {

quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/signers/NostrSigner.kt

@@ -20,7 +20,7 @@
  */
 package com.vitorpamplona.quartz.nip01Core.signers
 
-import com.vitorpamplona.quartz.nip01Core.EventFactory
+import com.vitorpamplona.quartz.EventFactory
 import com.vitorpamplona.quartz.nip01Core.HexKey
 import com.vitorpamplona.quartz.nip01Core.core.Event
 import com.vitorpamplona.quartz.nip04Dm.Nip04

quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/signers/NostrSignerInternal.kt

@@ -20,8 +20,8 @@
  */
 package com.vitorpamplona.quartz.nip01Core.signers
 
-import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.nip01Core.HexKey
+import com.vitorpamplona.quartz.nip01Core.KeyPair
 import com.vitorpamplona.quartz.nip01Core.core.Event
 import com.vitorpamplona.quartz.nip01Core.toHexKey
 import com.vitorpamplona.quartz.nip57Zaps.LnZapPrivateEvent

quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/signers/NostrSignerSync.kt

@@ -21,16 +21,16 @@
 package com.vitorpamplona.quartz.nip01Core.signers
 
 import android.util.Log
-import com.vitorpamplona.quartz.crypto.CryptoUtils
-import com.vitorpamplona.quartz.crypto.KeyPair
-import com.vitorpamplona.quartz.nip01Core.EventFactory
+import com.vitorpamplona.quartz.CryptoUtils
+import com.vitorpamplona.quartz.EventFactory
 import com.vitorpamplona.quartz.nip01Core.HexKey
+import com.vitorpamplona.quartz.nip01Core.KeyPair
 import com.vitorpamplona.quartz.nip01Core.core.Event
 import com.vitorpamplona.quartz.nip01Core.hexToByteArray
 import com.vitorpamplona.quartz.nip01Core.toHexKey
 import com.vitorpamplona.quartz.nip57Zaps.LnZapPrivateEvent
 import com.vitorpamplona.quartz.nip57Zaps.LnZapRequestEvent
-import com.vitorpamplona.quartz.nip57Zaps.PrivateZapEncryption
+import com.vitorpamplona.quartz.nip57Zaps.PrivateZapRequestBuilder
 
 class NostrSignerSync(
     val keyPair: KeyPair,
@@ -46,7 +46,7 @@ class NostrSignerSync(
 
         return if (isUnsignedPrivateZapEvent(kind, tags)) {
             // this is a private zap
-            signPrivateZap(createdAt, kind, tags, content)
+            PrivateZapRequestBuilder().signPrivateZapRequest(createdAt, kind, tags, content, this)
         } else {
             signNormal(createdAt, kind, tags, content)
         }
@@ -139,104 +139,5 @@ class NostrSignerSync(
             )
     }
 
-    private fun <T> signPrivateZap(
-        createdAt: Long,
-        kind: Int,
-        tags: Array<Array<String>>,
-        content: String,
-    ): T? {
-        if (keyPair.privKey == null) return null
-
-        val zappedEvent = tags.firstOrNull { it.size > 1 && it[0] == "e" }?.let { it[1] }
-        val userHex = tags.firstOrNull { it.size > 1 && it[0] == "p" }?.let { it[1] } ?: return null
-
-        // if it is a Zap for an Event, use event.id if not, use the user's pubkey
-        val idToGeneratePrivateKey = zappedEvent ?: userHex
-
-        val encryptionPrivateKey =
-            PrivateZapEncryption.createEncryptionPrivateKey(
-                keyPair.privKey.toHexKey(),
-                idToGeneratePrivateKey,
-                createdAt,
-            )
-
-        val fullTagsNoAnon = tags.filter { t -> t.getOrNull(0) != "anon" }.toTypedArray()
-
-        val privateEvent = LnZapPrivateEvent.create(this, fullTagsNoAnon, content) ?: return null
-
-        val noteJson = privateEvent.toJson()
-        val encryptedContent =
-            PrivateZapEncryption.encryptPrivateZapMessage(
-                noteJson,
-                encryptionPrivateKey,
-                userHex.hexToByteArray(),
-            )
-
-        val newTags =
-            tags.filter { t -> t.getOrNull(0) != "anon" } + listOf(arrayOf("anon", encryptedContent))
-        val newContent = ""
-
-        return NostrSignerSync(KeyPair(encryptionPrivateKey)).signNormal(createdAt, kind, newTags.toTypedArray(), newContent)
-    }
-
-    fun decryptZapEvent(event: LnZapRequestEvent): LnZapPrivateEvent? {
-        if (keyPair.privKey == null) return null
-
-        val recipientPK = event.zappedAuthor().firstOrNull()
-        val recipientPost = event.zappedPost().firstOrNull()
-        val privateEvent =
-            if (recipientPK == pubKey) {
-                // if the receiver is logged in, these are the params.
-                val privateKeyToUse = keyPair.privKey
-                val pubkeyToUse = event.pubKey
-
-                event.getPrivateZapEvent(privateKeyToUse, pubkeyToUse)
-            } else {
-                // if the sender is logged in, these are the params
-                val altPubkeyToUse = recipientPK
-                val altPrivateKeyToUse =
-                    if (recipientPost != null) {
-                        PrivateZapEncryption.createEncryptionPrivateKey(
-                            keyPair.privKey.toHexKey(),
-                            recipientPost,
-                            event.createdAt,
-                        )
-                    } else if (recipientPK != null) {
-                        PrivateZapEncryption.createEncryptionPrivateKey(
-                            keyPair.privKey.toHexKey(),
-                            recipientPK,
-                            event.createdAt,
-                        )
-                    } else {
-                        null
-                    }
-
-                try {
-                    if (altPrivateKeyToUse != null && altPubkeyToUse != null) {
-                        val altPubKeyFromPrivate = CryptoUtils.pubkeyCreate(altPrivateKeyToUse).toHexKey()
-
-                        if (altPubKeyFromPrivate == event.pubKey) {
-                            val result = event.getPrivateZapEvent(altPrivateKeyToUse, altPubkeyToUse)
-
-                            if (result == null) {
-                                Log.w(
-                                    "Private ZAP Decrypt",
-                                    "Fail to decrypt Zap from ${event.id}",
-                                )
-                            }
-                            result
-                        } else {
-                            null
-                        }
-                    } else {
-                        null
-                    }
-                } catch (e: Exception) {
-                    Log.e("Account", "Failed to create pubkey for ZapRequest ${event.id}", e)
-                    null
-                }
-            }
-
-        return privateEvent
-    }
+    fun decryptZapEvent(event: LnZapRequestEvent): LnZapPrivateEvent? = PrivateZapRequestBuilder().decryptZapEvent(event, this)
 }

quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/tags/addressables/ATag.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.addressables
+package com.vitorpamplona.quartz.nip01Core.tags.addressables
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.utils.bytesUsedInMemory

quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/tags/addressables/EventExt.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.addressables
+package com.vitorpamplona.quartz.nip01Core.tags.addressables
 
 import com.vitorpamplona.quartz.nip01Core.core.Event
 

quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/tags/addressables/TagArrayExt.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.addressables
+package com.vitorpamplona.quartz.nip01Core.tags.addressables
 
 import com.vitorpamplona.quartz.nip01Core.core.TagArray
 import com.vitorpamplona.quartz.nip01Core.core.firstMapTagged
@@ -26,7 +26,9 @@ import com.vitorpamplona.quartz.nip01Core.core.isAnyTagged
 import com.vitorpamplona.quartz.nip01Core.core.isTagged
 import com.vitorpamplona.quartz.nip01Core.core.mapTagged
 import com.vitorpamplona.quartz.nip01Core.core.mapValueTagged
-import com.vitorpamplona.quartz.nip19Bech32Entities.parse
+import com.vitorpamplona.quartz.nip19Bech32.parse
+
+fun TagArray.dTag() = this.firstOrNull { it.size > 1 && it[0] == "d" }?.get(1) ?: ""
 
 fun <R> TagArray.mapTaggedAddress(map: (address: String) -> R) = this.mapValueTagged("a", map)
 

quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/tags/events/EventExt.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.events
+package com.vitorpamplona.quartz.nip01Core.tags.events
 
 import com.vitorpamplona.quartz.nip01Core.HexKey
 import com.vitorpamplona.quartz.nip01Core.core.Event

quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/tags/events/TagArrayExt.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.events
+package com.vitorpamplona.quartz.nip01Core.tags.events
 
 import com.vitorpamplona.quartz.nip01Core.HexKey
 import com.vitorpamplona.quartz.nip01Core.core.TagArray

quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/tags/geohash/EventExt.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.geohash
+package com.vitorpamplona.quartz.nip01Core.tags.geohash
 
 import com.vitorpamplona.quartz.nip01Core.core.Event
 import com.vitorpamplona.quartz.nip22Comments.CommentEvent

quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/tags/geohash/GeoHash.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.geohash
+package com.vitorpamplona.quartz.nip01Core.tags.geohash
 
 fun geohashMipMap(geohash: String): Array<Array<String>> =
     geohash.indices

quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/tags/geohash/TagArrayExt.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.geohash
+package com.vitorpamplona.quartz.nip01Core.tags.geohash
 
 import com.vitorpamplona.quartz.nip01Core.core.TagArray
 import com.vitorpamplona.quartz.nip01Core.core.anyTagWithValueStartingWithIgnoreCase

quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/tags/hashtags/EventExt.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.hashtags
+package com.vitorpamplona.quartz.nip01Core.tags.hashtags
 
 import com.vitorpamplona.quartz.nip01Core.HexKey
 import com.vitorpamplona.quartz.nip01Core.core.Event

quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/tags/hashtags/TagArrayExt.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.hashtags
+package com.vitorpamplona.quartz.nip01Core.tags.hashtags
 
 import com.vitorpamplona.quartz.nip01Core.HexKey
 import com.vitorpamplona.quartz.nip01Core.core.TagArray

quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/tags/people/EventExt.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.people
+package com.vitorpamplona.quartz.nip01Core.tags.people
 
 import com.vitorpamplona.quartz.nip01Core.core.Event
 import com.vitorpamplona.quartz.nip01Core.core.firstTagValue

quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/tags/people/TagArrayExt.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.people
+package com.vitorpamplona.quartz.nip01Core.tags.people
 
 import com.vitorpamplona.quartz.nip01Core.core.TagArray
 import com.vitorpamplona.quartz.nip01Core.core.firstTagValue

quartz/src/main/java/com/vitorpamplona/quartz/nip02FollowList/ContactListEvent.kt

@@ -25,20 +25,20 @@ import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.ATag
-import com.vitorpamplona.quartz.nip01Core.addressables.isTaggedAddressableNote
 import com.vitorpamplona.quartz.nip01Core.core.Event
-import com.vitorpamplona.quartz.nip01Core.events.isTaggedEvent
-import com.vitorpamplona.quartz.nip01Core.geohash.isTaggedGeoHash
-import com.vitorpamplona.quartz.nip01Core.hashtags.hashtags
-import com.vitorpamplona.quartz.nip01Core.hashtags.isTaggedHash
 import com.vitorpamplona.quartz.nip01Core.jackson.EventMapper
-import com.vitorpamplona.quartz.nip01Core.people.isTaggedUser
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.ATag
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.isTaggedAddressableNote
+import com.vitorpamplona.quartz.nip01Core.tags.events.isTaggedEvent
+import com.vitorpamplona.quartz.nip01Core.tags.geohash.isTaggedGeoHash
+import com.vitorpamplona.quartz.nip01Core.tags.hashtags.hashtags
+import com.vitorpamplona.quartz.nip01Core.tags.hashtags.isTaggedHash
+import com.vitorpamplona.quartz.nip01Core.tags.people.isTaggedUser
 import com.vitorpamplona.quartz.nip01Core.toHexKey
-import com.vitorpamplona.quartz.nip19Bech32Entities.decodePublicKey
-import com.vitorpamplona.quartz.nip19Bech32Entities.parse
+import com.vitorpamplona.quartz.nip19Bech32.decodePublicKey
+import com.vitorpamplona.quartz.nip19Bech32.parse
 import com.vitorpamplona.quartz.utils.TimeUtils
 
 @Immutable data class Contact(

quartz/src/main/java/com/vitorpamplona/quartz/nip03Timestamp/ots/Hash.java

@@ -1,6 +1,6 @@
 package com.vitorpamplona.quartz.nip03Timestamp.ots;
 
-import com.vitorpamplona.quartz.crypto.Hex;
+import com.vitorpamplona.quartz.utils.Hex;
 import com.vitorpamplona.quartz.nip03Timestamp.ots.op.OpCrypto;
 import com.vitorpamplona.quartz.nip03Timestamp.ots.op.OpKECCAK256;
 import com.vitorpamplona.quartz.nip03Timestamp.ots.op.OpRIPEMD160;

quartz/src/main/java/com/vitorpamplona/quartz/nip03Timestamp/ots/OpenTimestamps.java

@@ -2,7 +2,7 @@ package com.vitorpamplona.quartz.nip03Timestamp.ots;
 
 import android.util.Log;
 
-import com.vitorpamplona.quartz.crypto.Hex;
+import com.vitorpamplona.quartz.utils.Hex;
 import com.vitorpamplona.quartz.nip03Timestamp.ots.attestation.BitcoinBlockHeaderAttestation;
 import com.vitorpamplona.quartz.nip03Timestamp.ots.attestation.EthereumBlockHeaderAttestation;
 import com.vitorpamplona.quartz.nip03Timestamp.ots.attestation.LitecoinBlockHeaderAttestation;

quartz/src/main/java/com/vitorpamplona/quartz/nip03Timestamp/ots/Timestamp.java

@@ -1,6 +1,6 @@
 package com.vitorpamplona.quartz.nip03Timestamp.ots;
 
-import com.vitorpamplona.quartz.crypto.Hex;
+import com.vitorpamplona.quartz.utils.Hex;
 import com.vitorpamplona.quartz.nip03Timestamp.ots.attestation.BitcoinBlockHeaderAttestation;
 import com.vitorpamplona.quartz.nip03Timestamp.ots.attestation.TimeAttestation;
 import com.vitorpamplona.quartz.nip03Timestamp.ots.exceptions.DeserializationException;

quartz/src/main/java/com/vitorpamplona/quartz/nip03Timestamp/ots/op/OpBinary.java

@@ -2,7 +2,7 @@ package com.vitorpamplona.quartz.nip03Timestamp.ots.op;
 
 import android.util.Log;
 
-import com.vitorpamplona.quartz.crypto.Hex;
+import com.vitorpamplona.quartz.utils.Hex;
 import com.vitorpamplona.quartz.nip03Timestamp.ots.StreamDeserializationContext;
 import com.vitorpamplona.quartz.nip03Timestamp.ots.StreamSerializationContext;
 import com.vitorpamplona.quartz.nip03Timestamp.ots.Utils;

quartz/src/main/java/com/vitorpamplona/quartz/nip04Dm/Nip04.kt

@@ -21,8 +21,8 @@
 package com.vitorpamplona.quartz.nip04Dm
 
 import android.util.Log
-import com.vitorpamplona.quartz.crypto.Hex
 import com.vitorpamplona.quartz.nip44Encryption.SharedKeyCache
+import com.vitorpamplona.quartz.utils.Hex
 import fr.acinq.secp256k1.Secp256k1
 import java.security.SecureRandom
 import java.util.Base64

quartz/src/main/java/com/vitorpamplona/quartz/nip04Dm/PrivateDmEvent.kt

@@ -21,16 +21,16 @@
 package com.vitorpamplona.quartz.nip04Dm
 
 import androidx.compose.runtime.Immutable
-import com.vitorpamplona.quartz.crypto.Hex
 import com.vitorpamplona.quartz.experimental.inlineMetadata.Nip54InlineMetadata
 import com.vitorpamplona.quartz.nip01Core.HexKey
 import com.vitorpamplona.quartz.nip01Core.core.Event
-import com.vitorpamplona.quartz.nip01Core.geohash.geohashMipMap
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip01Core.tags.geohash.geohashMipMap
 import com.vitorpamplona.quartz.nip17Dm.ChatroomKey
 import com.vitorpamplona.quartz.nip17Dm.ChatroomKeyable
 import com.vitorpamplona.quartz.nip57Zaps.ZapSplitSetup
 import com.vitorpamplona.quartz.nip92IMeta.IMetaTag
+import com.vitorpamplona.quartz.utils.Hex
 import com.vitorpamplona.quartz.utils.TimeUtils
 import com.vitorpamplona.quartz.utils.bytesUsedInMemory
 import com.vitorpamplona.quartz.utils.pointerSizeInBytes

quartz/src/main/java/com/vitorpamplona/quartz/nip05DnsIdentifiers/Nip05.kt

@@ -0,0 +1,67 @@
+/**
+ * Copyright (c) 2024 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * 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.nip05DnsIdentifiers
+
+import com.vitorpamplona.quartz.nip01Core.jackson.EventMapper
+import kotlinx.coroutines.CancellationException
+
+class Nip05 {
+    fun assembleUrl(nip05address: String): String? {
+        val parts = nip05address.trim().split("@")
+
+        if (parts.size == 2) {
+            return "https://${parts[1]}/.well-known/nostr.json?name=${parts[0]}"
+        }
+        if (parts.size == 1) {
+            return "https://${parts[0]}/.well-known/nostr.json?name=_"
+        }
+
+        return null
+    }
+
+    fun parseHexKeyFor(
+        nip05: String,
+        returnBody: String,
+    ): Result<String?> {
+        // NIP05 usernames are case insensitive, but JSON properties are not
+        // converts the json to lowercase and then tries to access the username via a
+        // lowercase version of the username.
+        val nip05url =
+            try {
+                EventMapper.mapper.readTree(returnBody.lowercase())
+            } catch (e: Throwable) {
+                if (e is CancellationException) throw e
+                return Result.failure(e)
+            }
+
+        val parts = nip05.split("@")
+        val user =
+            if (parts.size == 2) {
+                parts[0].lowercase()
+            } else {
+                "_"
+            }
+
+        val hexKey = nip05url?.get("names")?.get(user)?.asText()
+
+        return Result.success(hexKey)
+    }
+}

quartz/src/main/java/com/vitorpamplona/quartz/nip06KeyDerivation/Bip39Mnemonics.kt

@@ -20,8 +20,8 @@
  */
 package com.vitorpamplona.quartz.nip06KeyDerivation
 
-import com.vitorpamplona.quartz.crypto.sha256Hash
 import com.vitorpamplona.quartz.nip49PrivKeyEnc.PBKDF
+import com.vitorpamplona.quartz.utils.sha256Hash
 
 // CODE FROM: https://github.com/ACINQ/bitcoin-kmp/
 

quartz/src/main/java/com/vitorpamplona/quartz/nip09Deletions/DeletionEvent.kt

@@ -22,11 +22,11 @@ package com.vitorpamplona.quartz.nip09Deletions
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.AddressableEvent
-import com.vitorpamplona.quartz.nip01Core.addressables.taggedAddresses
+import com.vitorpamplona.quartz.nip01Core.core.AddressableEvent
 import com.vitorpamplona.quartz.nip01Core.core.Event
-import com.vitorpamplona.quartz.nip01Core.events.taggedEvents
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.taggedAddresses
+import com.vitorpamplona.quartz.nip01Core.tags.events.taggedEvents
 import com.vitorpamplona.quartz.utils.TimeUtils
 
 @Immutable

quartz/src/main/java/com/vitorpamplona/quartz/nip10Notes/BaseTextNoteEvent.kt

@@ -23,20 +23,20 @@ package com.vitorpamplona.quartz.nip10Notes
 import android.util.Log
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.ATag
-import com.vitorpamplona.quartz.nip01Core.addressables.taggedAddresses
 import com.vitorpamplona.quartz.nip01Core.core.Event
-import com.vitorpamplona.quartz.nip01Core.people.taggedUsers
-import com.vitorpamplona.quartz.nip19Bech32Entities.Nip19Parser
-import com.vitorpamplona.quartz.nip19Bech32Entities.Nip19Parser.nip19regex
-import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NAddress
-import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NEmbed
-import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NEvent
-import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NProfile
-import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NPub
-import com.vitorpamplona.quartz.nip19Bech32Entities.entities.Note
-import com.vitorpamplona.quartz.nip19Bech32Entities.parse
-import com.vitorpamplona.quartz.nip19Bech32Entities.parseAtag
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.ATag
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.taggedAddresses
+import com.vitorpamplona.quartz.nip01Core.tags.people.taggedUsers
+import com.vitorpamplona.quartz.nip19Bech32.Nip19Parser
+import com.vitorpamplona.quartz.nip19Bech32.Nip19Parser.nip19regex
+import com.vitorpamplona.quartz.nip19Bech32.entities.NAddress
+import com.vitorpamplona.quartz.nip19Bech32.entities.NEmbed
+import com.vitorpamplona.quartz.nip19Bech32.entities.NEvent
+import com.vitorpamplona.quartz.nip19Bech32.entities.NProfile
+import com.vitorpamplona.quartz.nip19Bech32.entities.NPub
+import com.vitorpamplona.quartz.nip19Bech32.entities.Note
+import com.vitorpamplona.quartz.nip19Bech32.parse
+import com.vitorpamplona.quartz.nip19Bech32.parseAtag
 import com.vitorpamplona.quartz.nip54Wiki.WikiNoteEvent
 import com.vitorpamplona.quartz.nip72ModCommunities.CommunityDefinitionEvent
 import java.util.regex.Pattern

quartz/src/main/java/com/vitorpamplona/quartz/nip10Notes/ETag.kt

@@ -23,9 +23,9 @@ package com.vitorpamplona.quartz.nip10Notes
 import android.util.Log
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip19Bech32Entities.Nip19Parser
-import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NEvent
-import com.vitorpamplona.quartz.nip19Bech32Entities.entities.Note
+import com.vitorpamplona.quartz.nip19Bech32.Nip19Parser
+import com.vitorpamplona.quartz.nip19Bech32.entities.NEvent
+import com.vitorpamplona.quartz.nip19Bech32.entities.Note
 import com.vitorpamplona.quartz.utils.bytesUsedInMemory
 import com.vitorpamplona.quartz.utils.pointerSizeInBytes
 import com.vitorpamplona.quartz.utils.removeTrailingNullsAndEmptyOthers

quartz/src/main/java/com/vitorpamplona/quartz/nip10Notes/PTag.kt

@@ -23,8 +23,8 @@ package com.vitorpamplona.quartz.nip10Notes
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
 import com.vitorpamplona.quartz.nip01Core.hexToByteArray
-import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NProfile
-import com.vitorpamplona.quartz.nip19Bech32Entities.toNpub
+import com.vitorpamplona.quartz.nip19Bech32.entities.NProfile
+import com.vitorpamplona.quartz.nip19Bech32.toNpub
 import com.vitorpamplona.quartz.utils.bytesUsedInMemory
 import com.vitorpamplona.quartz.utils.pointerSizeInBytes
 import com.vitorpamplona.quartz.utils.removeTrailingNullsAndEmptyOthers

quartz/src/main/java/com/vitorpamplona/quartz/nip10Notes/TextNoteEvent.kt

@@ -24,11 +24,11 @@ import androidx.compose.runtime.Immutable
 import com.linkedin.urls.detection.UrlDetector
 import com.linkedin.urls.detection.UrlDetectorOptions
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.ATag
-import com.vitorpamplona.quartz.nip01Core.addressables.AddressableEvent
+import com.vitorpamplona.quartz.nip01Core.core.AddressableEvent
 import com.vitorpamplona.quartz.nip01Core.core.Event
-import com.vitorpamplona.quartz.nip01Core.geohash.geohashMipMap
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.ATag
+import com.vitorpamplona.quartz.nip01Core.tags.geohash.geohashMipMap
 import com.vitorpamplona.quartz.nip30CustomEmoji.EmojiUrl
 import com.vitorpamplona.quartz.nip57Zaps.ZapSplitSetup
 import com.vitorpamplona.quartz.nip92IMeta.IMetaTag

quartz/src/main/java/com/vitorpamplona/quartz/nip17Dm/AESGCM.kt

@@ -20,7 +20,7 @@
  */
 package com.vitorpamplona.quartz.nip17Dm
 
-import com.vitorpamplona.quartz.crypto.CryptoUtils
+import com.vitorpamplona.quartz.CryptoUtils
 import com.vitorpamplona.quartz.nip01Core.toHexKey
 import javax.crypto.Cipher
 import javax.crypto.spec.GCMParameterSpec

quartz/src/main/java/com/vitorpamplona/quartz/nip17Dm/ChatMessageEvent.kt

@@ -22,8 +22,8 @@ package com.vitorpamplona.quartz.nip17Dm
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.geohash.geohashMipMap
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip01Core.tags.geohash.geohashMipMap
 import com.vitorpamplona.quartz.nip30CustomEmoji.EmojiUrl
 import com.vitorpamplona.quartz.nip57Zaps.ZapSplitSetup
 import com.vitorpamplona.quartz.nip59Giftwrap.WrappedEvent

quartz/src/main/java/com/vitorpamplona/quartz/nip17Dm/ChatMessageRelayListEvent.kt

@@ -22,10 +22,10 @@ package com.vitorpamplona.quartz.nip17Dm
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.ATag
-import com.vitorpamplona.quartz.nip01Core.addressables.BaseAddressableEvent
+import com.vitorpamplona.quartz.nip01Core.core.BaseAddressableEvent
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.ATag
 import com.vitorpamplona.quartz.utils.TimeUtils
 
 @Immutable

quartz/src/main/java/com/vitorpamplona/quartz/nip18Reposts/GenericRepostEvent.kt

@@ -22,7 +22,7 @@ package com.vitorpamplona.quartz.nip18Reposts
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.AddressableEvent
+import com.vitorpamplona.quartz.nip01Core.core.AddressableEvent
 import com.vitorpamplona.quartz.nip01Core.core.Event
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
 import com.vitorpamplona.quartz.utils.TimeUtils

quartz/src/main/java/com/vitorpamplona/quartz/nip18Reposts/RepostEvent.kt

@@ -22,11 +22,11 @@ package com.vitorpamplona.quartz.nip18Reposts
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.AddressableEvent
+import com.vitorpamplona.quartz.nip01Core.core.AddressableEvent
 import com.vitorpamplona.quartz.nip01Core.core.Event
-import com.vitorpamplona.quartz.nip01Core.events.taggedEvents
-import com.vitorpamplona.quartz.nip01Core.people.taggedUsers
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip01Core.tags.events.taggedEvents
+import com.vitorpamplona.quartz.nip01Core.tags.people.taggedUsers
 import com.vitorpamplona.quartz.utils.TimeUtils
 
 @Immutable

quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/ATagExt.kt

@@ -18,12 +18,12 @@
  * 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.nip19Bech32Entities
+package com.vitorpamplona.quartz.nip19Bech32
 
 import android.util.Log
-import com.vitorpamplona.quartz.crypto.Hex
-import com.vitorpamplona.quartz.nip01Core.addressables.ATag
-import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NAddress
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.ATag
+import com.vitorpamplona.quartz.nip19Bech32.entities.NAddress
+import com.vitorpamplona.quartz.utils.Hex
 
 fun ATag.Companion.isATag(key: String): Boolean = key.startsWith("naddr1") || key.contains(":")
 

quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/ByteArrayExt.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.quartz.nip19Bech32Entities
+package com.vitorpamplona.quartz.nip19Bech32
 
-import com.vitorpamplona.quartz.nip19Bech32Entities.bech32.Bech32
+import com.vitorpamplona.quartz.nip19Bech32.bech32.Bech32
 
 fun ByteArray.toNsec() = Bech32.encodeBytes(hrp = "nsec", this, Bech32.Encoding.Bech32)
 

quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/EventExt.kt

@@ -18,12 +18,12 @@
  * 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.nip19Bech32Entities
+package com.vitorpamplona.quartz.nip19Bech32
 
-import com.vitorpamplona.quartz.nip01Core.addressables.ATag
-import com.vitorpamplona.quartz.nip01Core.addressables.AddressableEvent
+import com.vitorpamplona.quartz.nip01Core.core.AddressableEvent
 import com.vitorpamplona.quartz.nip01Core.core.Event
-import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NEvent
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.ATag
+import com.vitorpamplona.quartz.nip19Bech32.entities.NEvent
 
 fun Event.toNIP19(): String =
     if (this is AddressableEvent) {

quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/Nip19Parser.kt

@@ -18,25 +18,25 @@
  * 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.nip19Bech32Entities
+package com.vitorpamplona.quartz.nip19Bech32
 
 import android.util.Log
 import androidx.compose.runtime.Immutable
-import com.vitorpamplona.quartz.crypto.Hex
-import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.nip01Core.HexKey
+import com.vitorpamplona.quartz.nip01Core.KeyPair
 import com.vitorpamplona.quartz.nip01Core.hexToByteArray
 import com.vitorpamplona.quartz.nip01Core.toHexKey
-import com.vitorpamplona.quartz.nip19Bech32Entities.bech32.bechToBytes
-import com.vitorpamplona.quartz.nip19Bech32Entities.entities.Entity
-import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NAddress
-import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NEmbed
-import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NEvent
-import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NProfile
-import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NPub
-import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NRelay
-import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NSec
-import com.vitorpamplona.quartz.nip19Bech32Entities.entities.Note
+import com.vitorpamplona.quartz.nip19Bech32.bech32.bechToBytes
+import com.vitorpamplona.quartz.nip19Bech32.entities.Entity
+import com.vitorpamplona.quartz.nip19Bech32.entities.NAddress
+import com.vitorpamplona.quartz.nip19Bech32.entities.NEmbed
+import com.vitorpamplona.quartz.nip19Bech32.entities.NEvent
+import com.vitorpamplona.quartz.nip19Bech32.entities.NProfile
+import com.vitorpamplona.quartz.nip19Bech32.entities.NPub
+import com.vitorpamplona.quartz.nip19Bech32.entities.NRelay
+import com.vitorpamplona.quartz.nip19Bech32.entities.NSec
+import com.vitorpamplona.quartz.nip19Bech32.entities.Note
+import com.vitorpamplona.quartz.utils.Hex
 import kotlinx.coroutines.CancellationException
 import java.util.regex.Pattern
 

quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/TlvBuilderExt.kt

@@ -19,8 +19,8 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip19Bech32Entities.TlvTypes
-import com.vitorpamplona.quartz.nip19Bech32Entities.tlv.TlvBuilder
+import com.vitorpamplona.quartz.nip19Bech32.TlvTypes
+import com.vitorpamplona.quartz.nip19Bech32.tlv.TlvBuilder
 
 fun TlvBuilder.addString(
     type: TlvTypes,

quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/TlvTypes.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.quartz.nip19Bech32Entities
+package com.vitorpamplona.quartz.nip19Bech32
 
-import com.vitorpamplona.quartz.nip19Bech32Entities.tlv.Tlv
+import com.vitorpamplona.quartz.nip19Bech32.tlv.Tlv
 
 enum class TlvTypes(
     val id: Byte,

quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/bech32/Bech32Util.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.nip19Bech32Entities.bech32
+package com.vitorpamplona.quartz.nip19Bech32.bech32
 
 /*
  * Copyright 2020 ACINQ SAS

quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/entities/Entity.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.quartz.nip19Bech32Entities.entities
+package com.vitorpamplona.quartz.nip19Bech32.entities
 
 interface Entity

quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/entities/NAddress.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.nip19Bech32Entities.entities
+package com.vitorpamplona.quartz.nip19Bech32.entities
 
 import addHex
 import addInt
@@ -26,12 +26,12 @@ import addString
 import addStringIfNotNull
 import android.util.Log
 import androidx.compose.runtime.Immutable
-import com.vitorpamplona.quartz.nip01Core.addressables.ATag
-import com.vitorpamplona.quartz.nip19Bech32Entities.TlvTypes
-import com.vitorpamplona.quartz.nip19Bech32Entities.bech32.bechToBytes
-import com.vitorpamplona.quartz.nip19Bech32Entities.tlv.Tlv
-import com.vitorpamplona.quartz.nip19Bech32Entities.tlv.TlvBuilder
-import com.vitorpamplona.quartz.nip19Bech32Entities.toNAddress
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.ATag
+import com.vitorpamplona.quartz.nip19Bech32.TlvTypes
+import com.vitorpamplona.quartz.nip19Bech32.bech32.bechToBytes
+import com.vitorpamplona.quartz.nip19Bech32.tlv.Tlv
+import com.vitorpamplona.quartz.nip19Bech32.tlv.TlvBuilder
+import com.vitorpamplona.quartz.nip19Bech32.toNAddress
 
 @Immutable
 data class NAddress(

quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/entities/NEmbed.kt

@@ -18,11 +18,11 @@
  * 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.nip19Bech32Entities.entities
+package com.vitorpamplona.quartz.nip19Bech32.entities
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.core.Event
-import com.vitorpamplona.quartz.nip19Bech32Entities.toNEmbed
+import com.vitorpamplona.quartz.nip19Bech32.toNEmbed
 import java.io.ByteArrayOutputStream
 import java.util.zip.GZIPInputStream
 import java.util.zip.GZIPOutputStream

quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/entities/NEvent.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.quartz.nip19Bech32Entities.entities
+package com.vitorpamplona.quartz.nip19Bech32.entities
 
 import addHex
 import addHexIfNotNull
 import addIntIfNotNull
 import addStringIfNotNull
 import androidx.compose.runtime.Immutable
-import com.vitorpamplona.quartz.nip19Bech32Entities.TlvTypes
-import com.vitorpamplona.quartz.nip19Bech32Entities.asStringList
-import com.vitorpamplona.quartz.nip19Bech32Entities.firstAsHex
-import com.vitorpamplona.quartz.nip19Bech32Entities.tlv.Tlv
-import com.vitorpamplona.quartz.nip19Bech32Entities.tlv.TlvBuilder
-import com.vitorpamplona.quartz.nip19Bech32Entities.toNEvent
+import com.vitorpamplona.quartz.nip19Bech32.TlvTypes
+import com.vitorpamplona.quartz.nip19Bech32.asStringList
+import com.vitorpamplona.quartz.nip19Bech32.firstAsHex
+import com.vitorpamplona.quartz.nip19Bech32.tlv.Tlv
+import com.vitorpamplona.quartz.nip19Bech32.tlv.TlvBuilder
+import com.vitorpamplona.quartz.nip19Bech32.toNEvent
 
 @Immutable
 data class NEvent(

quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/entities/NProfile.kt

@@ -18,17 +18,17 @@
  * 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.nip19Bech32Entities.entities
+package com.vitorpamplona.quartz.nip19Bech32.entities
 
 import addHex
 import addStringIfNotNull
 import androidx.compose.runtime.Immutable
-import com.vitorpamplona.quartz.nip19Bech32Entities.TlvTypes
-import com.vitorpamplona.quartz.nip19Bech32Entities.asStringList
-import com.vitorpamplona.quartz.nip19Bech32Entities.firstAsHex
-import com.vitorpamplona.quartz.nip19Bech32Entities.tlv.Tlv
-import com.vitorpamplona.quartz.nip19Bech32Entities.tlv.TlvBuilder
-import com.vitorpamplona.quartz.nip19Bech32Entities.toNProfile
+import com.vitorpamplona.quartz.nip19Bech32.TlvTypes
+import com.vitorpamplona.quartz.nip19Bech32.asStringList
+import com.vitorpamplona.quartz.nip19Bech32.firstAsHex
+import com.vitorpamplona.quartz.nip19Bech32.tlv.Tlv
+import com.vitorpamplona.quartz.nip19Bech32.tlv.TlvBuilder
+import com.vitorpamplona.quartz.nip19Bech32.toNProfile
 
 @Immutable
 data class NProfile(

quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/entities/NPub.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.quartz.nip19Bech32Entities.entities
+package com.vitorpamplona.quartz.nip19Bech32.entities
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
 import com.vitorpamplona.quartz.nip01Core.hexToByteArray
 import com.vitorpamplona.quartz.nip01Core.toHexKey
-import com.vitorpamplona.quartz.nip19Bech32Entities.toNpub
+import com.vitorpamplona.quartz.nip19Bech32.toNpub
 
 @Immutable
 data class NPub(

quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/entities/NRelay.kt

@@ -18,11 +18,11 @@
  * 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.nip19Bech32Entities.entities
+package com.vitorpamplona.quartz.nip19Bech32.entities
 
 import androidx.compose.runtime.Immutable
-import com.vitorpamplona.quartz.nip19Bech32Entities.TlvTypes
-import com.vitorpamplona.quartz.nip19Bech32Entities.tlv.Tlv
+import com.vitorpamplona.quartz.nip19Bech32.TlvTypes
+import com.vitorpamplona.quartz.nip19Bech32.tlv.Tlv
 
 @Immutable
 data class NRelay(

quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/entities/NSec.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.nip19Bech32Entities.entities
+package com.vitorpamplona.quartz.nip19Bech32.entities
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.toHexKey

quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/entities/Note.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.quartz.nip19Bech32Entities.entities
+package com.vitorpamplona.quartz.nip19Bech32.entities
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
 import com.vitorpamplona.quartz.nip01Core.hexToByteArray
 import com.vitorpamplona.quartz.nip01Core.toHexKey
-import com.vitorpamplona.quartz.nip19Bech32Entities.toNote
+import com.vitorpamplona.quartz.nip19Bech32.toNote
 
 @Immutable
 data class Note(

quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/tlv/Tlv.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.nip19Bech32Entities.tlv
+package com.vitorpamplona.quartz.nip19Bech32.tlv
 
 import com.vitorpamplona.quartz.nip01Core.toHexKey
 import java.nio.ByteBuffer

quartz/src/main/java/com/vitorpamplona/quartz/nip19Bech32/tlv/TlvBuilder.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.nip19Bech32Entities.tlv
+package com.vitorpamplona.quartz.nip19Bech32.tlv
 
 import com.vitorpamplona.quartz.nip01Core.HexKey
 import com.vitorpamplona.quartz.nip01Core.hexToByteArray

quartz/src/main/java/com/vitorpamplona/quartz/nip21UriScheme/EventExt.kt

@@ -21,6 +21,6 @@
 package com.vitorpamplona.quartz.nip21UriScheme
 
 import com.vitorpamplona.quartz.nip01Core.core.Event
-import com.vitorpamplona.quartz.nip19Bech32Entities.toNIP19
+import com.vitorpamplona.quartz.nip19Bech32.toNIP19
 
 fun Event.toNostrUri(): String = "nostr:${toNIP19()}"

quartz/src/main/java/com/vitorpamplona/quartz/nip22Comments/CommentEvent.kt

@@ -21,19 +21,19 @@
 package com.vitorpamplona.quartz.nip22Comments
 
 import androidx.compose.runtime.Immutable
-import com.vitorpamplona.quartz.nip01Core.EventHint
+import com.vitorpamplona.quartz.nip01Core.EventHintBundle
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.ATag
-import com.vitorpamplona.quartz.nip01Core.addressables.AddressableEvent
+import com.vitorpamplona.quartz.nip01Core.core.AddressableEvent
 import com.vitorpamplona.quartz.nip01Core.core.Event
-import com.vitorpamplona.quartz.nip01Core.geohash.geohashMipMap
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.ATag
+import com.vitorpamplona.quartz.nip01Core.tags.geohash.geohashMipMap
 import com.vitorpamplona.quartz.nip10Notes.BaseTextNoteEvent
 import com.vitorpamplona.quartz.nip10Notes.ETag
 import com.vitorpamplona.quartz.nip10Notes.PTag
 import com.vitorpamplona.quartz.nip10Notes.findHashtags
 import com.vitorpamplona.quartz.nip10Notes.findURLs
-import com.vitorpamplona.quartz.nip19Bech32Entities.parseAtag
+import com.vitorpamplona.quartz.nip19Bech32.parseAtag
 import com.vitorpamplona.quartz.nip30CustomEmoji.EmojiUrl
 import com.vitorpamplona.quartz.nip57Zaps.ZapSplitSetup
 import com.vitorpamplona.quartz.nip92IMeta.IMetaTag
@@ -102,7 +102,7 @@ class CommentEvent(
 
         fun firstReplyToEvent(
             msg: String,
-            replyingTo: EventHint<Event>,
+            replyingTo: EventHintBundle<Event>,
             usersMentioned: Set<PTag> = emptySet(),
             addressesMentioned: Set<ATag> = emptySet(),
             eventsMentioned: Set<ETag> = emptySet(),
@@ -135,7 +135,7 @@ class CommentEvent(
 
         fun replyComment(
             msg: String,
-            replyingTo: EventHint<CommentEvent>,
+            replyingTo: EventHintBundle<CommentEvent>,
             usersMentioned: Set<PTag> = emptySet(),
             addressesMentioned: Set<ATag> = emptySet(),
             eventsMentioned: Set<ETag> = emptySet(),

quartz/src/main/java/com/vitorpamplona/quartz/nip23LongContent/LongTextNoteEvent.kt

@@ -22,10 +22,10 @@ package com.vitorpamplona.quartz.nip23LongContent
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.ATag
-import com.vitorpamplona.quartz.nip01Core.addressables.AddressableEvent
-import com.vitorpamplona.quartz.nip01Core.hashtags.hashtags
+import com.vitorpamplona.quartz.nip01Core.core.AddressableEvent
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.ATag
+import com.vitorpamplona.quartz.nip01Core.tags.hashtags.hashtags
 import com.vitorpamplona.quartz.nip10Notes.BaseTextNoteEvent
 import com.vitorpamplona.quartz.utils.TimeUtils
 

quartz/src/main/java/com/vitorpamplona/quartz/nip25Reactions/ReactionEvent.kt

@@ -22,7 +22,7 @@ package com.vitorpamplona.quartz.nip25Reactions
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.AddressableEvent
+import com.vitorpamplona.quartz.nip01Core.core.AddressableEvent
 import com.vitorpamplona.quartz.nip01Core.core.Event
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
 import com.vitorpamplona.quartz.nip30CustomEmoji.EmojiUrl

quartz/src/main/java/com/vitorpamplona/quartz/nip28PublicChat/ChannelMessageEvent.kt

@@ -22,8 +22,8 @@ package com.vitorpamplona.quartz.nip28PublicChat
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.geohash.geohashMipMap
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip01Core.tags.geohash.geohashMipMap
 import com.vitorpamplona.quartz.nip10Notes.BaseTextNoteEvent
 import com.vitorpamplona.quartz.nip30CustomEmoji.EmojiUrl
 import com.vitorpamplona.quartz.nip57Zaps.ZapSplitSetup

quartz/src/main/java/com/vitorpamplona/quartz/nip30CustomEmoji/EmojiPackSelectionEvent.kt

@@ -22,9 +22,9 @@ package com.vitorpamplona.quartz.nip30CustomEmoji
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.ATag
-import com.vitorpamplona.quartz.nip01Core.addressables.BaseAddressableEvent
+import com.vitorpamplona.quartz.nip01Core.core.BaseAddressableEvent
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.ATag
 import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
 import com.vitorpamplona.quartz.utils.TimeUtils
 

quartz/src/main/java/com/vitorpamplona/quartz/nip34Git/GitIssueEvent.kt

@@ -22,10 +22,10 @@ package com.vitorpamplona.quartz.nip34Git
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.ATag
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.ATag
 import com.vitorpamplona.quartz.nip10Notes.BaseTextNoteEvent
-import com.vitorpamplona.quartz.nip19Bech32Entities.parse
+import com.vitorpamplona.quartz.nip19Bech32.parse
 import com.vitorpamplona.quartz.utils.TimeUtils
 
 @Immutable

quartz/src/main/java/com/vitorpamplona/quartz/nip34Git/GitPatchEvent.kt

@@ -22,10 +22,10 @@ package com.vitorpamplona.quartz.nip34Git
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.ATag
 import com.vitorpamplona.quartz.nip01Core.core.Event
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
-import com.vitorpamplona.quartz.nip19Bech32Entities.parse
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.ATag
+import com.vitorpamplona.quartz.nip19Bech32.parse
 import com.vitorpamplona.quartz.utils.TimeUtils
 
 @Immutable

quartz/src/main/java/com/vitorpamplona/quartz/nip34Git/GitReplyEvent.kt

@@ -22,16 +22,16 @@ package com.vitorpamplona.quartz.nip34Git
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.ATag
-import com.vitorpamplona.quartz.nip01Core.addressables.AddressableEvent
+import com.vitorpamplona.quartz.nip01Core.core.AddressableEvent
 import com.vitorpamplona.quartz.nip01Core.core.Event
-import com.vitorpamplona.quartz.nip01Core.geohash.geohashMipMap
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.ATag
+import com.vitorpamplona.quartz.nip01Core.tags.geohash.geohashMipMap
 import com.vitorpamplona.quartz.nip10Notes.BaseTextNoteEvent
 import com.vitorpamplona.quartz.nip10Notes.findHashtags
 import com.vitorpamplona.quartz.nip10Notes.findURLs
 import com.vitorpamplona.quartz.nip10Notes.positionalMarkedTags
-import com.vitorpamplona.quartz.nip19Bech32Entities.parse
+import com.vitorpamplona.quartz.nip19Bech32.parse
 import com.vitorpamplona.quartz.nip30CustomEmoji.EmojiUrl
 import com.vitorpamplona.quartz.nip57Zaps.ZapSplitSetup
 import com.vitorpamplona.quartz.nip92IMeta.IMetaTag

quartz/src/main/java/com/vitorpamplona/quartz/nip34Git/GitRepositoryEvent.kt

@@ -22,7 +22,7 @@ package com.vitorpamplona.quartz.nip34Git
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.BaseAddressableEvent
+import com.vitorpamplona.quartz.nip01Core.core.BaseAddressableEvent
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
 import com.vitorpamplona.quartz.utils.TimeUtils
 

quartz/src/main/java/com/vitorpamplona/quartz/nip35Torrents/TorrentCommentEvent.kt

@@ -22,11 +22,11 @@ package com.vitorpamplona.quartz.nip35Torrents
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.ATag
-import com.vitorpamplona.quartz.nip01Core.addressables.AddressableEvent
+import com.vitorpamplona.quartz.nip01Core.core.AddressableEvent
 import com.vitorpamplona.quartz.nip01Core.core.Event
-import com.vitorpamplona.quartz.nip01Core.geohash.geohashMipMap
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.ATag
+import com.vitorpamplona.quartz.nip01Core.tags.geohash.geohashMipMap
 import com.vitorpamplona.quartz.nip10Notes.BaseTextNoteEvent
 import com.vitorpamplona.quartz.nip10Notes.findHashtags
 import com.vitorpamplona.quartz.nip10Notes.findURLs

quartz/src/main/java/com/vitorpamplona/quartz/nip37Drafts/DraftEvent.kt

@@ -24,10 +24,10 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.experimental.interactiveStories.InteractiveStoryBaseEvent
 import com.vitorpamplona.quartz.experimental.zapPolls.PollNoteEvent
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.ATag
-import com.vitorpamplona.quartz.nip01Core.addressables.BaseAddressableEvent
+import com.vitorpamplona.quartz.nip01Core.core.BaseAddressableEvent
 import com.vitorpamplona.quartz.nip01Core.core.Event
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.ATag
 import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent
 import com.vitorpamplona.quartz.nip22Comments.CommentEvent
 import com.vitorpamplona.quartz.nip28PublicChat.ChannelMessageEvent

quartz/src/main/java/com/vitorpamplona/quartz/nip38UserStatus/StatusEvent.kt

@@ -22,7 +22,7 @@ package com.vitorpamplona.quartz.nip38UserStatus
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.BaseAddressableEvent
+import com.vitorpamplona.quartz.nip01Core.core.BaseAddressableEvent
 import com.vitorpamplona.quartz.nip01Core.core.firstTagValue
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
 import com.vitorpamplona.quartz.utils.TimeUtils

quartz/src/main/java/com/vitorpamplona/quartz/nip44Encryption/Nip44v1.kt

@@ -23,9 +23,9 @@ package com.vitorpamplona.quartz.nip44Encryption
 import android.util.Log
 import com.goterl.lazysodium.SodiumAndroid
 import com.goterl.lazysodium.utils.Key
-import com.vitorpamplona.quartz.crypto.Hex
-import com.vitorpamplona.quartz.crypto.sha256Hash
 import com.vitorpamplona.quartz.nip44Encryption.crypto.cryptoStreamXChaCha20Xor
+import com.vitorpamplona.quartz.utils.Hex
+import com.vitorpamplona.quartz.utils.sha256Hash
 import fr.acinq.secp256k1.Secp256k1
 import java.security.SecureRandom
 import java.util.Base64

quartz/src/main/java/com/vitorpamplona/quartz/nip44Encryption/Nip44v2.kt

@@ -23,9 +23,9 @@ package com.vitorpamplona.quartz.nip44Encryption
 import android.util.Log
 import com.goterl.lazysodium.LazySodiumAndroid
 import com.goterl.lazysodium.SodiumAndroid
-import com.vitorpamplona.quartz.crypto.Hex
 import com.vitorpamplona.quartz.nip01Core.toHexKey
 import com.vitorpamplona.quartz.nip44Encryption.crypto.Hkdf
+import com.vitorpamplona.quartz.utils.Hex
 import fr.acinq.secp256k1.Secp256k1
 import java.nio.ByteBuffer
 import java.nio.ByteOrder

quartz/src/main/java/com/vitorpamplona/quartz/nip46RemoteSigner/BunkerResponse.kt

@@ -27,7 +27,7 @@ import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.SerializerProvider
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer
 import com.fasterxml.jackson.databind.ser.std.StdSerializer
-import com.vitorpamplona.quartz.crypto.Hex
+import com.vitorpamplona.quartz.utils.Hex
 import com.vitorpamplona.quartz.utils.bytesUsedInMemory
 import com.vitorpamplona.quartz.utils.pointerSizeInBytes
 

quartz/src/main/java/com/vitorpamplona/quartz/nip46RemoteSigner/NostrConnectEvent.kt

@@ -21,11 +21,11 @@
 package com.vitorpamplona.quartz.nip46RemoteSigner
 
 import androidx.compose.runtime.Immutable
-import com.vitorpamplona.quartz.crypto.Hex
 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.signers.NostrSigner
+import com.vitorpamplona.quartz.utils.Hex
 import com.vitorpamplona.quartz.utils.TimeUtils
 import com.vitorpamplona.quartz.utils.pointerSizeInBytes
 

quartz/src/main/java/com/vitorpamplona/quartz/nip47WalletConnect/Nip47WalletConnect.kt

@@ -23,7 +23,7 @@ package com.vitorpamplona.quartz.nip47WalletConnect
 import android.net.Uri
 import com.vitorpamplona.quartz.nip01Core.HexKey
 import com.vitorpamplona.quartz.nip01Core.toHexKey
-import com.vitorpamplona.quartz.nip19Bech32Entities.decodePublicKey
+import com.vitorpamplona.quartz.nip19Bech32.decodePublicKey
 import kotlinx.coroutines.CancellationException
 
 // Rename to the corect nip number when ready.

quartz/src/main/java/com/vitorpamplona/quartz/nip49PrivKeyEnc/Nip49.kt

@@ -26,8 +26,8 @@ import com.goterl.lazysodium.SodiumAndroid
 import com.vitorpamplona.quartz.nip01Core.HexKey
 import com.vitorpamplona.quartz.nip01Core.hexToByteArray
 import com.vitorpamplona.quartz.nip01Core.toHexKey
-import com.vitorpamplona.quartz.nip19Bech32Entities.bech32.Bech32
-import com.vitorpamplona.quartz.nip19Bech32Entities.bech32.bechToBytes
+import com.vitorpamplona.quartz.nip19Bech32.bech32.Bech32
+import com.vitorpamplona.quartz.nip19Bech32.bech32.bechToBytes
 import fr.acinq.secp256k1.Secp256k1
 import java.security.SecureRandom
 import java.text.Normalizer

quartz/src/main/java/com/vitorpamplona/quartz/nip50Search/SearchRelayListEvent.kt

@@ -22,10 +22,10 @@ package com.vitorpamplona.quartz.nip50Search
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.ATag
-import com.vitorpamplona.quartz.nip01Core.addressables.BaseAddressableEvent
+import com.vitorpamplona.quartz.nip01Core.core.BaseAddressableEvent
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.ATag
 import com.vitorpamplona.quartz.utils.TimeUtils
 
 @Immutable

quartz/src/main/java/com/vitorpamplona/quartz/nip51Lists/BookmarkListEvent.kt

@@ -22,8 +22,8 @@ package com.vitorpamplona.quartz.nip51Lists
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.ATag
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.ATag
 import com.vitorpamplona.quartz.utils.TimeUtils
 
 @Immutable

quartz/src/main/java/com/vitorpamplona/quartz/nip51Lists/GeneralListEvent.kt

@@ -22,14 +22,14 @@ package com.vitorpamplona.quartz.nip51Lists
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.ATag
 import com.vitorpamplona.quartz.nip01Core.core.isTagged
-import com.vitorpamplona.quartz.nip01Core.events.taggedEvents
-import com.vitorpamplona.quartz.nip01Core.geohash.geohashes
 import com.vitorpamplona.quartz.nip01Core.jackson.EventMapper
-import com.vitorpamplona.quartz.nip01Core.people.taggedUsers
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
-import com.vitorpamplona.quartz.nip19Bech32Entities.parse
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.ATag
+import com.vitorpamplona.quartz.nip01Core.tags.events.taggedEvents
+import com.vitorpamplona.quartz.nip01Core.tags.geohash.geohashes
+import com.vitorpamplona.quartz.nip01Core.tags.people.taggedUsers
+import com.vitorpamplona.quartz.nip19Bech32.parse
 import kotlinx.collections.immutable.ImmutableSet
 import kotlinx.collections.immutable.toImmutableSet
 

quartz/src/main/java/com/vitorpamplona/quartz/nip51Lists/PinListEvent.kt

@@ -22,7 +22,7 @@ package com.vitorpamplona.quartz.nip51Lists
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.BaseAddressableEvent
+import com.vitorpamplona.quartz.nip01Core.core.BaseAddressableEvent
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
 import com.vitorpamplona.quartz.utils.TimeUtils
 

quartz/src/main/java/com/vitorpamplona/quartz/nip51Lists/PrivateTagArrayEvent.kt

@@ -24,7 +24,7 @@ import android.util.Log
 import androidx.compose.runtime.Immutable
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.BaseAddressableEvent
+import com.vitorpamplona.quartz.nip01Core.core.BaseAddressableEvent
 import com.vitorpamplona.quartz.nip01Core.jackson.EventMapper
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
 import com.vitorpamplona.quartz.utils.bytesUsedInMemory

quartz/src/main/java/com/vitorpamplona/quartz/nip51Lists/RelaySetEvent.kt

@@ -22,7 +22,7 @@ package com.vitorpamplona.quartz.nip51Lists
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.HexKey
-import com.vitorpamplona.quartz.nip01Core.addressables.BaseAddressableEvent
+import com.vitorpamplona.quartz.nip01Core.core.BaseAddressableEvent
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
 import com.vitorpamplona.quartz.utils.TimeUtils