diff --git a/app/src/main/java/com/bitchat/android/noise/NoiseEncryptionService.kt b/app/src/main/java/com/bitchat/android/noise/NoiseEncryptionService.kt
index fd3fa2e4..3de049f3 100644
--- a/app/src/main/java/com/bitchat/android/noise/NoiseEncryptionService.kt
+++ b/app/src/main/java/com/bitchat/android/noise/NoiseEncryptionService.kt
@@ -3,7 +3,7 @@ package com.bitchat.android.noise
 import android.content.Context
 import android.util.Log
 import com.bitchat.android.identity.SecureIdentityStateManager
-import com.bitchat.android.noise.southernstorm.noise.protocol.Noise
+import com.bitchat.android.noise.southernstorm.protocol.Noise
 import java.security.MessageDigest
 import java.security.SecureRandom
 import java.util.concurrent.ConcurrentHashMap
@@ -296,7 +296,7 @@ class NoiseEncryptionService(private val context: Context) {
      */
     private fun generateKeyPair(): Pair<ByteArray, ByteArray> {
         try {
-            val dhState = com.bitchat.android.noise.southernstorm.noise.protocol.Noise.createDH("25519")
+            val dhState = com.bitchat.android.noise.southernstorm.protocol.Noise.createDH("25519")
             dhState.generateKeyPair()
             
             val privateKey = ByteArray(32)
diff --git a/app/src/main/java/com/bitchat/android/noise/NoiseSession.kt b/app/src/main/java/com/bitchat/android/noise/NoiseSession.kt
index 71db1900..3f1d857d 100644
--- a/app/src/main/java/com/bitchat/android/noise/NoiseSession.kt
+++ b/app/src/main/java/com/bitchat/android/noise/NoiseSession.kt
@@ -1,7 +1,7 @@
 package com.bitchat.android.noise
 
 import android.util.Log
-import com.bitchat.android.noise.southernstorm.noise.protocol.*
+import com.bitchat.android.noise.southernstorm.protocol.*
 import java.security.SecureRandom
 
 
@@ -195,8 +195,7 @@ class NoiseSession(
             state = NoiseSessionState.Handshaking
             handshakeMessageCount = 1
             
-            // CRITICAL FIX: Use exact buffer size for XX message 1 (32 bytes)
-            val messageBuffer = ByteArray(XX_MESSAGE_1_SIZE + MAX_PAYLOAD_SIZE) // Extra space for safety
+            val messageBuffer = ByteArray(XX_MESSAGE_1_SIZE)
             val handshakeStateLocal = handshakeState ?: throw IllegalStateException("Handshake state is null")
             val messageLength = handshakeStateLocal.writeMessage(messageBuffer, 0, ByteArray(0), 0, 0)
             val firstMessage = messageBuffer.copyOf(messageLength)
@@ -206,7 +205,7 @@ class NoiseSession(
                 Log.w(TAG, "Warning: XX message 1 size ${firstMessage.size} != expected $XX_MESSAGE_1_SIZE")
             }
             
-            Log.d(TAG, "Sent real XX handshake message 1 to $peerID (${firstMessage.size} bytes)")
+            Log.d(TAG, "Sending XX handshake message 1 to $peerID (${firstMessage.size} bytes)")
             return firstMessage
         } catch (e: Exception) {
             state = NoiseSessionState.Failed(e)
diff --git a/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/Blake2bMessageDigest.java b/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/Blake2bMessageDigest.java
index 36f6e593..1d754d47 100644
--- a/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/Blake2bMessageDigest.java
+++ b/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/Blake2bMessageDigest.java
@@ -20,13 +20,13 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package com.bitchat.android.noise.southernstorm.noise.crypto;
+package com.bitchat.android.noise.southernstorm.crypto;
 
 import java.security.DigestException;
 import java.security.MessageDigest;
 import java.util.Arrays;
 
-import com.bitchat.android.noise.southernstorm.noise.protocol.Destroyable;
+import com.bitchat.android.noise.southernstorm.protocol.Destroyable;
 
 /**
  * Fallback implementation of BLAKE2b for the Noise library.
diff --git a/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/Blake2sMessageDigest.java b/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/Blake2sMessageDigest.java
index 93922f60..4f3f98c6 100644
--- a/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/Blake2sMessageDigest.java
+++ b/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/Blake2sMessageDigest.java
@@ -20,13 +20,13 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package com.bitchat.android.noise.southernstorm.noise.crypto;
+package com.bitchat.android.noise.southernstorm.crypto;
 
 import java.security.DigestException;
 import java.security.MessageDigest;
 import java.util.Arrays;
 
-import com.bitchat.android.noise.southernstorm.noise.protocol.Destroyable;
+import com.bitchat.android.noise.southernstorm.protocol.Destroyable;
 
 /**
  * Fallback implementation of BLAKE2s for the Noise library.
diff --git a/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/ChaChaCore.java b/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/ChaChaCore.java
index d2e204ba..cadcb89f 100644
--- a/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/ChaChaCore.java
+++ b/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/ChaChaCore.java
@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package com.bitchat.android.noise.southernstorm.noise.crypto;
+package com.bitchat.android.noise.southernstorm.crypto;
 
 /**
  * Implementation of the ChaCha20 core hash transformation.
diff --git a/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/Curve25519.java b/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/Curve25519.java
index 1f0909c8..4b06562a 100644
--- a/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/Curve25519.java
+++ b/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/Curve25519.java
@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package com.bitchat.android.noise.southernstorm.noise.crypto;
+package com.bitchat.android.noise.southernstorm.crypto;
 
 import java.util.Arrays;
 
diff --git a/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/Curve448.java b/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/Curve448.java
index 298593f9..715b8549 100644
--- a/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/Curve448.java
+++ b/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/Curve448.java
@@ -53,7 +53,7 @@ THE SOFTWARE.
 
 */
 
-package com.bitchat.android.noise.southernstorm.noise.crypto;
+package com.bitchat.android.noise.southernstorm.crypto;
 
 import java.util.Arrays;
 
diff --git a/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/GHASH.java b/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/GHASH.java
index 45696006..386438ae 100644
--- a/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/GHASH.java
+++ b/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/GHASH.java
@@ -20,11 +20,11 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package com.bitchat.android.noise.southernstorm.noise.crypto;
+package com.bitchat.android.noise.southernstorm.crypto;
 
 import java.util.Arrays;
 
-import com.bitchat.android.noise.southernstorm.noise.protocol.Destroyable;
+import com.bitchat.android.noise.southernstorm.protocol.Destroyable;
 
 /**
  * Implementation of the GHASH primitive for GCM.
diff --git a/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/NewHope.java b/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/NewHope.java
index fb1c11e4..df1d8360 100644
--- a/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/NewHope.java
+++ b/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/NewHope.java
@@ -6,7 +6,7 @@
  * Java port: Rhys Weatherley
  */
 
-package com.bitchat.android.noise.southernstorm.noise.crypto;
+package com.bitchat.android.noise.southernstorm.crypto;
 
 import java.security.SecureRandom;
 import java.util.Arrays;
diff --git a/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/NewHopeTor.java b/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/NewHopeTor.java
index 5c229066..45c6c774 100644
--- a/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/NewHopeTor.java
+++ b/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/NewHopeTor.java
@@ -6,7 +6,7 @@
  * Java port: Rhys Weatherley
  */
 
-package com.bitchat.android.noise.southernstorm.noise.crypto;
+package com.bitchat.android.noise.southernstorm.crypto;
 
 import java.util.Arrays;
 
diff --git a/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/Poly1305.java b/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/Poly1305.java
index 53c4c7be..820539f8 100644
--- a/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/Poly1305.java
+++ b/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/Poly1305.java
@@ -20,11 +20,11 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package com.bitchat.android.noise.southernstorm.noise.crypto;
+package com.bitchat.android.noise.southernstorm.crypto;
 
 import java.util.Arrays;
 
-import com.bitchat.android.noise.southernstorm.noise.protocol.Destroyable;
+import com.bitchat.android.noise.southernstorm.protocol.Destroyable;
 
 /**
  * Simple implementation of the Poly1305 message authenticator.
diff --git a/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/RijndaelAES.java b/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/RijndaelAES.java
index f46788db..a34d07c2 100644
--- a/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/RijndaelAES.java
+++ b/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/RijndaelAES.java
@@ -30,7 +30,7 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.bitchat.android.noise.southernstorm.noise.crypto;
+package com.bitchat.android.noise.southernstorm.crypto;
 
 import java.util.Arrays;
 
diff --git a/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/SHA256MessageDigest.java b/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/SHA256MessageDigest.java
index 97c3475e..0ef581df 100644
--- a/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/SHA256MessageDigest.java
+++ b/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/SHA256MessageDigest.java
@@ -20,13 +20,13 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package com.bitchat.android.noise.southernstorm.noise.crypto;
+package com.bitchat.android.noise.southernstorm.crypto;
 
 import java.security.DigestException;
 import java.security.MessageDigest;
 import java.util.Arrays;
 
-import com.bitchat.android.noise.southernstorm.noise.protocol.Destroyable;
+import com.bitchat.android.noise.southernstorm.protocol.Destroyable;
 
 /**
  * Fallback implementation of SHA256.
diff --git a/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/SHA512MessageDigest.java b/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/SHA512MessageDigest.java
index 4c2d5235..e1f0fcdf 100644
--- a/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/SHA512MessageDigest.java
+++ b/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/SHA512MessageDigest.java
@@ -20,13 +20,13 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package com.bitchat.android.noise.southernstorm.noise.crypto;
+package com.bitchat.android.noise.southernstorm.crypto;
 
 import java.security.DigestException;
 import java.security.MessageDigest;
 import java.util.Arrays;
 
-import com.bitchat.android.noise.southernstorm.noise.protocol.Destroyable;
+import com.bitchat.android.noise.southernstorm.protocol.Destroyable;
 
 /**
  * Fallback implementation of SHA512.
diff --git a/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/package-info.java b/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/package-info.java
index 30446b52..2f12fb80 100644
--- a/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/package-info.java
+++ b/app/src/main/java/com/bitchat/android/noise/southernstorm/crypto/package-info.java
@@ -9,4 +9,4 @@
  * Applications that use Noise won't normally use these classes
  * directly.
  */
-package com.bitchat.android.noise.southernstorm.noise.crypto;
+package com.bitchat.android.noise.southernstorm.crypto;
diff --git a/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/AESGCMFallbackCipherState.java b/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/AESGCMFallbackCipherState.java
index b170c514..683dcfc4 100644
--- a/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/AESGCMFallbackCipherState.java
+++ b/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/AESGCMFallbackCipherState.java
@@ -20,15 +20,15 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package com.bitchat.android.noise.southernstorm.noise.protocol;
+package com.bitchat.android.noise.southernstorm.protocol;
 
 import java.util.Arrays;
 
 import javax.crypto.BadPaddingException;
 import javax.crypto.ShortBufferException;
 
-import com.bitchat.android.noise.southernstorm.noise.crypto.GHASH;
-import com.bitchat.android.noise.southernstorm.noise.crypto.RijndaelAES;
+import com.bitchat.android.noise.southernstorm.crypto.GHASH;
+import com.bitchat.android.noise.southernstorm.crypto.RijndaelAES;
 
 /**
  * Fallback implementation of "AESGCM" on platforms where
diff --git a/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/AESGCMOnCtrCipherState.java b/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/AESGCMOnCtrCipherState.java
index b84a86f6..7795cbdb 100644
--- a/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/AESGCMOnCtrCipherState.java
+++ b/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/AESGCMOnCtrCipherState.java
@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package com.bitchat.android.noise.southernstorm.noise.protocol;
+package com.bitchat.android.noise.southernstorm.protocol;
 
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
@@ -35,7 +35,7 @@ import javax.crypto.ShortBufferException;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
-import com.bitchat.android.noise.southernstorm.noise.crypto.GHASH;
+import com.bitchat.android.noise.southernstorm.crypto.GHASH;
 
 /**
  * Emulates the "AESGCM" cipher for Noise using the "AES/CTR/NoPadding"
diff --git a/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/ChaChaPolyCipherState.java b/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/ChaChaPolyCipherState.java
index 31e870a4..bbb8c37b 100644
--- a/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/ChaChaPolyCipherState.java
+++ b/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/ChaChaPolyCipherState.java
@@ -20,15 +20,15 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package com.bitchat.android.noise.southernstorm.noise.protocol;
+package com.bitchat.android.noise.southernstorm.protocol;
 
 import java.util.Arrays;
 
 import javax.crypto.BadPaddingException;
 import javax.crypto.ShortBufferException;
 
-import com.bitchat.android.noise.southernstorm.noise.crypto.ChaChaCore;
-import com.bitchat.android.noise.southernstorm.noise.crypto.Poly1305;
+import com.bitchat.android.noise.southernstorm.crypto.ChaChaCore;
+import com.bitchat.android.noise.southernstorm.crypto.Poly1305;
 
 /**
  * Implements the ChaChaPoly cipher for Noise.
diff --git a/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/CipherState.java b/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/CipherState.java
index 59e05d22..95796740 100644
--- a/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/CipherState.java
+++ b/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/CipherState.java
@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package com.bitchat.android.noise.southernstorm.noise.protocol;
+package com.bitchat.android.noise.southernstorm.protocol;
 
 import javax.crypto.BadPaddingException;
 import javax.crypto.ShortBufferException;
diff --git a/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/CipherStatePair.java b/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/CipherStatePair.java
index 191e61d5..88563fce 100644
--- a/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/CipherStatePair.java
+++ b/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/CipherStatePair.java
@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package com.bitchat.android.noise.southernstorm.noise.protocol;
+package com.bitchat.android.noise.southernstorm.protocol;
 
 /**
  * Class that contains a pair of CipherState objects.
diff --git a/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/Curve25519DHState.java b/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/Curve25519DHState.java
index faef7bb4..95b81e5a 100644
--- a/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/Curve25519DHState.java
+++ b/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/Curve25519DHState.java
@@ -20,11 +20,11 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package com.bitchat.android.noise.southernstorm.noise.protocol;
+package com.bitchat.android.noise.southernstorm.protocol;
 
 import java.util.Arrays;
 
-import com.bitchat.android.noise.southernstorm.noise.crypto.Curve25519;
+import com.bitchat.android.noise.southernstorm.crypto.Curve25519;
 
 /**
  * Implementation of the Curve25519 algorithm for the Noise protocol.
diff --git a/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/Curve448DHState.java b/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/Curve448DHState.java
index 92331d62..2ab449f6 100644
--- a/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/Curve448DHState.java
+++ b/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/Curve448DHState.java
@@ -20,11 +20,11 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package com.bitchat.android.noise.southernstorm.noise.protocol;
+package com.bitchat.android.noise.southernstorm.protocol;
 
 import java.util.Arrays;
 
-import com.bitchat.android.noise.southernstorm.noise.crypto.Curve448;
+import com.bitchat.android.noise.southernstorm.crypto.Curve448;
 
 /**
  * Implementation of the Curve448 algorithm for the Noise protocol.
diff --git a/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/DHState.java b/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/DHState.java
index ae21d7c4..2b2477ce 100644
--- a/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/DHState.java
+++ b/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/DHState.java
@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package com.bitchat.android.noise.southernstorm.noise.protocol;
+package com.bitchat.android.noise.southernstorm.protocol;
 
 /**
  * Interface to a Diffie-Hellman algorithm for the Noise protocol.
diff --git a/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/DHStateHybrid.java b/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/DHStateHybrid.java
index 33a45b4d..1446684b 100644
--- a/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/DHStateHybrid.java
+++ b/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/DHStateHybrid.java
@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package com.bitchat.android.noise.southernstorm.noise.protocol;
+package com.bitchat.android.noise.southernstorm.protocol;
 
 /**
  * Additional API for DH objects that need special handling for
diff --git a/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/Destroyable.java b/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/Destroyable.java
index 623c2f58..1ab0061c 100644
--- a/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/Destroyable.java
+++ b/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/Destroyable.java
@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package com.bitchat.android.noise.southernstorm.noise.protocol;
+package com.bitchat.android.noise.southernstorm.protocol;
 
 /**
  * Interface for objects that implement destroying.
diff --git a/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/HandshakeState.java b/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/HandshakeState.java
index 422d807a..8e275476 100644
--- a/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/HandshakeState.java
+++ b/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/HandshakeState.java
@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package com.bitchat.android.noise.southernstorm.noise.protocol;
+package com.bitchat.android.noise.southernstorm.protocol;
 
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
diff --git a/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/NewHopeDHState.java b/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/NewHopeDHState.java
index e111ae3e..bb3c275f 100644
--- a/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/NewHopeDHState.java
+++ b/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/NewHopeDHState.java
@@ -20,12 +20,12 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package com.bitchat.android.noise.southernstorm.noise.protocol;
+package com.bitchat.android.noise.southernstorm.protocol;
 
 import java.util.Arrays;
 
-import com.bitchat.android.noise.southernstorm.noise.crypto.NewHope;
-import com.bitchat.android.noise.southernstorm.noise.crypto.NewHopeTor;
+import com.bitchat.android.noise.southernstorm.crypto.NewHope;
+import com.bitchat.android.noise.southernstorm.crypto.NewHopeTor;
 
 /**
  * Implementation of the New Hope post-quantum algorithm for the Noise protocol.
diff --git a/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/Noise.java b/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/Noise.java
index 0e600ed4..c8fb7196 100644
--- a/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/Noise.java
+++ b/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/Noise.java
@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package com.bitchat.android.noise.southernstorm.noise.protocol;
+package com.bitchat.android.noise.southernstorm.protocol;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -29,10 +29,10 @@ import java.util.Arrays;
 
 import javax.crypto.BadPaddingException;
 
-import com.bitchat.android.noise.southernstorm.noise.crypto.Blake2bMessageDigest;
-import com.bitchat.android.noise.southernstorm.noise.crypto.Blake2sMessageDigest;
-import com.bitchat.android.noise.southernstorm.noise.crypto.SHA256MessageDigest;
-import com.bitchat.android.noise.southernstorm.noise.crypto.SHA512MessageDigest;
+import com.bitchat.android.noise.southernstorm.crypto.Blake2bMessageDigest;
+import com.bitchat.android.noise.southernstorm.crypto.Blake2sMessageDigest;
+import com.bitchat.android.noise.southernstorm.crypto.SHA256MessageDigest;
+import com.bitchat.android.noise.southernstorm.crypto.SHA512MessageDigest;
 
 /**
  * Utility functions for the Noise protocol library.
diff --git a/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/Pattern.java b/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/Pattern.java
index e6446ef4..2a625c90 100644
--- a/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/Pattern.java
+++ b/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/Pattern.java
@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package com.bitchat.android.noise.southernstorm.noise.protocol;
+package com.bitchat.android.noise.southernstorm.protocol;
 
 /**
  * Information about all supported handshake patterns.
diff --git a/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/SymmetricState.java b/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/SymmetricState.java
index 84daebdd..ffdb8428 100644
--- a/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/SymmetricState.java
+++ b/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/SymmetricState.java
@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package com.bitchat.android.noise.southernstorm.noise.protocol;
+package com.bitchat.android.noise.southernstorm.protocol;
 
 import java.io.UnsupportedEncodingException;
 import java.security.DigestException;
diff --git a/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/package-info.java b/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/package-info.java
index 0feaa239..8027d7ca 100644
--- a/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/package-info.java
+++ b/app/src/main/java/com/bitchat/android/noise/southernstorm/protocol/package-info.java
@@ -4,4 +4,4 @@
  *
  * Reference: http://noiseprotocol.org
  */
-package com.bitchat.android.noise.southernstorm.noise.protocol;
+package com.bitchat.android.noise.southernstorm.protocol;