diff --git a/.idea/misc.xml b/.idea/misc.xml index be2c23c15..f5c6d9eb6 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,44 +1,4 @@ - - - - - - - - - + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index f8c9c15b7..21f77a666 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,11 +2,8 @@ - - - - - + + \ No newline at end of file diff --git a/presentation/build.gradle b/app/build.gradle similarity index 99% rename from presentation/build.gradle rename to app/build.gradle index 7aa6b18b0..14d7e8454 100644 --- a/presentation/build.gradle +++ b/app/build.gradle @@ -207,6 +207,8 @@ dependencies { implementation 'net.orange-box.storebox:storebox-lib:1.4.0' compileOnly 'org.projectlombok:lombok:1.18.10' annotationProcessor 'org.projectlombok:lombok:1.18.10' + kapt "org.projectlombok:lombok:1.18.10" + implementation 'com.jakewharton:butterknife:10.2.0' kapt 'com.jakewharton:butterknife-compiler:10.2.0' implementation 'com.github.HITGIF:TextFieldBoxes:1.4.5' diff --git a/presentation/gplay.gradle b/app/gplay.gradle similarity index 100% rename from presentation/gplay.gradle rename to app/gplay.gradle diff --git a/presentation/gplay/release/output.json b/app/gplay/release/output.json similarity index 100% rename from presentation/gplay/release/output.json rename to app/gplay/release/output.json diff --git a/presentation/src/androidTest/java/com/nextcloud/talk/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/nextcloud/talk/ExampleInstrumentedTest.java similarity index 100% rename from presentation/src/androidTest/java/com/nextcloud/talk/ExampleInstrumentedTest.java rename to app/src/androidTest/java/com/nextcloud/talk/ExampleInstrumentedTest.java diff --git a/presentation/src/dev/fastlane/metadata/android/tr-TR/full_description.txt b/app/src/dev/fastlane/metadata/android/tr-TR/full_description.txt similarity index 100% rename from presentation/src/dev/fastlane/metadata/android/tr-TR/full_description.txt rename to app/src/dev/fastlane/metadata/android/tr-TR/full_description.txt diff --git a/presentation/src/dev/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.java b/app/src/dev/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.java similarity index 100% rename from presentation/src/dev/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.java rename to app/src/dev/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.java diff --git a/presentation/src/generic/fastlane/metadata/android/tr-TR/full_description.txt b/app/src/generic/fastlane/metadata/android/tr-TR/full_description.txt similarity index 100% rename from presentation/src/generic/fastlane/metadata/android/tr-TR/full_description.txt rename to app/src/generic/fastlane/metadata/android/tr-TR/full_description.txt diff --git a/presentation/src/generic/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.java b/app/src/generic/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.java similarity index 100% rename from presentation/src/generic/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.java rename to app/src/generic/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.java diff --git a/presentation/src/gplay/AndroidManifest.xml b/app/src/gplay/AndroidManifest.xml similarity index 100% rename from presentation/src/gplay/AndroidManifest.xml rename to app/src/gplay/AndroidManifest.xml diff --git a/presentation/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.java b/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.java similarity index 100% rename from presentation/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.java rename to app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.java diff --git a/presentation/src/gplay/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.java b/app/src/gplay/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.java similarity index 100% rename from presentation/src/gplay/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.java rename to app/src/gplay/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.java diff --git a/presentation/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 100% rename from presentation/src/main/AndroidManifest.xml rename to app/src/main/AndroidManifest.xml diff --git a/presentation/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png similarity index 100% rename from presentation/src/main/ic_launcher-web.png rename to app/src/main/ic_launcher-web.png diff --git a/presentation/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt rename to app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt diff --git a/presentation/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt rename to app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt diff --git a/presentation/src/main/java/com/nextcloud/talk/activities/MainActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/activities/MainActivity.kt rename to app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt diff --git a/presentation/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java rename to app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java diff --git a/presentation/src/main/java/com/nextcloud/talk/adapters/items/AppItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/AppItem.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/adapters/items/AppItem.java rename to app/src/main/java/com/nextcloud/talk/adapters/items/AppItem.java diff --git a/presentation/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java rename to app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java diff --git a/presentation/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java rename to app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java diff --git a/presentation/src/main/java/com/nextcloud/talk/adapters/items/GenericTextHeaderItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/GenericTextHeaderItem.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/adapters/items/GenericTextHeaderItem.java rename to app/src/main/java/com/nextcloud/talk/adapters/items/GenericTextHeaderItem.java diff --git a/presentation/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.java rename to app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.java diff --git a/presentation/src/main/java/com/nextcloud/talk/adapters/items/MenuItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/MenuItem.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/adapters/items/MenuItem.java rename to app/src/main/java/com/nextcloud/talk/adapters/items/MenuItem.java diff --git a/presentation/src/main/java/com/nextcloud/talk/adapters/items/NotificationSoundItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/NotificationSoundItem.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/adapters/items/NotificationSoundItem.java rename to app/src/main/java/com/nextcloud/talk/adapters/items/NotificationSoundItem.java diff --git a/presentation/src/main/java/com/nextcloud/talk/adapters/items/ProgressItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/ProgressItem.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/adapters/items/ProgressItem.java rename to app/src/main/java/com/nextcloud/talk/adapters/items/ProgressItem.java diff --git a/presentation/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java rename to app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java diff --git a/presentation/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.java rename to app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.java diff --git a/presentation/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.java rename to app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.java diff --git a/presentation/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.java rename to app/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.java diff --git a/presentation/src/main/java/com/nextcloud/talk/adapters/messages/MagicSystemMessageViewHolder.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicSystemMessageViewHolder.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/adapters/messages/MagicSystemMessageViewHolder.java rename to app/src/main/java/com/nextcloud/talk/adapters/messages/MagicSystemMessageViewHolder.java diff --git a/presentation/src/main/java/com/nextcloud/talk/adapters/messages/MagicUnreadNoticeMessageViewHolder.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicUnreadNoticeMessageViewHolder.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/adapters/messages/MagicUnreadNoticeMessageViewHolder.java rename to app/src/main/java/com/nextcloud/talk/adapters/messages/MagicUnreadNoticeMessageViewHolder.java diff --git a/presentation/src/main/java/com/nextcloud/talk/api/NcApi.java b/app/src/main/java/com/nextcloud/talk/api/NcApi.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/api/NcApi.java rename to app/src/main/java/com/nextcloud/talk/api/NcApi.java diff --git a/presentation/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt b/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt rename to app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt diff --git a/presentation/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java b/app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java rename to app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java diff --git a/presentation/src/main/java/com/nextcloud/talk/components/filebrowser/adapters/items/BrowserFileItem.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/adapters/items/BrowserFileItem.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/components/filebrowser/adapters/items/BrowserFileItem.java rename to app/src/main/java/com/nextcloud/talk/components/filebrowser/adapters/items/BrowserFileItem.java diff --git a/presentation/src/main/java/com/nextcloud/talk/components/filebrowser/controllers/BrowserController.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/controllers/BrowserController.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/components/filebrowser/controllers/BrowserController.java rename to app/src/main/java/com/nextcloud/talk/components/filebrowser/controllers/BrowserController.java diff --git a/presentation/src/main/java/com/nextcloud/talk/components/filebrowser/interfaces/ListingInterface.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/interfaces/ListingInterface.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/components/filebrowser/interfaces/ListingInterface.java rename to app/src/main/java/com/nextcloud/talk/components/filebrowser/interfaces/ListingInterface.java diff --git a/presentation/src/main/java/com/nextcloud/talk/components/filebrowser/models/BrowserFile.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/BrowserFile.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/components/filebrowser/models/BrowserFile.java rename to app/src/main/java/com/nextcloud/talk/components/filebrowser/models/BrowserFile.java diff --git a/presentation/src/main/java/com/nextcloud/talk/components/filebrowser/models/DavResponse.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/DavResponse.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/components/filebrowser/models/DavResponse.java rename to app/src/main/java/com/nextcloud/talk/components/filebrowser/models/DavResponse.java diff --git a/presentation/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCEncrypted.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCEncrypted.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCEncrypted.java rename to app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCEncrypted.java diff --git a/presentation/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCPreview.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCPreview.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCPreview.java rename to app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCPreview.java diff --git a/presentation/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCFavorite.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCFavorite.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCFavorite.java rename to app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCFavorite.java diff --git a/presentation/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCId.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCId.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCId.java rename to app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCId.java diff --git a/presentation/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCSize.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCSize.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCSize.java rename to app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCSize.java diff --git a/presentation/src/main/java/com/nextcloud/talk/components/filebrowser/operations/DavListing.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/operations/DavListing.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/components/filebrowser/operations/DavListing.java rename to app/src/main/java/com/nextcloud/talk/components/filebrowser/operations/DavListing.java diff --git a/presentation/src/main/java/com/nextcloud/talk/components/filebrowser/operations/ListingAbstractClass.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/operations/ListingAbstractClass.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/components/filebrowser/operations/ListingAbstractClass.java rename to app/src/main/java/com/nextcloud/talk/components/filebrowser/operations/ListingAbstractClass.java diff --git a/presentation/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/DavUtils.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/DavUtils.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/DavUtils.java rename to app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/DavUtils.java diff --git a/presentation/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFilesystemOperation.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFilesystemOperation.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFilesystemOperation.java rename to app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFilesystemOperation.java diff --git a/presentation/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java b/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java rename to app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java diff --git a/presentation/src/main/java/com/nextcloud/talk/controllers/CallController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/controllers/CallController.java rename to app/src/main/java/com/nextcloud/talk/controllers/CallController.java diff --git a/presentation/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java rename to app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java diff --git a/presentation/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/controllers/ChatController.kt rename to app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt diff --git a/presentation/src/main/java/com/nextcloud/talk/controllers/ContactsController.java b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/controllers/ContactsController.java rename to app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java diff --git a/presentation/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt rename to app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt diff --git a/presentation/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java rename to app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java diff --git a/presentation/src/main/java/com/nextcloud/talk/controllers/LockedController.java b/app/src/main/java/com/nextcloud/talk/controllers/LockedController.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/controllers/LockedController.java rename to app/src/main/java/com/nextcloud/talk/controllers/LockedController.java diff --git a/presentation/src/main/java/com/nextcloud/talk/controllers/RingtoneSelectionController.java b/app/src/main/java/com/nextcloud/talk/controllers/RingtoneSelectionController.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/controllers/RingtoneSelectionController.java rename to app/src/main/java/com/nextcloud/talk/controllers/RingtoneSelectionController.java diff --git a/presentation/src/main/java/com/nextcloud/talk/controllers/ServerSelectionController.java b/app/src/main/java/com/nextcloud/talk/controllers/ServerSelectionController.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/controllers/ServerSelectionController.java rename to app/src/main/java/com/nextcloud/talk/controllers/ServerSelectionController.java diff --git a/presentation/src/main/java/com/nextcloud/talk/controllers/SettingsController.java b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/controllers/SettingsController.java rename to app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java diff --git a/presentation/src/main/java/com/nextcloud/talk/controllers/SwitchAccountController.java b/app/src/main/java/com/nextcloud/talk/controllers/SwitchAccountController.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/controllers/SwitchAccountController.java rename to app/src/main/java/com/nextcloud/talk/controllers/SwitchAccountController.java diff --git a/presentation/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java b/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java rename to app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java diff --git a/presentation/src/main/java/com/nextcloud/talk/controllers/base/BaseController.java b/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/controllers/base/BaseController.java rename to app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.java diff --git a/presentation/src/main/java/com/nextcloud/talk/controllers/base/ButterKnifeController.kt b/app/src/main/java/com/nextcloud/talk/controllers/base/ButterKnifeController.kt similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/controllers/base/ButterKnifeController.kt rename to app/src/main/java/com/nextcloud/talk/controllers/base/ButterKnifeController.kt diff --git a/presentation/src/main/java/com/nextcloud/talk/controllers/base/providers/ActionBarProvider.java b/app/src/main/java/com/nextcloud/talk/controllers/base/providers/ActionBarProvider.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/controllers/base/providers/ActionBarProvider.java rename to app/src/main/java/com/nextcloud/talk/controllers/base/providers/ActionBarProvider.java diff --git a/presentation/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java rename to app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java diff --git a/presentation/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java rename to app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java diff --git a/presentation/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java rename to app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java diff --git a/presentation/src/main/java/com/nextcloud/talk/controllers/bottomsheet/items/BasicListItemWithImage.kt b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/items/BasicListItemWithImage.kt similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/controllers/bottomsheet/items/BasicListItemWithImage.kt rename to app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/items/BasicListItemWithImage.kt diff --git a/presentation/src/main/java/com/nextcloud/talk/controllers/bottomsheet/items/ListIconDialogAdapter.kt b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/items/ListIconDialogAdapter.kt similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/controllers/bottomsheet/items/ListIconDialogAdapter.kt rename to app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/items/ListIconDialogAdapter.kt diff --git a/presentation/src/main/java/com/nextcloud/talk/controllers/bottomsheet/items/MagicBottomSheets.kt b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/items/MagicBottomSheets.kt similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/controllers/bottomsheet/items/MagicBottomSheets.kt rename to app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/items/MagicBottomSheets.kt diff --git a/presentation/src/main/java/com/nextcloud/talk/dagger/modules/BusModule.java b/app/src/main/java/com/nextcloud/talk/dagger/modules/BusModule.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/dagger/modules/BusModule.java rename to app/src/main/java/com/nextcloud/talk/dagger/modules/BusModule.java diff --git a/presentation/src/main/java/com/nextcloud/talk/dagger/modules/ContextModule.java b/app/src/main/java/com/nextcloud/talk/dagger/modules/ContextModule.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/dagger/modules/ContextModule.java rename to app/src/main/java/com/nextcloud/talk/dagger/modules/ContextModule.java diff --git a/presentation/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java b/app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java rename to app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java diff --git a/presentation/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java b/app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java rename to app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java diff --git a/presentation/src/main/java/com/nextcloud/talk/events/BottomSheetLockEvent.java b/app/src/main/java/com/nextcloud/talk/events/BottomSheetLockEvent.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/events/BottomSheetLockEvent.java rename to app/src/main/java/com/nextcloud/talk/events/BottomSheetLockEvent.java diff --git a/presentation/src/main/java/com/nextcloud/talk/events/CertificateEvent.java b/app/src/main/java/com/nextcloud/talk/events/CertificateEvent.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/events/CertificateEvent.java rename to app/src/main/java/com/nextcloud/talk/events/CertificateEvent.java diff --git a/presentation/src/main/java/com/nextcloud/talk/events/ConfigurationChangeEvent.java b/app/src/main/java/com/nextcloud/talk/events/ConfigurationChangeEvent.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/events/ConfigurationChangeEvent.java rename to app/src/main/java/com/nextcloud/talk/events/ConfigurationChangeEvent.java diff --git a/presentation/src/main/java/com/nextcloud/talk/events/EventStatus.java b/app/src/main/java/com/nextcloud/talk/events/EventStatus.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/events/EventStatus.java rename to app/src/main/java/com/nextcloud/talk/events/EventStatus.java diff --git a/presentation/src/main/java/com/nextcloud/talk/events/MediaStreamEvent.java b/app/src/main/java/com/nextcloud/talk/events/MediaStreamEvent.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/events/MediaStreamEvent.java rename to app/src/main/java/com/nextcloud/talk/events/MediaStreamEvent.java diff --git a/presentation/src/main/java/com/nextcloud/talk/events/MoreMenuClickEvent.java b/app/src/main/java/com/nextcloud/talk/events/MoreMenuClickEvent.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/events/MoreMenuClickEvent.java rename to app/src/main/java/com/nextcloud/talk/events/MoreMenuClickEvent.java diff --git a/presentation/src/main/java/com/nextcloud/talk/events/NetworkEvent.java b/app/src/main/java/com/nextcloud/talk/events/NetworkEvent.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/events/NetworkEvent.java rename to app/src/main/java/com/nextcloud/talk/events/NetworkEvent.java diff --git a/presentation/src/main/java/com/nextcloud/talk/events/PeerConnectionEvent.java b/app/src/main/java/com/nextcloud/talk/events/PeerConnectionEvent.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/events/PeerConnectionEvent.java rename to app/src/main/java/com/nextcloud/talk/events/PeerConnectionEvent.java diff --git a/presentation/src/main/java/com/nextcloud/talk/events/SessionDescriptionSendEvent.java b/app/src/main/java/com/nextcloud/talk/events/SessionDescriptionSendEvent.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/events/SessionDescriptionSendEvent.java rename to app/src/main/java/com/nextcloud/talk/events/SessionDescriptionSendEvent.java diff --git a/presentation/src/main/java/com/nextcloud/talk/events/UserMentionClickEvent.java b/app/src/main/java/com/nextcloud/talk/events/UserMentionClickEvent.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/events/UserMentionClickEvent.java rename to app/src/main/java/com/nextcloud/talk/events/UserMentionClickEvent.java diff --git a/presentation/src/main/java/com/nextcloud/talk/events/WebSocketCommunicationEvent.java b/app/src/main/java/com/nextcloud/talk/events/WebSocketCommunicationEvent.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/events/WebSocketCommunicationEvent.java rename to app/src/main/java/com/nextcloud/talk/events/WebSocketCommunicationEvent.java diff --git a/presentation/src/main/java/com/nextcloud/talk/interfaces/ClosedInterface.kt b/app/src/main/java/com/nextcloud/talk/interfaces/ClosedInterface.kt similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/interfaces/ClosedInterface.kt rename to app/src/main/java/com/nextcloud/talk/interfaces/ClosedInterface.kt diff --git a/presentation/src/main/java/com/nextcloud/talk/interfaces/ConversationMenuInterface.kt b/app/src/main/java/com/nextcloud/talk/interfaces/ConversationMenuInterface.kt similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/interfaces/ConversationMenuInterface.kt rename to app/src/main/java/com/nextcloud/talk/interfaces/ConversationMenuInterface.kt diff --git a/presentation/src/main/java/com/nextcloud/talk/interfaces/SelectionInterface.kt b/app/src/main/java/com/nextcloud/talk/interfaces/SelectionInterface.kt similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/interfaces/SelectionInterface.kt rename to app/src/main/java/com/nextcloud/talk/interfaces/SelectionInterface.kt diff --git a/presentation/src/main/java/com/nextcloud/talk/jobs/AccountRemovalWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalWorker.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/jobs/AccountRemovalWorker.java rename to app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalWorker.java diff --git a/presentation/src/main/java/com/nextcloud/talk/jobs/AddParticipantsToConversation.java b/app/src/main/java/com/nextcloud/talk/jobs/AddParticipantsToConversation.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/jobs/AddParticipantsToConversation.java rename to app/src/main/java/com/nextcloud/talk/jobs/AddParticipantsToConversation.java diff --git a/presentation/src/main/java/com/nextcloud/talk/jobs/CapabilitiesWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/CapabilitiesWorker.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/jobs/CapabilitiesWorker.java rename to app/src/main/java/com/nextcloud/talk/jobs/CapabilitiesWorker.java diff --git a/presentation/src/main/java/com/nextcloud/talk/jobs/DeleteConversationWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/DeleteConversationWorker.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/jobs/DeleteConversationWorker.java rename to app/src/main/java/com/nextcloud/talk/jobs/DeleteConversationWorker.java diff --git a/presentation/src/main/java/com/nextcloud/talk/jobs/LeaveConversationWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/LeaveConversationWorker.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/jobs/LeaveConversationWorker.java rename to app/src/main/java/com/nextcloud/talk/jobs/LeaveConversationWorker.java diff --git a/presentation/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java rename to app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java diff --git a/presentation/src/main/java/com/nextcloud/talk/jobs/PushRegistrationWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/PushRegistrationWorker.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/jobs/PushRegistrationWorker.java rename to app/src/main/java/com/nextcloud/talk/jobs/PushRegistrationWorker.java diff --git a/presentation/src/main/java/com/nextcloud/talk/jobs/ShareOperationWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/ShareOperationWorker.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/jobs/ShareOperationWorker.java rename to app/src/main/java/com/nextcloud/talk/jobs/ShareOperationWorker.java diff --git a/presentation/src/main/java/com/nextcloud/talk/jobs/SignalingSettingsWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/SignalingSettingsWorker.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/jobs/SignalingSettingsWorker.java rename to app/src/main/java/com/nextcloud/talk/jobs/SignalingSettingsWorker.java diff --git a/presentation/src/main/java/com/nextcloud/talk/jobs/WebsocketConnectionsWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/WebsocketConnectionsWorker.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/jobs/WebsocketConnectionsWorker.java rename to app/src/main/java/com/nextcloud/talk/jobs/WebsocketConnectionsWorker.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/ExternalSignalingServer.java b/app/src/main/java/com/nextcloud/talk/models/ExternalSignalingServer.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/ExternalSignalingServer.java rename to app/src/main/java/com/nextcloud/talk/models/ExternalSignalingServer.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/ImportAccount.java b/app/src/main/java/com/nextcloud/talk/models/ImportAccount.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/ImportAccount.java rename to app/src/main/java/com/nextcloud/talk/models/ImportAccount.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/LoginData.java b/app/src/main/java/com/nextcloud/talk/models/LoginData.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/LoginData.java rename to app/src/main/java/com/nextcloud/talk/models/LoginData.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/RetrofitBucket.java b/app/src/main/java/com/nextcloud/talk/models/RetrofitBucket.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/RetrofitBucket.java rename to app/src/main/java/com/nextcloud/talk/models/RetrofitBucket.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/RingtoneSettings.java b/app/src/main/java/com/nextcloud/talk/models/RingtoneSettings.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/RingtoneSettings.java rename to app/src/main/java/com/nextcloud/talk/models/RingtoneSettings.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/SignatureVerification.java b/app/src/main/java/com/nextcloud/talk/models/SignatureVerification.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/SignatureVerification.java rename to app/src/main/java/com/nextcloud/talk/models/SignatureVerification.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/database/ArbitraryStorage.java b/app/src/main/java/com/nextcloud/talk/models/database/ArbitraryStorage.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/database/ArbitraryStorage.java rename to app/src/main/java/com/nextcloud/talk/models/database/ArbitraryStorage.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/database/User.java b/app/src/main/java/com/nextcloud/talk/models/database/User.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/database/User.java rename to app/src/main/java/com/nextcloud/talk/models/database/User.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOCS.java b/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOCS.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOCS.java rename to app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOCS.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOverall.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOverall.java rename to app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOverall.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteUser.java b/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteUser.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteUser.java rename to app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteUser.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/capabilities/Capabilities.java b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/Capabilities.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/capabilities/Capabilities.java rename to app/src/main/java/com/nextcloud/talk/models/json/capabilities/Capabilities.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesList.java b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesList.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesList.java rename to app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesList.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOCS.java b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOCS.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOCS.java rename to app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOCS.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOverall.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOverall.java rename to app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOverall.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/capabilities/NotificationsCapability.java b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/NotificationsCapability.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/capabilities/NotificationsCapability.java rename to app/src/main/java/com/nextcloud/talk/models/json/capabilities/NotificationsCapability.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/capabilities/SpreedCapability.java b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/SpreedCapability.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/capabilities/SpreedCapability.java rename to app/src/main/java/com/nextcloud/talk/models/json/capabilities/SpreedCapability.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/capabilities/ThemingCapability.java b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/ThemingCapability.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/capabilities/ThemingCapability.java rename to app/src/main/java/com/nextcloud/talk/models/json/capabilities/ThemingCapability.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java rename to app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCS.java b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCS.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCS.java rename to app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCS.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverall.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverall.java rename to app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverall.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.java b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.java rename to app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.java b/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.java rename to app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOCS.java b/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOCS.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOCS.java rename to app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOCS.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOverall.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOverall.java rename to app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOverall.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOCS.java b/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOCS.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOCS.java rename to app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOCS.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOverall.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOverall.java rename to app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOverall.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/converters/EnumLobbyStateConverter.java b/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumLobbyStateConverter.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/converters/EnumLobbyStateConverter.java rename to app/src/main/java/com/nextcloud/talk/models/json/converters/EnumLobbyStateConverter.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/converters/EnumNotificationLevelConverter.java b/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumNotificationLevelConverter.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/converters/EnumNotificationLevelConverter.java rename to app/src/main/java/com/nextcloud/talk/models/json/converters/EnumNotificationLevelConverter.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/converters/EnumParticipantTypeConverter.java b/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumParticipantTypeConverter.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/converters/EnumParticipantTypeConverter.java rename to app/src/main/java/com/nextcloud/talk/models/json/converters/EnumParticipantTypeConverter.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/converters/EnumReadOnlyConversationConverter.java b/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumReadOnlyConversationConverter.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/converters/EnumReadOnlyConversationConverter.java rename to app/src/main/java/com/nextcloud/talk/models/json/converters/EnumReadOnlyConversationConverter.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/converters/EnumRoomTypeConverter.java b/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumRoomTypeConverter.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/converters/EnumRoomTypeConverter.java rename to app/src/main/java/com/nextcloud/talk/models/json/converters/EnumRoomTypeConverter.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.kt b/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.kt similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.kt rename to app/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.kt diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/converters/LoganSquareJodaTimeConverter.java b/app/src/main/java/com/nextcloud/talk/models/json/converters/LoganSquareJodaTimeConverter.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/converters/LoganSquareJodaTimeConverter.java rename to app/src/main/java/com/nextcloud/talk/models/json/converters/LoganSquareJodaTimeConverter.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/converters/ObjectParcelConverter.java b/app/src/main/java/com/nextcloud/talk/models/json/converters/ObjectParcelConverter.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/converters/ObjectParcelConverter.java rename to app/src/main/java/com/nextcloud/talk/models/json/converters/ObjectParcelConverter.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/converters/UriTypeConverter.java b/app/src/main/java/com/nextcloud/talk/models/json/converters/UriTypeConverter.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/converters/UriTypeConverter.java rename to app/src/main/java/com/nextcloud/talk/models/json/converters/UriTypeConverter.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/generic/GenericMeta.java b/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericMeta.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/generic/GenericMeta.java rename to app/src/main/java/com/nextcloud/talk/models/json/generic/GenericMeta.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/generic/GenericOCS.java b/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericOCS.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/generic/GenericOCS.java rename to app/src/main/java/com/nextcloud/talk/models/json/generic/GenericOCS.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/generic/GenericOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericOverall.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/generic/GenericOverall.java rename to app/src/main/java/com/nextcloud/talk/models/json/generic/GenericOverall.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/generic/Status.java b/app/src/main/java/com/nextcloud/talk/models/json/generic/Status.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/generic/Status.java rename to app/src/main/java/com/nextcloud/talk/models/json/generic/Status.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/mention/Mention.java b/app/src/main/java/com/nextcloud/talk/models/json/mention/Mention.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/mention/Mention.java rename to app/src/main/java/com/nextcloud/talk/models/json/mention/Mention.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/mention/MentionOCS.java b/app/src/main/java/com/nextcloud/talk/models/json/mention/MentionOCS.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/mention/MentionOCS.java rename to app/src/main/java/com/nextcloud/talk/models/json/mention/MentionOCS.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/mention/MentionOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/mention/MentionOverall.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/mention/MentionOverall.java rename to app/src/main/java/com/nextcloud/talk/models/json/mention/MentionOverall.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/notifications/Notification.java b/app/src/main/java/com/nextcloud/talk/models/json/notifications/Notification.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/notifications/Notification.java rename to app/src/main/java/com/nextcloud/talk/models/json/notifications/Notification.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationAction.java b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationAction.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationAction.java rename to app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationAction.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOCS.java b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOCS.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOCS.java rename to app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOCS.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOverall.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOverall.java rename to app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOverall.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationRichObject.java b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationRichObject.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationRichObject.java rename to app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationRichObject.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOCS.java b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOCS.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOCS.java rename to app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOCS.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOverall.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOverall.java rename to app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOverall.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOCS.java b/app/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOCS.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOCS.java rename to app/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOCS.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOverall.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOverall.java rename to app/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOverall.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/participants/Participant.java b/app/src/main/java/com/nextcloud/talk/models/json/participants/Participant.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/participants/Participant.java rename to app/src/main/java/com/nextcloud/talk/models/json/participants/Participant.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOCS.java b/app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOCS.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOCS.java rename to app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOCS.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOverall.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOverall.java rename to app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOverall.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/push/DecryptedPushMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/push/DecryptedPushMessage.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/push/DecryptedPushMessage.java rename to app/src/main/java/com/nextcloud/talk/models/json/push/DecryptedPushMessage.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/push/NotificationUser.java b/app/src/main/java/com/nextcloud/talk/models/json/push/NotificationUser.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/push/NotificationUser.java rename to app/src/main/java/com/nextcloud/talk/models/json/push/NotificationUser.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/push/PushConfigurationState.java b/app/src/main/java/com/nextcloud/talk/models/json/push/PushConfigurationState.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/push/PushConfigurationState.java rename to app/src/main/java/com/nextcloud/talk/models/json/push/PushConfigurationState.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/push/PushRegistration.java b/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistration.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/push/PushRegistration.java rename to app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistration.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOCS.java b/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOCS.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOCS.java rename to app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOCS.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOverall.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOverall.java rename to app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOverall.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/sharees/ExactSharees.java b/app/src/main/java/com/nextcloud/talk/models/json/sharees/ExactSharees.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/sharees/ExactSharees.java rename to app/src/main/java/com/nextcloud/talk/models/json/sharees/ExactSharees.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/sharees/Sharee.java b/app/src/main/java/com/nextcloud/talk/models/json/sharees/Sharee.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/sharees/Sharee.java rename to app/src/main/java/com/nextcloud/talk/models/json/sharees/Sharee.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOCS.java b/app/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOCS.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOCS.java rename to app/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOCS.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOverall.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOverall.java rename to app/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOverall.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/sharees/SharesData.java b/app/src/main/java/com/nextcloud/talk/models/json/sharees/SharesData.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/sharees/SharesData.java rename to app/src/main/java/com/nextcloud/talk/models/json/sharees/SharesData.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/sharees/Value.java b/app/src/main/java/com/nextcloud/talk/models/json/sharees/Value.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/sharees/Value.java rename to app/src/main/java/com/nextcloud/talk/models/json/sharees/Value.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessage.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessage.java rename to app/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessage.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessageNick.java b/app/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessageNick.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessageNick.java rename to app/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessageNick.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/signaling/NCIceCandidate.java b/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCIceCandidate.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/signaling/NCIceCandidate.java rename to app/src/main/java/com/nextcloud/talk/models/json/signaling/NCIceCandidate.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessagePayload.java b/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessagePayload.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessagePayload.java rename to app/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessagePayload.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessageWrapper.java b/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessageWrapper.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessageWrapper.java rename to app/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessageWrapper.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/signaling/NCSignalingMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCSignalingMessage.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/signaling/NCSignalingMessage.java rename to app/src/main/java/com/nextcloud/talk/models/json/signaling/NCSignalingMessage.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/signaling/Signaling.java b/app/src/main/java/com/nextcloud/talk/models/json/signaling/Signaling.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/signaling/Signaling.java rename to app/src/main/java/com/nextcloud/talk/models/json/signaling/Signaling.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOCS.java b/app/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOCS.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOCS.java rename to app/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOCS.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOverall.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOverall.java rename to app/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOverall.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/signaling/settings/IceServer.java b/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/IceServer.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/signaling/settings/IceServer.java rename to app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/IceServer.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/signaling/settings/Settings.java b/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/Settings.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/signaling/settings/Settings.java rename to app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/Settings.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOcs.java b/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOcs.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOcs.java rename to app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOcs.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOverall.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOverall.java rename to app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOverall.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileData.java b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileData.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileData.java rename to app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileData.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOCS.java b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOCS.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOCS.java rename to app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOCS.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOverall.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOverall.java rename to app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOverall.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/ActorWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ActorWebSocketMessage.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/websocket/ActorWebSocketMessage.java rename to app/src/main/java/com/nextcloud/talk/models/json/websocket/ActorWebSocketMessage.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/AuthParametersWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/AuthParametersWebSocketMessage.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/websocket/AuthParametersWebSocketMessage.java rename to app/src/main/java/com/nextcloud/talk/models/json/websocket/AuthParametersWebSocketMessage.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/AuthWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/AuthWebSocketMessage.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/websocket/AuthWebSocketMessage.java rename to app/src/main/java/com/nextcloud/talk/models/json/websocket/AuthWebSocketMessage.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/BaseWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/BaseWebSocketMessage.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/websocket/BaseWebSocketMessage.java rename to app/src/main/java/com/nextcloud/talk/models/json/websocket/BaseWebSocketMessage.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/ByeWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ByeWebSocketMessage.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/websocket/ByeWebSocketMessage.java rename to app/src/main/java/com/nextcloud/talk/models/json/websocket/ByeWebSocketMessage.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/CallOverallWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallOverallWebSocketMessage.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/websocket/CallOverallWebSocketMessage.java rename to app/src/main/java/com/nextcloud/talk/models/json/websocket/CallOverallWebSocketMessage.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/CallWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallWebSocketMessage.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/websocket/CallWebSocketMessage.java rename to app/src/main/java/com/nextcloud/talk/models/json/websocket/CallWebSocketMessage.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorOverallWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorOverallWebSocketMessage.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorOverallWebSocketMessage.java rename to app/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorOverallWebSocketMessage.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorWebSocketMessage.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorWebSocketMessage.java rename to app/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorWebSocketMessage.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/EventOverallWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/EventOverallWebSocketMessage.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/websocket/EventOverallWebSocketMessage.java rename to app/src/main/java/com/nextcloud/talk/models/json/websocket/EventOverallWebSocketMessage.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/HelloOverallWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloOverallWebSocketMessage.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/websocket/HelloOverallWebSocketMessage.java rename to app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloOverallWebSocketMessage.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseOverallWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseOverallWebSocketMessage.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseOverallWebSocketMessage.java rename to app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseOverallWebSocketMessage.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseWebSocketMessage.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseWebSocketMessage.java rename to app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseWebSocketMessage.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/HelloWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloWebSocketMessage.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/websocket/HelloWebSocketMessage.java rename to app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloWebSocketMessage.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/JoinedRoomOverallWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/JoinedRoomOverallWebSocketMessage.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/websocket/JoinedRoomOverallWebSocketMessage.java rename to app/src/main/java/com/nextcloud/talk/models/json/websocket/JoinedRoomOverallWebSocketMessage.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/RequestOfferOverallWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/RequestOfferOverallWebSocketMessage.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/websocket/RequestOfferOverallWebSocketMessage.java rename to app/src/main/java/com/nextcloud/talk/models/json/websocket/RequestOfferOverallWebSocketMessage.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/RequestOfferSignalingMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/RequestOfferSignalingMessage.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/websocket/RequestOfferSignalingMessage.java rename to app/src/main/java/com/nextcloud/talk/models/json/websocket/RequestOfferSignalingMessage.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/RoomOverallWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomOverallWebSocketMessage.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/websocket/RoomOverallWebSocketMessage.java rename to app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomOverallWebSocketMessage.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/RoomPropertiesWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomPropertiesWebSocketMessage.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/websocket/RoomPropertiesWebSocketMessage.java rename to app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomPropertiesWebSocketMessage.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/RoomWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomWebSocketMessage.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/websocket/RoomWebSocketMessage.java rename to app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomWebSocketMessage.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/ServerHelloResponseFeaturesWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ServerHelloResponseFeaturesWebSocketMessage.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/websocket/ServerHelloResponseFeaturesWebSocketMessage.java rename to app/src/main/java/com/nextcloud/talk/models/json/websocket/ServerHelloResponseFeaturesWebSocketMessage.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/SignalingDataWebSocketMessageForOffer.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/SignalingDataWebSocketMessageForOffer.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/models/json/websocket/SignalingDataWebSocketMessageForOffer.java rename to app/src/main/java/com/nextcloud/talk/models/json/websocket/SignalingDataWebSocketMessageForOffer.java diff --git a/presentation/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListContract.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListContract.kt similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListContract.kt rename to app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListContract.kt diff --git a/presentation/src/main/java/com/nextcloud/talk/newarch/mvp/BaseMvpView.kt b/app/src/main/java/com/nextcloud/talk/newarch/mvp/BaseMvpView.kt similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/newarch/mvp/BaseMvpView.kt rename to app/src/main/java/com/nextcloud/talk/newarch/mvp/BaseMvpView.kt diff --git a/presentation/src/main/java/com/nextcloud/talk/newarch/mvp/BasePresenter.kt b/app/src/main/java/com/nextcloud/talk/newarch/mvp/BasePresenter.kt similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/newarch/mvp/BasePresenter.kt rename to app/src/main/java/com/nextcloud/talk/newarch/mvp/BasePresenter.kt diff --git a/presentation/src/main/java/com/nextcloud/talk/newarch/mvp/MvpPresenter.kt b/app/src/main/java/com/nextcloud/talk/newarch/mvp/MvpPresenter.kt similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/newarch/mvp/MvpPresenter.kt rename to app/src/main/java/com/nextcloud/talk/newarch/mvp/MvpPresenter.kt diff --git a/presentation/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.java b/app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.java rename to app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.java diff --git a/presentation/src/main/java/com/nextcloud/talk/receivers/PackageReplacedReceiver.kt b/app/src/main/java/com/nextcloud/talk/receivers/PackageReplacedReceiver.kt similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/receivers/PackageReplacedReceiver.kt rename to app/src/main/java/com/nextcloud/talk/receivers/PackageReplacedReceiver.kt diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/AccountUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/AccountUtils.kt similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/AccountUtils.kt rename to app/src/main/java/com/nextcloud/talk/utils/AccountUtils.kt diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/ApiUtils.java b/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/ApiUtils.java rename to app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/ConductorRemapping.kt b/app/src/main/java/com/nextcloud/talk/utils/ConductorRemapping.kt similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/ConductorRemapping.kt rename to app/src/main/java/com/nextcloud/talk/utils/ConductorRemapping.kt diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/DateUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/DateUtils.kt similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/DateUtils.kt rename to app/src/main/java/com/nextcloud/talk/utils/DateUtils.kt diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/DeviceUtils.java b/app/src/main/java/com/nextcloud/talk/utils/DeviceUtils.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/DeviceUtils.java rename to app/src/main/java/com/nextcloud/talk/utils/DeviceUtils.java diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java rename to app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/DoNotDisturbUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/DoNotDisturbUtils.kt similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/DoNotDisturbUtils.kt rename to app/src/main/java/com/nextcloud/talk/utils/DoNotDisturbUtils.kt diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/DrawableUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/DrawableUtils.kt similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/DrawableUtils.kt rename to app/src/main/java/com/nextcloud/talk/utils/DrawableUtils.kt diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/EmojiTextInputEditText.java b/app/src/main/java/com/nextcloud/talk/utils/EmojiTextInputEditText.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/EmojiTextInputEditText.java rename to app/src/main/java/com/nextcloud/talk/utils/EmojiTextInputEditText.java diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/FABAwareScrollingViewBehavior.java b/app/src/main/java/com/nextcloud/talk/utils/FABAwareScrollingViewBehavior.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/FABAwareScrollingViewBehavior.java rename to app/src/main/java/com/nextcloud/talk/utils/FABAwareScrollingViewBehavior.java diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/KeyboardUtils.java b/app/src/main/java/com/nextcloud/talk/utils/KeyboardUtils.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/KeyboardUtils.java rename to app/src/main/java/com/nextcloud/talk/utils/KeyboardUtils.java diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/LoggingUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/LoggingUtils.kt similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/LoggingUtils.kt rename to app/src/main/java/com/nextcloud/talk/utils/LoggingUtils.kt diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/MagicCharPolicy.java b/app/src/main/java/com/nextcloud/talk/utils/MagicCharPolicy.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/MagicCharPolicy.java rename to app/src/main/java/com/nextcloud/talk/utils/MagicCharPolicy.java diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/MagicMap.kt b/app/src/main/java/com/nextcloud/talk/utils/MagicMap.kt similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/MagicMap.kt rename to app/src/main/java/com/nextcloud/talk/utils/MagicMap.kt diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/NotificationUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/NotificationUtils.kt similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/NotificationUtils.kt rename to app/src/main/java/com/nextcloud/talk/utils/NotificationUtils.kt diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/OkHttpNetworkFetcherWithCache.java b/app/src/main/java/com/nextcloud/talk/utils/OkHttpNetworkFetcherWithCache.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/OkHttpNetworkFetcherWithCache.java rename to app/src/main/java/com/nextcloud/talk/utils/OkHttpNetworkFetcherWithCache.java diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/PushUtils.java b/app/src/main/java/com/nextcloud/talk/utils/PushUtils.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/PushUtils.java rename to app/src/main/java/com/nextcloud/talk/utils/PushUtils.java diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/SecurityUtils.java b/app/src/main/java/com/nextcloud/talk/utils/SecurityUtils.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/SecurityUtils.java rename to app/src/main/java/com/nextcloud/talk/utils/SecurityUtils.java diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/ShareUtils.java b/app/src/main/java/com/nextcloud/talk/utils/ShareUtils.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/ShareUtils.java rename to app/src/main/java/com/nextcloud/talk/utils/ShareUtils.java diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/TextMatchers.java b/app/src/main/java/com/nextcloud/talk/utils/TextMatchers.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/TextMatchers.java rename to app/src/main/java/com/nextcloud/talk/utils/TextMatchers.java diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/animations/PulseAnimation.java b/app/src/main/java/com/nextcloud/talk/utils/animations/PulseAnimation.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/animations/PulseAnimation.java rename to app/src/main/java/com/nextcloud/talk/utils/animations/PulseAnimation.java diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/animations/SharedElementTransition.java b/app/src/main/java/com/nextcloud/talk/utils/animations/SharedElementTransition.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/animations/SharedElementTransition.java rename to app/src/main/java/com/nextcloud/talk/utils/animations/SharedElementTransition.java diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/animations/ViewHidingBehaviourAnimation.java b/app/src/main/java/com/nextcloud/talk/utils/animations/ViewHidingBehaviourAnimation.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/animations/ViewHidingBehaviourAnimation.java rename to app/src/main/java/com/nextcloud/talk/utils/animations/ViewHidingBehaviourAnimation.java diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/bundle/BundleKeys.kt b/app/src/main/java/com/nextcloud/talk/utils/bundle/BundleKeys.kt similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/bundle/BundleKeys.kt rename to app/src/main/java/com/nextcloud/talk/utils/bundle/BundleKeys.kt diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/database/arbitrarystorage/ArbitraryStorageModule.java b/app/src/main/java/com/nextcloud/talk/utils/database/arbitrarystorage/ArbitraryStorageModule.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/database/arbitrarystorage/ArbitraryStorageModule.java rename to app/src/main/java/com/nextcloud/talk/utils/database/arbitrarystorage/ArbitraryStorageModule.java diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/database/arbitrarystorage/ArbitraryStorageUtils.java b/app/src/main/java/com/nextcloud/talk/utils/database/arbitrarystorage/ArbitraryStorageUtils.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/database/arbitrarystorage/ArbitraryStorageUtils.java rename to app/src/main/java/com/nextcloud/talk/utils/database/arbitrarystorage/ArbitraryStorageUtils.java diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/database/user/UserModule.java b/app/src/main/java/com/nextcloud/talk/utils/database/user/UserModule.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/database/user/UserModule.java rename to app/src/main/java/com/nextcloud/talk/utils/database/user/UserModule.java diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/database/user/UserUtils.java b/app/src/main/java/com/nextcloud/talk/utils/database/user/UserUtils.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/database/user/UserUtils.java rename to app/src/main/java/com/nextcloud/talk/utils/database/user/UserUtils.java diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/power/PowerManagerUtils.java b/app/src/main/java/com/nextcloud/talk/utils/power/PowerManagerUtils.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/power/PowerManagerUtils.java rename to app/src/main/java/com/nextcloud/talk/utils/power/PowerManagerUtils.java diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/power/ProximityLock.java b/app/src/main/java/com/nextcloud/talk/utils/power/ProximityLock.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/power/ProximityLock.java rename to app/src/main/java/com/nextcloud/talk/utils/power/ProximityLock.java diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/preferences/AppPreferences.java b/app/src/main/java/com/nextcloud/talk/utils/preferences/AppPreferences.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/preferences/AppPreferences.java rename to app/src/main/java/com/nextcloud/talk/utils/preferences/AppPreferences.java diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/preferences/MagicUserInputModule.java b/app/src/main/java/com/nextcloud/talk/utils/preferences/MagicUserInputModule.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/preferences/MagicUserInputModule.java rename to app/src/main/java/com/nextcloud/talk/utils/preferences/MagicUserInputModule.java diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/preferences/preferencestorage/DatabaseStorageFactory.java b/app/src/main/java/com/nextcloud/talk/utils/preferences/preferencestorage/DatabaseStorageFactory.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/preferences/preferencestorage/DatabaseStorageFactory.java rename to app/src/main/java/com/nextcloud/talk/utils/preferences/preferencestorage/DatabaseStorageFactory.java diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/preferences/preferencestorage/DatabaseStorageModule.java b/app/src/main/java/com/nextcloud/talk/utils/preferences/preferencestorage/DatabaseStorageModule.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/preferences/preferencestorage/DatabaseStorageModule.java rename to app/src/main/java/com/nextcloud/talk/utils/preferences/preferencestorage/DatabaseStorageModule.java diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/singletons/ApplicationWideCurrentRoomHolder.java b/app/src/main/java/com/nextcloud/talk/utils/singletons/ApplicationWideCurrentRoomHolder.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/singletons/ApplicationWideCurrentRoomHolder.java rename to app/src/main/java/com/nextcloud/talk/utils/singletons/ApplicationWideCurrentRoomHolder.java diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/singletons/ApplicationWideMessageHolder.java b/app/src/main/java/com/nextcloud/talk/utils/singletons/ApplicationWideMessageHolder.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/singletons/ApplicationWideMessageHolder.java rename to app/src/main/java/com/nextcloud/talk/utils/singletons/ApplicationWideMessageHolder.java diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/singletons/AvatarStatusCodeHolder.java b/app/src/main/java/com/nextcloud/talk/utils/singletons/AvatarStatusCodeHolder.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/singletons/AvatarStatusCodeHolder.java rename to app/src/main/java/com/nextcloud/talk/utils/singletons/AvatarStatusCodeHolder.java diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/ssl/MagicKeyManager.java b/app/src/main/java/com/nextcloud/talk/utils/ssl/MagicKeyManager.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/ssl/MagicKeyManager.java rename to app/src/main/java/com/nextcloud/talk/utils/ssl/MagicKeyManager.java diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/ssl/MagicTrustManager.java b/app/src/main/java/com/nextcloud/talk/utils/ssl/MagicTrustManager.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/ssl/MagicTrustManager.java rename to app/src/main/java/com/nextcloud/talk/utils/ssl/MagicTrustManager.java diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/ssl/SSLSocketFactoryCompat.kt b/app/src/main/java/com/nextcloud/talk/utils/ssl/SSLSocketFactoryCompat.kt similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/ssl/SSLSocketFactoryCompat.kt rename to app/src/main/java/com/nextcloud/talk/utils/ssl/SSLSocketFactoryCompat.kt diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/text/Spans.java b/app/src/main/java/com/nextcloud/talk/utils/text/Spans.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/text/Spans.java rename to app/src/main/java/com/nextcloud/talk/utils/text/Spans.java diff --git a/presentation/src/main/java/com/nextcloud/talk/utils/ui/MaterialPreferenceCategoryWithRightLink.java b/app/src/main/java/com/nextcloud/talk/utils/ui/MaterialPreferenceCategoryWithRightLink.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/utils/ui/MaterialPreferenceCategoryWithRightLink.java rename to app/src/main/java/com/nextcloud/talk/utils/ui/MaterialPreferenceCategoryWithRightLink.java diff --git a/presentation/src/main/java/com/nextcloud/talk/webrtc/MagicAudioManager.java b/app/src/main/java/com/nextcloud/talk/webrtc/MagicAudioManager.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/webrtc/MagicAudioManager.java rename to app/src/main/java/com/nextcloud/talk/webrtc/MagicAudioManager.java diff --git a/presentation/src/main/java/com/nextcloud/talk/webrtc/MagicBluetoothManager.java b/app/src/main/java/com/nextcloud/talk/webrtc/MagicBluetoothManager.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/webrtc/MagicBluetoothManager.java rename to app/src/main/java/com/nextcloud/talk/webrtc/MagicBluetoothManager.java diff --git a/presentation/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java b/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java rename to app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java diff --git a/presentation/src/main/java/com/nextcloud/talk/webrtc/MagicProximitySensor.java b/app/src/main/java/com/nextcloud/talk/webrtc/MagicProximitySensor.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/webrtc/MagicProximitySensor.java rename to app/src/main/java/com/nextcloud/talk/webrtc/MagicProximitySensor.java diff --git a/presentation/src/main/java/com/nextcloud/talk/webrtc/MagicWebRTCUtils.java b/app/src/main/java/com/nextcloud/talk/webrtc/MagicWebRTCUtils.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/webrtc/MagicWebRTCUtils.java rename to app/src/main/java/com/nextcloud/talk/webrtc/MagicWebRTCUtils.java diff --git a/presentation/src/main/java/com/nextcloud/talk/webrtc/MagicWebSocketInstance.java b/app/src/main/java/com/nextcloud/talk/webrtc/MagicWebSocketInstance.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/webrtc/MagicWebSocketInstance.java rename to app/src/main/java/com/nextcloud/talk/webrtc/MagicWebSocketInstance.java diff --git a/presentation/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java b/app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java similarity index 100% rename from presentation/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java rename to app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java diff --git a/presentation/src/main/res/drawable/accent_circle.xml b/app/src/main/res/drawable/accent_circle.xml similarity index 100% rename from presentation/src/main/res/drawable/accent_circle.xml rename to app/src/main/res/drawable/accent_circle.xml diff --git a/presentation/src/main/res/drawable/asl_password_visibility.xml b/app/src/main/res/drawable/asl_password_visibility.xml similarity index 100% rename from presentation/src/main/res/drawable/asl_password_visibility.xml rename to app/src/main/res/drawable/asl_password_visibility.xml diff --git a/presentation/src/main/res/drawable/avd_hide_password.xml b/app/src/main/res/drawable/avd_hide_password.xml similarity index 100% rename from presentation/src/main/res/drawable/avd_hide_password.xml rename to app/src/main/res/drawable/avd_hide_password.xml diff --git a/presentation/src/main/res/drawable/avd_show_password.xml b/app/src/main/res/drawable/avd_show_password.xml similarity index 100% rename from presentation/src/main/res/drawable/avd_show_password.xml rename to app/src/main/res/drawable/avd_show_password.xml diff --git a/presentation/src/main/res/drawable/bubble_circle_unread.xml b/app/src/main/res/drawable/bubble_circle_unread.xml similarity index 100% rename from presentation/src/main/res/drawable/bubble_circle_unread.xml rename to app/src/main/res/drawable/bubble_circle_unread.xml diff --git a/presentation/src/main/res/drawable/bubble_circle_unread_mention.xml b/app/src/main/res/drawable/bubble_circle_unread_mention.xml similarity index 100% rename from presentation/src/main/res/drawable/bubble_circle_unread_mention.xml rename to app/src/main/res/drawable/bubble_circle_unread_mention.xml diff --git a/presentation/src/main/res/drawable/ic_add_grey600_24px.xml b/app/src/main/res/drawable/ic_add_grey600_24px.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_add_grey600_24px.xml rename to app/src/main/res/drawable/ic_add_grey600_24px.xml diff --git a/presentation/src/main/res/drawable/ic_add_white_24px.xml b/app/src/main/res/drawable/ic_add_white_24px.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_add_white_24px.xml rename to app/src/main/res/drawable/ic_add_white_24px.xml diff --git a/presentation/src/main/res/drawable/ic_arrow_back_black_24dp.xml b/app/src/main/res/drawable/ic_arrow_back_black_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_arrow_back_black_24dp.xml rename to app/src/main/res/drawable/ic_arrow_back_black_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_arrow_forward_white_24px.xml b/app/src/main/res/drawable/ic_arrow_forward_white_24px.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_arrow_forward_white_24px.xml rename to app/src/main/res/drawable/ic_arrow_forward_white_24px.xml diff --git a/presentation/src/main/res/drawable/ic_av_timer_timer_24dp.xml b/app/src/main/res/drawable/ic_av_timer_timer_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_av_timer_timer_24dp.xml rename to app/src/main/res/drawable/ic_av_timer_timer_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_baseline_arrow_downward_24px.xml b/app/src/main/res/drawable/ic_baseline_arrow_downward_24px.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_baseline_arrow_downward_24px.xml rename to app/src/main/res/drawable/ic_baseline_arrow_downward_24px.xml diff --git a/presentation/src/main/res/drawable/ic_call_black_24dp.xml b/app/src/main/res/drawable/ic_call_black_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_call_black_24dp.xml rename to app/src/main/res/drawable/ic_call_black_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_call_end_white_24px.xml b/app/src/main/res/drawable/ic_call_end_white_24px.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_call_end_white_24px.xml rename to app/src/main/res/drawable/ic_call_end_white_24px.xml diff --git a/presentation/src/main/res/drawable/ic_call_grey_600_24dp.xml b/app/src/main/res/drawable/ic_call_grey_600_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_call_grey_600_24dp.xml rename to app/src/main/res/drawable/ic_call_grey_600_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_call_white_24dp.xml b/app/src/main/res/drawable/ic_call_white_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_call_white_24dp.xml rename to app/src/main/res/drawable/ic_call_white_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_cancel_black_24dp.xml b/app/src/main/res/drawable/ic_cancel_black_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_cancel_black_24dp.xml rename to app/src/main/res/drawable/ic_cancel_black_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_chat_black_24dp.xml b/app/src/main/res/drawable/ic_chat_black_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_chat_black_24dp.xml rename to app/src/main/res/drawable/ic_chat_black_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_check_black_24dp.xml b/app/src/main/res/drawable/ic_check_black_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_check_black_24dp.xml rename to app/src/main/res/drawable/ic_check_black_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_check_circle_black_24dp.xml b/app/src/main/res/drawable/ic_check_circle_black_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_check_circle_black_24dp.xml rename to app/src/main/res/drawable/ic_check_circle_black_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_close_grey600_24dp.xml b/app/src/main/res/drawable/ic_close_grey600_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_close_grey600_24dp.xml rename to app/src/main/res/drawable/ic_close_grey600_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_delete_black_24dp.xml b/app/src/main/res/drawable/ic_delete_black_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_delete_black_24dp.xml rename to app/src/main/res/drawable/ic_delete_black_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_delete_grey600_24dp.xml b/app/src/main/res/drawable/ic_delete_grey600_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_delete_grey600_24dp.xml rename to app/src/main/res/drawable/ic_delete_grey600_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_exit_to_app_black_24dp.xml b/app/src/main/res/drawable/ic_exit_to_app_black_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_exit_to_app_black_24dp.xml rename to app/src/main/res/drawable/ic_exit_to_app_black_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_file_icon.xml b/app/src/main/res/drawable/ic_file_icon.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_file_icon.xml rename to app/src/main/res/drawable/ic_file_icon.xml diff --git a/presentation/src/main/res/drawable/ic_file_password_request.xml b/app/src/main/res/drawable/ic_file_password_request.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_file_password_request.xml rename to app/src/main/res/drawable/ic_file_password_request.xml diff --git a/presentation/src/main/res/drawable/ic_group_grey600_24px.xml b/app/src/main/res/drawable/ic_group_grey600_24px.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_group_grey600_24px.xml rename to app/src/main/res/drawable/ic_group_grey600_24px.xml diff --git a/presentation/src/main/res/drawable/ic_info_white_24dp.xml b/app/src/main/res/drawable/ic_info_white_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_info_white_24dp.xml rename to app/src/main/res/drawable/ic_info_white_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_insert_emoticon_black_24dp.xml b/app/src/main/res/drawable/ic_insert_emoticon_black_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_insert_emoticon_black_24dp.xml rename to app/src/main/res/drawable/ic_insert_emoticon_black_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_launcher_background.xml rename to app/src/main/res/drawable/ic_launcher_background.xml diff --git a/presentation/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_launcher_foreground.xml rename to app/src/main/res/drawable/ic_launcher_foreground.xml diff --git a/presentation/src/main/res/drawable/ic_link_black_24px.xml b/app/src/main/res/drawable/ic_link_black_24px.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_link_black_24px.xml rename to app/src/main/res/drawable/ic_link_black_24px.xml diff --git a/presentation/src/main/res/drawable/ic_link_grey600_24px.xml b/app/src/main/res/drawable/ic_link_grey600_24px.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_link_grey600_24px.xml rename to app/src/main/res/drawable/ic_link_grey600_24px.xml diff --git a/presentation/src/main/res/drawable/ic_link_white_24px.xml b/app/src/main/res/drawable/ic_link_white_24px.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_link_white_24px.xml rename to app/src/main/res/drawable/ic_link_white_24px.xml diff --git a/presentation/src/main/res/drawable/ic_lock_grey600_24px.xml b/app/src/main/res/drawable/ic_lock_grey600_24px.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_lock_grey600_24px.xml rename to app/src/main/res/drawable/ic_lock_grey600_24px.xml diff --git a/presentation/src/main/res/drawable/ic_lock_open_grey600_24dp.xml b/app/src/main/res/drawable/ic_lock_open_grey600_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_lock_open_grey600_24dp.xml rename to app/src/main/res/drawable/ic_lock_open_grey600_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_lock_plus_grey600_24dp.xml b/app/src/main/res/drawable/ic_lock_plus_grey600_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_lock_plus_grey600_24dp.xml rename to app/src/main/res/drawable/ic_lock_plus_grey600_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_lock_white_24px.xml b/app/src/main/res/drawable/ic_lock_white_24px.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_lock_white_24px.xml rename to app/src/main/res/drawable/ic_lock_white_24px.xml diff --git a/presentation/src/main/res/drawable/ic_logo.xml b/app/src/main/res/drawable/ic_logo.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_logo.xml rename to app/src/main/res/drawable/ic_logo.xml diff --git a/presentation/src/main/res/drawable/ic_mic_grey_600_24dp.xml b/app/src/main/res/drawable/ic_mic_grey_600_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_mic_grey_600_24dp.xml rename to app/src/main/res/drawable/ic_mic_grey_600_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_mic_off_white_24px.xml b/app/src/main/res/drawable/ic_mic_off_white_24px.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_mic_off_white_24px.xml rename to app/src/main/res/drawable/ic_mic_off_white_24px.xml diff --git a/presentation/src/main/res/drawable/ic_mic_white_24px.xml b/app/src/main/res/drawable/ic_mic_white_24px.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_mic_white_24px.xml rename to app/src/main/res/drawable/ic_mic_white_24px.xml diff --git a/presentation/src/main/res/drawable/ic_mimetype_application.xml b/app/src/main/res/drawable/ic_mimetype_application.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_mimetype_application.xml rename to app/src/main/res/drawable/ic_mimetype_application.xml diff --git a/presentation/src/main/res/drawable/ic_mimetype_application_pdf.xml b/app/src/main/res/drawable/ic_mimetype_application_pdf.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_mimetype_application_pdf.xml rename to app/src/main/res/drawable/ic_mimetype_application_pdf.xml diff --git a/presentation/src/main/res/drawable/ic_mimetype_audio.xml b/app/src/main/res/drawable/ic_mimetype_audio.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_mimetype_audio.xml rename to app/src/main/res/drawable/ic_mimetype_audio.xml diff --git a/presentation/src/main/res/drawable/ic_mimetype_file.xml b/app/src/main/res/drawable/ic_mimetype_file.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_mimetype_file.xml rename to app/src/main/res/drawable/ic_mimetype_file.xml diff --git a/presentation/src/main/res/drawable/ic_mimetype_folder.xml b/app/src/main/res/drawable/ic_mimetype_folder.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_mimetype_folder.xml rename to app/src/main/res/drawable/ic_mimetype_folder.xml diff --git a/presentation/src/main/res/drawable/ic_mimetype_folder_drag_accept.xml b/app/src/main/res/drawable/ic_mimetype_folder_drag_accept.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_mimetype_folder_drag_accept.xml rename to app/src/main/res/drawable/ic_mimetype_folder_drag_accept.xml diff --git a/presentation/src/main/res/drawable/ic_mimetype_folder_encrypted.xml b/app/src/main/res/drawable/ic_mimetype_folder_encrypted.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_mimetype_folder_encrypted.xml rename to app/src/main/res/drawable/ic_mimetype_folder_encrypted.xml diff --git a/presentation/src/main/res/drawable/ic_mimetype_folder_external.xml b/app/src/main/res/drawable/ic_mimetype_folder_external.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_mimetype_folder_external.xml rename to app/src/main/res/drawable/ic_mimetype_folder_external.xml diff --git a/presentation/src/main/res/drawable/ic_mimetype_folder_public.xml b/app/src/main/res/drawable/ic_mimetype_folder_public.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_mimetype_folder_public.xml rename to app/src/main/res/drawable/ic_mimetype_folder_public.xml diff --git a/presentation/src/main/res/drawable/ic_mimetype_folder_shared.xml b/app/src/main/res/drawable/ic_mimetype_folder_shared.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_mimetype_folder_shared.xml rename to app/src/main/res/drawable/ic_mimetype_folder_shared.xml diff --git a/presentation/src/main/res/drawable/ic_mimetype_folder_starred.xml b/app/src/main/res/drawable/ic_mimetype_folder_starred.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_mimetype_folder_starred.xml rename to app/src/main/res/drawable/ic_mimetype_folder_starred.xml diff --git a/presentation/src/main/res/drawable/ic_mimetype_image.xml b/app/src/main/res/drawable/ic_mimetype_image.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_mimetype_image.xml rename to app/src/main/res/drawable/ic_mimetype_image.xml diff --git a/presentation/src/main/res/drawable/ic_mimetype_link.xml b/app/src/main/res/drawable/ic_mimetype_link.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_mimetype_link.xml rename to app/src/main/res/drawable/ic_mimetype_link.xml diff --git a/presentation/src/main/res/drawable/ic_mimetype_location.xml b/app/src/main/res/drawable/ic_mimetype_location.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_mimetype_location.xml rename to app/src/main/res/drawable/ic_mimetype_location.xml diff --git a/presentation/src/main/res/drawable/ic_mimetype_package_x_generic.xml b/app/src/main/res/drawable/ic_mimetype_package_x_generic.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_mimetype_package_x_generic.xml rename to app/src/main/res/drawable/ic_mimetype_package_x_generic.xml diff --git a/presentation/src/main/res/drawable/ic_mimetype_text.xml b/app/src/main/res/drawable/ic_mimetype_text.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_mimetype_text.xml rename to app/src/main/res/drawable/ic_mimetype_text.xml diff --git a/presentation/src/main/res/drawable/ic_mimetype_text_calendar.xml b/app/src/main/res/drawable/ic_mimetype_text_calendar.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_mimetype_text_calendar.xml rename to app/src/main/res/drawable/ic_mimetype_text_calendar.xml diff --git a/presentation/src/main/res/drawable/ic_mimetype_text_code.xml b/app/src/main/res/drawable/ic_mimetype_text_code.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_mimetype_text_code.xml rename to app/src/main/res/drawable/ic_mimetype_text_code.xml diff --git a/presentation/src/main/res/drawable/ic_mimetype_text_vcard.xml b/app/src/main/res/drawable/ic_mimetype_text_vcard.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_mimetype_text_vcard.xml rename to app/src/main/res/drawable/ic_mimetype_text_vcard.xml diff --git a/presentation/src/main/res/drawable/ic_mimetype_video.xml b/app/src/main/res/drawable/ic_mimetype_video.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_mimetype_video.xml rename to app/src/main/res/drawable/ic_mimetype_video.xml diff --git a/presentation/src/main/res/drawable/ic_mimetype_x_office_document.xml b/app/src/main/res/drawable/ic_mimetype_x_office_document.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_mimetype_x_office_document.xml rename to app/src/main/res/drawable/ic_mimetype_x_office_document.xml diff --git a/presentation/src/main/res/drawable/ic_mimetype_x_office_presentation.xml b/app/src/main/res/drawable/ic_mimetype_x_office_presentation.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_mimetype_x_office_presentation.xml rename to app/src/main/res/drawable/ic_mimetype_x_office_presentation.xml diff --git a/presentation/src/main/res/drawable/ic_mimetype_x_office_spreadsheet.xml b/app/src/main/res/drawable/ic_mimetype_x_office_spreadsheet.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_mimetype_x_office_spreadsheet.xml rename to app/src/main/res/drawable/ic_mimetype_x_office_spreadsheet.xml diff --git a/presentation/src/main/res/drawable/ic_more_horiz_black_24dp.xml b/app/src/main/res/drawable/ic_more_horiz_black_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_more_horiz_black_24dp.xml rename to app/src/main/res/drawable/ic_more_horiz_black_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_password_masked.xml b/app/src/main/res/drawable/ic_password_masked.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_password_masked.xml rename to app/src/main/res/drawable/ic_password_masked.xml diff --git a/presentation/src/main/res/drawable/ic_password_visible.xml b/app/src/main/res/drawable/ic_password_visible.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_password_visible.xml rename to app/src/main/res/drawable/ic_password_visible.xml diff --git a/presentation/src/main/res/drawable/ic_pencil_grey600_24dp.xml b/app/src/main/res/drawable/ic_pencil_grey600_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_pencil_grey600_24dp.xml rename to app/src/main/res/drawable/ic_pencil_grey600_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_people_group_black_24px.xml b/app/src/main/res/drawable/ic_people_group_black_24px.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_people_group_black_24px.xml rename to app/src/main/res/drawable/ic_people_group_black_24px.xml diff --git a/presentation/src/main/res/drawable/ic_people_group_white_24px.xml b/app/src/main/res/drawable/ic_people_group_white_24px.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_people_group_white_24px.xml rename to app/src/main/res/drawable/ic_people_group_white_24px.xml diff --git a/presentation/src/main/res/drawable/ic_play_circle_outline_white_24dp.xml b/app/src/main/res/drawable/ic_play_circle_outline_white_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_play_circle_outline_white_24dp.xml rename to app/src/main/res/drawable/ic_play_circle_outline_white_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_public_black_24px.xml b/app/src/main/res/drawable/ic_public_black_24px.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_public_black_24px.xml rename to app/src/main/res/drawable/ic_public_black_24px.xml diff --git a/presentation/src/main/res/drawable/ic_refresh_black_24dp.xml b/app/src/main/res/drawable/ic_refresh_black_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_refresh_black_24dp.xml rename to app/src/main/res/drawable/ic_refresh_black_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_room_service_black_24dp.xml b/app/src/main/res/drawable/ic_room_service_black_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_room_service_black_24dp.xml rename to app/src/main/res/drawable/ic_room_service_black_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_search_white_24dp.xml b/app/src/main/res/drawable/ic_search_white_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_search_white_24dp.xml rename to app/src/main/res/drawable/ic_search_white_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_security_white_24dp.xml b/app/src/main/res/drawable/ic_security_white_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_security_white_24dp.xml rename to app/src/main/res/drawable/ic_security_white_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_settings_white_24dp.xml b/app/src/main/res/drawable/ic_settings_white_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_settings_white_24dp.xml rename to app/src/main/res/drawable/ic_settings_white_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_signal_wifi_off_white_24dp.xml b/app/src/main/res/drawable/ic_signal_wifi_off_white_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_signal_wifi_off_white_24dp.xml rename to app/src/main/res/drawable/ic_signal_wifi_off_white_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_star_black_24dp.xml b/app/src/main/res/drawable/ic_star_black_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_star_black_24dp.xml rename to app/src/main/res/drawable/ic_star_black_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_star_border_black_24dp.xml b/app/src/main/res/drawable/ic_star_border_black_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_star_border_black_24dp.xml rename to app/src/main/res/drawable/ic_star_border_black_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_stop_white_24dp.xml b/app/src/main/res/drawable/ic_stop_white_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_stop_white_24dp.xml rename to app/src/main/res/drawable/ic_stop_white_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_switch_video_white_24px.xml b/app/src/main/res/drawable/ic_switch_video_white_24px.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_switch_video_white_24px.xml rename to app/src/main/res/drawable/ic_switch_video_white_24px.xml diff --git a/presentation/src/main/res/drawable/ic_timer_black_24dp.xml b/app/src/main/res/drawable/ic_timer_black_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_timer_black_24dp.xml rename to app/src/main/res/drawable/ic_timer_black_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_videocam_grey_600_24dp.xml b/app/src/main/res/drawable/ic_videocam_grey_600_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_videocam_grey_600_24dp.xml rename to app/src/main/res/drawable/ic_videocam_grey_600_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_videocam_off_white_24px.xml b/app/src/main/res/drawable/ic_videocam_off_white_24px.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_videocam_off_white_24px.xml rename to app/src/main/res/drawable/ic_videocam_off_white_24px.xml diff --git a/presentation/src/main/res/drawable/ic_videocam_white_24px.xml b/app/src/main/res/drawable/ic_videocam_white_24px.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_videocam_white_24px.xml rename to app/src/main/res/drawable/ic_videocam_white_24px.xml diff --git a/presentation/src/main/res/drawable/ic_volume_mute_white_24dp.xml b/app/src/main/res/drawable/ic_volume_mute_white_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_volume_mute_white_24dp.xml rename to app/src/main/res/drawable/ic_volume_mute_white_24dp.xml diff --git a/presentation/src/main/res/drawable/ic_volume_up_white_24dp.xml b/app/src/main/res/drawable/ic_volume_up_white_24dp.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_volume_up_white_24dp.xml rename to app/src/main/res/drawable/ic_volume_up_white_24dp.xml diff --git a/presentation/src/main/res/drawable/incoming_gradient.xml b/app/src/main/res/drawable/incoming_gradient.xml similarity index 100% rename from presentation/src/main/res/drawable/incoming_gradient.xml rename to app/src/main/res/drawable/incoming_gradient.xml diff --git a/presentation/src/main/res/drawable/mention_chip.xml b/app/src/main/res/drawable/mention_chip.xml similarity index 100% rename from presentation/src/main/res/drawable/mention_chip.xml rename to app/src/main/res/drawable/mention_chip.xml diff --git a/presentation/src/main/res/drawable/shape_call_bubble.xml b/app/src/main/res/drawable/shape_call_bubble.xml similarity index 100% rename from presentation/src/main/res/drawable/shape_call_bubble.xml rename to app/src/main/res/drawable/shape_call_bubble.xml diff --git a/presentation/src/main/res/drawable/shape_favorite_bubble.xml b/app/src/main/res/drawable/shape_favorite_bubble.xml similarity index 100% rename from presentation/src/main/res/drawable/shape_favorite_bubble.xml rename to app/src/main/res/drawable/shape_favorite_bubble.xml diff --git a/presentation/src/main/res/drawable/shape_grouped_incoming_message.xml b/app/src/main/res/drawable/shape_grouped_incoming_message.xml similarity index 100% rename from presentation/src/main/res/drawable/shape_grouped_incoming_message.xml rename to app/src/main/res/drawable/shape_grouped_incoming_message.xml diff --git a/presentation/src/main/res/drawable/shape_grouped_outcoming_message.xml b/app/src/main/res/drawable/shape_grouped_outcoming_message.xml similarity index 100% rename from presentation/src/main/res/drawable/shape_grouped_outcoming_message.xml rename to app/src/main/res/drawable/shape_grouped_outcoming_message.xml diff --git a/presentation/src/main/res/drawable/shape_incoming_message.xml b/app/src/main/res/drawable/shape_incoming_message.xml similarity index 100% rename from presentation/src/main/res/drawable/shape_incoming_message.xml rename to app/src/main/res/drawable/shape_incoming_message.xml diff --git a/presentation/src/main/res/drawable/shape_lock_bubble.xml b/app/src/main/res/drawable/shape_lock_bubble.xml similarity index 100% rename from presentation/src/main/res/drawable/shape_lock_bubble.xml rename to app/src/main/res/drawable/shape_lock_bubble.xml diff --git a/presentation/src/main/res/drawable/shape_outcoming_message.xml b/app/src/main/res/drawable/shape_outcoming_message.xml similarity index 100% rename from presentation/src/main/res/drawable/shape_outcoming_message.xml rename to app/src/main/res/drawable/shape_outcoming_message.xml diff --git a/presentation/src/main/res/drawable/shape_video_bubble.xml b/app/src/main/res/drawable/shape_video_bubble.xml similarity index 100% rename from presentation/src/main/res/drawable/shape_video_bubble.xml rename to app/src/main/res/drawable/shape_video_bubble.xml diff --git a/presentation/src/main/res/drawable/shape_voice_bubble.xml b/app/src/main/res/drawable/shape_voice_bubble.xml similarity index 100% rename from presentation/src/main/res/drawable/shape_voice_bubble.xml rename to app/src/main/res/drawable/shape_voice_bubble.xml diff --git a/presentation/src/main/res/layout/activity_magic_call.xml b/app/src/main/res/layout/activity_magic_call.xml similarity index 100% rename from presentation/src/main/res/layout/activity_magic_call.xml rename to app/src/main/res/layout/activity_magic_call.xml diff --git a/presentation/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml similarity index 100% rename from presentation/src/main/res/layout/activity_main.xml rename to app/src/main/res/layout/activity_main.xml diff --git a/presentation/src/main/res/layout/bottom_sheet.xml b/app/src/main/res/layout/bottom_sheet.xml similarity index 100% rename from presentation/src/main/res/layout/bottom_sheet.xml rename to app/src/main/res/layout/bottom_sheet.xml diff --git a/presentation/src/main/res/layout/call_item.xml b/app/src/main/res/layout/call_item.xml similarity index 100% rename from presentation/src/main/res/layout/call_item.xml rename to app/src/main/res/layout/call_item.xml diff --git a/presentation/src/main/res/layout/call_states.xml b/app/src/main/res/layout/call_states.xml similarity index 100% rename from presentation/src/main/res/layout/call_states.xml rename to app/src/main/res/layout/call_states.xml diff --git a/presentation/src/main/res/layout/category_with_right_action.xml b/app/src/main/res/layout/category_with_right_action.xml similarity index 100% rename from presentation/src/main/res/layout/category_with_right_action.xml rename to app/src/main/res/layout/category_with_right_action.xml diff --git a/presentation/src/main/res/layout/controller_account_verification.xml b/app/src/main/res/layout/controller_account_verification.xml similarity index 100% rename from presentation/src/main/res/layout/controller_account_verification.xml rename to app/src/main/res/layout/controller_account_verification.xml diff --git a/presentation/src/main/res/layout/controller_browser.xml b/app/src/main/res/layout/controller_browser.xml similarity index 100% rename from presentation/src/main/res/layout/controller_browser.xml rename to app/src/main/res/layout/controller_browser.xml diff --git a/presentation/src/main/res/layout/controller_call.xml b/app/src/main/res/layout/controller_call.xml similarity index 100% rename from presentation/src/main/res/layout/controller_call.xml rename to app/src/main/res/layout/controller_call.xml diff --git a/presentation/src/main/res/layout/controller_call_menu.xml b/app/src/main/res/layout/controller_call_menu.xml similarity index 100% rename from presentation/src/main/res/layout/controller_call_menu.xml rename to app/src/main/res/layout/controller_call_menu.xml diff --git a/presentation/src/main/res/layout/controller_call_notification.xml b/app/src/main/res/layout/controller_call_notification.xml similarity index 100% rename from presentation/src/main/res/layout/controller_call_notification.xml rename to app/src/main/res/layout/controller_call_notification.xml diff --git a/presentation/src/main/res/layout/controller_chat.xml b/app/src/main/res/layout/controller_chat.xml similarity index 100% rename from presentation/src/main/res/layout/controller_chat.xml rename to app/src/main/res/layout/controller_chat.xml diff --git a/presentation/src/main/res/layout/controller_contacts_rv.xml b/app/src/main/res/layout/controller_contacts_rv.xml similarity index 100% rename from presentation/src/main/res/layout/controller_contacts_rv.xml rename to app/src/main/res/layout/controller_contacts_rv.xml diff --git a/presentation/src/main/res/layout/controller_conversation_info.xml b/app/src/main/res/layout/controller_conversation_info.xml similarity index 100% rename from presentation/src/main/res/layout/controller_conversation_info.xml rename to app/src/main/res/layout/controller_conversation_info.xml diff --git a/presentation/src/main/res/layout/controller_conversations_rv.xml b/app/src/main/res/layout/controller_conversations_rv.xml similarity index 100% rename from presentation/src/main/res/layout/controller_conversations_rv.xml rename to app/src/main/res/layout/controller_conversations_rv.xml diff --git a/presentation/src/main/res/layout/controller_entry_menu.xml b/app/src/main/res/layout/controller_entry_menu.xml similarity index 100% rename from presentation/src/main/res/layout/controller_entry_menu.xml rename to app/src/main/res/layout/controller_entry_menu.xml diff --git a/presentation/src/main/res/layout/controller_generic_rv.xml b/app/src/main/res/layout/controller_generic_rv.xml similarity index 100% rename from presentation/src/main/res/layout/controller_generic_rv.xml rename to app/src/main/res/layout/controller_generic_rv.xml diff --git a/presentation/src/main/res/layout/controller_locked.xml b/app/src/main/res/layout/controller_locked.xml similarity index 100% rename from presentation/src/main/res/layout/controller_locked.xml rename to app/src/main/res/layout/controller_locked.xml diff --git a/presentation/src/main/res/layout/controller_operations_menu.xml b/app/src/main/res/layout/controller_operations_menu.xml similarity index 100% rename from presentation/src/main/res/layout/controller_operations_menu.xml rename to app/src/main/res/layout/controller_operations_menu.xml diff --git a/presentation/src/main/res/layout/controller_server_selection.xml b/app/src/main/res/layout/controller_server_selection.xml similarity index 100% rename from presentation/src/main/res/layout/controller_server_selection.xml rename to app/src/main/res/layout/controller_server_selection.xml diff --git a/presentation/src/main/res/layout/controller_settings.xml b/app/src/main/res/layout/controller_settings.xml similarity index 100% rename from presentation/src/main/res/layout/controller_settings.xml rename to app/src/main/res/layout/controller_settings.xml diff --git a/presentation/src/main/res/layout/controller_web_view_login.xml b/app/src/main/res/layout/controller_web_view_login.xml similarity index 100% rename from presentation/src/main/res/layout/controller_web_view_login.xml rename to app/src/main/res/layout/controller_web_view_login.xml diff --git a/presentation/src/main/res/layout/conversation_privacy_toggle.xml b/app/src/main/res/layout/conversation_privacy_toggle.xml similarity index 100% rename from presentation/src/main/res/layout/conversation_privacy_toggle.xml rename to app/src/main/res/layout/conversation_privacy_toggle.xml diff --git a/presentation/src/main/res/layout/dialog_standard.xml b/app/src/main/res/layout/dialog_standard.xml similarity index 100% rename from presentation/src/main/res/layout/dialog_standard.xml rename to app/src/main/res/layout/dialog_standard.xml diff --git a/presentation/src/main/res/layout/dialog_standard_vertical.xml b/app/src/main/res/layout/dialog_standard_vertical.xml similarity index 100% rename from presentation/src/main/res/layout/dialog_standard_vertical.xml rename to app/src/main/res/layout/dialog_standard_vertical.xml diff --git a/presentation/src/main/res/layout/emoji_view.xml b/app/src/main/res/layout/emoji_view.xml similarity index 100% rename from presentation/src/main/res/layout/emoji_view.xml rename to app/src/main/res/layout/emoji_view.xml diff --git a/presentation/src/main/res/layout/fast_scroller.xml b/app/src/main/res/layout/fast_scroller.xml similarity index 100% rename from presentation/src/main/res/layout/fast_scroller.xml rename to app/src/main/res/layout/fast_scroller.xml diff --git a/presentation/src/main/res/layout/item_custom_incoming_preview_message.xml b/app/src/main/res/layout/item_custom_incoming_preview_message.xml similarity index 100% rename from presentation/src/main/res/layout/item_custom_incoming_preview_message.xml rename to app/src/main/res/layout/item_custom_incoming_preview_message.xml diff --git a/presentation/src/main/res/layout/item_custom_incoming_text_message.xml b/app/src/main/res/layout/item_custom_incoming_text_message.xml similarity index 100% rename from presentation/src/main/res/layout/item_custom_incoming_text_message.xml rename to app/src/main/res/layout/item_custom_incoming_text_message.xml diff --git a/presentation/src/main/res/layout/item_custom_outcoming_preview_message.xml b/app/src/main/res/layout/item_custom_outcoming_preview_message.xml similarity index 100% rename from presentation/src/main/res/layout/item_custom_outcoming_preview_message.xml rename to app/src/main/res/layout/item_custom_outcoming_preview_message.xml diff --git a/presentation/src/main/res/layout/item_custom_outcoming_text_message.xml b/app/src/main/res/layout/item_custom_outcoming_text_message.xml similarity index 100% rename from presentation/src/main/res/layout/item_custom_outcoming_text_message.xml rename to app/src/main/res/layout/item_custom_outcoming_text_message.xml diff --git a/presentation/src/main/res/layout/item_system_message.xml b/app/src/main/res/layout/item_system_message.xml similarity index 100% rename from presentation/src/main/res/layout/item_system_message.xml rename to app/src/main/res/layout/item_system_message.xml diff --git a/presentation/src/main/res/layout/join_conversation_via_link.xml b/app/src/main/res/layout/join_conversation_via_link.xml similarity index 100% rename from presentation/src/main/res/layout/join_conversation_via_link.xml rename to app/src/main/res/layout/join_conversation_via_link.xml diff --git a/presentation/src/main/res/layout/library_fast_scroller_layout.xml b/app/src/main/res/layout/library_fast_scroller_layout.xml similarity index 100% rename from presentation/src/main/res/layout/library_fast_scroller_layout.xml rename to app/src/main/res/layout/library_fast_scroller_layout.xml diff --git a/presentation/src/main/res/layout/lobby_view.xml b/app/src/main/res/layout/lobby_view.xml similarity index 100% rename from presentation/src/main/res/layout/lobby_view.xml rename to app/src/main/res/layout/lobby_view.xml diff --git a/presentation/src/main/res/layout/menu_item_sheet.xml b/app/src/main/res/layout/menu_item_sheet.xml similarity index 100% rename from presentation/src/main/res/layout/menu_item_sheet.xml rename to app/src/main/res/layout/menu_item_sheet.xml diff --git a/presentation/src/main/res/layout/notification_settings_item.xml b/app/src/main/res/layout/notification_settings_item.xml similarity index 100% rename from presentation/src/main/res/layout/notification_settings_item.xml rename to app/src/main/res/layout/notification_settings_item.xml diff --git a/presentation/src/main/res/layout/progress_layout.xml b/app/src/main/res/layout/progress_layout.xml similarity index 100% rename from presentation/src/main/res/layout/progress_layout.xml rename to app/src/main/res/layout/progress_layout.xml diff --git a/presentation/src/main/res/layout/rv_item_app.xml b/app/src/main/res/layout/rv_item_app.xml similarity index 100% rename from presentation/src/main/res/layout/rv_item_app.xml rename to app/src/main/res/layout/rv_item_app.xml diff --git a/presentation/src/main/res/layout/rv_item_browser_file.xml b/app/src/main/res/layout/rv_item_browser_file.xml similarity index 100% rename from presentation/src/main/res/layout/rv_item_browser_file.xml rename to app/src/main/res/layout/rv_item_browser_file.xml diff --git a/presentation/src/main/res/layout/rv_item_contact.xml b/app/src/main/res/layout/rv_item_contact.xml similarity index 100% rename from presentation/src/main/res/layout/rv_item_contact.xml rename to app/src/main/res/layout/rv_item_contact.xml diff --git a/presentation/src/main/res/layout/rv_item_conversation.xml b/app/src/main/res/layout/rv_item_conversation.xml similarity index 100% rename from presentation/src/main/res/layout/rv_item_conversation.xml rename to app/src/main/res/layout/rv_item_conversation.xml diff --git a/presentation/src/main/res/layout/rv_item_conversation_info_participant.xml b/app/src/main/res/layout/rv_item_conversation_info_participant.xml similarity index 96% rename from presentation/src/main/res/layout/rv_item_conversation_info_participant.xml rename to app/src/main/res/layout/rv_item_conversation_info_participant.xml index 1269f8693..6b62c9240 100644 --- a/presentation/src/main/res/layout/rv_item_conversation_info_participant.xml +++ b/app/src/main/res/layout/rv_item_conversation_info_participant.xml @@ -1,4 +1,4 @@ -