diff --git a/quartz/src/androidTest/java/com/vitorpamplona/quartz/crypto/nip44/NIP44v2Test.kt b/quartz/src/androidTest/java/com/vitorpamplona/quartz/crypto/nip44/NIP44v2Test.kt
index f936c3275..beab3e00c 100644
--- a/quartz/src/androidTest/java/com/vitorpamplona/quartz/crypto/nip44/NIP44v2Test.kt
+++ b/quartz/src/androidTest/java/com/vitorpamplona/quartz/crypto/nip44/NIP44v2Test.kt
@@ -22,7 +22,6 @@ package com.vitorpamplona.quartz.crypto.nip44
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.crypto.nip01.Nip01
@@ -191,74 +190,3 @@ class NIP44v2Test {
         return MessageDigest.getInstance("SHA-256").digest(data).toHexKey()
     }
 }
-
-data class VectorFile(
-    val v2: V2? = V2(),
-)
-
-data class V2(
-    val valid: Valid? = Valid(),
-    val invalid: Invalid? = Invalid(),
-)
-
-data class Valid(
-    @JsonProperty("get_conversation_key")
-    val getConversationKey: ArrayList<GetConversationKey> = arrayListOf(),
-    @JsonProperty("get_message_keys") val getMessageKeys: GetMessageKeys? = GetMessageKeys(),
-    @JsonProperty("calc_padded_len") val calcPaddedLen: ArrayList<ArrayList<Int>> = arrayListOf(),
-    @JsonProperty("encrypt_decrypt") val encryptDecrypt: ArrayList<EncryptDecrypt> = arrayListOf(),
-    @JsonProperty("encrypt_decrypt_long_msg")
-    val encryptDecryptLongMsg: ArrayList<EncryptDecryptLongMsg> = arrayListOf(),
-)
-
-data class Invalid(
-    @JsonProperty("encrypt_msg_lengths") val encryptMsgLengths: ArrayList<Int> = arrayListOf(),
-    @JsonProperty("get_conversation_key")
-    val getConversationKey: ArrayList<GetConversationKey> = arrayListOf(),
-    @JsonProperty("decrypt") val decrypt: ArrayList<Decrypt> = arrayListOf(),
-)
-
-data class GetConversationKey(
-    val sec1: String? = null,
-    val pub2: String? = null,
-    val note: String? = null,
-    @JsonProperty("conversation_key") val conversationKey: String? = null,
-)
-
-data class GetMessageKeys(
-    @JsonProperty("conversation_key") val conversationKey: String? = null,
-    val keys: ArrayList<Keys> = arrayListOf(),
-)
-
-data class Keys(
-    @JsonProperty("nonce") val nonce: String? = null,
-    @JsonProperty("chacha_key") val chachaKey: String? = null,
-    @JsonProperty("chacha_nonce") val chachaNonce: String? = null,
-    @JsonProperty("hmac_key") val hmacKey: String? = null,
-)
-
-data class EncryptDecrypt(
-    val sec1: String? = null,
-    val sec2: String? = null,
-    @JsonProperty("conversation_key") val conversationKey: String? = null,
-    val nonce: String? = null,
-    val plaintext: String? = null,
-    val payload: String? = null,
-)
-
-data class EncryptDecryptLongMsg(
-    @JsonProperty("conversation_key") val conversationKey: String? = null,
-    val nonce: String? = null,
-    val pattern: String? = null,
-    val repeat: Int? = null,
-    @JsonProperty("plaintext_sha256") val plaintextSha256: String? = null,
-    @JsonProperty("payload_sha256") val payloadSha256: String? = null,
-)
-
-data class Decrypt(
-    @JsonProperty("conversation_key") val conversationKey: String? = null,
-    val nonce: String? = null,
-    val plaintext: String? = null,
-    val payload: String? = null,
-    val note: String? = null,
-)
diff --git a/quartz/src/androidTest/java/com/vitorpamplona/quartz/crypto/nip44/TestPackageClasses.kt b/quartz/src/androidTest/java/com/vitorpamplona/quartz/crypto/nip44/TestPackageClasses.kt
new file mode 100644
index 000000000..4e86da5be
--- /dev/null
+++ b/quartz/src/androidTest/java/com/vitorpamplona/quartz/crypto/nip44/TestPackageClasses.kt
@@ -0,0 +1,94 @@
+/**
+ * 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.crypto.nip44
+
+import com.fasterxml.jackson.annotation.JsonProperty
+
+data class VectorFile(
+    val v2: V2? = V2(),
+)
+
+data class V2(
+    val valid: Valid? = Valid(),
+    val invalid: Invalid? = Invalid(),
+)
+
+data class Valid(
+    @JsonProperty("get_conversation_key")
+    val getConversationKey: ArrayList<GetConversationKey> = arrayListOf(),
+    @JsonProperty("get_message_keys") val getMessageKeys: GetMessageKeys? = GetMessageKeys(),
+    @JsonProperty("calc_padded_len") val calcPaddedLen: ArrayList<ArrayList<Int>> = arrayListOf(),
+    @JsonProperty("encrypt_decrypt") val encryptDecrypt: ArrayList<EncryptDecrypt> = arrayListOf(),
+    @JsonProperty("encrypt_decrypt_long_msg")
+    val encryptDecryptLongMsg: ArrayList<EncryptDecryptLongMsg> = arrayListOf(),
+)
+
+data class Invalid(
+    @JsonProperty("encrypt_msg_lengths") val encryptMsgLengths: ArrayList<Int> = arrayListOf(),
+    @JsonProperty("get_conversation_key")
+    val getConversationKey: ArrayList<GetConversationKey> = arrayListOf(),
+    @JsonProperty("decrypt") val decrypt: ArrayList<Decrypt> = arrayListOf(),
+)
+
+data class GetConversationKey(
+    val sec1: String? = null,
+    val pub2: String? = null,
+    val note: String? = null,
+    @JsonProperty("conversation_key") val conversationKey: String? = null,
+)
+
+data class GetMessageKeys(
+    @JsonProperty("conversation_key") val conversationKey: String? = null,
+    val keys: ArrayList<Keys> = arrayListOf(),
+)
+
+data class Keys(
+    @JsonProperty("nonce") val nonce: String? = null,
+    @JsonProperty("chacha_key") val chachaKey: String? = null,
+    @JsonProperty("chacha_nonce") val chachaNonce: String? = null,
+    @JsonProperty("hmac_key") val hmacKey: String? = null,
+)
+
+data class EncryptDecrypt(
+    val sec1: String? = null,
+    val sec2: String? = null,
+    @JsonProperty("conversation_key") val conversationKey: String? = null,
+    val nonce: String? = null,
+    val plaintext: String? = null,
+    val payload: String? = null,
+)
+
+data class EncryptDecryptLongMsg(
+    @JsonProperty("conversation_key") val conversationKey: String? = null,
+    val nonce: String? = null,
+    val pattern: String? = null,
+    val repeat: Int? = null,
+    @JsonProperty("plaintext_sha256") val plaintextSha256: String? = null,
+    @JsonProperty("payload_sha256") val payloadSha256: String? = null,
+)
+
+data class Decrypt(
+    @JsonProperty("conversation_key") val conversationKey: String? = null,
+    val nonce: String? = null,
+    val plaintext: String? = null,
+    val payload: String? = null,
+    val note: String? = null,
+)