diff --git a/lib/src/main/kotlin/org/didcommx/DIDComm.kt b/lib/src/main/kotlin/org/didcommx/didcomm/DIDComm.kt
similarity index 100%
rename from lib/src/main/kotlin/org/didcommx/DIDComm.kt
rename to lib/src/main/kotlin/org/didcommx/didcomm/DIDComm.kt
diff --git a/lib/src/main/kotlin/org/didcommx/common/Algorithms.kt b/lib/src/main/kotlin/org/didcommx/didcomm/common/Algorithms.kt
similarity index 100%
rename from lib/src/main/kotlin/org/didcommx/common/Algorithms.kt
rename to lib/src/main/kotlin/org/didcommx/didcomm/common/Algorithms.kt
diff --git a/lib/src/main/kotlin/org/didcommx/common/Types.kt b/lib/src/main/kotlin/org/didcommx/didcomm/common/Types.kt
similarity index 100%
rename from lib/src/main/kotlin/org/didcommx/common/Types.kt
rename to lib/src/main/kotlin/org/didcommx/didcomm/common/Types.kt
diff --git a/lib/src/main/kotlin/org/didcommx/crypto/JWE.kt b/lib/src/main/kotlin/org/didcommx/didcomm/crypto/JWE.kt
similarity index 100%
rename from lib/src/main/kotlin/org/didcommx/crypto/JWE.kt
rename to lib/src/main/kotlin/org/didcommx/didcomm/crypto/JWE.kt
diff --git a/lib/src/main/kotlin/org/didcommx/crypto/JWM.kt b/lib/src/main/kotlin/org/didcommx/didcomm/crypto/JWM.kt
similarity index 100%
rename from lib/src/main/kotlin/org/didcommx/crypto/JWM.kt
rename to lib/src/main/kotlin/org/didcommx/didcomm/crypto/JWM.kt
diff --git a/lib/src/main/kotlin/org/didcommx/crypto/JWS.kt b/lib/src/main/kotlin/org/didcommx/didcomm/crypto/JWS.kt
similarity index 100%
rename from lib/src/main/kotlin/org/didcommx/crypto/JWS.kt
rename to lib/src/main/kotlin/org/didcommx/didcomm/crypto/JWS.kt
diff --git a/lib/src/main/kotlin/org/didcommx/crypto/key/Key.kt b/lib/src/main/kotlin/org/didcommx/didcomm/crypto/key/Key.kt
similarity index 100%
rename from lib/src/main/kotlin/org/didcommx/crypto/key/Key.kt
rename to lib/src/main/kotlin/org/didcommx/didcomm/crypto/key/Key.kt
diff --git a/lib/src/main/kotlin/org/didcommx/crypto/key/RecipientKeySelector.kt b/lib/src/main/kotlin/org/didcommx/didcomm/crypto/key/RecipientKeySelector.kt
similarity index 100%
rename from lib/src/main/kotlin/org/didcommx/crypto/key/RecipientKeySelector.kt
rename to lib/src/main/kotlin/org/didcommx/didcomm/crypto/key/RecipientKeySelector.kt
diff --git a/lib/src/main/kotlin/org/didcommx/crypto/key/SenderKeySelector.kt b/lib/src/main/kotlin/org/didcommx/didcomm/crypto/key/SenderKeySelector.kt
similarity index 100%
rename from lib/src/main/kotlin/org/didcommx/crypto/key/SenderKeySelector.kt
rename to lib/src/main/kotlin/org/didcommx/didcomm/crypto/key/SenderKeySelector.kt
diff --git a/lib/src/main/kotlin/org/didcommx/diddoc/DIDDoc.kt b/lib/src/main/kotlin/org/didcommx/didcomm/diddoc/DIDDoc.kt
similarity index 100%
rename from lib/src/main/kotlin/org/didcommx/diddoc/DIDDoc.kt
rename to lib/src/main/kotlin/org/didcommx/didcomm/diddoc/DIDDoc.kt
diff --git a/lib/src/main/kotlin/org/didcommx/diddoc/DIDDocResolver.kt b/lib/src/main/kotlin/org/didcommx/didcomm/diddoc/DIDDocResolver.kt
similarity index 100%
rename from lib/src/main/kotlin/org/didcommx/diddoc/DIDDocResolver.kt
rename to lib/src/main/kotlin/org/didcommx/didcomm/diddoc/DIDDocResolver.kt
diff --git a/lib/src/main/kotlin/org/didcommx/diddoc/DIDDocResolverInMemory.kt b/lib/src/main/kotlin/org/didcommx/didcomm/diddoc/DIDDocResolverInMemory.kt
similarity index 100%
rename from lib/src/main/kotlin/org/didcommx/diddoc/DIDDocResolverInMemory.kt
rename to lib/src/main/kotlin/org/didcommx/didcomm/diddoc/DIDDocResolverInMemory.kt
diff --git a/lib/src/main/kotlin/org/didcommx/exceptions/Exceptions.kt b/lib/src/main/kotlin/org/didcommx/didcomm/exceptions/Exceptions.kt
similarity index 100%
rename from lib/src/main/kotlin/org/didcommx/exceptions/Exceptions.kt
rename to lib/src/main/kotlin/org/didcommx/didcomm/exceptions/Exceptions.kt
diff --git a/lib/src/main/kotlin/org/didcommx/message/Attachment.kt b/lib/src/main/kotlin/org/didcommx/didcomm/message/Attachment.kt
similarity index 100%
rename from lib/src/main/kotlin/org/didcommx/message/Attachment.kt
rename to lib/src/main/kotlin/org/didcommx/didcomm/message/Attachment.kt
diff --git a/lib/src/main/kotlin/org/didcommx/message/FromPrior.kt b/lib/src/main/kotlin/org/didcommx/didcomm/message/FromPrior.kt
similarity index 100%
rename from lib/src/main/kotlin/org/didcommx/message/FromPrior.kt
rename to lib/src/main/kotlin/org/didcommx/didcomm/message/FromPrior.kt
diff --git a/lib/src/main/kotlin/org/didcommx/message/Message.kt b/lib/src/main/kotlin/org/didcommx/didcomm/message/Message.kt
similarity index 100%
rename from lib/src/main/kotlin/org/didcommx/message/Message.kt
rename to lib/src/main/kotlin/org/didcommx/didcomm/message/Message.kt
diff --git a/lib/src/main/kotlin/org/didcommx/model/PackEncryptedParams.kt b/lib/src/main/kotlin/org/didcommx/didcomm/model/PackEncryptedParams.kt
similarity index 100%
rename from lib/src/main/kotlin/org/didcommx/model/PackEncryptedParams.kt
rename to lib/src/main/kotlin/org/didcommx/didcomm/model/PackEncryptedParams.kt
diff --git a/lib/src/main/kotlin/org/didcommx/model/PackEncryptedResult.kt b/lib/src/main/kotlin/org/didcommx/didcomm/model/PackEncryptedResult.kt
similarity index 100%
rename from lib/src/main/kotlin/org/didcommx/model/PackEncryptedResult.kt
rename to lib/src/main/kotlin/org/didcommx/didcomm/model/PackEncryptedResult.kt
diff --git a/lib/src/main/kotlin/org/didcommx/model/PackPlaintextParams.kt b/lib/src/main/kotlin/org/didcommx/didcomm/model/PackPlaintextParams.kt
similarity index 100%
rename from lib/src/main/kotlin/org/didcommx/model/PackPlaintextParams.kt
rename to lib/src/main/kotlin/org/didcommx/didcomm/model/PackPlaintextParams.kt
diff --git a/lib/src/main/kotlin/org/didcommx/model/PackPlaintextResult.kt b/lib/src/main/kotlin/org/didcommx/didcomm/model/PackPlaintextResult.kt
similarity index 100%
rename from lib/src/main/kotlin/org/didcommx/model/PackPlaintextResult.kt
rename to lib/src/main/kotlin/org/didcommx/didcomm/model/PackPlaintextResult.kt
diff --git a/lib/src/main/kotlin/org/didcommx/model/PackSignedParams.kt b/lib/src/main/kotlin/org/didcommx/didcomm/model/PackSignedParams.kt
similarity index 100%
rename from lib/src/main/kotlin/org/didcommx/model/PackSignedParams.kt
rename to lib/src/main/kotlin/org/didcommx/didcomm/model/PackSignedParams.kt
diff --git a/lib/src/main/kotlin/org/didcommx/model/PackSignedResult.kt b/lib/src/main/kotlin/org/didcommx/didcomm/model/PackSignedResult.kt
similarity index 100%
rename from lib/src/main/kotlin/org/didcommx/model/PackSignedResult.kt
rename to lib/src/main/kotlin/org/didcommx/didcomm/model/PackSignedResult.kt
diff --git a/lib/src/main/kotlin/org/didcommx/model/UnpackParams.kt b/lib/src/main/kotlin/org/didcommx/didcomm/model/UnpackParams.kt
similarity index 100%
rename from lib/src/main/kotlin/org/didcommx/model/UnpackParams.kt
rename to lib/src/main/kotlin/org/didcommx/didcomm/model/UnpackParams.kt
diff --git a/lib/src/main/kotlin/org/didcommx/model/UnpackResult.kt b/lib/src/main/kotlin/org/didcommx/didcomm/model/UnpackResult.kt
similarity index 100%
rename from lib/src/main/kotlin/org/didcommx/model/UnpackResult.kt
rename to lib/src/main/kotlin/org/didcommx/didcomm/model/UnpackResult.kt
diff --git a/lib/src/main/kotlin/org/didcommx/operations/PackEncrypt.kt b/lib/src/main/kotlin/org/didcommx/didcomm/operations/PackEncrypt.kt
similarity index 100%
rename from lib/src/main/kotlin/org/didcommx/operations/PackEncrypt.kt
rename to lib/src/main/kotlin/org/didcommx/didcomm/operations/PackEncrypt.kt
diff --git a/lib/src/main/kotlin/org/didcommx/operations/Unpack.kt b/lib/src/main/kotlin/org/didcommx/didcomm/operations/Unpack.kt
similarity index 100%
rename from lib/src/main/kotlin/org/didcommx/operations/Unpack.kt
rename to lib/src/main/kotlin/org/didcommx/didcomm/operations/Unpack.kt
diff --git a/lib/src/main/kotlin/org/didcommx/secret/Secret.kt b/lib/src/main/kotlin/org/didcommx/didcomm/secret/Secret.kt
similarity index 100%
rename from lib/src/main/kotlin/org/didcommx/secret/Secret.kt
rename to lib/src/main/kotlin/org/didcommx/didcomm/secret/Secret.kt
diff --git a/lib/src/main/kotlin/org/didcommx/secret/SecretResolver.kt b/lib/src/main/kotlin/org/didcommx/didcomm/secret/SecretResolver.kt
similarity index 100%
rename from lib/src/main/kotlin/org/didcommx/secret/SecretResolver.kt
rename to lib/src/main/kotlin/org/didcommx/didcomm/secret/SecretResolver.kt
diff --git a/lib/src/main/kotlin/org/didcommx/secret/SecretResolverInMemory.kt b/lib/src/main/kotlin/org/didcommx/didcomm/secret/SecretResolverInMemory.kt
similarity index 100%
rename from lib/src/main/kotlin/org/didcommx/secret/SecretResolverInMemory.kt
rename to lib/src/main/kotlin/org/didcommx/didcomm/secret/SecretResolverInMemory.kt
diff --git a/lib/src/main/kotlin/org/didcommx/utils/DIDUtils.kt b/lib/src/main/kotlin/org/didcommx/didcomm/utils/DIDUtils.kt
similarity index 100%
rename from lib/src/main/kotlin/org/didcommx/utils/DIDUtils.kt
rename to lib/src/main/kotlin/org/didcommx/didcomm/utils/DIDUtils.kt
diff --git a/lib/src/main/kotlin/org/didcommx/utils/JSONUtils.kt b/lib/src/main/kotlin/org/didcommx/didcomm/utils/JSONUtils.kt
similarity index 100%
rename from lib/src/main/kotlin/org/didcommx/utils/JSONUtils.kt
rename to lib/src/main/kotlin/org/didcommx/didcomm/utils/JSONUtils.kt
diff --git a/lib/src/main/kotlin/org/didcommx/utils/JWKUtils.kt b/lib/src/main/kotlin/org/didcommx/didcomm/utils/JWKUtils.kt
similarity index 100%
rename from lib/src/main/kotlin/org/didcommx/utils/JWKUtils.kt
rename to lib/src/main/kotlin/org/didcommx/didcomm/utils/JWKUtils.kt