diff --git a/README.md b/README.md
index 19ce171..fb45cc6 100644
--- a/README.md
+++ b/README.md
@@ -29,18 +29,21 @@ Setup
 
 Add Jabit as Gradle dependency:
 ```Gradle
-compile 'ch.dissem.jabit:jabit-domain:0.2.0'
+compile 'ch.dissem.jabit:jabit-core:0.2.0'
 ```
 Unless you want to implement your own, also add the following:
 ```Gradle
 compile 'ch.dissem.jabit:jabit-networking:0.2.0'
 compile 'ch.dissem.jabit:jabit-repositories:0.2.0'
+compile 'ch.dissem.jabit:jabit-cryptography-bc:0.2.0'
 ```
 And if you want to import from or export to the Wallet Import Format (used by PyBitmessage) you might also want to add:
 ```Gradle
 compile 'ch.dissem.jabit:jabit-wif:0.2.0'
 ```
 
+For Android clients use `jabit-cryptography-sc` instead of `jabit-cryptography-bc`.
+
 Usage
 -----
 
diff --git a/domain/build.gradle b/core/build.gradle
similarity index 89%
rename from domain/build.gradle
rename to core/build.gradle
index 484abfd..8754cb3 100644
--- a/domain/build.gradle
+++ b/core/build.gradle
@@ -2,8 +2,8 @@ uploadArchives {
     repositories {
         mavenDeployer {
             pom.project {
-                name 'Jabit Domain'
-                artifactId = 'jabit-domain'
+                name 'Jabit Core'
+                artifactId = 'jabit-core'
                 description 'A Java implementation of the Bitmessage protocol. This is the core part. You\'ll either need the networking and repositories modules, too, or implement your own.'
             }
         }
diff --git a/domain/src/main/java/ch/dissem/bitmessage/BitmessageContext.java b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
rename to core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java b/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
rename to core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/InternalContext.java b/core/src/main/java/ch/dissem/bitmessage/InternalContext.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/InternalContext.java
rename to core/src/main/java/ch/dissem/bitmessage/InternalContext.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/MessageCallback.java b/core/src/main/java/ch/dissem/bitmessage/MessageCallback.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/MessageCallback.java
rename to core/src/main/java/ch/dissem/bitmessage/MessageCallback.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java b/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java
rename to core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/Addr.java b/core/src/main/java/ch/dissem/bitmessage/entity/Addr.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/entity/Addr.java
rename to core/src/main/java/ch/dissem/bitmessage/entity/Addr.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java b/core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java
rename to core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/CustomMessage.java b/core/src/main/java/ch/dissem/bitmessage/entity/CustomMessage.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/entity/CustomMessage.java
rename to core/src/main/java/ch/dissem/bitmessage/entity/CustomMessage.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/Encrypted.java b/core/src/main/java/ch/dissem/bitmessage/entity/Encrypted.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/entity/Encrypted.java
rename to core/src/main/java/ch/dissem/bitmessage/entity/Encrypted.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/GetData.java b/core/src/main/java/ch/dissem/bitmessage/entity/GetData.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/entity/GetData.java
rename to core/src/main/java/ch/dissem/bitmessage/entity/GetData.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/Inv.java b/core/src/main/java/ch/dissem/bitmessage/entity/Inv.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/entity/Inv.java
rename to core/src/main/java/ch/dissem/bitmessage/entity/Inv.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/MessagePayload.java b/core/src/main/java/ch/dissem/bitmessage/entity/MessagePayload.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/entity/MessagePayload.java
rename to core/src/main/java/ch/dissem/bitmessage/entity/MessagePayload.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/NetworkMessage.java b/core/src/main/java/ch/dissem/bitmessage/entity/NetworkMessage.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/entity/NetworkMessage.java
rename to core/src/main/java/ch/dissem/bitmessage/entity/NetworkMessage.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/ObjectMessage.java b/core/src/main/java/ch/dissem/bitmessage/entity/ObjectMessage.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/entity/ObjectMessage.java
rename to core/src/main/java/ch/dissem/bitmessage/entity/ObjectMessage.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java b/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
rename to core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/PlaintextHolder.java b/core/src/main/java/ch/dissem/bitmessage/entity/PlaintextHolder.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/entity/PlaintextHolder.java
rename to core/src/main/java/ch/dissem/bitmessage/entity/PlaintextHolder.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/Streamable.java b/core/src/main/java/ch/dissem/bitmessage/entity/Streamable.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/entity/Streamable.java
rename to core/src/main/java/ch/dissem/bitmessage/entity/Streamable.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/VerAck.java b/core/src/main/java/ch/dissem/bitmessage/entity/VerAck.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/entity/VerAck.java
rename to core/src/main/java/ch/dissem/bitmessage/entity/VerAck.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/Version.java b/core/src/main/java/ch/dissem/bitmessage/entity/Version.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/entity/Version.java
rename to core/src/main/java/ch/dissem/bitmessage/entity/Version.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/payload/Broadcast.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/Broadcast.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/entity/payload/Broadcast.java
rename to core/src/main/java/ch/dissem/bitmessage/entity/payload/Broadcast.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/payload/CryptoBox.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/CryptoBox.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/entity/payload/CryptoBox.java
rename to core/src/main/java/ch/dissem/bitmessage/entity/payload/CryptoBox.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/payload/GenericPayload.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/GenericPayload.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/entity/payload/GenericPayload.java
rename to core/src/main/java/ch/dissem/bitmessage/entity/payload/GenericPayload.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/payload/GetPubkey.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/GetPubkey.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/entity/payload/GetPubkey.java
rename to core/src/main/java/ch/dissem/bitmessage/entity/payload/GetPubkey.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/payload/Msg.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/Msg.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/entity/payload/Msg.java
rename to core/src/main/java/ch/dissem/bitmessage/entity/payload/Msg.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/payload/ObjectPayload.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/ObjectPayload.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/entity/payload/ObjectPayload.java
rename to core/src/main/java/ch/dissem/bitmessage/entity/payload/ObjectPayload.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/payload/ObjectType.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/ObjectType.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/entity/payload/ObjectType.java
rename to core/src/main/java/ch/dissem/bitmessage/entity/payload/ObjectType.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/payload/Pubkey.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/Pubkey.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/entity/payload/Pubkey.java
rename to core/src/main/java/ch/dissem/bitmessage/entity/payload/Pubkey.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/payload/V2Pubkey.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/V2Pubkey.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/entity/payload/V2Pubkey.java
rename to core/src/main/java/ch/dissem/bitmessage/entity/payload/V2Pubkey.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/payload/V3Pubkey.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/V3Pubkey.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/entity/payload/V3Pubkey.java
rename to core/src/main/java/ch/dissem/bitmessage/entity/payload/V3Pubkey.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/payload/V4Broadcast.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/V4Broadcast.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/entity/payload/V4Broadcast.java
rename to core/src/main/java/ch/dissem/bitmessage/entity/payload/V4Broadcast.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/payload/V4Pubkey.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/V4Pubkey.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/entity/payload/V4Pubkey.java
rename to core/src/main/java/ch/dissem/bitmessage/entity/payload/V4Pubkey.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/payload/V5Broadcast.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/V5Broadcast.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/entity/payload/V5Broadcast.java
rename to core/src/main/java/ch/dissem/bitmessage/entity/payload/V5Broadcast.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/valueobject/InventoryVector.java b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/InventoryVector.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/entity/valueobject/InventoryVector.java
rename to core/src/main/java/ch/dissem/bitmessage/entity/valueobject/InventoryVector.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/valueobject/Label.java b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/Label.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/entity/valueobject/Label.java
rename to core/src/main/java/ch/dissem/bitmessage/entity/valueobject/Label.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/valueobject/NetworkAddress.java b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/NetworkAddress.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/entity/valueobject/NetworkAddress.java
rename to core/src/main/java/ch/dissem/bitmessage/entity/valueobject/NetworkAddress.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/valueobject/PrivateKey.java b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/PrivateKey.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/entity/valueobject/PrivateKey.java
rename to core/src/main/java/ch/dissem/bitmessage/entity/valueobject/PrivateKey.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/exception/AddressFormatException.java b/core/src/main/java/ch/dissem/bitmessage/exception/AddressFormatException.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/exception/AddressFormatException.java
rename to core/src/main/java/ch/dissem/bitmessage/exception/AddressFormatException.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/exception/DecryptionFailedException.java b/core/src/main/java/ch/dissem/bitmessage/exception/DecryptionFailedException.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/exception/DecryptionFailedException.java
rename to core/src/main/java/ch/dissem/bitmessage/exception/DecryptionFailedException.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/exception/InsufficientProofOfWorkException.java b/core/src/main/java/ch/dissem/bitmessage/exception/InsufficientProofOfWorkException.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/exception/InsufficientProofOfWorkException.java
rename to core/src/main/java/ch/dissem/bitmessage/exception/InsufficientProofOfWorkException.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/exception/NodeException.java b/core/src/main/java/ch/dissem/bitmessage/exception/NodeException.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/exception/NodeException.java
rename to core/src/main/java/ch/dissem/bitmessage/exception/NodeException.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/factory/Factory.java b/core/src/main/java/ch/dissem/bitmessage/factory/Factory.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/factory/Factory.java
rename to core/src/main/java/ch/dissem/bitmessage/factory/Factory.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/factory/V3MessageFactory.java b/core/src/main/java/ch/dissem/bitmessage/factory/V3MessageFactory.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/factory/V3MessageFactory.java
rename to core/src/main/java/ch/dissem/bitmessage/factory/V3MessageFactory.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/ports/AbstractCryptography.java b/core/src/main/java/ch/dissem/bitmessage/ports/AbstractCryptography.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/ports/AbstractCryptography.java
rename to core/src/main/java/ch/dissem/bitmessage/ports/AbstractCryptography.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/ports/AddressRepository.java b/core/src/main/java/ch/dissem/bitmessage/ports/AddressRepository.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/ports/AddressRepository.java
rename to core/src/main/java/ch/dissem/bitmessage/ports/AddressRepository.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/ports/Cryptography.java b/core/src/main/java/ch/dissem/bitmessage/ports/Cryptography.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/ports/Cryptography.java
rename to core/src/main/java/ch/dissem/bitmessage/ports/Cryptography.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/ports/CustomCommandHandler.java b/core/src/main/java/ch/dissem/bitmessage/ports/CustomCommandHandler.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/ports/CustomCommandHandler.java
rename to core/src/main/java/ch/dissem/bitmessage/ports/CustomCommandHandler.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/ports/Inventory.java b/core/src/main/java/ch/dissem/bitmessage/ports/Inventory.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/ports/Inventory.java
rename to core/src/main/java/ch/dissem/bitmessage/ports/Inventory.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/ports/MemoryNodeRegistry.java b/core/src/main/java/ch/dissem/bitmessage/ports/MemoryNodeRegistry.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/ports/MemoryNodeRegistry.java
rename to core/src/main/java/ch/dissem/bitmessage/ports/MemoryNodeRegistry.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/ports/MessageRepository.java b/core/src/main/java/ch/dissem/bitmessage/ports/MessageRepository.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/ports/MessageRepository.java
rename to core/src/main/java/ch/dissem/bitmessage/ports/MessageRepository.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/ports/MultiThreadedPOWEngine.java b/core/src/main/java/ch/dissem/bitmessage/ports/MultiThreadedPOWEngine.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/ports/MultiThreadedPOWEngine.java
rename to core/src/main/java/ch/dissem/bitmessage/ports/MultiThreadedPOWEngine.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/ports/NetworkHandler.java b/core/src/main/java/ch/dissem/bitmessage/ports/NetworkHandler.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/ports/NetworkHandler.java
rename to core/src/main/java/ch/dissem/bitmessage/ports/NetworkHandler.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/ports/NodeRegistry.java b/core/src/main/java/ch/dissem/bitmessage/ports/NodeRegistry.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/ports/NodeRegistry.java
rename to core/src/main/java/ch/dissem/bitmessage/ports/NodeRegistry.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/ports/ProofOfWorkEngine.java b/core/src/main/java/ch/dissem/bitmessage/ports/ProofOfWorkEngine.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/ports/ProofOfWorkEngine.java
rename to core/src/main/java/ch/dissem/bitmessage/ports/ProofOfWorkEngine.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/ports/ProofOfWorkRepository.java b/core/src/main/java/ch/dissem/bitmessage/ports/ProofOfWorkRepository.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/ports/ProofOfWorkRepository.java
rename to core/src/main/java/ch/dissem/bitmessage/ports/ProofOfWorkRepository.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/ports/SimplePOWEngine.java b/core/src/main/java/ch/dissem/bitmessage/ports/SimplePOWEngine.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/ports/SimplePOWEngine.java
rename to core/src/main/java/ch/dissem/bitmessage/ports/SimplePOWEngine.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/utils/AccessCounter.java b/core/src/main/java/ch/dissem/bitmessage/utils/AccessCounter.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/utils/AccessCounter.java
rename to core/src/main/java/ch/dissem/bitmessage/utils/AccessCounter.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/utils/Base58.java b/core/src/main/java/ch/dissem/bitmessage/utils/Base58.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/utils/Base58.java
rename to core/src/main/java/ch/dissem/bitmessage/utils/Base58.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/utils/Bytes.java b/core/src/main/java/ch/dissem/bitmessage/utils/Bytes.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/utils/Bytes.java
rename to core/src/main/java/ch/dissem/bitmessage/utils/Bytes.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/utils/CallbackWaiter.java b/core/src/main/java/ch/dissem/bitmessage/utils/CallbackWaiter.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/utils/CallbackWaiter.java
rename to core/src/main/java/ch/dissem/bitmessage/utils/CallbackWaiter.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/utils/Collections.java b/core/src/main/java/ch/dissem/bitmessage/utils/Collections.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/utils/Collections.java
rename to core/src/main/java/ch/dissem/bitmessage/utils/Collections.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/utils/DebugUtils.java b/core/src/main/java/ch/dissem/bitmessage/utils/DebugUtils.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/utils/DebugUtils.java
rename to core/src/main/java/ch/dissem/bitmessage/utils/DebugUtils.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/utils/Decode.java b/core/src/main/java/ch/dissem/bitmessage/utils/Decode.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/utils/Decode.java
rename to core/src/main/java/ch/dissem/bitmessage/utils/Decode.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/utils/Encode.java b/core/src/main/java/ch/dissem/bitmessage/utils/Encode.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/utils/Encode.java
rename to core/src/main/java/ch/dissem/bitmessage/utils/Encode.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/utils/Numbers.java b/core/src/main/java/ch/dissem/bitmessage/utils/Numbers.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/utils/Numbers.java
rename to core/src/main/java/ch/dissem/bitmessage/utils/Numbers.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/utils/Points.java b/core/src/main/java/ch/dissem/bitmessage/utils/Points.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/utils/Points.java
rename to core/src/main/java/ch/dissem/bitmessage/utils/Points.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/utils/Property.java b/core/src/main/java/ch/dissem/bitmessage/utils/Property.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/utils/Property.java
rename to core/src/main/java/ch/dissem/bitmessage/utils/Property.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/utils/Singleton.java b/core/src/main/java/ch/dissem/bitmessage/utils/Singleton.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/utils/Singleton.java
rename to core/src/main/java/ch/dissem/bitmessage/utils/Singleton.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/utils/Strings.java b/core/src/main/java/ch/dissem/bitmessage/utils/Strings.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/utils/Strings.java
rename to core/src/main/java/ch/dissem/bitmessage/utils/Strings.java
diff --git a/domain/src/main/java/ch/dissem/bitmessage/utils/UnixTime.java b/core/src/main/java/ch/dissem/bitmessage/utils/UnixTime.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/utils/UnixTime.java
rename to core/src/main/java/ch/dissem/bitmessage/utils/UnixTime.java
diff --git a/domain/src/main/resources/nodes.txt b/core/src/main/resources/nodes.txt
similarity index 100%
rename from domain/src/main/resources/nodes.txt
rename to core/src/main/resources/nodes.txt
diff --git a/domain/src/test/java/ch/dissem/bitmessage/DecryptionTest.java b/core/src/test/java/ch/dissem/bitmessage/DecryptionTest.java
similarity index 100%
rename from domain/src/test/java/ch/dissem/bitmessage/DecryptionTest.java
rename to core/src/test/java/ch/dissem/bitmessage/DecryptionTest.java
diff --git a/domain/src/test/java/ch/dissem/bitmessage/EncryptionTest.java b/core/src/test/java/ch/dissem/bitmessage/EncryptionTest.java
similarity index 100%
rename from domain/src/test/java/ch/dissem/bitmessage/EncryptionTest.java
rename to core/src/test/java/ch/dissem/bitmessage/EncryptionTest.java
diff --git a/domain/src/test/java/ch/dissem/bitmessage/SignatureTest.java b/core/src/test/java/ch/dissem/bitmessage/SignatureTest.java
similarity index 100%
rename from domain/src/test/java/ch/dissem/bitmessage/SignatureTest.java
rename to core/src/test/java/ch/dissem/bitmessage/SignatureTest.java
diff --git a/domain/src/test/java/ch/dissem/bitmessage/entity/BitmessageAddressTest.java b/core/src/test/java/ch/dissem/bitmessage/entity/BitmessageAddressTest.java
similarity index 100%
rename from domain/src/test/java/ch/dissem/bitmessage/entity/BitmessageAddressTest.java
rename to core/src/test/java/ch/dissem/bitmessage/entity/BitmessageAddressTest.java
diff --git a/domain/src/test/java/ch/dissem/bitmessage/entity/SerializationTest.java b/core/src/test/java/ch/dissem/bitmessage/entity/SerializationTest.java
similarity index 100%
rename from domain/src/test/java/ch/dissem/bitmessage/entity/SerializationTest.java
rename to core/src/test/java/ch/dissem/bitmessage/entity/SerializationTest.java
diff --git a/domain/src/test/java/ch/dissem/bitmessage/ports/ProofOfWorkEngineTest.java b/core/src/test/java/ch/dissem/bitmessage/ports/ProofOfWorkEngineTest.java
similarity index 100%
rename from domain/src/test/java/ch/dissem/bitmessage/ports/ProofOfWorkEngineTest.java
rename to core/src/test/java/ch/dissem/bitmessage/ports/ProofOfWorkEngineTest.java
diff --git a/domain/src/test/java/ch/dissem/bitmessage/utils/BytesTest.java b/core/src/test/java/ch/dissem/bitmessage/utils/BytesTest.java
similarity index 100%
rename from domain/src/test/java/ch/dissem/bitmessage/utils/BytesTest.java
rename to core/src/test/java/ch/dissem/bitmessage/utils/BytesTest.java
diff --git a/domain/src/test/java/ch/dissem/bitmessage/utils/CollectionsTest.java b/core/src/test/java/ch/dissem/bitmessage/utils/CollectionsTest.java
similarity index 100%
rename from domain/src/test/java/ch/dissem/bitmessage/utils/CollectionsTest.java
rename to core/src/test/java/ch/dissem/bitmessage/utils/CollectionsTest.java
diff --git a/domain/src/test/java/ch/dissem/bitmessage/utils/DecodeTest.java b/core/src/test/java/ch/dissem/bitmessage/utils/DecodeTest.java
similarity index 100%
rename from domain/src/test/java/ch/dissem/bitmessage/utils/DecodeTest.java
rename to core/src/test/java/ch/dissem/bitmessage/utils/DecodeTest.java
diff --git a/domain/src/test/java/ch/dissem/bitmessage/utils/EncodeTest.java b/core/src/test/java/ch/dissem/bitmessage/utils/EncodeTest.java
similarity index 100%
rename from domain/src/test/java/ch/dissem/bitmessage/utils/EncodeTest.java
rename to core/src/test/java/ch/dissem/bitmessage/utils/EncodeTest.java
diff --git a/domain/src/test/java/ch/dissem/bitmessage/utils/StringsTest.java b/core/src/test/java/ch/dissem/bitmessage/utils/StringsTest.java
similarity index 100%
rename from domain/src/test/java/ch/dissem/bitmessage/utils/StringsTest.java
rename to core/src/test/java/ch/dissem/bitmessage/utils/StringsTest.java
diff --git a/domain/src/test/java/ch/dissem/bitmessage/utils/TestBase.java b/core/src/test/java/ch/dissem/bitmessage/utils/TestBase.java
similarity index 100%
rename from domain/src/test/java/ch/dissem/bitmessage/utils/TestBase.java
rename to core/src/test/java/ch/dissem/bitmessage/utils/TestBase.java
diff --git a/domain/src/test/java/ch/dissem/bitmessage/utils/TestUtils.java b/core/src/test/java/ch/dissem/bitmessage/utils/TestUtils.java
similarity index 100%
rename from domain/src/test/java/ch/dissem/bitmessage/utils/TestUtils.java
rename to core/src/test/java/ch/dissem/bitmessage/utils/TestUtils.java
diff --git a/domain/src/test/resources/BM-2D9Vc5rFxxR5vTi53T9gkLfemViHRMVLQZ.pubkey b/core/src/test/resources/BM-2D9Vc5rFxxR5vTi53T9gkLfemViHRMVLQZ.pubkey
similarity index 100%
rename from domain/src/test/resources/BM-2D9Vc5rFxxR5vTi53T9gkLfemViHRMVLQZ.pubkey
rename to core/src/test/resources/BM-2D9Vc5rFxxR5vTi53T9gkLfemViHRMVLQZ.pubkey
diff --git a/domain/src/test/resources/BM-2cSqjfJ8xK6UUn5Rw3RpdGQ9RsDkBhWnS8.privkey b/core/src/test/resources/BM-2cSqjfJ8xK6UUn5Rw3RpdGQ9RsDkBhWnS8.privkey
similarity index 100%
rename from domain/src/test/resources/BM-2cSqjfJ8xK6UUn5Rw3RpdGQ9RsDkBhWnS8.privkey
rename to core/src/test/resources/BM-2cSqjfJ8xK6UUn5Rw3RpdGQ9RsDkBhWnS8.privkey
diff --git a/domain/src/test/resources/BM-2cXxfcSetKnbHJX2Y85rSkaVpsdNUZ5q9h.pubkey b/core/src/test/resources/BM-2cXxfcSetKnbHJX2Y85rSkaVpsdNUZ5q9h.pubkey
similarity index 100%
rename from domain/src/test/resources/BM-2cXxfcSetKnbHJX2Y85rSkaVpsdNUZ5q9h.pubkey
rename to core/src/test/resources/BM-2cXxfcSetKnbHJX2Y85rSkaVpsdNUZ5q9h.pubkey
diff --git a/domain/src/test/resources/V1Msg.payload b/core/src/test/resources/V1Msg.payload
similarity index 100%
rename from domain/src/test/resources/V1Msg.payload
rename to core/src/test/resources/V1Msg.payload
diff --git a/domain/src/test/resources/V1MsgStrangeData.payload b/core/src/test/resources/V1MsgStrangeData.payload
similarity index 100%
rename from domain/src/test/resources/V1MsgStrangeData.payload
rename to core/src/test/resources/V1MsgStrangeData.payload
diff --git a/domain/src/test/resources/V2GetPubkey.payload b/core/src/test/resources/V2GetPubkey.payload
similarity index 100%
rename from domain/src/test/resources/V2GetPubkey.payload
rename to core/src/test/resources/V2GetPubkey.payload
diff --git a/domain/src/test/resources/V2Pubkey.payload b/core/src/test/resources/V2Pubkey.payload
similarity index 100%
rename from domain/src/test/resources/V2Pubkey.payload
rename to core/src/test/resources/V2Pubkey.payload
diff --git a/domain/src/test/resources/V3GetPubkey.payload b/core/src/test/resources/V3GetPubkey.payload
similarity index 100%
rename from domain/src/test/resources/V3GetPubkey.payload
rename to core/src/test/resources/V3GetPubkey.payload
diff --git a/domain/src/test/resources/V3Pubkey.payload b/core/src/test/resources/V3Pubkey.payload
similarity index 100%
rename from domain/src/test/resources/V3Pubkey.payload
rename to core/src/test/resources/V3Pubkey.payload
diff --git a/domain/src/test/resources/V4Broadcast.payload b/core/src/test/resources/V4Broadcast.payload
similarity index 100%
rename from domain/src/test/resources/V4Broadcast.payload
rename to core/src/test/resources/V4Broadcast.payload
diff --git a/domain/src/test/resources/V4GetPubkey.payload b/core/src/test/resources/V4GetPubkey.payload
similarity index 100%
rename from domain/src/test/resources/V4GetPubkey.payload
rename to core/src/test/resources/V4GetPubkey.payload
diff --git a/domain/src/test/resources/V4Pubkey.payload b/core/src/test/resources/V4Pubkey.payload
similarity index 100%
rename from domain/src/test/resources/V4Pubkey.payload
rename to core/src/test/resources/V4Pubkey.payload
diff --git a/domain/src/test/resources/V5Broadcast.payload b/core/src/test/resources/V5Broadcast.payload
similarity index 100%
rename from domain/src/test/resources/V5Broadcast.payload
rename to core/src/test/resources/V5Broadcast.payload
diff --git a/cryptography-bc/build.gradle b/cryptography-bc/build.gradle
index 0634154..c09b0db 100644
--- a/cryptography-bc/build.gradle
+++ b/cryptography-bc/build.gradle
@@ -11,7 +11,7 @@ uploadArchives {
 }
 
 dependencies {
-    compile project(':domain')
+    compile project(':core')
     compile 'org.bouncycastle:bcprov-jdk15on:1.52'
     testCompile 'junit:junit:4.11'
     testCompile 'org.mockito:mockito-core:1.10.19'
diff --git a/cryptography-sc/build.gradle b/cryptography-sc/build.gradle
index 2d4f82f..16771fc 100644
--- a/cryptography-sc/build.gradle
+++ b/cryptography-sc/build.gradle
@@ -11,7 +11,7 @@ uploadArchives {
 }
 
 dependencies {
-    compile project(':domain')
+    compile project(':core')
     compile 'com.madgag.spongycastle:prov:1.52.0.0'
     testCompile 'junit:junit:4.11'
 }
diff --git a/demo/build.gradle b/demo/build.gradle
index e520157..84d5907 100644
--- a/demo/build.gradle
+++ b/demo/build.gradle
@@ -21,7 +21,7 @@ task fatCapsule(type: FatCapsule) {
 }
 
 dependencies {
-    compile project(':domain')
+    compile project(':core')
     compile project(':networking')
     compile project(':repositories')
     compile project(':cryptography-bc')
diff --git a/extensions/build.gradle b/extensions/build.gradle
index c92eb96..d44f900 100644
--- a/extensions/build.gradle
+++ b/extensions/build.gradle
@@ -27,10 +27,10 @@ uploadArchives {
 }
 
 dependencies {
-    compile project(':domain')
+    compile project(':core')
     testCompile 'junit:junit:4.11'
     testCompile 'org.slf4j:slf4j-simple:1.7.12'
     testCompile 'org.mockito:mockito-core:1.10.19'
-    testCompile project(path: ':domain', configuration: 'testArtifacts')
+    testCompile project(path: ':core', configuration: 'testArtifacts')
     testCompile project(':cryptography-bc')
 }
diff --git a/networking/build.gradle b/networking/build.gradle
index 788bc4d..984f585 100644
--- a/networking/build.gradle
+++ b/networking/build.gradle
@@ -11,10 +11,10 @@ uploadArchives {
 }
 
 dependencies {
-    compile project(':domain')
+    compile project(':core')
     testCompile 'junit:junit:4.11'
     testCompile 'org.slf4j:slf4j-simple:1.7.12'
     testCompile 'org.mockito:mockito-core:1.10.19'
-    testCompile project(path: ':domain', configuration: 'testArtifacts')
+    testCompile project(path: ':core', configuration: 'testArtifacts')
     testCompile project(':cryptography-bc')
 }
\ No newline at end of file
diff --git a/repositories/build.gradle b/repositories/build.gradle
index cfbc9ea..abb8651 100644
--- a/repositories/build.gradle
+++ b/repositories/build.gradle
@@ -2,7 +2,7 @@ uploadArchives {
     repositories {
         mavenDeployer {
             pom.project {
-                name 'Jabit Domain'
+                name 'Jabit Repositories'
                 artifactId = 'jabit-repositories'
                 description 'A Java implementation of the Bitmessage protocol. This contains JDBC implementations of the repositories.'
             }
@@ -13,7 +13,7 @@ uploadArchives {
 sourceCompatibility = 1.8
 
 dependencies {
-    compile project(':domain')
+    compile project(':core')
     compile 'org.flywaydb:flyway-core:3.2.1'
     testCompile 'junit:junit:4.12'
     testCompile 'com.h2database:h2:1.4.190'
diff --git a/settings.gradle b/settings.gradle
index 634c473..4caa813 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,6 @@
 rootProject.name = 'Jabit'
 
-include 'domain'
+include 'core'
 
 include 'networking'
 
diff --git a/wif/build.gradle b/wif/build.gradle
index ef16682..93a0248 100644
--- a/wif/build.gradle
+++ b/wif/build.gradle
@@ -11,7 +11,7 @@ uploadArchives {
 }
 
 dependencies {
-    compile project(':domain')
+    compile project(':core')
     compile 'org.ini4j:ini4j:0.5.4'
     testCompile 'junit:junit:4.11'
     testCompile 'org.mockito:mockito-core:1.10.19'