diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
index 1eb6c46..b363fc7 100644
--- a/.github/workflows/verify.yml
+++ b/.github/workflows/verify.yml
@@ -2,9 +2,6 @@ name: verify
 
 on: [ pull_request ]
 
-env:
-  PKG_NAME: didcomm
-
 
 jobs:
 
diff --git a/android-benchmark/src/androidTest/kotlin/org/didcommx/DIDCommBenchAndroidNaive.kt b/android-benchmark/src/androidTest/kotlin/org/didcommx/didcomm/benchmark/DIDCommBenchAndroidNaive.kt
similarity index 100%
rename from android-benchmark/src/androidTest/kotlin/org/didcommx/DIDCommBenchAndroidNaive.kt
rename to android-benchmark/src/androidTest/kotlin/org/didcommx/didcomm/benchmark/DIDCommBenchAndroidNaive.kt
diff --git a/lib/src/jmh/kotlin/org/didcommx/DIDCommBenchPackEncrypted.kt b/lib/src/jmh/kotlin/org/didcommx/didcomm/jmh/DIDCommBenchPackEncrypted.kt
similarity index 100%
rename from lib/src/jmh/kotlin/org/didcommx/DIDCommBenchPackEncrypted.kt
rename to lib/src/jmh/kotlin/org/didcommx/didcomm/jmh/DIDCommBenchPackEncrypted.kt
diff --git a/lib/src/jmh/kotlin/org/didcommx/DIDCommBenchPackSigned.kt b/lib/src/jmh/kotlin/org/didcommx/didcomm/jmh/DIDCommBenchPackSigned.kt
similarity index 100%
rename from lib/src/jmh/kotlin/org/didcommx/DIDCommBenchPackSigned.kt
rename to lib/src/jmh/kotlin/org/didcommx/didcomm/jmh/DIDCommBenchPackSigned.kt
diff --git a/lib/src/jmh/kotlin/org/didcommx/DIDCommBenchUnpack.kt b/lib/src/jmh/kotlin/org/didcommx/didcomm/jmh/DIDCommBenchUnpack.kt
similarity index 100%
rename from lib/src/jmh/kotlin/org/didcommx/DIDCommBenchUnpack.kt
rename to lib/src/jmh/kotlin/org/didcommx/didcomm/jmh/DIDCommBenchUnpack.kt
diff --git a/lib/src/test/kotlin/org/didcommx/DIDCommBenchmarkJVMNaive.kt b/lib/src/test/kotlin/org/didcommx/didcomm/DIDCommBenchmarkJVMNaive.kt
similarity index 100%
rename from lib/src/test/kotlin/org/didcommx/DIDCommBenchmarkJVMNaive.kt
rename to lib/src/test/kotlin/org/didcommx/didcomm/DIDCommBenchmarkJVMNaive.kt
diff --git a/lib/src/test/kotlin/org/didcommx/DIDCommTest.kt b/lib/src/test/kotlin/org/didcommx/didcomm/DIDCommTest.kt
similarity index 100%
rename from lib/src/test/kotlin/org/didcommx/DIDCommTest.kt
rename to lib/src/test/kotlin/org/didcommx/didcomm/DIDCommTest.kt
diff --git a/lib/src/test/kotlin/org/didcommx/EncryptedMessageTest.kt b/lib/src/test/kotlin/org/didcommx/didcomm/EncryptedMessageTest.kt
similarity index 100%
rename from lib/src/test/kotlin/org/didcommx/EncryptedMessageTest.kt
rename to lib/src/test/kotlin/org/didcommx/didcomm/EncryptedMessageTest.kt
diff --git a/lib/src/test/kotlin/org/didcommx/PlaintextMessageTest.kt b/lib/src/test/kotlin/org/didcommx/didcomm/PlaintextMessageTest.kt
similarity index 100%
rename from lib/src/test/kotlin/org/didcommx/PlaintextMessageTest.kt
rename to lib/src/test/kotlin/org/didcommx/didcomm/PlaintextMessageTest.kt
diff --git a/lib/src/test/kotlin/org/didcommx/SignedMessageTest.kt b/lib/src/test/kotlin/org/didcommx/didcomm/SignedMessageTest.kt
similarity index 100%
rename from lib/src/test/kotlin/org/didcommx/SignedMessageTest.kt
rename to lib/src/test/kotlin/org/didcommx/didcomm/SignedMessageTest.kt
diff --git a/lib/src/test/kotlin/org/didcommx/crypto/key/RecipientKeySelectorTest.kt b/lib/src/test/kotlin/org/didcommx/didcomm/crypto/key/RecipientKeySelectorTest.kt
similarity index 100%
rename from lib/src/test/kotlin/org/didcommx/crypto/key/RecipientKeySelectorTest.kt
rename to lib/src/test/kotlin/org/didcommx/didcomm/crypto/key/RecipientKeySelectorTest.kt
diff --git a/lib/src/test/kotlin/org/didcommx/crypto/key/SenderKeySelectorTest.kt b/lib/src/test/kotlin/org/didcommx/didcomm/crypto/key/SenderKeySelectorTest.kt
similarity index 100%
rename from lib/src/test/kotlin/org/didcommx/crypto/key/SenderKeySelectorTest.kt
rename to lib/src/test/kotlin/org/didcommx/didcomm/crypto/key/SenderKeySelectorTest.kt
diff --git a/lib/src/testCommon/kotlin/org/didcommx/fixtures/BenchCommon.kt b/lib/src/testCommon/kotlin/org/didcommx/didcomm/fixtures/BenchCommon.kt
similarity index 100%
rename from lib/src/testCommon/kotlin/org/didcommx/fixtures/BenchCommon.kt
rename to lib/src/testCommon/kotlin/org/didcommx/didcomm/fixtures/BenchCommon.kt
diff --git a/lib/src/testCommon/kotlin/org/didcommx/fixtures/Fixtures.kt b/lib/src/testCommon/kotlin/org/didcommx/didcomm/fixtures/Fixtures.kt
similarity index 100%
rename from lib/src/testCommon/kotlin/org/didcommx/fixtures/Fixtures.kt
rename to lib/src/testCommon/kotlin/org/didcommx/didcomm/fixtures/Fixtures.kt
diff --git a/lib/src/testCommon/kotlin/org/didcommx/mock/AliceSecretResolverMock.kt b/lib/src/testCommon/kotlin/org/didcommx/didcomm/mock/AliceSecretResolverMock.kt
similarity index 100%
rename from lib/src/testCommon/kotlin/org/didcommx/mock/AliceSecretResolverMock.kt
rename to lib/src/testCommon/kotlin/org/didcommx/didcomm/mock/AliceSecretResolverMock.kt
diff --git a/lib/src/testCommon/kotlin/org/didcommx/mock/BobSecretResolverMock.kt b/lib/src/testCommon/kotlin/org/didcommx/didcomm/mock/BobSecretResolverMock.kt
similarity index 100%
rename from lib/src/testCommon/kotlin/org/didcommx/mock/BobSecretResolverMock.kt
rename to lib/src/testCommon/kotlin/org/didcommx/didcomm/mock/BobSecretResolverMock.kt
diff --git a/lib/src/testCommon/kotlin/org/didcommx/mock/CharlieSecretResolverMock.kt b/lib/src/testCommon/kotlin/org/didcommx/didcomm/mock/CharlieSecretResolverMock.kt
similarity index 100%
rename from lib/src/testCommon/kotlin/org/didcommx/mock/CharlieSecretResolverMock.kt
rename to lib/src/testCommon/kotlin/org/didcommx/didcomm/mock/CharlieSecretResolverMock.kt
diff --git a/lib/src/testCommon/kotlin/org/didcommx/mock/DIDDocResolverMock.kt b/lib/src/testCommon/kotlin/org/didcommx/didcomm/mock/DIDDocResolverMock.kt
similarity index 100%
rename from lib/src/testCommon/kotlin/org/didcommx/mock/DIDDocResolverMock.kt
rename to lib/src/testCommon/kotlin/org/didcommx/didcomm/mock/DIDDocResolverMock.kt