diff --git a/app/src/main/java/org/mercury_im/messenger/MercuryImApplication.java b/app/src/main/java/org/mercury_im/messenger/MercuryImApplication.java
index ee2f0c2..e3e475b 100644
--- a/app/src/main/java/org/mercury_im/messenger/MercuryImApplication.java
+++ b/app/src/main/java/org/mercury_im/messenger/MercuryImApplication.java
@@ -12,7 +12,7 @@ import android.os.Build;
 import org.mercury_im.messenger.core.centers.ConnectionCenter;
 import org.mercury_im.messenger.core.connection.MercuryConfiguration;
 import org.mercury_im.messenger.xmpp.util.ChatAndPossiblyContact;
-import org.mercury_im.messenger.core.util.ContactNameUtil;
+import org.mercury_im.core.data.util.ContactNameUtil;
 import org.mercury_im.messenger.di.component.AppComponent;
 import org.mercury_im.messenger.di.component.DaggerAppComponent;
 import org.mercury_im.messenger.di.module.AppModule;
diff --git a/core-old/build.gradle b/core-old/build.gradle
index c7ecd80..03b0732 100644
--- a/core-old/build.gradle
+++ b/core-old/build.gradle
@@ -9,7 +9,6 @@ sourceSets {
 dependencies {
 
     api project(':entity') // Entities
-    api project(':data') // Repository
 
     // Smack
     // Not all of those are needed, but it may be a good idea to define those versions explicitly
diff --git a/core-old/src/main/java/org/mercury_im/messenger/core/util/ContactNameUtil.java b/core-old/src/main/java/org/mercury_im/core/data/util/ContactNameUtil.java
similarity index 94%
rename from core-old/src/main/java/org/mercury_im/messenger/core/util/ContactNameUtil.java
rename to core-old/src/main/java/org/mercury_im/core/data/util/ContactNameUtil.java
index 647c814..cf6c932 100644
--- a/core-old/src/main/java/org/mercury_im/messenger/core/util/ContactNameUtil.java
+++ b/core-old/src/main/java/org/mercury_im/core/data/util/ContactNameUtil.java
@@ -1,4 +1,4 @@
-package org.mercury_im.messenger.core.util;
+package org.mercury_im.core.data.util;
 
 import org.mercury_im.messenger.xmpp.model.ContactModel;
 import org.mercury_im.messenger.xmpp.model.EntityModel;
diff --git a/core-old/src/main/java/org/mercury_im/messenger/core/di/CenterModule.java b/core-old/src/main/java/org/mercury_im/messenger/core/di/CenterModule.java
index 82d1360..6a295a1 100644
--- a/core-old/src/main/java/org/mercury_im/messenger/core/di/CenterModule.java
+++ b/core-old/src/main/java/org/mercury_im/messenger/core/di/CenterModule.java
@@ -2,7 +2,7 @@ package org.mercury_im.messenger.core.di;
 
 import org.mercury_im.messenger.core.NotificationManager;
 import org.mercury_im.messenger.core.centers.ConnectionCenter;
-import org.mercury_im.messenger.core.repository.AccountRepository;
+import org.mercury_im.core.data.repository.AccountRepository;
 import org.mercury_im.messenger.core.stores.EntityCapsStore;
 import org.mercury_im.messenger.core.stores.PlainMessageStore;
 
diff --git a/data/build.gradle b/data/build.gradle
index f8d2ebb..b480c15 100644
--- a/data/build.gradle
+++ b/data/build.gradle
@@ -1,10 +1,29 @@
 apply plugin: 'java-library'
 
-dependencies {
-    api project(":entity")
+// Add the generated folder to the source directories so that we can work with generated classes
+// This is apparently necessary for use with requery.
+sourceSets {
+    main.java.srcDirs += "${buildDir}/generated/sources/annotationProcessor/java/main/"
+}
 
-    // RxJava 2
-    api "io.reactivex.rxjava2:rxjava:$rxJava2Version"
+dependencies {
+
+    implementation project(":entity")
+    implementation project(':domain')
+
+    // RxJava2
+    implementation "io.reactivex.rxjava2:rxjava:$rxJava2Version"
+
+    // Dagger 2 for dependency injection
+    implementation "com.google.dagger:dagger:$daggerVersion"
+    annotationProcessor "com.google.dagger:dagger-compiler:$daggerVersion"
+
+    // Requery ORM
+    api "io.requery:requery:$requeryVersion"
+    annotationProcessor "io.requery:requery-processor:$requeryVersion"
+
+    // JUnit for testing
+    testImplementation "junit:junit:$junitVersion"
 }
 
 sourceCompatibility = "8"
diff --git a/repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/converter/SaslConditionConverter.java b/data/src/main/java/org/mercury_im/messenger/xmpp/converter/SaslConditionConverter.java
similarity index 100%
rename from repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/converter/SaslConditionConverter.java
rename to data/src/main/java/org/mercury_im/messenger/xmpp/converter/SaslConditionConverter.java
diff --git a/repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/converter/SubscriptionDirectionConverter.java b/data/src/main/java/org/mercury_im/messenger/xmpp/converter/SubscriptionDirectionConverter.java
similarity index 100%
rename from repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/converter/SubscriptionDirectionConverter.java
rename to data/src/main/java/org/mercury_im/messenger/xmpp/converter/SubscriptionDirectionConverter.java
diff --git a/repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/di/RequeryModule.java b/data/src/main/java/org/mercury_im/messenger/xmpp/di/RequeryModule.java
similarity index 100%
rename from repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/di/RequeryModule.java
rename to data/src/main/java/org/mercury_im/messenger/xmpp/di/RequeryModule.java
diff --git a/repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/enums/SaslCondition.java b/data/src/main/java/org/mercury_im/messenger/xmpp/enums/SaslCondition.java
similarity index 100%
rename from repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/enums/SaslCondition.java
rename to data/src/main/java/org/mercury_im/messenger/xmpp/enums/SaslCondition.java
diff --git a/repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/enums/SubscriptionDirection.java b/data/src/main/java/org/mercury_im/messenger/xmpp/enums/SubscriptionDirection.java
similarity index 100%
rename from repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/enums/SubscriptionDirection.java
rename to data/src/main/java/org/mercury_im/messenger/xmpp/enums/SubscriptionDirection.java
diff --git a/repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/mapping/AccountMapping.java b/data/src/main/java/org/mercury_im/messenger/xmpp/mapping/AccountMapping.java
similarity index 100%
rename from repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/mapping/AccountMapping.java
rename to data/src/main/java/org/mercury_im/messenger/xmpp/mapping/AccountMapping.java
diff --git a/repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractAccountModel.java b/data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractAccountModel.java
similarity index 100%
rename from repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractAccountModel.java
rename to data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractAccountModel.java
diff --git a/repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractChatModel.java b/data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractChatModel.java
similarity index 100%
rename from repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractChatModel.java
rename to data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractChatModel.java
diff --git a/repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractContactModel.java b/data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractContactModel.java
similarity index 100%
rename from repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractContactModel.java
rename to data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractContactModel.java
diff --git a/repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractEntityCapsModel.java b/data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractEntityCapsModel.java
similarity index 100%
rename from repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractEntityCapsModel.java
rename to data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractEntityCapsModel.java
diff --git a/repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractLastChatMessageRelation.java b/data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractLastChatMessageRelation.java
similarity index 100%
rename from repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractLastChatMessageRelation.java
rename to data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractLastChatMessageRelation.java
diff --git a/repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractLastReadChatMessageRelation.java b/data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractLastReadChatMessageRelation.java
similarity index 100%
rename from repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractLastReadChatMessageRelation.java
rename to data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractLastReadChatMessageRelation.java
diff --git a/repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractMessageModel.java b/data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractMessageModel.java
similarity index 100%
rename from repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractMessageModel.java
rename to data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractMessageModel.java
diff --git a/repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractPeerModel.java b/data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractPeerModel.java
similarity index 100%
rename from repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractPeerModel.java
rename to data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractPeerModel.java
diff --git a/repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractSaslAuthenticationResultModel.java b/data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractSaslAuthenticationResultModel.java
similarity index 100%
rename from repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractSaslAuthenticationResultModel.java
rename to data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractSaslAuthenticationResultModel.java
diff --git a/repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/repository/AbstractRepository.java b/data/src/main/java/org/mercury_im/messenger/xmpp/repository/AbstractRepository.java
similarity index 100%
rename from repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/repository/AbstractRepository.java
rename to data/src/main/java/org/mercury_im/messenger/xmpp/repository/AbstractRepository.java
diff --git a/repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/repository/ChatRepository.java b/data/src/main/java/org/mercury_im/messenger/xmpp/repository/ChatRepository.java
similarity index 100%
rename from repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/repository/ChatRepository.java
rename to data/src/main/java/org/mercury_im/messenger/xmpp/repository/ChatRepository.java
diff --git a/repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/repository/EntityCapsRepository.java b/data/src/main/java/org/mercury_im/messenger/xmpp/repository/EntityCapsRepository.java
similarity index 100%
rename from repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/repository/EntityCapsRepository.java
rename to data/src/main/java/org/mercury_im/messenger/xmpp/repository/EntityCapsRepository.java
diff --git a/repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/repository/MessageRepository.java b/data/src/main/java/org/mercury_im/messenger/xmpp/repository/MessageRepository.java
similarity index 100%
rename from repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/repository/MessageRepository.java
rename to data/src/main/java/org/mercury_im/messenger/xmpp/repository/MessageRepository.java
diff --git a/repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/repository/ReactiveXmppAccountRepository.java b/data/src/main/java/org/mercury_im/messenger/xmpp/repository/ReactiveXmppAccountRepository.java
similarity index 98%
rename from repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/repository/ReactiveXmppAccountRepository.java
rename to data/src/main/java/org/mercury_im/messenger/xmpp/repository/ReactiveXmppAccountRepository.java
index 80a225f..620b7e0 100644
--- a/repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/repository/ReactiveXmppAccountRepository.java
+++ b/data/src/main/java/org/mercury_im/messenger/xmpp/repository/ReactiveXmppAccountRepository.java
@@ -1,8 +1,8 @@
 package org.mercury_im.messenger.xmpp.repository;
 
 import org.mercury_im.messenger.core.entity.Account;
-import org.mercury_im.messenger.core.repository.AccountRepository;
-import org.mercury_im.messenger.core.util.Optional;
+import org.mercury_im.core.data.repository.AccountRepository;
+import org.mercury_im.core.data.util.Optional;
 import org.mercury_im.core.util.ThreadUtils;
 import org.mercury_im.messenger.xmpp.mapping.AccountMapping;
 import org.mercury_im.messenger.xmpp.model.AccountModel;
@@ -50,7 +50,6 @@ public class ReactiveXmppAccountRepository
                 .map(result -> new Optional<>(AccountMapping.modelToEntity(result.firstOrNull())))
                 .subscribeOn(subscriberScheduler())
                 .observeOn(observerScheduler());
-
     }
 
     @Override
diff --git a/repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/repository/RequeryRepository.java b/data/src/main/java/org/mercury_im/messenger/xmpp/repository/RequeryRepository.java
similarity index 100%
rename from repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/repository/RequeryRepository.java
rename to data/src/main/java/org/mercury_im/messenger/xmpp/repository/RequeryRepository.java
diff --git a/repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/repository/RosterRepository.java b/data/src/main/java/org/mercury_im/messenger/xmpp/repository/RosterRepository.java
similarity index 100%
rename from repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/repository/RosterRepository.java
rename to data/src/main/java/org/mercury_im/messenger/xmpp/repository/RosterRepository.java
diff --git a/repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/util/ChatAndPossiblyContact.java b/data/src/main/java/org/mercury_im/messenger/xmpp/util/ChatAndPossiblyContact.java
similarity index 100%
rename from repository_xmpp/src/main/java/org/mercury_im/messenger/xmpp/util/ChatAndPossiblyContact.java
rename to data/src/main/java/org/mercury_im/messenger/xmpp/util/ChatAndPossiblyContact.java
diff --git a/domain/build.gradle b/domain/build.gradle
index e520b65..608afd2 100644
--- a/domain/build.gradle
+++ b/domain/build.gradle
@@ -3,7 +3,6 @@ apply plugin: 'java-library'
 dependencies {
 
     implementation project(':entity')
-    implementation project(':data')
 
     // RxJava2
     implementation "io.reactivex.rxjava2:rxjava:$rxJava2Version"
diff --git a/data/src/main/java/org/mercury_im/messenger/core/repository/AccountRepository.java b/domain/src/main/java/org/mercury_im/core/data/repository/AccountRepository.java
similarity index 88%
rename from data/src/main/java/org/mercury_im/messenger/core/repository/AccountRepository.java
rename to domain/src/main/java/org/mercury_im/core/data/repository/AccountRepository.java
index 85429cd..53bad4c 100644
--- a/data/src/main/java/org/mercury_im/messenger/core/repository/AccountRepository.java
+++ b/domain/src/main/java/org/mercury_im/core/data/repository/AccountRepository.java
@@ -1,7 +1,7 @@
-package org.mercury_im.messenger.core.repository;
+package org.mercury_im.core.data.repository;
 
 import org.mercury_im.messenger.core.entity.Account;
-import org.mercury_im.messenger.core.util.Optional;
+import org.mercury_im.core.data.util.Optional;
 
 import java.util.List;
 
diff --git a/data/src/main/java/org/mercury_im/messenger/core/repository/ContactRepository.java b/domain/src/main/java/org/mercury_im/core/data/repository/ContactRepository.java
similarity index 88%
rename from data/src/main/java/org/mercury_im/messenger/core/repository/ContactRepository.java
rename to domain/src/main/java/org/mercury_im/core/data/repository/ContactRepository.java
index 19daaf7..8fd754e 100644
--- a/data/src/main/java/org/mercury_im/messenger/core/repository/ContactRepository.java
+++ b/domain/src/main/java/org/mercury_im/core/data/repository/ContactRepository.java
@@ -1,7 +1,7 @@
-package org.mercury_im.messenger.core.repository;
+package org.mercury_im.core.data.repository;
 
 import org.mercury_im.messenger.core.entity.contact.Contact;
-import org.mercury_im.messenger.core.util.Optional;
+import org.mercury_im.core.data.util.Optional;
 
 import java.util.List;
 
diff --git a/data/src/main/java/org/mercury_im/messenger/core/repository/DirectChatRepository.java b/domain/src/main/java/org/mercury_im/core/data/repository/DirectChatRepository.java
similarity index 92%
rename from data/src/main/java/org/mercury_im/messenger/core/repository/DirectChatRepository.java
rename to domain/src/main/java/org/mercury_im/core/data/repository/DirectChatRepository.java
index 2cca016..77f4dbf 100644
--- a/data/src/main/java/org/mercury_im/messenger/core/repository/DirectChatRepository.java
+++ b/domain/src/main/java/org/mercury_im/core/data/repository/DirectChatRepository.java
@@ -1,9 +1,9 @@
-package org.mercury_im.messenger.core.repository;
+package org.mercury_im.core.data.repository;
 
 import org.mercury_im.messenger.core.entity.chat.DirectChat;
 import org.mercury_im.messenger.core.entity.contact.Peer;
 import org.mercury_im.messenger.core.entity.message.Message;
-import org.mercury_im.messenger.core.util.Optional;
+import org.mercury_im.core.data.util.Optional;
 
 import java.util.List;
 
diff --git a/data/src/main/java/org/mercury_im/messenger/core/repository/GroupChatRepository.java b/domain/src/main/java/org/mercury_im/core/data/repository/GroupChatRepository.java
similarity index 92%
rename from data/src/main/java/org/mercury_im/messenger/core/repository/GroupChatRepository.java
rename to domain/src/main/java/org/mercury_im/core/data/repository/GroupChatRepository.java
index a5e1271..ad79bf2 100644
--- a/data/src/main/java/org/mercury_im/messenger/core/repository/GroupChatRepository.java
+++ b/domain/src/main/java/org/mercury_im/core/data/repository/GroupChatRepository.java
@@ -1,8 +1,8 @@
-package org.mercury_im.messenger.core.repository;
+package org.mercury_im.core.data.repository;
 
 import org.mercury_im.messenger.core.entity.chat.GroupChat;
 import org.mercury_im.messenger.core.entity.message.Message;
-import org.mercury_im.messenger.core.util.Optional;
+import org.mercury_im.core.data.util.Optional;
 
 import java.util.List;
 
diff --git a/data/src/main/java/org/mercury_im/messenger/core/util/Optional.java b/domain/src/main/java/org/mercury_im/core/data/util/Optional.java
similarity index 89%
rename from data/src/main/java/org/mercury_im/messenger/core/util/Optional.java
rename to domain/src/main/java/org/mercury_im/core/data/util/Optional.java
index 12336e7..786661b 100644
--- a/data/src/main/java/org/mercury_im/messenger/core/util/Optional.java
+++ b/domain/src/main/java/org/mercury_im/core/data/util/Optional.java
@@ -1,4 +1,4 @@
-package org.mercury_im.messenger.core.util;
+package org.mercury_im.core.data.util;
 
 /**
  * Since j.u.Optional is only available on Android since API lvl 24, we need this utility class.
diff --git a/repository_xmpp/.gitignore b/repository_xmpp/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/repository_xmpp/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/repository_xmpp/build.gradle b/repository_xmpp/build.gradle
deleted file mode 100644
index 8c68c29..0000000
--- a/repository_xmpp/build.gradle
+++ /dev/null
@@ -1,31 +0,0 @@
-apply plugin: 'java-library'
-
-// Add the generated folder to the source directories so that we can work with generated classes
-// This is apparently necessary for use with requery.
-sourceSets {
-    main.java.srcDirs += "${buildDir}/generated/sources/annotationProcessor/java/main/"
-}
-
-dependencies {
-
-    implementation project(":entity")
-    implementation project(':domain')
-    implementation project(':data')
-
-    // RxJava2
-    api "io.reactivex.rxjava2:rxjava:$rxJava2Version"
-
-    // Dagger 2 for dependency injection
-    implementation "com.google.dagger:dagger:$daggerVersion"
-    annotationProcessor "com.google.dagger:dagger-compiler:$daggerVersion"
-
-    // Requery ORM
-    api "io.requery:requery:$requeryVersion"
-    annotationProcessor "io.requery:requery-processor:$requeryVersion"
-
-    // JUnit for testing
-    testImplementation "junit:junit:$junitVersion"
-}
-
-sourceCompatibility = "8"
-targetCompatibility = "8"
diff --git a/settings.gradle b/settings.gradle
index 83c28a4..cf4c43f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,5 @@
 include ':entity',
         ':data',
-        ':repository_xmpp',
         ':domain',
         ':transport_xmpp',
         ':app',
diff --git a/transport_xmpp/build.gradle b/transport_xmpp/build.gradle
index 5de9efc..b59ea59 100644
--- a/transport_xmpp/build.gradle
+++ b/transport_xmpp/build.gradle
@@ -3,7 +3,9 @@ apply plugin: 'java-library'
 dependencies {
     implementation project(":entity")
     implementation project(':domain')
-    implementation project(":repository_xmpp")
+
+    // RxJava2
+    implementation "io.reactivex.rxjava2:rxjava:$rxJava2Version"
 
     // Smack
     // Not all of those are needed, but it may be a good idea to define those versions explicitly
diff --git a/transport_xmpp/src/main/java/org/mercury_im/xmpp/connection/XmppConnectionFactory.java b/transport_xmpp/src/main/java/org/mercury_im/xmpp/domain/connection/XmppConnectionFactory.java
similarity index 95%
rename from transport_xmpp/src/main/java/org/mercury_im/xmpp/connection/XmppConnectionFactory.java
rename to transport_xmpp/src/main/java/org/mercury_im/xmpp/domain/connection/XmppConnectionFactory.java
index 021c2c6..1442c84 100644
--- a/transport_xmpp/src/main/java/org/mercury_im/xmpp/connection/XmppConnectionFactory.java
+++ b/transport_xmpp/src/main/java/org/mercury_im/xmpp/domain/connection/XmppConnectionFactory.java
@@ -1,4 +1,4 @@
-package org.mercury_im.xmpp.connection;
+package org.mercury_im.xmpp.domain.connection;
 
 import org.jivesoftware.smack.ConnectionConfiguration;
 import org.jivesoftware.smack.XMPPConnection;
diff --git a/transport_xmpp/src/main/java/org/mercury_im/xmpp/connection/XmppTcpConnectionFactory.java b/transport_xmpp/src/main/java/org/mercury_im/xmpp/domain/connection/XmppTcpConnectionFactory.java
similarity index 80%
rename from transport_xmpp/src/main/java/org/mercury_im/xmpp/connection/XmppTcpConnectionFactory.java
rename to transport_xmpp/src/main/java/org/mercury_im/xmpp/domain/connection/XmppTcpConnectionFactory.java
index e5e3063..9834a32 100644
--- a/transport_xmpp/src/main/java/org/mercury_im/xmpp/connection/XmppTcpConnectionFactory.java
+++ b/transport_xmpp/src/main/java/org/mercury_im/xmpp/domain/connection/XmppTcpConnectionFactory.java
@@ -1,4 +1,4 @@
-package org.mercury_im.xmpp.connection;
+package org.mercury_im.xmpp.domain.connection;
 
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.tcp.XMPPTCPConnection;
@@ -7,7 +7,7 @@ import org.jxmpp.jid.EntityBareJid;
 import org.jxmpp.jid.impl.JidCreate;
 import org.mercury_im.core.Messenger;
 import org.mercury_im.messenger.core.entity.Account;
-import org.mercury_im.xmpp.entity.XmppAuthMethod;
+import org.mercury_im.messenger.core.entity.PasswordAuthentication;
 
 public class XmppTcpConnectionFactory extends XmppConnectionFactory<XMPPTCPConnectionConfiguration> {
 
@@ -20,8 +20,8 @@ public class XmppTcpConnectionFactory extends XmppConnectionFactory<XMPPTCPConne
         XMPPTCPConnectionConfiguration.Builder configBuilder = XMPPTCPConnectionConfiguration.builder();
         configBuilder.setConnectTimeout(20 * 1000);
 
-        if (account.getAuthentication() instanceof XmppAuthMethod.AuthPassword) {
-            XmppAuthMethod.AuthPassword authPassword = (XmppAuthMethod.AuthPassword) account.getAuthentication();
+        if (account.getAuthentication() instanceof PasswordAuthentication) {
+            PasswordAuthentication authPassword = (PasswordAuthentication) account.getAuthentication();
             EntityBareJid accountAddress = JidCreate.entityBareFromOrThrowUnchecked(account.getAddress());
             configBuilder.setXmppAddressAndPassword(accountAddress, authPassword.getPassword());
         }
diff --git a/transport_xmpp/src/main/java/org/mercury_im/xmpp/connection/XmppTcpConnectionMethod.java b/transport_xmpp/src/main/java/org/mercury_im/xmpp/domain/connection/XmppTcpConnectionMethod.java
similarity index 97%
rename from transport_xmpp/src/main/java/org/mercury_im/xmpp/connection/XmppTcpConnectionMethod.java
rename to transport_xmpp/src/main/java/org/mercury_im/xmpp/domain/connection/XmppTcpConnectionMethod.java
index 8954cb5..4808af8 100644
--- a/transport_xmpp/src/main/java/org/mercury_im/xmpp/connection/XmppTcpConnectionMethod.java
+++ b/transport_xmpp/src/main/java/org/mercury_im/xmpp/domain/connection/XmppTcpConnectionMethod.java
@@ -1,4 +1,4 @@
-package org.mercury_im.xmpp.connection;
+package org.mercury_im.xmpp.domain.connection;
 
 import org.jivesoftware.smack.AbstractXMPPConnection;
 import org.jivesoftware.smack.XMPPConnection;
diff --git a/transport_xmpp/src/main/java/org/mercury_im/xmpp/connection/message/XmppDirectMessageCenter.java b/transport_xmpp/src/main/java/org/mercury_im/xmpp/domain/connection/message/XmppDirectMessageCenter.java
similarity index 94%
rename from transport_xmpp/src/main/java/org/mercury_im/xmpp/connection/message/XmppDirectMessageCenter.java
rename to transport_xmpp/src/main/java/org/mercury_im/xmpp/domain/connection/message/XmppDirectMessageCenter.java
index 348c7d8..76a61dc 100644
--- a/transport_xmpp/src/main/java/org/mercury_im/xmpp/connection/message/XmppDirectMessageCenter.java
+++ b/transport_xmpp/src/main/java/org/mercury_im/xmpp/domain/connection/message/XmppDirectMessageCenter.java
@@ -1,4 +1,4 @@
-package org.mercury_im.xmpp.connection.message;
+package org.mercury_im.xmpp.domain.connection.message;
 
 import org.jivesoftware.smack.chat2.Chat;
 import org.jivesoftware.smack.chat2.ChatManager;
@@ -10,7 +10,7 @@ import org.mercury_im.core.transport.listener.IncomingDirectMessageListener;
 import org.mercury_im.messenger.core.entity.message.Message;
 import org.mercury_im.core.MessageCenter;
 import org.mercury_im.messenger.core.entity.chat.DirectChat;
-import org.mercury_im.xmpp.connection.XmppTcpConnectionMethod;
+import org.mercury_im.xmpp.domain.connection.XmppTcpConnectionMethod;
 
 import io.reactivex.Completable;
 
diff --git a/transport_xmpp/src/main/java/org/mercury_im/xmpp/entity/XmppAuthMethod.java b/transport_xmpp/src/main/java/org/mercury_im/xmpp/entity/XmppAuthMethod.java
deleted file mode 100644
index 64b0071..0000000
--- a/transport_xmpp/src/main/java/org/mercury_im/xmpp/entity/XmppAuthMethod.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.mercury_im.xmpp.entity;
-
-import org.mercury_im.messenger.core.entity.Account;
-
-public abstract class XmppAuthMethod implements Account.AuthMethod {
-
-    public static class AuthPassword extends XmppAuthMethod {
-        private String password;
-
-        public String getPassword() {
-            return password;
-        }
-
-        public void setPassword(String password) {
-            this.password = password;
-        }
-
-        public static AuthPassword fromPassword(String password) {
-            AuthPassword auth = new AuthPassword();
-            auth.setPassword(password);
-            return auth;
-        }
-    }
-}