diff --git a/build.gradle b/build.gradle index ab0325717..2352b1162 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,11 @@ android { } dependencies { - // ToDo: Move libs here if possible (instead of including the jars) - "compile 'com.android.support:support-v13:19.1.0'" + compile project(':minidns') + compile project(':openpgpapilib') + compile project(':memorizingTrustManager') + compile 'com.android.support:support-v13:19.1.0' + // compile files('libs/bcprov-jdk15on-150.jar') + // compile files('libs/otr4j-0.10.jar') compile fileTree(dir: 'libs', include: ['*.jar']) } diff --git a/conversations/build.gradle b/conversations/build.gradle deleted file mode 100644 index 08060e59c..000000000 --- a/conversations/build.gradle +++ /dev/null @@ -1,28 +0,0 @@ -apply plugin: 'com.android.application' - -android { - compileSdkVersion 19 - buildToolsVersion "20.0.0" - - defaultConfig { - applicationId "eu.siacs.conversations" - minSdkVersion 14 - targetSdkVersion 19 - } - - buildTypes { - release { - runProguard false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' - } - } -} - -dependencies { - compile project(':minidns') - compile project(':openpgpapilib') - compile project(':memorizingTrustManager') - compile files('libs/android-support-v13.jar') - compile files('libs/bcprov-jdk15on-150.jar') - compile files('libs/otr4j-0.10.jar') -} diff --git a/conversations/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml similarity index 100% rename from conversations/src/main/AndroidManifest.xml rename to src/main/AndroidManifest.xml diff --git a/conversations/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/Config.java rename to src/main/java/eu/siacs/conversations/Config.java diff --git a/conversations/src/main/java/eu/siacs/conversations/crypto/OtrEngine.java b/src/main/java/eu/siacs/conversations/crypto/OtrEngine.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/crypto/OtrEngine.java rename to src/main/java/eu/siacs/conversations/crypto/OtrEngine.java diff --git a/conversations/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java b/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java rename to src/main/java/eu/siacs/conversations/crypto/PgpEngine.java diff --git a/conversations/src/main/java/eu/siacs/conversations/entities/AbstractEntity.java b/src/main/java/eu/siacs/conversations/entities/AbstractEntity.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/entities/AbstractEntity.java rename to src/main/java/eu/siacs/conversations/entities/AbstractEntity.java diff --git a/conversations/src/main/java/eu/siacs/conversations/entities/Account.java b/src/main/java/eu/siacs/conversations/entities/Account.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/entities/Account.java rename to src/main/java/eu/siacs/conversations/entities/Account.java diff --git a/conversations/src/main/java/eu/siacs/conversations/entities/Bookmark.java b/src/main/java/eu/siacs/conversations/entities/Bookmark.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/entities/Bookmark.java rename to src/main/java/eu/siacs/conversations/entities/Bookmark.java diff --git a/conversations/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/entities/Contact.java rename to src/main/java/eu/siacs/conversations/entities/Contact.java diff --git a/conversations/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/entities/Conversation.java rename to src/main/java/eu/siacs/conversations/entities/Conversation.java diff --git a/conversations/src/main/java/eu/siacs/conversations/entities/Downloadable.java b/src/main/java/eu/siacs/conversations/entities/Downloadable.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/entities/Downloadable.java rename to src/main/java/eu/siacs/conversations/entities/Downloadable.java diff --git a/conversations/src/main/java/eu/siacs/conversations/entities/DownloadableFile.java b/src/main/java/eu/siacs/conversations/entities/DownloadableFile.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/entities/DownloadableFile.java rename to src/main/java/eu/siacs/conversations/entities/DownloadableFile.java diff --git a/conversations/src/main/java/eu/siacs/conversations/entities/ListItem.java b/src/main/java/eu/siacs/conversations/entities/ListItem.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/entities/ListItem.java rename to src/main/java/eu/siacs/conversations/entities/ListItem.java diff --git a/conversations/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/entities/Message.java rename to src/main/java/eu/siacs/conversations/entities/Message.java diff --git a/conversations/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/entities/MucOptions.java rename to src/main/java/eu/siacs/conversations/entities/MucOptions.java diff --git a/conversations/src/main/java/eu/siacs/conversations/entities/Presences.java b/src/main/java/eu/siacs/conversations/entities/Presences.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/entities/Presences.java rename to src/main/java/eu/siacs/conversations/entities/Presences.java diff --git a/conversations/src/main/java/eu/siacs/conversations/entities/Roster.java b/src/main/java/eu/siacs/conversations/entities/Roster.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/entities/Roster.java rename to src/main/java/eu/siacs/conversations/entities/Roster.java diff --git a/conversations/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java rename to src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java diff --git a/conversations/src/main/java/eu/siacs/conversations/generator/IqGenerator.java b/src/main/java/eu/siacs/conversations/generator/IqGenerator.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/generator/IqGenerator.java rename to src/main/java/eu/siacs/conversations/generator/IqGenerator.java diff --git a/conversations/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java rename to src/main/java/eu/siacs/conversations/generator/MessageGenerator.java diff --git a/conversations/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java b/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java rename to src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java diff --git a/conversations/src/main/java/eu/siacs/conversations/http/HttpConnection.java b/src/main/java/eu/siacs/conversations/http/HttpConnection.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/http/HttpConnection.java rename to src/main/java/eu/siacs/conversations/http/HttpConnection.java diff --git a/conversations/src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java b/src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java rename to src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java diff --git a/conversations/src/main/java/eu/siacs/conversations/parser/AbstractParser.java b/src/main/java/eu/siacs/conversations/parser/AbstractParser.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/parser/AbstractParser.java rename to src/main/java/eu/siacs/conversations/parser/AbstractParser.java diff --git a/conversations/src/main/java/eu/siacs/conversations/parser/IqParser.java b/src/main/java/eu/siacs/conversations/parser/IqParser.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/parser/IqParser.java rename to src/main/java/eu/siacs/conversations/parser/IqParser.java diff --git a/conversations/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/parser/MessageParser.java rename to src/main/java/eu/siacs/conversations/parser/MessageParser.java diff --git a/conversations/src/main/java/eu/siacs/conversations/parser/PresenceParser.java b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/parser/PresenceParser.java rename to src/main/java/eu/siacs/conversations/parser/PresenceParser.java diff --git a/conversations/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java b/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java rename to src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java diff --git a/conversations/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/persistance/FileBackend.java rename to src/main/java/eu/siacs/conversations/persistance/FileBackend.java diff --git a/conversations/src/main/java/eu/siacs/conversations/persistance/OnPhoneContactsMerged.java b/src/main/java/eu/siacs/conversations/persistance/OnPhoneContactsMerged.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/persistance/OnPhoneContactsMerged.java rename to src/main/java/eu/siacs/conversations/persistance/OnPhoneContactsMerged.java diff --git a/conversations/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java b/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java rename to src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java diff --git a/conversations/src/main/java/eu/siacs/conversations/services/AvatarService.java b/src/main/java/eu/siacs/conversations/services/AvatarService.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/services/AvatarService.java rename to src/main/java/eu/siacs/conversations/services/AvatarService.java diff --git a/conversations/src/main/java/eu/siacs/conversations/services/EventReceiver.java b/src/main/java/eu/siacs/conversations/services/EventReceiver.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/services/EventReceiver.java rename to src/main/java/eu/siacs/conversations/services/EventReceiver.java diff --git a/conversations/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/services/NotificationService.java rename to src/main/java/eu/siacs/conversations/services/NotificationService.java diff --git a/conversations/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java rename to src/main/java/eu/siacs/conversations/services/XmppConnectionService.java diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java b/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java rename to src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java rename to src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java rename to src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java rename to src/main/java/eu/siacs/conversations/ui/ConversationActivity.java diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java rename to src/main/java/eu/siacs/conversations/ui/ConversationFragment.java diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java rename to src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/EditMessage.java b/src/main/java/eu/siacs/conversations/ui/EditMessage.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/ui/EditMessage.java rename to src/main/java/eu/siacs/conversations/ui/EditMessage.java diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java rename to src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java rename to src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java rename to src/main/java/eu/siacs/conversations/ui/SettingsActivity.java diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/SettingsFragment.java b/src/main/java/eu/siacs/conversations/ui/SettingsFragment.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/ui/SettingsFragment.java rename to src/main/java/eu/siacs/conversations/ui/SettingsFragment.java diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java rename to src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java rename to src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/UiCallback.java b/src/main/java/eu/siacs/conversations/ui/UiCallback.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/ui/UiCallback.java rename to src/main/java/eu/siacs/conversations/ui/UiCallback.java diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/ui/XmppActivity.java rename to src/main/java/eu/siacs/conversations/ui/XmppActivity.java diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java rename to src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java rename to src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java rename to src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java rename to src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java rename to src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java diff --git a/conversations/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java b/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java rename to src/main/java/eu/siacs/conversations/utils/CryptoHelper.java diff --git a/conversations/src/main/java/eu/siacs/conversations/utils/DNSHelper.java b/src/main/java/eu/siacs/conversations/utils/DNSHelper.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/utils/DNSHelper.java rename to src/main/java/eu/siacs/conversations/utils/DNSHelper.java diff --git a/conversations/src/main/java/eu/siacs/conversations/utils/ExceptionHandler.java b/src/main/java/eu/siacs/conversations/utils/ExceptionHandler.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/utils/ExceptionHandler.java rename to src/main/java/eu/siacs/conversations/utils/ExceptionHandler.java diff --git a/conversations/src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java b/src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java rename to src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java diff --git a/conversations/src/main/java/eu/siacs/conversations/utils/OnPhoneContactsLoadedListener.java b/src/main/java/eu/siacs/conversations/utils/OnPhoneContactsLoadedListener.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/utils/OnPhoneContactsLoadedListener.java rename to src/main/java/eu/siacs/conversations/utils/OnPhoneContactsLoadedListener.java diff --git a/conversations/src/main/java/eu/siacs/conversations/utils/PRNGFixes.java b/src/main/java/eu/siacs/conversations/utils/PRNGFixes.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/utils/PRNGFixes.java rename to src/main/java/eu/siacs/conversations/utils/PRNGFixes.java diff --git a/conversations/src/main/java/eu/siacs/conversations/utils/PhoneHelper.java b/src/main/java/eu/siacs/conversations/utils/PhoneHelper.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/utils/PhoneHelper.java rename to src/main/java/eu/siacs/conversations/utils/PhoneHelper.java diff --git a/conversations/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/utils/UIHelper.java rename to src/main/java/eu/siacs/conversations/utils/UIHelper.java diff --git a/conversations/src/main/java/eu/siacs/conversations/utils/Validator.java b/src/main/java/eu/siacs/conversations/utils/Validator.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/utils/Validator.java rename to src/main/java/eu/siacs/conversations/utils/Validator.java diff --git a/conversations/src/main/java/eu/siacs/conversations/utils/XmlHelper.java b/src/main/java/eu/siacs/conversations/utils/XmlHelper.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/utils/XmlHelper.java rename to src/main/java/eu/siacs/conversations/utils/XmlHelper.java diff --git a/conversations/src/main/java/eu/siacs/conversations/utils/zlib/ZLibInputStream.java b/src/main/java/eu/siacs/conversations/utils/zlib/ZLibInputStream.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/utils/zlib/ZLibInputStream.java rename to src/main/java/eu/siacs/conversations/utils/zlib/ZLibInputStream.java diff --git a/conversations/src/main/java/eu/siacs/conversations/utils/zlib/ZLibOutputStream.java b/src/main/java/eu/siacs/conversations/utils/zlib/ZLibOutputStream.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/utils/zlib/ZLibOutputStream.java rename to src/main/java/eu/siacs/conversations/utils/zlib/ZLibOutputStream.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xml/Element.java b/src/main/java/eu/siacs/conversations/xml/Element.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xml/Element.java rename to src/main/java/eu/siacs/conversations/xml/Element.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xml/Tag.java b/src/main/java/eu/siacs/conversations/xml/Tag.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xml/Tag.java rename to src/main/java/eu/siacs/conversations/xml/Tag.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xml/TagWriter.java b/src/main/java/eu/siacs/conversations/xml/TagWriter.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xml/TagWriter.java rename to src/main/java/eu/siacs/conversations/xml/TagWriter.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xml/XmlReader.java b/src/main/java/eu/siacs/conversations/xml/XmlReader.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xml/XmlReader.java rename to src/main/java/eu/siacs/conversations/xml/XmlReader.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/OnBindListener.java b/src/main/java/eu/siacs/conversations/xmpp/OnBindListener.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/OnBindListener.java rename to src/main/java/eu/siacs/conversations/xmpp/OnBindListener.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/OnContactStatusChanged.java b/src/main/java/eu/siacs/conversations/xmpp/OnContactStatusChanged.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/OnContactStatusChanged.java rename to src/main/java/eu/siacs/conversations/xmpp/OnContactStatusChanged.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/OnIqPacketReceived.java b/src/main/java/eu/siacs/conversations/xmpp/OnIqPacketReceived.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/OnIqPacketReceived.java rename to src/main/java/eu/siacs/conversations/xmpp/OnIqPacketReceived.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/OnMessageAcknowledged.java b/src/main/java/eu/siacs/conversations/xmpp/OnMessageAcknowledged.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/OnMessageAcknowledged.java rename to src/main/java/eu/siacs/conversations/xmpp/OnMessageAcknowledged.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/OnMessagePacketReceived.java b/src/main/java/eu/siacs/conversations/xmpp/OnMessagePacketReceived.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/OnMessagePacketReceived.java rename to src/main/java/eu/siacs/conversations/xmpp/OnMessagePacketReceived.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/OnPresencePacketReceived.java b/src/main/java/eu/siacs/conversations/xmpp/OnPresencePacketReceived.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/OnPresencePacketReceived.java rename to src/main/java/eu/siacs/conversations/xmpp/OnPresencePacketReceived.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/OnStatusChanged.java b/src/main/java/eu/siacs/conversations/xmpp/OnStatusChanged.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/OnStatusChanged.java rename to src/main/java/eu/siacs/conversations/xmpp/OnStatusChanged.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/PacketReceived.java b/src/main/java/eu/siacs/conversations/xmpp/PacketReceived.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/PacketReceived.java rename to src/main/java/eu/siacs/conversations/xmpp/PacketReceived.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java rename to src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java rename to src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java rename to src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java rename to src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java rename to src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java rename to src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleTransport.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleTransport.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleTransport.java rename to src/main/java/eu/siacs/conversations/xmpp/jingle/JingleTransport.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/OnFileTransmissionStatusChanged.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/OnFileTransmissionStatusChanged.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/OnFileTransmissionStatusChanged.java rename to src/main/java/eu/siacs/conversations/xmpp/jingle/OnFileTransmissionStatusChanged.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/OnJinglePacketReceived.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/OnJinglePacketReceived.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/OnJinglePacketReceived.java rename to src/main/java/eu/siacs/conversations/xmpp/jingle/OnJinglePacketReceived.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/OnPrimaryCandidateFound.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/OnPrimaryCandidateFound.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/OnPrimaryCandidateFound.java rename to src/main/java/eu/siacs/conversations/xmpp/jingle/OnPrimaryCandidateFound.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/OnTransportConnected.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/OnTransportConnected.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/OnTransportConnected.java rename to src/main/java/eu/siacs/conversations/xmpp/jingle/OnTransportConnected.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java rename to src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/JinglePacket.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/JinglePacket.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/JinglePacket.java rename to src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/JinglePacket.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Reason.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Reason.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Reason.java rename to src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Reason.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java b/src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java rename to src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java rename to src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java rename to src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java rename to src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/PresencePacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/PresencePacket.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/PresencePacket.java rename to src/main/java/eu/siacs/conversations/xmpp/stanzas/PresencePacket.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/ActivePacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/ActivePacket.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/ActivePacket.java rename to src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/ActivePacket.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/InactivePacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/InactivePacket.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/InactivePacket.java rename to src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/InactivePacket.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/AckPacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/AckPacket.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/AckPacket.java rename to src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/AckPacket.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java rename to src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/RequestPacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/RequestPacket.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/RequestPacket.java rename to src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/RequestPacket.java diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/ResumePacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/ResumePacket.java similarity index 100% rename from conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/ResumePacket.java rename to src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/ResumePacket.java diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_add_group.png b/src/main/res/drawable-hdpi/ic_action_add_group.png similarity index 100% rename from conversations/src/main/res/drawable-hdpi/ic_action_add_group.png rename to src/main/res/drawable-hdpi/ic_action_add_group.png diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_add_person.png b/src/main/res/drawable-hdpi/ic_action_add_person.png similarity index 100% rename from conversations/src/main/res/drawable-hdpi/ic_action_add_person.png rename to src/main/res/drawable-hdpi/ic_action_add_person.png diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_chat.png b/src/main/res/drawable-hdpi/ic_action_chat.png similarity index 100% rename from conversations/src/main/res/drawable-hdpi/ic_action_chat.png rename to src/main/res/drawable-hdpi/ic_action_chat.png diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_copy.png b/src/main/res/drawable-hdpi/ic_action_copy.png similarity index 100% rename from conversations/src/main/res/drawable-hdpi/ic_action_copy.png rename to src/main/res/drawable-hdpi/ic_action_copy.png diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_discard.png b/src/main/res/drawable-hdpi/ic_action_discard.png similarity index 100% rename from conversations/src/main/res/drawable-hdpi/ic_action_discard.png rename to src/main/res/drawable-hdpi/ic_action_discard.png diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_edit.png b/src/main/res/drawable-hdpi/ic_action_edit.png similarity index 100% rename from conversations/src/main/res/drawable-hdpi/ic_action_edit.png rename to src/main/res/drawable-hdpi/ic_action_edit.png diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_edit_dark.png b/src/main/res/drawable-hdpi/ic_action_edit_dark.png similarity index 100% rename from conversations/src/main/res/drawable-hdpi/ic_action_edit_dark.png rename to src/main/res/drawable-hdpi/ic_action_edit_dark.png diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_group.png b/src/main/res/drawable-hdpi/ic_action_group.png similarity index 100% rename from conversations/src/main/res/drawable-hdpi/ic_action_group.png rename to src/main/res/drawable-hdpi/ic_action_group.png diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_new.png b/src/main/res/drawable-hdpi/ic_action_new.png similarity index 100% rename from conversations/src/main/res/drawable-hdpi/ic_action_new.png rename to src/main/res/drawable-hdpi/ic_action_new.png diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_new_attachment.png b/src/main/res/drawable-hdpi/ic_action_new_attachment.png similarity index 100% rename from conversations/src/main/res/drawable-hdpi/ic_action_new_attachment.png rename to src/main/res/drawable-hdpi/ic_action_new_attachment.png diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_not_secure.png b/src/main/res/drawable-hdpi/ic_action_not_secure.png similarity index 100% rename from conversations/src/main/res/drawable-hdpi/ic_action_not_secure.png rename to src/main/res/drawable-hdpi/ic_action_not_secure.png diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_refresh.png b/src/main/res/drawable-hdpi/ic_action_refresh.png similarity index 100% rename from conversations/src/main/res/drawable-hdpi/ic_action_refresh.png rename to src/main/res/drawable-hdpi/ic_action_refresh.png diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_remove.png b/src/main/res/drawable-hdpi/ic_action_remove.png similarity index 100% rename from conversations/src/main/res/drawable-hdpi/ic_action_remove.png rename to src/main/res/drawable-hdpi/ic_action_remove.png diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_search.png b/src/main/res/drawable-hdpi/ic_action_search.png similarity index 100% rename from conversations/src/main/res/drawable-hdpi/ic_action_search.png rename to src/main/res/drawable-hdpi/ic_action_search.png diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_secure.png b/src/main/res/drawable-hdpi/ic_action_secure.png similarity index 100% rename from conversations/src/main/res/drawable-hdpi/ic_action_secure.png rename to src/main/res/drawable-hdpi/ic_action_secure.png diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_send_now_away.png b/src/main/res/drawable-hdpi/ic_action_send_now_away.png similarity index 100% rename from conversations/src/main/res/drawable-hdpi/ic_action_send_now_away.png rename to src/main/res/drawable-hdpi/ic_action_send_now_away.png diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_send_now_dnd.png b/src/main/res/drawable-hdpi/ic_action_send_now_dnd.png similarity index 100% rename from conversations/src/main/res/drawable-hdpi/ic_action_send_now_dnd.png rename to src/main/res/drawable-hdpi/ic_action_send_now_dnd.png diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_send_now_offline.png b/src/main/res/drawable-hdpi/ic_action_send_now_offline.png similarity index 100% rename from conversations/src/main/res/drawable-hdpi/ic_action_send_now_offline.png rename to src/main/res/drawable-hdpi/ic_action_send_now_offline.png diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_send_now_online.png b/src/main/res/drawable-hdpi/ic_action_send_now_online.png similarity index 100% rename from conversations/src/main/res/drawable-hdpi/ic_action_send_now_online.png rename to src/main/res/drawable-hdpi/ic_action_send_now_online.png diff --git a/conversations/src/main/res/drawable-hdpi/ic_activity.png b/src/main/res/drawable-hdpi/ic_activity.png similarity index 100% rename from conversations/src/main/res/drawable-hdpi/ic_activity.png rename to src/main/res/drawable-hdpi/ic_activity.png diff --git a/conversations/src/main/res/drawable-hdpi/ic_indicator.png b/src/main/res/drawable-hdpi/ic_indicator.png similarity index 100% rename from conversations/src/main/res/drawable-hdpi/ic_indicator.png rename to src/main/res/drawable-hdpi/ic_indicator.png diff --git a/conversations/src/main/res/drawable-hdpi/ic_launcher.png b/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from conversations/src/main/res/drawable-hdpi/ic_launcher.png rename to src/main/res/drawable-hdpi/ic_launcher.png diff --git a/conversations/src/main/res/drawable-hdpi/ic_notification.png b/src/main/res/drawable-hdpi/ic_notification.png similarity index 100% rename from conversations/src/main/res/drawable-hdpi/ic_notification.png rename to src/main/res/drawable-hdpi/ic_notification.png diff --git a/conversations/src/main/res/drawable-hdpi/ic_profile.png b/src/main/res/drawable-hdpi/ic_profile.png similarity index 100% rename from conversations/src/main/res/drawable-hdpi/ic_profile.png rename to src/main/res/drawable-hdpi/ic_profile.png diff --git a/conversations/src/main/res/drawable-hdpi/ic_received_indicator.png b/src/main/res/drawable-hdpi/ic_received_indicator.png similarity index 100% rename from conversations/src/main/res/drawable-hdpi/ic_received_indicator.png rename to src/main/res/drawable-hdpi/ic_received_indicator.png diff --git a/conversations/src/main/res/drawable-hdpi/ic_secure_indicator.png b/src/main/res/drawable-hdpi/ic_secure_indicator.png similarity index 100% rename from conversations/src/main/res/drawable-hdpi/ic_secure_indicator.png rename to src/main/res/drawable-hdpi/ic_secure_indicator.png diff --git a/conversations/src/main/res/drawable-hdpi/tab_selected_conversations.9.png b/src/main/res/drawable-hdpi/tab_selected_conversations.9.png similarity index 100% rename from conversations/src/main/res/drawable-hdpi/tab_selected_conversations.9.png rename to src/main/res/drawable-hdpi/tab_selected_conversations.9.png diff --git a/conversations/src/main/res/drawable-hdpi/tab_selected_focused_conversations.9.png b/src/main/res/drawable-hdpi/tab_selected_focused_conversations.9.png similarity index 100% rename from conversations/src/main/res/drawable-hdpi/tab_selected_focused_conversations.9.png rename to src/main/res/drawable-hdpi/tab_selected_focused_conversations.9.png diff --git a/conversations/src/main/res/drawable-hdpi/tab_selected_pressed_conversations.9.png b/src/main/res/drawable-hdpi/tab_selected_pressed_conversations.9.png similarity index 100% rename from conversations/src/main/res/drawable-hdpi/tab_selected_pressed_conversations.9.png rename to src/main/res/drawable-hdpi/tab_selected_pressed_conversations.9.png diff --git a/conversations/src/main/res/drawable-hdpi/tab_unselected_conversations.9.png b/src/main/res/drawable-hdpi/tab_unselected_conversations.9.png similarity index 100% rename from conversations/src/main/res/drawable-hdpi/tab_unselected_conversations.9.png rename to src/main/res/drawable-hdpi/tab_unselected_conversations.9.png diff --git a/conversations/src/main/res/drawable-hdpi/tab_unselected_focused_conversations.9.png b/src/main/res/drawable-hdpi/tab_unselected_focused_conversations.9.png similarity index 100% rename from conversations/src/main/res/drawable-hdpi/tab_unselected_focused_conversations.9.png rename to src/main/res/drawable-hdpi/tab_unselected_focused_conversations.9.png diff --git a/conversations/src/main/res/drawable-hdpi/tab_unselected_pressed_conversations.9.png b/src/main/res/drawable-hdpi/tab_unselected_pressed_conversations.9.png similarity index 100% rename from conversations/src/main/res/drawable-hdpi/tab_unselected_pressed_conversations.9.png rename to src/main/res/drawable-hdpi/tab_unselected_pressed_conversations.9.png diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_add_group.png b/src/main/res/drawable-mdpi/ic_action_add_group.png similarity index 100% rename from conversations/src/main/res/drawable-mdpi/ic_action_add_group.png rename to src/main/res/drawable-mdpi/ic_action_add_group.png diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_add_person.png b/src/main/res/drawable-mdpi/ic_action_add_person.png similarity index 100% rename from conversations/src/main/res/drawable-mdpi/ic_action_add_person.png rename to src/main/res/drawable-mdpi/ic_action_add_person.png diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_chat.png b/src/main/res/drawable-mdpi/ic_action_chat.png similarity index 100% rename from conversations/src/main/res/drawable-mdpi/ic_action_chat.png rename to src/main/res/drawable-mdpi/ic_action_chat.png diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_copy.png b/src/main/res/drawable-mdpi/ic_action_copy.png similarity index 100% rename from conversations/src/main/res/drawable-mdpi/ic_action_copy.png rename to src/main/res/drawable-mdpi/ic_action_copy.png diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_discard.png b/src/main/res/drawable-mdpi/ic_action_discard.png similarity index 100% rename from conversations/src/main/res/drawable-mdpi/ic_action_discard.png rename to src/main/res/drawable-mdpi/ic_action_discard.png diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_edit.png b/src/main/res/drawable-mdpi/ic_action_edit.png similarity index 100% rename from conversations/src/main/res/drawable-mdpi/ic_action_edit.png rename to src/main/res/drawable-mdpi/ic_action_edit.png diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_edit_dark.png b/src/main/res/drawable-mdpi/ic_action_edit_dark.png similarity index 100% rename from conversations/src/main/res/drawable-mdpi/ic_action_edit_dark.png rename to src/main/res/drawable-mdpi/ic_action_edit_dark.png diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_group.png b/src/main/res/drawable-mdpi/ic_action_group.png similarity index 100% rename from conversations/src/main/res/drawable-mdpi/ic_action_group.png rename to src/main/res/drawable-mdpi/ic_action_group.png diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_new.png b/src/main/res/drawable-mdpi/ic_action_new.png similarity index 100% rename from conversations/src/main/res/drawable-mdpi/ic_action_new.png rename to src/main/res/drawable-mdpi/ic_action_new.png diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_new_attachment.png b/src/main/res/drawable-mdpi/ic_action_new_attachment.png similarity index 100% rename from conversations/src/main/res/drawable-mdpi/ic_action_new_attachment.png rename to src/main/res/drawable-mdpi/ic_action_new_attachment.png diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_not_secure.png b/src/main/res/drawable-mdpi/ic_action_not_secure.png similarity index 100% rename from conversations/src/main/res/drawable-mdpi/ic_action_not_secure.png rename to src/main/res/drawable-mdpi/ic_action_not_secure.png diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_refresh.png b/src/main/res/drawable-mdpi/ic_action_refresh.png similarity index 100% rename from conversations/src/main/res/drawable-mdpi/ic_action_refresh.png rename to src/main/res/drawable-mdpi/ic_action_refresh.png diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_remove.png b/src/main/res/drawable-mdpi/ic_action_remove.png similarity index 100% rename from conversations/src/main/res/drawable-mdpi/ic_action_remove.png rename to src/main/res/drawable-mdpi/ic_action_remove.png diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_search.png b/src/main/res/drawable-mdpi/ic_action_search.png similarity index 100% rename from conversations/src/main/res/drawable-mdpi/ic_action_search.png rename to src/main/res/drawable-mdpi/ic_action_search.png diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_secure.png b/src/main/res/drawable-mdpi/ic_action_secure.png similarity index 100% rename from conversations/src/main/res/drawable-mdpi/ic_action_secure.png rename to src/main/res/drawable-mdpi/ic_action_secure.png diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_send_now_away.png b/src/main/res/drawable-mdpi/ic_action_send_now_away.png similarity index 100% rename from conversations/src/main/res/drawable-mdpi/ic_action_send_now_away.png rename to src/main/res/drawable-mdpi/ic_action_send_now_away.png diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_send_now_dnd.png b/src/main/res/drawable-mdpi/ic_action_send_now_dnd.png similarity index 100% rename from conversations/src/main/res/drawable-mdpi/ic_action_send_now_dnd.png rename to src/main/res/drawable-mdpi/ic_action_send_now_dnd.png diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_send_now_offline.png b/src/main/res/drawable-mdpi/ic_action_send_now_offline.png similarity index 100% rename from conversations/src/main/res/drawable-mdpi/ic_action_send_now_offline.png rename to src/main/res/drawable-mdpi/ic_action_send_now_offline.png diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_send_now_online.png b/src/main/res/drawable-mdpi/ic_action_send_now_online.png similarity index 100% rename from conversations/src/main/res/drawable-mdpi/ic_action_send_now_online.png rename to src/main/res/drawable-mdpi/ic_action_send_now_online.png diff --git a/conversations/src/main/res/drawable-mdpi/ic_activity.png b/src/main/res/drawable-mdpi/ic_activity.png similarity index 100% rename from conversations/src/main/res/drawable-mdpi/ic_activity.png rename to src/main/res/drawable-mdpi/ic_activity.png diff --git a/conversations/src/main/res/drawable-mdpi/ic_indicator.png b/src/main/res/drawable-mdpi/ic_indicator.png similarity index 100% rename from conversations/src/main/res/drawable-mdpi/ic_indicator.png rename to src/main/res/drawable-mdpi/ic_indicator.png diff --git a/conversations/src/main/res/drawable-mdpi/ic_launcher.png b/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from conversations/src/main/res/drawable-mdpi/ic_launcher.png rename to src/main/res/drawable-mdpi/ic_launcher.png diff --git a/conversations/src/main/res/drawable-mdpi/ic_notification.png b/src/main/res/drawable-mdpi/ic_notification.png similarity index 100% rename from conversations/src/main/res/drawable-mdpi/ic_notification.png rename to src/main/res/drawable-mdpi/ic_notification.png diff --git a/conversations/src/main/res/drawable-mdpi/ic_profile.png b/src/main/res/drawable-mdpi/ic_profile.png similarity index 100% rename from conversations/src/main/res/drawable-mdpi/ic_profile.png rename to src/main/res/drawable-mdpi/ic_profile.png diff --git a/conversations/src/main/res/drawable-mdpi/ic_received_indicator.png b/src/main/res/drawable-mdpi/ic_received_indicator.png similarity index 100% rename from conversations/src/main/res/drawable-mdpi/ic_received_indicator.png rename to src/main/res/drawable-mdpi/ic_received_indicator.png diff --git a/conversations/src/main/res/drawable-mdpi/ic_secure_indicator.png b/src/main/res/drawable-mdpi/ic_secure_indicator.png similarity index 100% rename from conversations/src/main/res/drawable-mdpi/ic_secure_indicator.png rename to src/main/res/drawable-mdpi/ic_secure_indicator.png diff --git a/conversations/src/main/res/drawable-mdpi/tab_selected_conversations.9.png b/src/main/res/drawable-mdpi/tab_selected_conversations.9.png similarity index 100% rename from conversations/src/main/res/drawable-mdpi/tab_selected_conversations.9.png rename to src/main/res/drawable-mdpi/tab_selected_conversations.9.png diff --git a/conversations/src/main/res/drawable-mdpi/tab_selected_focused_conversations.9.png b/src/main/res/drawable-mdpi/tab_selected_focused_conversations.9.png similarity index 100% rename from conversations/src/main/res/drawable-mdpi/tab_selected_focused_conversations.9.png rename to src/main/res/drawable-mdpi/tab_selected_focused_conversations.9.png diff --git a/conversations/src/main/res/drawable-mdpi/tab_selected_pressed_conversations.9.png b/src/main/res/drawable-mdpi/tab_selected_pressed_conversations.9.png similarity index 100% rename from conversations/src/main/res/drawable-mdpi/tab_selected_pressed_conversations.9.png rename to src/main/res/drawable-mdpi/tab_selected_pressed_conversations.9.png diff --git a/conversations/src/main/res/drawable-mdpi/tab_unselected_conversations.9.png b/src/main/res/drawable-mdpi/tab_unselected_conversations.9.png similarity index 100% rename from conversations/src/main/res/drawable-mdpi/tab_unselected_conversations.9.png rename to src/main/res/drawable-mdpi/tab_unselected_conversations.9.png diff --git a/conversations/src/main/res/drawable-mdpi/tab_unselected_focused_conversations.9.png b/src/main/res/drawable-mdpi/tab_unselected_focused_conversations.9.png similarity index 100% rename from conversations/src/main/res/drawable-mdpi/tab_unselected_focused_conversations.9.png rename to src/main/res/drawable-mdpi/tab_unselected_focused_conversations.9.png diff --git a/conversations/src/main/res/drawable-mdpi/tab_unselected_pressed_conversations.9.png b/src/main/res/drawable-mdpi/tab_unselected_pressed_conversations.9.png similarity index 100% rename from conversations/src/main/res/drawable-mdpi/tab_unselected_pressed_conversations.9.png rename to src/main/res/drawable-mdpi/tab_unselected_pressed_conversations.9.png diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_add_group.png b/src/main/res/drawable-xhdpi/ic_action_add_group.png similarity index 100% rename from conversations/src/main/res/drawable-xhdpi/ic_action_add_group.png rename to src/main/res/drawable-xhdpi/ic_action_add_group.png diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_add_person.png b/src/main/res/drawable-xhdpi/ic_action_add_person.png similarity index 100% rename from conversations/src/main/res/drawable-xhdpi/ic_action_add_person.png rename to src/main/res/drawable-xhdpi/ic_action_add_person.png diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_chat.png b/src/main/res/drawable-xhdpi/ic_action_chat.png similarity index 100% rename from conversations/src/main/res/drawable-xhdpi/ic_action_chat.png rename to src/main/res/drawable-xhdpi/ic_action_chat.png diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_copy.png b/src/main/res/drawable-xhdpi/ic_action_copy.png similarity index 100% rename from conversations/src/main/res/drawable-xhdpi/ic_action_copy.png rename to src/main/res/drawable-xhdpi/ic_action_copy.png diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_discard.png b/src/main/res/drawable-xhdpi/ic_action_discard.png similarity index 100% rename from conversations/src/main/res/drawable-xhdpi/ic_action_discard.png rename to src/main/res/drawable-xhdpi/ic_action_discard.png diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_edit.png b/src/main/res/drawable-xhdpi/ic_action_edit.png similarity index 100% rename from conversations/src/main/res/drawable-xhdpi/ic_action_edit.png rename to src/main/res/drawable-xhdpi/ic_action_edit.png diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_edit_dark.png b/src/main/res/drawable-xhdpi/ic_action_edit_dark.png similarity index 100% rename from conversations/src/main/res/drawable-xhdpi/ic_action_edit_dark.png rename to src/main/res/drawable-xhdpi/ic_action_edit_dark.png diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_group.png b/src/main/res/drawable-xhdpi/ic_action_group.png similarity index 100% rename from conversations/src/main/res/drawable-xhdpi/ic_action_group.png rename to src/main/res/drawable-xhdpi/ic_action_group.png diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_new.png b/src/main/res/drawable-xhdpi/ic_action_new.png similarity index 100% rename from conversations/src/main/res/drawable-xhdpi/ic_action_new.png rename to src/main/res/drawable-xhdpi/ic_action_new.png diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_new_attachment.png b/src/main/res/drawable-xhdpi/ic_action_new_attachment.png similarity index 100% rename from conversations/src/main/res/drawable-xhdpi/ic_action_new_attachment.png rename to src/main/res/drawable-xhdpi/ic_action_new_attachment.png diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_not_secure.png b/src/main/res/drawable-xhdpi/ic_action_not_secure.png similarity index 100% rename from conversations/src/main/res/drawable-xhdpi/ic_action_not_secure.png rename to src/main/res/drawable-xhdpi/ic_action_not_secure.png diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_refresh.png b/src/main/res/drawable-xhdpi/ic_action_refresh.png similarity index 100% rename from conversations/src/main/res/drawable-xhdpi/ic_action_refresh.png rename to src/main/res/drawable-xhdpi/ic_action_refresh.png diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_remove.png b/src/main/res/drawable-xhdpi/ic_action_remove.png similarity index 100% rename from conversations/src/main/res/drawable-xhdpi/ic_action_remove.png rename to src/main/res/drawable-xhdpi/ic_action_remove.png diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_search.png b/src/main/res/drawable-xhdpi/ic_action_search.png similarity index 100% rename from conversations/src/main/res/drawable-xhdpi/ic_action_search.png rename to src/main/res/drawable-xhdpi/ic_action_search.png diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_secure.png b/src/main/res/drawable-xhdpi/ic_action_secure.png similarity index 100% rename from conversations/src/main/res/drawable-xhdpi/ic_action_secure.png rename to src/main/res/drawable-xhdpi/ic_action_secure.png diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_send_now_away.png b/src/main/res/drawable-xhdpi/ic_action_send_now_away.png similarity index 100% rename from conversations/src/main/res/drawable-xhdpi/ic_action_send_now_away.png rename to src/main/res/drawable-xhdpi/ic_action_send_now_away.png diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_send_now_dnd.png b/src/main/res/drawable-xhdpi/ic_action_send_now_dnd.png similarity index 100% rename from conversations/src/main/res/drawable-xhdpi/ic_action_send_now_dnd.png rename to src/main/res/drawable-xhdpi/ic_action_send_now_dnd.png diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_send_now_offline.png b/src/main/res/drawable-xhdpi/ic_action_send_now_offline.png similarity index 100% rename from conversations/src/main/res/drawable-xhdpi/ic_action_send_now_offline.png rename to src/main/res/drawable-xhdpi/ic_action_send_now_offline.png diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_send_now_online.png b/src/main/res/drawable-xhdpi/ic_action_send_now_online.png similarity index 100% rename from conversations/src/main/res/drawable-xhdpi/ic_action_send_now_online.png rename to src/main/res/drawable-xhdpi/ic_action_send_now_online.png diff --git a/conversations/src/main/res/drawable-xhdpi/ic_activity.png b/src/main/res/drawable-xhdpi/ic_activity.png similarity index 100% rename from conversations/src/main/res/drawable-xhdpi/ic_activity.png rename to src/main/res/drawable-xhdpi/ic_activity.png diff --git a/conversations/src/main/res/drawable-xhdpi/ic_indicator.png b/src/main/res/drawable-xhdpi/ic_indicator.png similarity index 100% rename from conversations/src/main/res/drawable-xhdpi/ic_indicator.png rename to src/main/res/drawable-xhdpi/ic_indicator.png diff --git a/conversations/src/main/res/drawable-xhdpi/ic_launcher.png b/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from conversations/src/main/res/drawable-xhdpi/ic_launcher.png rename to src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/conversations/src/main/res/drawable-xhdpi/ic_notification.png b/src/main/res/drawable-xhdpi/ic_notification.png similarity index 100% rename from conversations/src/main/res/drawable-xhdpi/ic_notification.png rename to src/main/res/drawable-xhdpi/ic_notification.png diff --git a/conversations/src/main/res/drawable-xhdpi/ic_profile.png b/src/main/res/drawable-xhdpi/ic_profile.png similarity index 100% rename from conversations/src/main/res/drawable-xhdpi/ic_profile.png rename to src/main/res/drawable-xhdpi/ic_profile.png diff --git a/conversations/src/main/res/drawable-xhdpi/ic_received_indicator.png b/src/main/res/drawable-xhdpi/ic_received_indicator.png similarity index 100% rename from conversations/src/main/res/drawable-xhdpi/ic_received_indicator.png rename to src/main/res/drawable-xhdpi/ic_received_indicator.png diff --git a/conversations/src/main/res/drawable-xhdpi/ic_secure_indicator.png b/src/main/res/drawable-xhdpi/ic_secure_indicator.png similarity index 100% rename from conversations/src/main/res/drawable-xhdpi/ic_secure_indicator.png rename to src/main/res/drawable-xhdpi/ic_secure_indicator.png diff --git a/conversations/src/main/res/drawable-xhdpi/tab_selected_conversations.9.png b/src/main/res/drawable-xhdpi/tab_selected_conversations.9.png similarity index 100% rename from conversations/src/main/res/drawable-xhdpi/tab_selected_conversations.9.png rename to src/main/res/drawable-xhdpi/tab_selected_conversations.9.png diff --git a/conversations/src/main/res/drawable-xhdpi/tab_selected_focused_conversations.9.png b/src/main/res/drawable-xhdpi/tab_selected_focused_conversations.9.png similarity index 100% rename from conversations/src/main/res/drawable-xhdpi/tab_selected_focused_conversations.9.png rename to src/main/res/drawable-xhdpi/tab_selected_focused_conversations.9.png diff --git a/conversations/src/main/res/drawable-xhdpi/tab_selected_pressed_conversations.9.png b/src/main/res/drawable-xhdpi/tab_selected_pressed_conversations.9.png similarity index 100% rename from conversations/src/main/res/drawable-xhdpi/tab_selected_pressed_conversations.9.png rename to src/main/res/drawable-xhdpi/tab_selected_pressed_conversations.9.png diff --git a/conversations/src/main/res/drawable-xhdpi/tab_unselected_conversations.9.png b/src/main/res/drawable-xhdpi/tab_unselected_conversations.9.png similarity index 100% rename from conversations/src/main/res/drawable-xhdpi/tab_unselected_conversations.9.png rename to src/main/res/drawable-xhdpi/tab_unselected_conversations.9.png diff --git a/conversations/src/main/res/drawable-xhdpi/tab_unselected_focused_conversations.9.png b/src/main/res/drawable-xhdpi/tab_unselected_focused_conversations.9.png similarity index 100% rename from conversations/src/main/res/drawable-xhdpi/tab_unselected_focused_conversations.9.png rename to src/main/res/drawable-xhdpi/tab_unselected_focused_conversations.9.png diff --git a/conversations/src/main/res/drawable-xhdpi/tab_unselected_pressed_conversations.9.png b/src/main/res/drawable-xhdpi/tab_unselected_pressed_conversations.9.png similarity index 100% rename from conversations/src/main/res/drawable-xhdpi/tab_unselected_pressed_conversations.9.png rename to src/main/res/drawable-xhdpi/tab_unselected_pressed_conversations.9.png diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_add_group.png b/src/main/res/drawable-xxhdpi/ic_action_add_group.png similarity index 100% rename from conversations/src/main/res/drawable-xxhdpi/ic_action_add_group.png rename to src/main/res/drawable-xxhdpi/ic_action_add_group.png diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_add_person.png b/src/main/res/drawable-xxhdpi/ic_action_add_person.png similarity index 100% rename from conversations/src/main/res/drawable-xxhdpi/ic_action_add_person.png rename to src/main/res/drawable-xxhdpi/ic_action_add_person.png diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_chat.png b/src/main/res/drawable-xxhdpi/ic_action_chat.png similarity index 100% rename from conversations/src/main/res/drawable-xxhdpi/ic_action_chat.png rename to src/main/res/drawable-xxhdpi/ic_action_chat.png diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_copy.png b/src/main/res/drawable-xxhdpi/ic_action_copy.png similarity index 100% rename from conversations/src/main/res/drawable-xxhdpi/ic_action_copy.png rename to src/main/res/drawable-xxhdpi/ic_action_copy.png diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_discard.png b/src/main/res/drawable-xxhdpi/ic_action_discard.png similarity index 100% rename from conversations/src/main/res/drawable-xxhdpi/ic_action_discard.png rename to src/main/res/drawable-xxhdpi/ic_action_discard.png diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_edit.png b/src/main/res/drawable-xxhdpi/ic_action_edit.png similarity index 100% rename from conversations/src/main/res/drawable-xxhdpi/ic_action_edit.png rename to src/main/res/drawable-xxhdpi/ic_action_edit.png diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png b/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png similarity index 100% rename from conversations/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png rename to src/main/res/drawable-xxhdpi/ic_action_edit_dark.png diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_group.png b/src/main/res/drawable-xxhdpi/ic_action_group.png similarity index 100% rename from conversations/src/main/res/drawable-xxhdpi/ic_action_group.png rename to src/main/res/drawable-xxhdpi/ic_action_group.png diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_new.png b/src/main/res/drawable-xxhdpi/ic_action_new.png similarity index 100% rename from conversations/src/main/res/drawable-xxhdpi/ic_action_new.png rename to src/main/res/drawable-xxhdpi/ic_action_new.png diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_new_attachment.png b/src/main/res/drawable-xxhdpi/ic_action_new_attachment.png similarity index 100% rename from conversations/src/main/res/drawable-xxhdpi/ic_action_new_attachment.png rename to src/main/res/drawable-xxhdpi/ic_action_new_attachment.png diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_not_secure.png b/src/main/res/drawable-xxhdpi/ic_action_not_secure.png similarity index 100% rename from conversations/src/main/res/drawable-xxhdpi/ic_action_not_secure.png rename to src/main/res/drawable-xxhdpi/ic_action_not_secure.png diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_refresh.png b/src/main/res/drawable-xxhdpi/ic_action_refresh.png similarity index 100% rename from conversations/src/main/res/drawable-xxhdpi/ic_action_refresh.png rename to src/main/res/drawable-xxhdpi/ic_action_refresh.png diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_remove.png b/src/main/res/drawable-xxhdpi/ic_action_remove.png similarity index 100% rename from conversations/src/main/res/drawable-xxhdpi/ic_action_remove.png rename to src/main/res/drawable-xxhdpi/ic_action_remove.png diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_search.png b/src/main/res/drawable-xxhdpi/ic_action_search.png similarity index 100% rename from conversations/src/main/res/drawable-xxhdpi/ic_action_search.png rename to src/main/res/drawable-xxhdpi/ic_action_search.png diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_secure.png b/src/main/res/drawable-xxhdpi/ic_action_secure.png similarity index 100% rename from conversations/src/main/res/drawable-xxhdpi/ic_action_secure.png rename to src/main/res/drawable-xxhdpi/ic_action_secure.png diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_send_now_away.png b/src/main/res/drawable-xxhdpi/ic_action_send_now_away.png similarity index 100% rename from conversations/src/main/res/drawable-xxhdpi/ic_action_send_now_away.png rename to src/main/res/drawable-xxhdpi/ic_action_send_now_away.png diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_send_now_dnd.png b/src/main/res/drawable-xxhdpi/ic_action_send_now_dnd.png similarity index 100% rename from conversations/src/main/res/drawable-xxhdpi/ic_action_send_now_dnd.png rename to src/main/res/drawable-xxhdpi/ic_action_send_now_dnd.png diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_send_now_offline.png b/src/main/res/drawable-xxhdpi/ic_action_send_now_offline.png similarity index 100% rename from conversations/src/main/res/drawable-xxhdpi/ic_action_send_now_offline.png rename to src/main/res/drawable-xxhdpi/ic_action_send_now_offline.png diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_send_now_online.png b/src/main/res/drawable-xxhdpi/ic_action_send_now_online.png similarity index 100% rename from conversations/src/main/res/drawable-xxhdpi/ic_action_send_now_online.png rename to src/main/res/drawable-xxhdpi/ic_action_send_now_online.png diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_activity.png b/src/main/res/drawable-xxhdpi/ic_activity.png similarity index 100% rename from conversations/src/main/res/drawable-xxhdpi/ic_activity.png rename to src/main/res/drawable-xxhdpi/ic_activity.png diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_indicator.png b/src/main/res/drawable-xxhdpi/ic_indicator.png similarity index 100% rename from conversations/src/main/res/drawable-xxhdpi/ic_indicator.png rename to src/main/res/drawable-xxhdpi/ic_indicator.png diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_launcher.png b/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from conversations/src/main/res/drawable-xxhdpi/ic_launcher.png rename to src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_notification.png b/src/main/res/drawable-xxhdpi/ic_notification.png similarity index 100% rename from conversations/src/main/res/drawable-xxhdpi/ic_notification.png rename to src/main/res/drawable-xxhdpi/ic_notification.png diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_profile.png b/src/main/res/drawable-xxhdpi/ic_profile.png similarity index 100% rename from conversations/src/main/res/drawable-xxhdpi/ic_profile.png rename to src/main/res/drawable-xxhdpi/ic_profile.png diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_received_indicator.png b/src/main/res/drawable-xxhdpi/ic_received_indicator.png similarity index 100% rename from conversations/src/main/res/drawable-xxhdpi/ic_received_indicator.png rename to src/main/res/drawable-xxhdpi/ic_received_indicator.png diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_secure_indicator.png b/src/main/res/drawable-xxhdpi/ic_secure_indicator.png similarity index 100% rename from conversations/src/main/res/drawable-xxhdpi/ic_secure_indicator.png rename to src/main/res/drawable-xxhdpi/ic_secure_indicator.png diff --git a/conversations/src/main/res/drawable-xxhdpi/tab_selected_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_selected_conversations.9.png similarity index 100% rename from conversations/src/main/res/drawable-xxhdpi/tab_selected_conversations.9.png rename to src/main/res/drawable-xxhdpi/tab_selected_conversations.9.png diff --git a/conversations/src/main/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png similarity index 100% rename from conversations/src/main/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png rename to src/main/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png diff --git a/conversations/src/main/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png similarity index 100% rename from conversations/src/main/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png rename to src/main/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png diff --git a/conversations/src/main/res/drawable-xxhdpi/tab_unselected_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_unselected_conversations.9.png similarity index 100% rename from conversations/src/main/res/drawable-xxhdpi/tab_unselected_conversations.9.png rename to src/main/res/drawable-xxhdpi/tab_unselected_conversations.9.png diff --git a/conversations/src/main/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png similarity index 100% rename from conversations/src/main/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png rename to src/main/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png diff --git a/conversations/src/main/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png similarity index 100% rename from conversations/src/main/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png rename to src/main/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png diff --git a/conversations/src/main/res/drawable/actionbar_tab_indicator.xml b/src/main/res/drawable/actionbar_tab_indicator.xml similarity index 100% rename from conversations/src/main/res/drawable/actionbar_tab_indicator.xml rename to src/main/res/drawable/actionbar_tab_indicator.xml diff --git a/conversations/src/main/res/drawable/es_slidingpane_shadow.xml b/src/main/res/drawable/es_slidingpane_shadow.xml similarity index 100% rename from conversations/src/main/res/drawable/es_slidingpane_shadow.xml rename to src/main/res/drawable/es_slidingpane_shadow.xml diff --git a/conversations/src/main/res/drawable/grey.xml b/src/main/res/drawable/grey.xml similarity index 100% rename from conversations/src/main/res/drawable/grey.xml rename to src/main/res/drawable/grey.xml diff --git a/conversations/src/main/res/drawable/greybackground.xml b/src/main/res/drawable/greybackground.xml similarity index 100% rename from conversations/src/main/res/drawable/greybackground.xml rename to src/main/res/drawable/greybackground.xml diff --git a/conversations/src/main/res/drawable/infocard_border.xml b/src/main/res/drawable/infocard_border.xml similarity index 100% rename from conversations/src/main/res/drawable/infocard_border.xml rename to src/main/res/drawable/infocard_border.xml diff --git a/conversations/src/main/res/drawable/message_border.xml b/src/main/res/drawable/message_border.xml similarity index 100% rename from conversations/src/main/res/drawable/message_border.xml rename to src/main/res/drawable/message_border.xml diff --git a/conversations/src/main/res/drawable/snackbar.xml b/src/main/res/drawable/snackbar.xml similarity index 100% rename from conversations/src/main/res/drawable/snackbar.xml rename to src/main/res/drawable/snackbar.xml diff --git a/conversations/src/main/res/layout-w360dp/fragment_conversations_overview.xml b/src/main/res/layout-w360dp/fragment_conversations_overview.xml similarity index 100% rename from conversations/src/main/res/layout-w360dp/fragment_conversations_overview.xml rename to src/main/res/layout-w360dp/fragment_conversations_overview.xml diff --git a/conversations/src/main/res/layout-w384dp/fragment_conversations_overview.xml b/src/main/res/layout-w384dp/fragment_conversations_overview.xml similarity index 100% rename from conversations/src/main/res/layout-w384dp/fragment_conversations_overview.xml rename to src/main/res/layout-w384dp/fragment_conversations_overview.xml diff --git a/conversations/src/main/res/layout-w600dp/fragment_conversations_overview.xml b/src/main/res/layout-w600dp/fragment_conversations_overview.xml similarity index 100% rename from conversations/src/main/res/layout-w600dp/fragment_conversations_overview.xml rename to src/main/res/layout-w600dp/fragment_conversations_overview.xml diff --git a/conversations/src/main/res/layout-w960dp/fragment_conversations_overview.xml b/src/main/res/layout-w960dp/fragment_conversations_overview.xml similarity index 100% rename from conversations/src/main/res/layout-w960dp/fragment_conversations_overview.xml rename to src/main/res/layout-w960dp/fragment_conversations_overview.xml diff --git a/conversations/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml similarity index 100% rename from conversations/src/main/res/layout/account_row.xml rename to src/main/res/layout/account_row.xml diff --git a/conversations/src/main/res/layout/actionview_search.xml b/src/main/res/layout/actionview_search.xml similarity index 100% rename from conversations/src/main/res/layout/actionview_search.xml rename to src/main/res/layout/actionview_search.xml diff --git a/conversations/src/main/res/layout/activity_choose_contact.xml b/src/main/res/layout/activity_choose_contact.xml similarity index 100% rename from conversations/src/main/res/layout/activity_choose_contact.xml rename to src/main/res/layout/activity_choose_contact.xml diff --git a/conversations/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml similarity index 100% rename from conversations/src/main/res/layout/activity_contact_details.xml rename to src/main/res/layout/activity_contact_details.xml diff --git a/conversations/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml similarity index 100% rename from conversations/src/main/res/layout/activity_edit_account.xml rename to src/main/res/layout/activity_edit_account.xml diff --git a/conversations/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml similarity index 100% rename from conversations/src/main/res/layout/activity_muc_details.xml rename to src/main/res/layout/activity_muc_details.xml diff --git a/conversations/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml similarity index 100% rename from conversations/src/main/res/layout/activity_publish_profile_picture.xml rename to src/main/res/layout/activity_publish_profile_picture.xml diff --git a/conversations/src/main/res/layout/activity_start_conversation.xml b/src/main/res/layout/activity_start_conversation.xml similarity index 100% rename from conversations/src/main/res/layout/activity_start_conversation.xml rename to src/main/res/layout/activity_start_conversation.xml diff --git a/conversations/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml similarity index 100% rename from conversations/src/main/res/layout/contact.xml rename to src/main/res/layout/contact.xml diff --git a/conversations/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml similarity index 100% rename from conversations/src/main/res/layout/contact_key.xml rename to src/main/res/layout/contact_key.xml diff --git a/conversations/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml similarity index 100% rename from conversations/src/main/res/layout/conversation_list_row.xml rename to src/main/res/layout/conversation_list_row.xml diff --git a/conversations/src/main/res/layout/create_contact_dialog.xml b/src/main/res/layout/create_contact_dialog.xml similarity index 100% rename from conversations/src/main/res/layout/create_contact_dialog.xml rename to src/main/res/layout/create_contact_dialog.xml diff --git a/conversations/src/main/res/layout/dialog_clear_history.xml b/src/main/res/layout/dialog_clear_history.xml similarity index 100% rename from conversations/src/main/res/layout/dialog_clear_history.xml rename to src/main/res/layout/dialog_clear_history.xml diff --git a/conversations/src/main/res/layout/dialog_verify_otr.xml b/src/main/res/layout/dialog_verify_otr.xml similarity index 100% rename from conversations/src/main/res/layout/dialog_verify_otr.xml rename to src/main/res/layout/dialog_verify_otr.xml diff --git a/conversations/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml similarity index 100% rename from conversations/src/main/res/layout/fragment_conversation.xml rename to src/main/res/layout/fragment_conversation.xml diff --git a/conversations/src/main/res/layout/fragment_conversations_overview.xml b/src/main/res/layout/fragment_conversations_overview.xml similarity index 100% rename from conversations/src/main/res/layout/fragment_conversations_overview.xml rename to src/main/res/layout/fragment_conversations_overview.xml diff --git a/conversations/src/main/res/layout/join_conference_dialog.xml b/src/main/res/layout/join_conference_dialog.xml similarity index 100% rename from conversations/src/main/res/layout/join_conference_dialog.xml rename to src/main/res/layout/join_conference_dialog.xml diff --git a/conversations/src/main/res/layout/manage_accounts.xml b/src/main/res/layout/manage_accounts.xml similarity index 100% rename from conversations/src/main/res/layout/manage_accounts.xml rename to src/main/res/layout/manage_accounts.xml diff --git a/conversations/src/main/res/layout/message_null.xml b/src/main/res/layout/message_null.xml similarity index 100% rename from conversations/src/main/res/layout/message_null.xml rename to src/main/res/layout/message_null.xml diff --git a/conversations/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml similarity index 100% rename from conversations/src/main/res/layout/message_received.xml rename to src/main/res/layout/message_received.xml diff --git a/conversations/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml similarity index 100% rename from conversations/src/main/res/layout/message_sent.xml rename to src/main/res/layout/message_sent.xml diff --git a/conversations/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml similarity index 100% rename from conversations/src/main/res/layout/message_status.xml rename to src/main/res/layout/message_status.xml diff --git a/conversations/src/main/res/layout/quickedit.xml b/src/main/res/layout/quickedit.xml similarity index 100% rename from conversations/src/main/res/layout/quickedit.xml rename to src/main/res/layout/quickedit.xml diff --git a/conversations/src/main/res/layout/share_with.xml b/src/main/res/layout/share_with.xml similarity index 100% rename from conversations/src/main/res/layout/share_with.xml rename to src/main/res/layout/share_with.xml diff --git a/conversations/src/main/res/menu/attachment_choices.xml b/src/main/res/menu/attachment_choices.xml similarity index 100% rename from conversations/src/main/res/menu/attachment_choices.xml rename to src/main/res/menu/attachment_choices.xml diff --git a/conversations/src/main/res/menu/choose_contact.xml b/src/main/res/menu/choose_contact.xml similarity index 100% rename from conversations/src/main/res/menu/choose_contact.xml rename to src/main/res/menu/choose_contact.xml diff --git a/conversations/src/main/res/menu/conference_context.xml b/src/main/res/menu/conference_context.xml similarity index 100% rename from conversations/src/main/res/menu/conference_context.xml rename to src/main/res/menu/conference_context.xml diff --git a/conversations/src/main/res/menu/contact_context.xml b/src/main/res/menu/contact_context.xml similarity index 100% rename from conversations/src/main/res/menu/contact_context.xml rename to src/main/res/menu/contact_context.xml diff --git a/conversations/src/main/res/menu/contact_details.xml b/src/main/res/menu/contact_details.xml similarity index 100% rename from conversations/src/main/res/menu/contact_details.xml rename to src/main/res/menu/contact_details.xml diff --git a/conversations/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml similarity index 100% rename from conversations/src/main/res/menu/conversations.xml rename to src/main/res/menu/conversations.xml diff --git a/conversations/src/main/res/menu/encryption_choices.xml b/src/main/res/menu/encryption_choices.xml similarity index 100% rename from conversations/src/main/res/menu/encryption_choices.xml rename to src/main/res/menu/encryption_choices.xml diff --git a/conversations/src/main/res/menu/manageaccounts.xml b/src/main/res/menu/manageaccounts.xml similarity index 100% rename from conversations/src/main/res/menu/manageaccounts.xml rename to src/main/res/menu/manageaccounts.xml diff --git a/conversations/src/main/res/menu/manageaccounts_context.xml b/src/main/res/menu/manageaccounts_context.xml similarity index 100% rename from conversations/src/main/res/menu/manageaccounts_context.xml rename to src/main/res/menu/manageaccounts_context.xml diff --git a/conversations/src/main/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml similarity index 100% rename from conversations/src/main/res/menu/muc_details.xml rename to src/main/res/menu/muc_details.xml diff --git a/conversations/src/main/res/menu/share_with.xml b/src/main/res/menu/share_with.xml similarity index 100% rename from conversations/src/main/res/menu/share_with.xml rename to src/main/res/menu/share_with.xml diff --git a/conversations/src/main/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml similarity index 100% rename from conversations/src/main/res/menu/start_conversation.xml rename to src/main/res/menu/start_conversation.xml diff --git a/conversations/src/main/res/values-ca/arrays.xml b/src/main/res/values-ca/arrays.xml similarity index 100% rename from conversations/src/main/res/values-ca/arrays.xml rename to src/main/res/values-ca/arrays.xml diff --git a/conversations/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml similarity index 100% rename from conversations/src/main/res/values-ca/strings.xml rename to src/main/res/values-ca/strings.xml diff --git a/conversations/src/main/res/values-cs/arrays.xml b/src/main/res/values-cs/arrays.xml similarity index 100% rename from conversations/src/main/res/values-cs/arrays.xml rename to src/main/res/values-cs/arrays.xml diff --git a/conversations/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml similarity index 100% rename from conversations/src/main/res/values-cs/strings.xml rename to src/main/res/values-cs/strings.xml diff --git a/conversations/src/main/res/values-de/arrays.xml b/src/main/res/values-de/arrays.xml similarity index 100% rename from conversations/src/main/res/values-de/arrays.xml rename to src/main/res/values-de/arrays.xml diff --git a/conversations/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml similarity index 100% rename from conversations/src/main/res/values-de/strings.xml rename to src/main/res/values-de/strings.xml diff --git a/conversations/src/main/res/values-es/arrays.xml b/src/main/res/values-es/arrays.xml similarity index 100% rename from conversations/src/main/res/values-es/arrays.xml rename to src/main/res/values-es/arrays.xml diff --git a/conversations/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml similarity index 100% rename from conversations/src/main/res/values-es/strings.xml rename to src/main/res/values-es/strings.xml diff --git a/conversations/src/main/res/values-eu/arrays.xml b/src/main/res/values-eu/arrays.xml similarity index 100% rename from conversations/src/main/res/values-eu/arrays.xml rename to src/main/res/values-eu/arrays.xml diff --git a/conversations/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml similarity index 100% rename from conversations/src/main/res/values-eu/strings.xml rename to src/main/res/values-eu/strings.xml diff --git a/conversations/src/main/res/values-fr/arrays.xml b/src/main/res/values-fr/arrays.xml similarity index 100% rename from conversations/src/main/res/values-fr/arrays.xml rename to src/main/res/values-fr/arrays.xml diff --git a/conversations/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml similarity index 100% rename from conversations/src/main/res/values-fr/strings.xml rename to src/main/res/values-fr/strings.xml diff --git a/conversations/src/main/res/values-gl/arrays.xml b/src/main/res/values-gl/arrays.xml similarity index 100% rename from conversations/src/main/res/values-gl/arrays.xml rename to src/main/res/values-gl/arrays.xml diff --git a/conversations/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml similarity index 100% rename from conversations/src/main/res/values-gl/strings.xml rename to src/main/res/values-gl/strings.xml diff --git a/conversations/src/main/res/values-it/arrays.xml b/src/main/res/values-it/arrays.xml similarity index 100% rename from conversations/src/main/res/values-it/arrays.xml rename to src/main/res/values-it/arrays.xml diff --git a/conversations/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml similarity index 100% rename from conversations/src/main/res/values-it/strings.xml rename to src/main/res/values-it/strings.xml diff --git a/conversations/src/main/res/values-iw/arrays.xml b/src/main/res/values-iw/arrays.xml similarity index 100% rename from conversations/src/main/res/values-iw/arrays.xml rename to src/main/res/values-iw/arrays.xml diff --git a/conversations/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml similarity index 100% rename from conversations/src/main/res/values-iw/strings.xml rename to src/main/res/values-iw/strings.xml diff --git a/conversations/src/main/res/values-nl/arrays.xml b/src/main/res/values-nl/arrays.xml similarity index 100% rename from conversations/src/main/res/values-nl/arrays.xml rename to src/main/res/values-nl/arrays.xml diff --git a/conversations/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml similarity index 100% rename from conversations/src/main/res/values-nl/strings.xml rename to src/main/res/values-nl/strings.xml diff --git a/conversations/src/main/res/values-ru/arrays.xml b/src/main/res/values-ru/arrays.xml similarity index 100% rename from conversations/src/main/res/values-ru/arrays.xml rename to src/main/res/values-ru/arrays.xml diff --git a/conversations/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml similarity index 100% rename from conversations/src/main/res/values-ru/strings.xml rename to src/main/res/values-ru/strings.xml diff --git a/conversations/src/main/res/values-sv/arrays.xml b/src/main/res/values-sv/arrays.xml similarity index 100% rename from conversations/src/main/res/values-sv/arrays.xml rename to src/main/res/values-sv/arrays.xml diff --git a/conversations/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml similarity index 100% rename from conversations/src/main/res/values-sv/strings.xml rename to src/main/res/values-sv/strings.xml diff --git a/conversations/src/main/res/values-zh-rCN/arrays.xml b/src/main/res/values-zh-rCN/arrays.xml similarity index 100% rename from conversations/src/main/res/values-zh-rCN/arrays.xml rename to src/main/res/values-zh-rCN/arrays.xml diff --git a/conversations/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from conversations/src/main/res/values-zh-rCN/strings.xml rename to src/main/res/values-zh-rCN/strings.xml diff --git a/conversations/src/main/res/values-zh-rTW/arrays.xml b/src/main/res/values-zh-rTW/arrays.xml similarity index 100% rename from conversations/src/main/res/values-zh-rTW/arrays.xml rename to src/main/res/values-zh-rTW/arrays.xml diff --git a/conversations/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from conversations/src/main/res/values-zh-rTW/strings.xml rename to src/main/res/values-zh-rTW/strings.xml diff --git a/conversations/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml similarity index 100% rename from conversations/src/main/res/values/arrays.xml rename to src/main/res/values/arrays.xml diff --git a/conversations/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml similarity index 100% rename from conversations/src/main/res/values/attrs.xml rename to src/main/res/values/attrs.xml diff --git a/conversations/src/main/res/values/colors.xml b/src/main/res/values/colors.xml similarity index 100% rename from conversations/src/main/res/values/colors.xml rename to src/main/res/values/colors.xml diff --git a/conversations/src/main/res/values/strings.xml b/src/main/res/values/strings.xml similarity index 100% rename from conversations/src/main/res/values/strings.xml rename to src/main/res/values/strings.xml diff --git a/conversations/src/main/res/values/styles.xml b/src/main/res/values/styles.xml similarity index 100% rename from conversations/src/main/res/values/styles.xml rename to src/main/res/values/styles.xml diff --git a/conversations/src/main/res/values/themes.xml b/src/main/res/values/themes.xml similarity index 100% rename from conversations/src/main/res/values/themes.xml rename to src/main/res/values/themes.xml diff --git a/conversations/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml similarity index 100% rename from conversations/src/main/res/xml/preferences.xml rename to src/main/res/xml/preferences.xml