diff --git a/.tx/config b/app/.tx/config similarity index 70% rename from .tx/config rename to app/.tx/config index 0be896e2d..88e7ddab9 100644 --- a/.tx/config +++ b/app/.tx/config @@ -3,8 +3,8 @@ host = https://www.transifex.com lang_map = da_DK:da-rDK,he:iw,id:in,kn_IN:kn-rIN,pt_BR:pt-rBR,pt_PT:pt,qu_EC:qu-rEC,sv_SE:sv-rSE,zh_CN:zh-rCN,zh_HK:zh-rHK,zh_TW:zh-rTW [signal-android.master] -file_filter = res/values-/strings.xml -source_file = res/values/strings.xml +file_filter = src/main/res/values-/strings.xml +source_file = src/main/res/values/strings.xml source_lang = en type = ANDROID diff --git a/app/build.gradle b/app/build.gradle index 7d7d16773..f1223b234 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -345,32 +345,6 @@ android { } } - sourceSets { - main { - manifest.srcFile '../AndroidManifest.xml' - java.srcDirs = ['../src'] - resources.srcDirs = ['../src'] - aidl.srcDirs = ['../src'] - renderscript.srcDirs = ['../src'] - res.srcDirs = ['../res'] - assets.srcDirs = ['../assets'] - jniLibs.srcDirs = ['../libs'] - proto.srcDir '../protobuf' - } - androidTest { - java.srcDirs = ['../test/androidTest/java'] - } - test { - java.srcDirs = ['../test/unitTest/java'] - resources.srcDirs = ['../test/unitTest/resources'] - } - staging { - res.srcDirs = ['../staging/res'] - } - - website.manifest.srcFile '../website/AndroidManifest.xml' - } - lintOptions { abortOnError true baseline file("lint-baseline.xml") diff --git a/jni/Android.mk b/app/jni/Android.mk similarity index 100% rename from jni/Android.mk rename to app/jni/Android.mk diff --git a/jni/Application.mk b/app/jni/Application.mk similarity index 100% rename from jni/Application.mk rename to app/jni/Application.mk diff --git a/jni/utils/org_thoughtcrime_securesms_util_FileUtils.cpp b/app/jni/utils/org_thoughtcrime_securesms_util_FileUtils.cpp similarity index 100% rename from jni/utils/org_thoughtcrime_securesms_util_FileUtils.cpp rename to app/jni/utils/org_thoughtcrime_securesms_util_FileUtils.cpp diff --git a/jni/utils/org_thoughtcrime_securesms_util_FileUtils.h b/app/jni/utils/org_thoughtcrime_securesms_util_FileUtils.h similarity index 100% rename from jni/utils/org_thoughtcrime_securesms_util_FileUtils.h rename to app/jni/utils/org_thoughtcrime_securesms_util_FileUtils.h diff --git a/libs/arm64-v8a/libnative-utils.so b/app/libs/arm64-v8a/libnative-utils.so similarity index 100% rename from libs/arm64-v8a/libnative-utils.so rename to app/libs/arm64-v8a/libnative-utils.so diff --git a/libs/armeabi-v7a/libnative-utils.so b/app/libs/armeabi-v7a/libnative-utils.so similarity index 100% rename from libs/armeabi-v7a/libnative-utils.so rename to app/libs/armeabi-v7a/libnative-utils.so diff --git a/libs/x86/libnative-utils.so b/app/libs/x86/libnative-utils.so similarity index 100% rename from libs/x86/libnative-utils.so rename to app/libs/x86/libnative-utils.so diff --git a/libs/x86_64/libnative-utils.so b/app/libs/x86_64/libnative-utils.so similarity index 100% rename from libs/x86_64/libnative-utils.so rename to app/libs/x86_64/libnative-utils.so diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml index 98ead8c53..500948f13 100644 --- a/app/lint-baseline.xml +++ b/app/lint-baseline.xml @@ -7,7 +7,7 @@ errorLine1=" List<SubscriptionInfo> list = subscriptionManager.getActiveSubscriptionInfoList();" errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -18,7 +18,7 @@ errorLine1=" drawables.getColor(1, 0xff000000);" errorLine2=" ~"> diff --git a/test/androidTest/java/org/thoughtcrime/securesms/TextSecureTestCase.java b/app/src/androidTest/java/org/thoughtcrime/securesms/TextSecureTestCase.java similarity index 100% rename from test/androidTest/java/org/thoughtcrime/securesms/TextSecureTestCase.java rename to app/src/androidTest/java/org/thoughtcrime/securesms/TextSecureTestCase.java diff --git a/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 100% rename from AndroidManifest.xml rename to app/src/main/AndroidManifest.xml diff --git a/assets/databases/apns.db b/app/src/main/assets/databases/apns.db similarity index 100% rename from assets/databases/apns.db rename to app/src/main/assets/databases/apns.db diff --git a/assets/emoji/Activity.webp b/app/src/main/assets/emoji/Activity.webp similarity index 100% rename from assets/emoji/Activity.webp rename to app/src/main/assets/emoji/Activity.webp diff --git a/assets/emoji/Flags.webp b/app/src/main/assets/emoji/Flags.webp similarity index 100% rename from assets/emoji/Flags.webp rename to app/src/main/assets/emoji/Flags.webp diff --git a/assets/emoji/Foods.webp b/app/src/main/assets/emoji/Foods.webp similarity index 100% rename from assets/emoji/Foods.webp rename to app/src/main/assets/emoji/Foods.webp diff --git a/assets/emoji/Nature.webp b/app/src/main/assets/emoji/Nature.webp similarity index 100% rename from assets/emoji/Nature.webp rename to app/src/main/assets/emoji/Nature.webp diff --git a/assets/emoji/Objects.webp b/app/src/main/assets/emoji/Objects.webp similarity index 100% rename from assets/emoji/Objects.webp rename to app/src/main/assets/emoji/Objects.webp diff --git a/assets/emoji/People_0.webp b/app/src/main/assets/emoji/People_0.webp similarity index 100% rename from assets/emoji/People_0.webp rename to app/src/main/assets/emoji/People_0.webp diff --git a/assets/emoji/People_1.webp b/app/src/main/assets/emoji/People_1.webp similarity index 100% rename from assets/emoji/People_1.webp rename to app/src/main/assets/emoji/People_1.webp diff --git a/assets/emoji/People_2.webp b/app/src/main/assets/emoji/People_2.webp similarity index 100% rename from assets/emoji/People_2.webp rename to app/src/main/assets/emoji/People_2.webp diff --git a/assets/emoji/People_3.webp b/app/src/main/assets/emoji/People_3.webp similarity index 100% rename from assets/emoji/People_3.webp rename to app/src/main/assets/emoji/People_3.webp diff --git a/assets/emoji/Places.webp b/app/src/main/assets/emoji/Places.webp similarity index 100% rename from assets/emoji/Places.webp rename to app/src/main/assets/emoji/Places.webp diff --git a/assets/emoji/Symbols.webp b/app/src/main/assets/emoji/Symbols.webp similarity index 100% rename from assets/emoji/Symbols.webp rename to app/src/main/assets/emoji/Symbols.webp diff --git a/assets/fonts/Roboto-Light.ttf b/app/src/main/assets/fonts/Roboto-Light.ttf similarity index 100% rename from assets/fonts/Roboto-Light.ttf rename to app/src/main/assets/fonts/Roboto-Light.ttf diff --git a/src/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java similarity index 100% rename from src/org/thoughtcrime/securesms/ApplicationContext.java rename to app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java diff --git a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java diff --git a/src/org/thoughtcrime/securesms/BaseActionBarActivity.java b/app/src/main/java/org/thoughtcrime/securesms/BaseActionBarActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/BaseActionBarActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/BaseActionBarActivity.java diff --git a/src/org/thoughtcrime/securesms/BaseActivity.java b/app/src/main/java/org/thoughtcrime/securesms/BaseActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/BaseActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/BaseActivity.java diff --git a/src/org/thoughtcrime/securesms/BasicIntroFragment.java b/app/src/main/java/org/thoughtcrime/securesms/BasicIntroFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/BasicIntroFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/BasicIntroFragment.java diff --git a/src/org/thoughtcrime/securesms/BindableConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java similarity index 100% rename from src/org/thoughtcrime/securesms/BindableConversationItem.java rename to app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java diff --git a/src/org/thoughtcrime/securesms/BindableConversationListItem.java b/app/src/main/java/org/thoughtcrime/securesms/BindableConversationListItem.java similarity index 100% rename from src/org/thoughtcrime/securesms/BindableConversationListItem.java rename to app/src/main/java/org/thoughtcrime/securesms/BindableConversationListItem.java diff --git a/src/org/thoughtcrime/securesms/BlockedContactsActivity.java b/app/src/main/java/org/thoughtcrime/securesms/BlockedContactsActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/BlockedContactsActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/BlockedContactsActivity.java diff --git a/src/org/thoughtcrime/securesms/ClearProfileAvatarActivity.java b/app/src/main/java/org/thoughtcrime/securesms/ClearProfileAvatarActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/ClearProfileAvatarActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/ClearProfileAvatarActivity.java diff --git a/src/org/thoughtcrime/securesms/ConfirmIdentityDialog.java b/app/src/main/java/org/thoughtcrime/securesms/ConfirmIdentityDialog.java similarity index 100% rename from src/org/thoughtcrime/securesms/ConfirmIdentityDialog.java rename to app/src/main/java/org/thoughtcrime/securesms/ConfirmIdentityDialog.java diff --git a/src/org/thoughtcrime/securesms/ContactSelectionActivity.java b/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/ContactSelectionActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/ContactSelectionActivity.java diff --git a/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/ContactSelectionListFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java diff --git a/src/org/thoughtcrime/securesms/CountrySelectionFragment.java b/app/src/main/java/org/thoughtcrime/securesms/CountrySelectionFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/CountrySelectionFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/CountrySelectionFragment.java diff --git a/src/org/thoughtcrime/securesms/CreateProfileActivity.java b/app/src/main/java/org/thoughtcrime/securesms/CreateProfileActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/CreateProfileActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/CreateProfileActivity.java diff --git a/src/org/thoughtcrime/securesms/DatabaseMigrationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/DatabaseMigrationActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/DatabaseMigrationActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/DatabaseMigrationActivity.java diff --git a/src/org/thoughtcrime/securesms/DeviceActivity.java b/app/src/main/java/org/thoughtcrime/securesms/DeviceActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/DeviceActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/DeviceActivity.java diff --git a/src/org/thoughtcrime/securesms/DeviceAddFragment.java b/app/src/main/java/org/thoughtcrime/securesms/DeviceAddFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/DeviceAddFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/DeviceAddFragment.java diff --git a/src/org/thoughtcrime/securesms/DeviceLinkFragment.java b/app/src/main/java/org/thoughtcrime/securesms/DeviceLinkFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/DeviceLinkFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/DeviceLinkFragment.java diff --git a/src/org/thoughtcrime/securesms/DeviceListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/DeviceListFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/DeviceListFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/DeviceListFragment.java diff --git a/src/org/thoughtcrime/securesms/DeviceListItem.java b/app/src/main/java/org/thoughtcrime/securesms/DeviceListItem.java similarity index 100% rename from src/org/thoughtcrime/securesms/DeviceListItem.java rename to app/src/main/java/org/thoughtcrime/securesms/DeviceListItem.java diff --git a/src/org/thoughtcrime/securesms/DeviceProvisioningActivity.java b/app/src/main/java/org/thoughtcrime/securesms/DeviceProvisioningActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/DeviceProvisioningActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/DeviceProvisioningActivity.java diff --git a/src/org/thoughtcrime/securesms/DummyActivity.java b/app/src/main/java/org/thoughtcrime/securesms/DummyActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/DummyActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/DummyActivity.java diff --git a/src/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java b/app/src/main/java/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java diff --git a/src/org/thoughtcrime/securesms/ExpirationDialog.java b/app/src/main/java/org/thoughtcrime/securesms/ExpirationDialog.java similarity index 100% rename from src/org/thoughtcrime/securesms/ExpirationDialog.java rename to app/src/main/java/org/thoughtcrime/securesms/ExpirationDialog.java diff --git a/src/org/thoughtcrime/securesms/GroupCreateActivity.java b/app/src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/GroupCreateActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java diff --git a/src/org/thoughtcrime/securesms/GroupMembersDialog.java b/app/src/main/java/org/thoughtcrime/securesms/GroupMembersDialog.java similarity index 100% rename from src/org/thoughtcrime/securesms/GroupMembersDialog.java rename to app/src/main/java/org/thoughtcrime/securesms/GroupMembersDialog.java diff --git a/src/org/thoughtcrime/securesms/IncomingMessageProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/IncomingMessageProcessor.java similarity index 100% rename from src/org/thoughtcrime/securesms/IncomingMessageProcessor.java rename to app/src/main/java/org/thoughtcrime/securesms/IncomingMessageProcessor.java diff --git a/src/org/thoughtcrime/securesms/IntroPagerAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/IntroPagerAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/IntroPagerAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/IntroPagerAdapter.java diff --git a/src/org/thoughtcrime/securesms/InviteActivity.java b/app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/InviteActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java diff --git a/src/org/thoughtcrime/securesms/LinkPreviewsIntroFragment.java b/app/src/main/java/org/thoughtcrime/securesms/LinkPreviewsIntroFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/LinkPreviewsIntroFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/LinkPreviewsIntroFragment.java diff --git a/src/org/thoughtcrime/securesms/LogSubmitActivity.java b/app/src/main/java/org/thoughtcrime/securesms/LogSubmitActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/LogSubmitActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/LogSubmitActivity.java diff --git a/src/org/thoughtcrime/securesms/MainActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/MainActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/MainActivity.java diff --git a/src/org/thoughtcrime/securesms/MainFragment.java b/app/src/main/java/org/thoughtcrime/securesms/MainFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/MainFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/MainFragment.java diff --git a/src/org/thoughtcrime/securesms/MainNavigator.java b/app/src/main/java/org/thoughtcrime/securesms/MainNavigator.java similarity index 100% rename from src/org/thoughtcrime/securesms/MainNavigator.java rename to app/src/main/java/org/thoughtcrime/securesms/MainNavigator.java diff --git a/src/org/thoughtcrime/securesms/MasterSecretListener.java b/app/src/main/java/org/thoughtcrime/securesms/MasterSecretListener.java similarity index 100% rename from src/org/thoughtcrime/securesms/MasterSecretListener.java rename to app/src/main/java/org/thoughtcrime/securesms/MasterSecretListener.java diff --git a/src/org/thoughtcrime/securesms/MediaPreviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/MediaPreviewActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java diff --git a/src/org/thoughtcrime/securesms/MessageDetailsActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/MessageDetailsActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java diff --git a/src/org/thoughtcrime/securesms/MessageDetailsRecipientAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsRecipientAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/MessageDetailsRecipientAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/MessageDetailsRecipientAdapter.java diff --git a/src/org/thoughtcrime/securesms/MessageRecipientListItem.java b/app/src/main/java/org/thoughtcrime/securesms/MessageRecipientListItem.java similarity index 100% rename from src/org/thoughtcrime/securesms/MessageRecipientListItem.java rename to app/src/main/java/org/thoughtcrime/securesms/MessageRecipientListItem.java diff --git a/src/org/thoughtcrime/securesms/MuteDialog.java b/app/src/main/java/org/thoughtcrime/securesms/MuteDialog.java similarity index 100% rename from src/org/thoughtcrime/securesms/MuteDialog.java rename to app/src/main/java/org/thoughtcrime/securesms/MuteDialog.java diff --git a/src/org/thoughtcrime/securesms/NewConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/NewConversationActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java diff --git a/src/org/thoughtcrime/securesms/PassphraseActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphraseActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/PassphraseActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/PassphraseActivity.java diff --git a/src/org/thoughtcrime/securesms/PassphraseChangeActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphraseChangeActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/PassphraseChangeActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/PassphraseChangeActivity.java diff --git a/src/org/thoughtcrime/securesms/PassphraseCreateActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphraseCreateActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/PassphraseCreateActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/PassphraseCreateActivity.java diff --git a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/PassphrasePromptActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java diff --git a/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java diff --git a/src/org/thoughtcrime/securesms/PlayServicesProblemActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PlayServicesProblemActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/PlayServicesProblemActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/PlayServicesProblemActivity.java diff --git a/src/org/thoughtcrime/securesms/PlayServicesProblemFragment.java b/app/src/main/java/org/thoughtcrime/securesms/PlayServicesProblemFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/PlayServicesProblemFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/PlayServicesProblemFragment.java diff --git a/src/org/thoughtcrime/securesms/PromptMmsActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PromptMmsActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/PromptMmsActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/PromptMmsActivity.java diff --git a/src/org/thoughtcrime/securesms/PushContactSelectionActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PushContactSelectionActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/PushContactSelectionActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/PushContactSelectionActivity.java diff --git a/src/org/thoughtcrime/securesms/ReadReceiptsIntroFragment.java b/app/src/main/java/org/thoughtcrime/securesms/ReadReceiptsIntroFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/ReadReceiptsIntroFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/ReadReceiptsIntroFragment.java diff --git a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java b/app/src/main/java/org/thoughtcrime/securesms/RecipientPreferenceActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/RecipientPreferenceActivity.java diff --git a/src/org/thoughtcrime/securesms/ShareActivity.java b/app/src/main/java/org/thoughtcrime/securesms/ShareActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/ShareActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/ShareActivity.java diff --git a/src/org/thoughtcrime/securesms/ShortcutLauncherActivity.java b/app/src/main/java/org/thoughtcrime/securesms/ShortcutLauncherActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/ShortcutLauncherActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/ShortcutLauncherActivity.java diff --git a/src/org/thoughtcrime/securesms/SmsSendtoActivity.java b/app/src/main/java/org/thoughtcrime/securesms/SmsSendtoActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/SmsSendtoActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/SmsSendtoActivity.java diff --git a/src/org/thoughtcrime/securesms/TextSecureExpiredException.java b/app/src/main/java/org/thoughtcrime/securesms/TextSecureExpiredException.java similarity index 100% rename from src/org/thoughtcrime/securesms/TextSecureExpiredException.java rename to app/src/main/java/org/thoughtcrime/securesms/TextSecureExpiredException.java diff --git a/src/org/thoughtcrime/securesms/TransportOption.java b/app/src/main/java/org/thoughtcrime/securesms/TransportOption.java similarity index 100% rename from src/org/thoughtcrime/securesms/TransportOption.java rename to app/src/main/java/org/thoughtcrime/securesms/TransportOption.java diff --git a/src/org/thoughtcrime/securesms/TransportOptions.java b/app/src/main/java/org/thoughtcrime/securesms/TransportOptions.java similarity index 100% rename from src/org/thoughtcrime/securesms/TransportOptions.java rename to app/src/main/java/org/thoughtcrime/securesms/TransportOptions.java diff --git a/src/org/thoughtcrime/securesms/TransportOptionsAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/TransportOptionsAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/TransportOptionsAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/TransportOptionsAdapter.java diff --git a/src/org/thoughtcrime/securesms/TransportOptionsPopup.java b/app/src/main/java/org/thoughtcrime/securesms/TransportOptionsPopup.java similarity index 100% rename from src/org/thoughtcrime/securesms/TransportOptionsPopup.java rename to app/src/main/java/org/thoughtcrime/securesms/TransportOptionsPopup.java diff --git a/src/org/thoughtcrime/securesms/TypingIndicatorIntroFragment.java b/app/src/main/java/org/thoughtcrime/securesms/TypingIndicatorIntroFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/TypingIndicatorIntroFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/TypingIndicatorIntroFragment.java diff --git a/src/org/thoughtcrime/securesms/Unbindable.java b/app/src/main/java/org/thoughtcrime/securesms/Unbindable.java similarity index 100% rename from src/org/thoughtcrime/securesms/Unbindable.java rename to app/src/main/java/org/thoughtcrime/securesms/Unbindable.java diff --git a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java b/app/src/main/java/org/thoughtcrime/securesms/VerifyIdentityActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/VerifyIdentityActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/VerifyIdentityActivity.java diff --git a/src/org/thoughtcrime/securesms/WebRtcCallActivity.java b/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/WebRtcCallActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java diff --git a/src/org/thoughtcrime/securesms/animation/AnimationCompleteListener.java b/app/src/main/java/org/thoughtcrime/securesms/animation/AnimationCompleteListener.java similarity index 100% rename from src/org/thoughtcrime/securesms/animation/AnimationCompleteListener.java rename to app/src/main/java/org/thoughtcrime/securesms/animation/AnimationCompleteListener.java diff --git a/src/org/thoughtcrime/securesms/animation/DepthPageTransformer.java b/app/src/main/java/org/thoughtcrime/securesms/animation/DepthPageTransformer.java similarity index 100% rename from src/org/thoughtcrime/securesms/animation/DepthPageTransformer.java rename to app/src/main/java/org/thoughtcrime/securesms/animation/DepthPageTransformer.java diff --git a/src/org/thoughtcrime/securesms/attachments/Attachment.java b/app/src/main/java/org/thoughtcrime/securesms/attachments/Attachment.java similarity index 100% rename from src/org/thoughtcrime/securesms/attachments/Attachment.java rename to app/src/main/java/org/thoughtcrime/securesms/attachments/Attachment.java diff --git a/src/org/thoughtcrime/securesms/attachments/AttachmentId.java b/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentId.java similarity index 100% rename from src/org/thoughtcrime/securesms/attachments/AttachmentId.java rename to app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentId.java diff --git a/src/org/thoughtcrime/securesms/attachments/DatabaseAttachment.java b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachment.java similarity index 100% rename from src/org/thoughtcrime/securesms/attachments/DatabaseAttachment.java rename to app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachment.java diff --git a/src/org/thoughtcrime/securesms/attachments/MmsNotificationAttachment.java b/app/src/main/java/org/thoughtcrime/securesms/attachments/MmsNotificationAttachment.java similarity index 100% rename from src/org/thoughtcrime/securesms/attachments/MmsNotificationAttachment.java rename to app/src/main/java/org/thoughtcrime/securesms/attachments/MmsNotificationAttachment.java diff --git a/src/org/thoughtcrime/securesms/attachments/PointerAttachment.java b/app/src/main/java/org/thoughtcrime/securesms/attachments/PointerAttachment.java similarity index 100% rename from src/org/thoughtcrime/securesms/attachments/PointerAttachment.java rename to app/src/main/java/org/thoughtcrime/securesms/attachments/PointerAttachment.java diff --git a/src/org/thoughtcrime/securesms/attachments/TombstoneAttachment.java b/app/src/main/java/org/thoughtcrime/securesms/attachments/TombstoneAttachment.java similarity index 100% rename from src/org/thoughtcrime/securesms/attachments/TombstoneAttachment.java rename to app/src/main/java/org/thoughtcrime/securesms/attachments/TombstoneAttachment.java diff --git a/src/org/thoughtcrime/securesms/attachments/UriAttachment.java b/app/src/main/java/org/thoughtcrime/securesms/attachments/UriAttachment.java similarity index 100% rename from src/org/thoughtcrime/securesms/attachments/UriAttachment.java rename to app/src/main/java/org/thoughtcrime/securesms/attachments/UriAttachment.java diff --git a/src/org/thoughtcrime/securesms/audio/AudioCodec.java b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioCodec.java similarity index 100% rename from src/org/thoughtcrime/securesms/audio/AudioCodec.java rename to app/src/main/java/org/thoughtcrime/securesms/audio/AudioCodec.java diff --git a/src/org/thoughtcrime/securesms/audio/AudioRecorder.java b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java similarity index 100% rename from src/org/thoughtcrime/securesms/audio/AudioRecorder.java rename to app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java diff --git a/src/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java similarity index 100% rename from src/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java rename to app/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java diff --git a/src/org/thoughtcrime/securesms/avatar/AvatarSelection.java b/app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarSelection.java similarity index 100% rename from src/org/thoughtcrime/securesms/avatar/AvatarSelection.java rename to app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarSelection.java diff --git a/src/org/thoughtcrime/securesms/backup/BackupDialog.java b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupDialog.java similarity index 100% rename from src/org/thoughtcrime/securesms/backup/BackupDialog.java rename to app/src/main/java/org/thoughtcrime/securesms/backup/BackupDialog.java diff --git a/src/org/thoughtcrime/securesms/backup/BackupPassphrase.java b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupPassphrase.java similarity index 100% rename from src/org/thoughtcrime/securesms/backup/BackupPassphrase.java rename to app/src/main/java/org/thoughtcrime/securesms/backup/BackupPassphrase.java diff --git a/src/org/thoughtcrime/securesms/backup/FullBackupBase.java b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupBase.java similarity index 100% rename from src/org/thoughtcrime/securesms/backup/FullBackupBase.java rename to app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupBase.java diff --git a/src/org/thoughtcrime/securesms/backup/FullBackupExporter.java b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java similarity index 100% rename from src/org/thoughtcrime/securesms/backup/FullBackupExporter.java rename to app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java diff --git a/src/org/thoughtcrime/securesms/backup/FullBackupImporter.java b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java similarity index 100% rename from src/org/thoughtcrime/securesms/backup/FullBackupImporter.java rename to app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java diff --git a/src/org/thoughtcrime/securesms/blurhash/Base83.java b/app/src/main/java/org/thoughtcrime/securesms/blurhash/Base83.java similarity index 100% rename from src/org/thoughtcrime/securesms/blurhash/Base83.java rename to app/src/main/java/org/thoughtcrime/securesms/blurhash/Base83.java diff --git a/src/org/thoughtcrime/securesms/blurhash/BlurHash.java b/app/src/main/java/org/thoughtcrime/securesms/blurhash/BlurHash.java similarity index 100% rename from src/org/thoughtcrime/securesms/blurhash/BlurHash.java rename to app/src/main/java/org/thoughtcrime/securesms/blurhash/BlurHash.java diff --git a/src/org/thoughtcrime/securesms/blurhash/BlurHashDecoder.java b/app/src/main/java/org/thoughtcrime/securesms/blurhash/BlurHashDecoder.java similarity index 100% rename from src/org/thoughtcrime/securesms/blurhash/BlurHashDecoder.java rename to app/src/main/java/org/thoughtcrime/securesms/blurhash/BlurHashDecoder.java diff --git a/src/org/thoughtcrime/securesms/blurhash/BlurHashEncoder.java b/app/src/main/java/org/thoughtcrime/securesms/blurhash/BlurHashEncoder.java similarity index 100% rename from src/org/thoughtcrime/securesms/blurhash/BlurHashEncoder.java rename to app/src/main/java/org/thoughtcrime/securesms/blurhash/BlurHashEncoder.java diff --git a/src/org/thoughtcrime/securesms/blurhash/BlurHashModelLoader.java b/app/src/main/java/org/thoughtcrime/securesms/blurhash/BlurHashModelLoader.java similarity index 100% rename from src/org/thoughtcrime/securesms/blurhash/BlurHashModelLoader.java rename to app/src/main/java/org/thoughtcrime/securesms/blurhash/BlurHashModelLoader.java diff --git a/src/org/thoughtcrime/securesms/blurhash/BlurHashResourceDecoder.java b/app/src/main/java/org/thoughtcrime/securesms/blurhash/BlurHashResourceDecoder.java similarity index 100% rename from src/org/thoughtcrime/securesms/blurhash/BlurHashResourceDecoder.java rename to app/src/main/java/org/thoughtcrime/securesms/blurhash/BlurHashResourceDecoder.java diff --git a/src/org/thoughtcrime/securesms/blurhash/BlurHashUtil.java b/app/src/main/java/org/thoughtcrime/securesms/blurhash/BlurHashUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/blurhash/BlurHashUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/blurhash/BlurHashUtil.java diff --git a/src/org/thoughtcrime/securesms/color/MaterialColor.java b/app/src/main/java/org/thoughtcrime/securesms/color/MaterialColor.java similarity index 100% rename from src/org/thoughtcrime/securesms/color/MaterialColor.java rename to app/src/main/java/org/thoughtcrime/securesms/color/MaterialColor.java diff --git a/src/org/thoughtcrime/securesms/color/MaterialColors.java b/app/src/main/java/org/thoughtcrime/securesms/color/MaterialColors.java similarity index 100% rename from src/org/thoughtcrime/securesms/color/MaterialColors.java rename to app/src/main/java/org/thoughtcrime/securesms/color/MaterialColors.java diff --git a/src/org/thoughtcrime/securesms/components/AccessibleToggleButton.java b/app/src/main/java/org/thoughtcrime/securesms/components/AccessibleToggleButton.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/AccessibleToggleButton.java rename to app/src/main/java/org/thoughtcrime/securesms/components/AccessibleToggleButton.java diff --git a/src/org/thoughtcrime/securesms/components/AlbumThumbnailView.java b/app/src/main/java/org/thoughtcrime/securesms/components/AlbumThumbnailView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/AlbumThumbnailView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/AlbumThumbnailView.java diff --git a/src/org/thoughtcrime/securesms/components/AlertView.java b/app/src/main/java/org/thoughtcrime/securesms/components/AlertView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/AlertView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/AlertView.java diff --git a/src/org/thoughtcrime/securesms/components/AnimatingToggle.java b/app/src/main/java/org/thoughtcrime/securesms/components/AnimatingToggle.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/AnimatingToggle.java rename to app/src/main/java/org/thoughtcrime/securesms/components/AnimatingToggle.java diff --git a/src/org/thoughtcrime/securesms/components/ArcProgressBar.java b/app/src/main/java/org/thoughtcrime/securesms/components/ArcProgressBar.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/ArcProgressBar.java rename to app/src/main/java/org/thoughtcrime/securesms/components/ArcProgressBar.java diff --git a/src/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java b/app/src/main/java/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java rename to app/src/main/java/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java diff --git a/src/org/thoughtcrime/securesms/components/AudioView.java b/app/src/main/java/org/thoughtcrime/securesms/components/AudioView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/AudioView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/AudioView.java diff --git a/src/org/thoughtcrime/securesms/components/AvatarImageView.java b/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/AvatarImageView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java diff --git a/src/org/thoughtcrime/securesms/components/BubbleDrawableBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/components/BubbleDrawableBuilder.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/BubbleDrawableBuilder.java rename to app/src/main/java/org/thoughtcrime/securesms/components/BubbleDrawableBuilder.java diff --git a/src/org/thoughtcrime/securesms/components/CircleColorImageView.java b/app/src/main/java/org/thoughtcrime/securesms/components/CircleColorImageView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/CircleColorImageView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/CircleColorImageView.java diff --git a/src/org/thoughtcrime/securesms/components/ComposeText.java b/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/ComposeText.java rename to app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java diff --git a/src/org/thoughtcrime/securesms/components/ContactFilterToolbar.java b/app/src/main/java/org/thoughtcrime/securesms/components/ContactFilterToolbar.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/ContactFilterToolbar.java rename to app/src/main/java/org/thoughtcrime/securesms/components/ContactFilterToolbar.java diff --git a/src/org/thoughtcrime/securesms/components/ControllableTabLayout.java b/app/src/main/java/org/thoughtcrime/securesms/components/ControllableTabLayout.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/ControllableTabLayout.java rename to app/src/main/java/org/thoughtcrime/securesms/components/ControllableTabLayout.java diff --git a/src/org/thoughtcrime/securesms/components/ControllableViewPager.java b/app/src/main/java/org/thoughtcrime/securesms/components/ControllableViewPager.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/ControllableViewPager.java rename to app/src/main/java/org/thoughtcrime/securesms/components/ControllableViewPager.java diff --git a/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/ConversationItemFooter.java rename to app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java diff --git a/src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java rename to app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java diff --git a/src/org/thoughtcrime/securesms/components/ConversationSearchBottomBar.java b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationSearchBottomBar.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/ConversationSearchBottomBar.java rename to app/src/main/java/org/thoughtcrime/securesms/components/ConversationSearchBottomBar.java diff --git a/src/org/thoughtcrime/securesms/components/ConversationTypingView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationTypingView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/ConversationTypingView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/ConversationTypingView.java diff --git a/src/org/thoughtcrime/securesms/components/CornerMask.java b/app/src/main/java/org/thoughtcrime/securesms/components/CornerMask.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/CornerMask.java rename to app/src/main/java/org/thoughtcrime/securesms/components/CornerMask.java diff --git a/src/org/thoughtcrime/securesms/components/CustomDefaultPreference.java b/app/src/main/java/org/thoughtcrime/securesms/components/CustomDefaultPreference.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/CustomDefaultPreference.java rename to app/src/main/java/org/thoughtcrime/securesms/components/CustomDefaultPreference.java diff --git a/src/org/thoughtcrime/securesms/components/DarkSearchView.java b/app/src/main/java/org/thoughtcrime/securesms/components/DarkSearchView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/DarkSearchView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/DarkSearchView.java diff --git a/src/org/thoughtcrime/securesms/components/DeliveryStatusView.java b/app/src/main/java/org/thoughtcrime/securesms/components/DeliveryStatusView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/DeliveryStatusView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/DeliveryStatusView.java diff --git a/src/org/thoughtcrime/securesms/components/DocumentView.java b/app/src/main/java/org/thoughtcrime/securesms/components/DocumentView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/DocumentView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/DocumentView.java diff --git a/src/org/thoughtcrime/securesms/components/ExpirationTimerView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ExpirationTimerView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/ExpirationTimerView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/ExpirationTimerView.java diff --git a/src/org/thoughtcrime/securesms/components/FromTextView.java b/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/FromTextView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java diff --git a/src/org/thoughtcrime/securesms/components/GlideBitmapListeningTarget.java b/app/src/main/java/org/thoughtcrime/securesms/components/GlideBitmapListeningTarget.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/GlideBitmapListeningTarget.java rename to app/src/main/java/org/thoughtcrime/securesms/components/GlideBitmapListeningTarget.java diff --git a/src/org/thoughtcrime/securesms/components/GlideDrawableListeningTarget.java b/app/src/main/java/org/thoughtcrime/securesms/components/GlideDrawableListeningTarget.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/GlideDrawableListeningTarget.java rename to app/src/main/java/org/thoughtcrime/securesms/components/GlideDrawableListeningTarget.java diff --git a/src/org/thoughtcrime/securesms/components/HidingLinearLayout.java b/app/src/main/java/org/thoughtcrime/securesms/components/HidingLinearLayout.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/HidingLinearLayout.java rename to app/src/main/java/org/thoughtcrime/securesms/components/HidingLinearLayout.java diff --git a/src/org/thoughtcrime/securesms/components/HourglassView.java b/app/src/main/java/org/thoughtcrime/securesms/components/HourglassView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/HourglassView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/HourglassView.java diff --git a/src/org/thoughtcrime/securesms/components/ImageDivet.java b/app/src/main/java/org/thoughtcrime/securesms/components/ImageDivet.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/ImageDivet.java rename to app/src/main/java/org/thoughtcrime/securesms/components/ImageDivet.java diff --git a/src/org/thoughtcrime/securesms/components/InputAwareLayout.java b/app/src/main/java/org/thoughtcrime/securesms/components/InputAwareLayout.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/InputAwareLayout.java rename to app/src/main/java/org/thoughtcrime/securesms/components/InputAwareLayout.java diff --git a/src/org/thoughtcrime/securesms/components/InputPanel.java b/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/InputPanel.java rename to app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java diff --git a/src/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java b/app/src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java rename to app/src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java diff --git a/src/org/thoughtcrime/securesms/components/LabeledEditText.java b/app/src/main/java/org/thoughtcrime/securesms/components/LabeledEditText.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/LabeledEditText.java rename to app/src/main/java/org/thoughtcrime/securesms/components/LabeledEditText.java diff --git a/src/org/thoughtcrime/securesms/components/LinkPreviewView.java b/app/src/main/java/org/thoughtcrime/securesms/components/LinkPreviewView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/LinkPreviewView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/LinkPreviewView.java diff --git a/src/org/thoughtcrime/securesms/components/MaskView.java b/app/src/main/java/org/thoughtcrime/securesms/components/MaskView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/MaskView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/MaskView.java diff --git a/src/org/thoughtcrime/securesms/components/MaxHeightFrameLayout.java b/app/src/main/java/org/thoughtcrime/securesms/components/MaxHeightFrameLayout.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/MaxHeightFrameLayout.java rename to app/src/main/java/org/thoughtcrime/securesms/components/MaxHeightFrameLayout.java diff --git a/src/org/thoughtcrime/securesms/components/MaxHeightScrollView.java b/app/src/main/java/org/thoughtcrime/securesms/components/MaxHeightScrollView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/MaxHeightScrollView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/MaxHeightScrollView.java diff --git a/src/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java b/app/src/main/java/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java diff --git a/src/org/thoughtcrime/securesms/components/OutlinedThumbnailView.java b/app/src/main/java/org/thoughtcrime/securesms/components/OutlinedThumbnailView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/OutlinedThumbnailView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/OutlinedThumbnailView.java diff --git a/src/org/thoughtcrime/securesms/components/Outliner.java b/app/src/main/java/org/thoughtcrime/securesms/components/Outliner.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/Outliner.java rename to app/src/main/java/org/thoughtcrime/securesms/components/Outliner.java diff --git a/src/org/thoughtcrime/securesms/components/PushRecipientsPanel.java b/app/src/main/java/org/thoughtcrime/securesms/components/PushRecipientsPanel.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/PushRecipientsPanel.java rename to app/src/main/java/org/thoughtcrime/securesms/components/PushRecipientsPanel.java diff --git a/src/org/thoughtcrime/securesms/components/QuoteView.java b/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/QuoteView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java diff --git a/src/org/thoughtcrime/securesms/components/RatingManager.java b/app/src/main/java/org/thoughtcrime/securesms/components/RatingManager.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/RatingManager.java rename to app/src/main/java/org/thoughtcrime/securesms/components/RatingManager.java diff --git a/src/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java b/app/src/main/java/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java rename to app/src/main/java/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java diff --git a/src/org/thoughtcrime/securesms/components/RecyclerViewFastScroller.java b/app/src/main/java/org/thoughtcrime/securesms/components/RecyclerViewFastScroller.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/RecyclerViewFastScroller.java rename to app/src/main/java/org/thoughtcrime/securesms/components/RecyclerViewFastScroller.java diff --git a/src/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java b/app/src/main/java/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java diff --git a/src/org/thoughtcrime/securesms/components/RepeatableImageKey.java b/app/src/main/java/org/thoughtcrime/securesms/components/RepeatableImageKey.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/RepeatableImageKey.java rename to app/src/main/java/org/thoughtcrime/securesms/components/RepeatableImageKey.java diff --git a/src/org/thoughtcrime/securesms/components/SearchToolbar.java b/app/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/SearchToolbar.java rename to app/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java diff --git a/src/org/thoughtcrime/securesms/components/SearchView.java b/app/src/main/java/org/thoughtcrime/securesms/components/SearchView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/SearchView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/SearchView.java diff --git a/src/org/thoughtcrime/securesms/components/SendButton.java b/app/src/main/java/org/thoughtcrime/securesms/components/SendButton.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/SendButton.java rename to app/src/main/java/org/thoughtcrime/securesms/components/SendButton.java diff --git a/src/org/thoughtcrime/securesms/components/ShapeScrim.java b/app/src/main/java/org/thoughtcrime/securesms/components/ShapeScrim.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/ShapeScrim.java rename to app/src/main/java/org/thoughtcrime/securesms/components/ShapeScrim.java diff --git a/src/org/thoughtcrime/securesms/components/SharedContactView.java b/app/src/main/java/org/thoughtcrime/securesms/components/SharedContactView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/SharedContactView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/SharedContactView.java diff --git a/src/org/thoughtcrime/securesms/components/SquareFrameLayout.java b/app/src/main/java/org/thoughtcrime/securesms/components/SquareFrameLayout.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/SquareFrameLayout.java rename to app/src/main/java/org/thoughtcrime/securesms/components/SquareFrameLayout.java diff --git a/src/org/thoughtcrime/securesms/components/SquareImageView.java b/app/src/main/java/org/thoughtcrime/securesms/components/SquareImageView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/SquareImageView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/SquareImageView.java diff --git a/src/org/thoughtcrime/securesms/components/SquareLinearLayout.java b/app/src/main/java/org/thoughtcrime/securesms/components/SquareLinearLayout.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/SquareLinearLayout.java rename to app/src/main/java/org/thoughtcrime/securesms/components/SquareLinearLayout.java diff --git a/src/org/thoughtcrime/securesms/components/StickerView.java b/app/src/main/java/org/thoughtcrime/securesms/components/StickerView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/StickerView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/StickerView.java diff --git a/src/org/thoughtcrime/securesms/components/SwitchPreferenceCompat.java b/app/src/main/java/org/thoughtcrime/securesms/components/SwitchPreferenceCompat.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/SwitchPreferenceCompat.java rename to app/src/main/java/org/thoughtcrime/securesms/components/SwitchPreferenceCompat.java diff --git a/src/org/thoughtcrime/securesms/components/ThreadPhotoRailView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ThreadPhotoRailView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/ThreadPhotoRailView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/ThreadPhotoRailView.java diff --git a/src/org/thoughtcrime/securesms/components/ThumbnailView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/ThumbnailView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java diff --git a/src/org/thoughtcrime/securesms/components/TooltipPopup.java b/app/src/main/java/org/thoughtcrime/securesms/components/TooltipPopup.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/TooltipPopup.java rename to app/src/main/java/org/thoughtcrime/securesms/components/TooltipPopup.java diff --git a/src/org/thoughtcrime/securesms/components/TransferControlView.java b/app/src/main/java/org/thoughtcrime/securesms/components/TransferControlView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/TransferControlView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/TransferControlView.java diff --git a/src/org/thoughtcrime/securesms/components/TypingIndicatorView.java b/app/src/main/java/org/thoughtcrime/securesms/components/TypingIndicatorView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/TypingIndicatorView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/TypingIndicatorView.java diff --git a/src/org/thoughtcrime/securesms/components/TypingStatusRepository.java b/app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusRepository.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/TypingStatusRepository.java rename to app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusRepository.java diff --git a/src/org/thoughtcrime/securesms/components/TypingStatusSender.java b/app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusSender.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/TypingStatusSender.java rename to app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusSender.java diff --git a/src/org/thoughtcrime/securesms/components/ZoomingImageView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/ZoomingImageView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java diff --git a/src/org/thoughtcrime/securesms/components/camera/CameraSurfaceView.java b/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraSurfaceView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/camera/CameraSurfaceView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraSurfaceView.java diff --git a/src/org/thoughtcrime/securesms/components/camera/CameraUtils.java b/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraUtils.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/camera/CameraUtils.java rename to app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraUtils.java diff --git a/src/org/thoughtcrime/securesms/components/camera/CameraView.java b/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/camera/CameraView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java diff --git a/src/org/thoughtcrime/securesms/components/emoji/AnimatingImageSpan.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/AnimatingImageSpan.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/emoji/AnimatingImageSpan.java rename to app/src/main/java/org/thoughtcrime/securesms/components/emoji/AnimatingImageSpan.java diff --git a/src/org/thoughtcrime/securesms/components/emoji/AsciiEmojiView.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/AsciiEmojiView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/emoji/AsciiEmojiView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/emoji/AsciiEmojiView.java diff --git a/src/org/thoughtcrime/securesms/components/emoji/CompositeEmojiPageModel.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/CompositeEmojiPageModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/emoji/CompositeEmojiPageModel.java rename to app/src/main/java/org/thoughtcrime/securesms/components/emoji/CompositeEmojiPageModel.java diff --git a/src/org/thoughtcrime/securesms/components/emoji/Emoji.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/Emoji.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/emoji/Emoji.java rename to app/src/main/java/org/thoughtcrime/securesms/components/emoji/Emoji.java diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java rename to app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiFilter.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiFilter.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/emoji/EmojiFilter.java rename to app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiFilter.java diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiImageView.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiImageView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/emoji/EmojiImageView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiImageView.java diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java rename to app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiPageModel.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/emoji/EmojiPageModel.java rename to app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageModel.java diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiPageViewGridAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageViewGridAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/emoji/EmojiPageViewGridAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageViewGridAdapter.java diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiPages.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPages.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/emoji/EmojiPages.java rename to app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPages.java diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java rename to app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiSpan.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiSpan.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/emoji/EmojiSpan.java rename to app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiSpan.java diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiStrings.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiStrings.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/emoji/EmojiStrings.java rename to app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiStrings.java diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java rename to app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java rename to app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java diff --git a/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java rename to app/src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java diff --git a/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboardBottomTabAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboardBottomTabAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/emoji/MediaKeyboardBottomTabAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboardBottomTabAdapter.java diff --git a/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboardProvider.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboardProvider.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/emoji/MediaKeyboardProvider.java rename to app/src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboardProvider.java diff --git a/src/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java rename to app/src/main/java/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java diff --git a/src/org/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel.java rename to app/src/main/java/org/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel.java diff --git a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiDrawInfo.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiDrawInfo.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiDrawInfo.java rename to app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiDrawInfo.java diff --git a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java rename to app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java diff --git a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java rename to app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java diff --git a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiTree.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiTree.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiTree.java rename to app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiTree.java diff --git a/src/org/thoughtcrime/securesms/components/emoji/parsing/Fitzpatrick.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/Fitzpatrick.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/emoji/parsing/Fitzpatrick.java rename to app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/Fitzpatrick.java diff --git a/src/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java b/app/src/main/java/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java rename to app/src/main/java/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java diff --git a/src/org/thoughtcrime/securesms/components/identity/UnverifiedBannerView.java b/app/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedBannerView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/identity/UnverifiedBannerView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedBannerView.java diff --git a/src/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java b/app/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java rename to app/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java diff --git a/src/org/thoughtcrime/securesms/components/location/SignalMapView.java b/app/src/main/java/org/thoughtcrime/securesms/components/location/SignalMapView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/location/SignalMapView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/location/SignalMapView.java diff --git a/src/org/thoughtcrime/securesms/components/location/SignalPlace.java b/app/src/main/java/org/thoughtcrime/securesms/components/location/SignalPlace.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/location/SignalPlace.java rename to app/src/main/java/org/thoughtcrime/securesms/components/location/SignalPlace.java diff --git a/src/org/thoughtcrime/securesms/components/recyclerview/DeleteItemAnimator.java b/app/src/main/java/org/thoughtcrime/securesms/components/recyclerview/DeleteItemAnimator.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/recyclerview/DeleteItemAnimator.java rename to app/src/main/java/org/thoughtcrime/securesms/components/recyclerview/DeleteItemAnimator.java diff --git a/src/org/thoughtcrime/securesms/components/recyclerview/SmoothScrollingLinearLayoutManager.java b/app/src/main/java/org/thoughtcrime/securesms/components/recyclerview/SmoothScrollingLinearLayoutManager.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/recyclerview/SmoothScrollingLinearLayoutManager.java rename to app/src/main/java/org/thoughtcrime/securesms/components/recyclerview/SmoothScrollingLinearLayoutManager.java diff --git a/src/org/thoughtcrime/securesms/components/registration/CallMeCountDownView.java b/app/src/main/java/org/thoughtcrime/securesms/components/registration/CallMeCountDownView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/registration/CallMeCountDownView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/registration/CallMeCountDownView.java diff --git a/src/org/thoughtcrime/securesms/components/registration/PulsingFloatingActionButton.java b/app/src/main/java/org/thoughtcrime/securesms/components/registration/PulsingFloatingActionButton.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/registration/PulsingFloatingActionButton.java rename to app/src/main/java/org/thoughtcrime/securesms/components/registration/PulsingFloatingActionButton.java diff --git a/src/org/thoughtcrime/securesms/components/registration/VerificationCodeView.java b/app/src/main/java/org/thoughtcrime/securesms/components/registration/VerificationCodeView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/registration/VerificationCodeView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/registration/VerificationCodeView.java diff --git a/src/org/thoughtcrime/securesms/components/registration/VerificationPinKeyboard.java b/app/src/main/java/org/thoughtcrime/securesms/components/registration/VerificationPinKeyboard.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/registration/VerificationPinKeyboard.java rename to app/src/main/java/org/thoughtcrime/securesms/components/registration/VerificationPinKeyboard.java diff --git a/src/org/thoughtcrime/securesms/components/reminder/DefaultSmsReminder.java b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/DefaultSmsReminder.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/reminder/DefaultSmsReminder.java rename to app/src/main/java/org/thoughtcrime/securesms/components/reminder/DefaultSmsReminder.java diff --git a/src/org/thoughtcrime/securesms/components/reminder/DozeReminder.java b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/DozeReminder.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/reminder/DozeReminder.java rename to app/src/main/java/org/thoughtcrime/securesms/components/reminder/DozeReminder.java diff --git a/src/org/thoughtcrime/securesms/components/reminder/ExpiredBuildReminder.java b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/ExpiredBuildReminder.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/reminder/ExpiredBuildReminder.java rename to app/src/main/java/org/thoughtcrime/securesms/components/reminder/ExpiredBuildReminder.java diff --git a/src/org/thoughtcrime/securesms/components/reminder/FirstInviteReminder.java b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/FirstInviteReminder.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/reminder/FirstInviteReminder.java rename to app/src/main/java/org/thoughtcrime/securesms/components/reminder/FirstInviteReminder.java diff --git a/src/org/thoughtcrime/securesms/components/reminder/OutdatedBuildReminder.java b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/OutdatedBuildReminder.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/reminder/OutdatedBuildReminder.java rename to app/src/main/java/org/thoughtcrime/securesms/components/reminder/OutdatedBuildReminder.java diff --git a/src/org/thoughtcrime/securesms/components/reminder/PushRegistrationReminder.java b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/PushRegistrationReminder.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/reminder/PushRegistrationReminder.java rename to app/src/main/java/org/thoughtcrime/securesms/components/reminder/PushRegistrationReminder.java diff --git a/src/org/thoughtcrime/securesms/components/reminder/Reminder.java b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/Reminder.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/reminder/Reminder.java rename to app/src/main/java/org/thoughtcrime/securesms/components/reminder/Reminder.java diff --git a/src/org/thoughtcrime/securesms/components/reminder/ReminderActionsAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/ReminderActionsAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/reminder/ReminderActionsAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/components/reminder/ReminderActionsAdapter.java diff --git a/src/org/thoughtcrime/securesms/components/reminder/ReminderView.java b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/ReminderView.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/reminder/ReminderView.java rename to app/src/main/java/org/thoughtcrime/securesms/components/reminder/ReminderView.java diff --git a/src/org/thoughtcrime/securesms/components/reminder/SecondInviteReminder.java b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/SecondInviteReminder.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/reminder/SecondInviteReminder.java rename to app/src/main/java/org/thoughtcrime/securesms/components/reminder/SecondInviteReminder.java diff --git a/src/org/thoughtcrime/securesms/components/reminder/ServiceOutageReminder.java b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/ServiceOutageReminder.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/reminder/ServiceOutageReminder.java rename to app/src/main/java/org/thoughtcrime/securesms/components/reminder/ServiceOutageReminder.java diff --git a/src/org/thoughtcrime/securesms/components/reminder/ShareReminder.java b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/ShareReminder.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/reminder/ShareReminder.java rename to app/src/main/java/org/thoughtcrime/securesms/components/reminder/ShareReminder.java diff --git a/src/org/thoughtcrime/securesms/components/reminder/SystemSmsImportReminder.java b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/SystemSmsImportReminder.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/reminder/SystemSmsImportReminder.java rename to app/src/main/java/org/thoughtcrime/securesms/components/reminder/SystemSmsImportReminder.java diff --git a/src/org/thoughtcrime/securesms/components/reminder/UnauthorizedReminder.java b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/UnauthorizedReminder.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/reminder/UnauthorizedReminder.java rename to app/src/main/java/org/thoughtcrime/securesms/components/reminder/UnauthorizedReminder.java diff --git a/src/org/thoughtcrime/securesms/components/subsampling/AttachmentBitmapDecoder.java b/app/src/main/java/org/thoughtcrime/securesms/components/subsampling/AttachmentBitmapDecoder.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/subsampling/AttachmentBitmapDecoder.java rename to app/src/main/java/org/thoughtcrime/securesms/components/subsampling/AttachmentBitmapDecoder.java diff --git a/src/org/thoughtcrime/securesms/components/subsampling/AttachmentRegionDecoder.java b/app/src/main/java/org/thoughtcrime/securesms/components/subsampling/AttachmentRegionDecoder.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/subsampling/AttachmentRegionDecoder.java rename to app/src/main/java/org/thoughtcrime/securesms/components/subsampling/AttachmentRegionDecoder.java diff --git a/src/org/thoughtcrime/securesms/components/viewpager/ExtendedOnPageChangedListener.java b/app/src/main/java/org/thoughtcrime/securesms/components/viewpager/ExtendedOnPageChangedListener.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/viewpager/ExtendedOnPageChangedListener.java rename to app/src/main/java/org/thoughtcrime/securesms/components/viewpager/ExtendedOnPageChangedListener.java diff --git a/src/org/thoughtcrime/securesms/components/viewpager/HackyViewPager.java b/app/src/main/java/org/thoughtcrime/securesms/components/viewpager/HackyViewPager.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/viewpager/HackyViewPager.java rename to app/src/main/java/org/thoughtcrime/securesms/components/viewpager/HackyViewPager.java diff --git a/src/org/thoughtcrime/securesms/components/webrtc/PercentFrameLayout.java b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/PercentFrameLayout.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/webrtc/PercentFrameLayout.java rename to app/src/main/java/org/thoughtcrime/securesms/components/webrtc/PercentFrameLayout.java diff --git a/src/org/thoughtcrime/securesms/components/webrtc/WebRtcAnswerDeclineButton.java b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAnswerDeclineButton.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/webrtc/WebRtcAnswerDeclineButton.java rename to app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAnswerDeclineButton.java diff --git a/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallControls.java b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallControls.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallControls.java rename to app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallControls.java diff --git a/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java similarity index 100% rename from src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java rename to app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java diff --git a/src/org/thoughtcrime/securesms/contacts/ArrayListCursor.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/ArrayListCursor.java similarity index 100% rename from src/org/thoughtcrime/securesms/contacts/ArrayListCursor.java rename to app/src/main/java/org/thoughtcrime/securesms/contacts/ArrayListCursor.java diff --git a/src/org/thoughtcrime/securesms/contacts/ContactAccessor.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactAccessor.java similarity index 100% rename from src/org/thoughtcrime/securesms/contacts/ContactAccessor.java rename to app/src/main/java/org/thoughtcrime/securesms/contacts/ContactAccessor.java diff --git a/src/org/thoughtcrime/securesms/contacts/ContactIdentityManager.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactIdentityManager.java similarity index 100% rename from src/org/thoughtcrime/securesms/contacts/ContactIdentityManager.java rename to app/src/main/java/org/thoughtcrime/securesms/contacts/ContactIdentityManager.java diff --git a/src/org/thoughtcrime/securesms/contacts/ContactIdentityManagerICS.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactIdentityManagerICS.java similarity index 100% rename from src/org/thoughtcrime/securesms/contacts/ContactIdentityManagerICS.java rename to app/src/main/java/org/thoughtcrime/securesms/contacts/ContactIdentityManagerICS.java diff --git a/src/org/thoughtcrime/securesms/contacts/ContactRepository.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactRepository.java similarity index 100% rename from src/org/thoughtcrime/securesms/contacts/ContactRepository.java rename to app/src/main/java/org/thoughtcrime/securesms/contacts/ContactRepository.java diff --git a/src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java diff --git a/src/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java similarity index 100% rename from src/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java rename to app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java diff --git a/src/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java similarity index 100% rename from src/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java rename to app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java diff --git a/src/org/thoughtcrime/securesms/contacts/ContactsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsDatabase.java similarity index 100% rename from src/org/thoughtcrime/securesms/contacts/ContactsDatabase.java rename to app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsDatabase.java diff --git a/src/org/thoughtcrime/securesms/contacts/ContactsSyncAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsSyncAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/contacts/ContactsSyncAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsSyncAdapter.java diff --git a/src/org/thoughtcrime/securesms/contacts/NameAndNumber.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/NameAndNumber.java similarity index 100% rename from src/org/thoughtcrime/securesms/contacts/NameAndNumber.java rename to app/src/main/java/org/thoughtcrime/securesms/contacts/NameAndNumber.java diff --git a/src/org/thoughtcrime/securesms/contacts/RecipientsAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/RecipientsAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/contacts/RecipientsAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/contacts/RecipientsAdapter.java diff --git a/src/org/thoughtcrime/securesms/contacts/RecipientsEditor.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/RecipientsEditor.java similarity index 100% rename from src/org/thoughtcrime/securesms/contacts/RecipientsEditor.java rename to app/src/main/java/org/thoughtcrime/securesms/contacts/RecipientsEditor.java diff --git a/src/org/thoughtcrime/securesms/contacts/SelectedContact.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/SelectedContact.java similarity index 100% rename from src/org/thoughtcrime/securesms/contacts/SelectedContact.java rename to app/src/main/java/org/thoughtcrime/securesms/contacts/SelectedContact.java diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/ContactColors.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ContactColors.java similarity index 100% rename from src/org/thoughtcrime/securesms/contacts/avatars/ContactColors.java rename to app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ContactColors.java diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/ContactColorsLegacy.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ContactColorsLegacy.java similarity index 100% rename from src/org/thoughtcrime/securesms/contacts/avatars/ContactColorsLegacy.java rename to app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ContactColorsLegacy.java diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/ContactPhoto.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ContactPhoto.java similarity index 100% rename from src/org/thoughtcrime/securesms/contacts/avatars/ContactPhoto.java rename to app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ContactPhoto.java diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/FallbackContactPhoto.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/FallbackContactPhoto.java similarity index 100% rename from src/org/thoughtcrime/securesms/contacts/avatars/FallbackContactPhoto.java rename to app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/FallbackContactPhoto.java diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java similarity index 100% rename from src/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java rename to app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/GroupRecordContactPhoto.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/GroupRecordContactPhoto.java similarity index 100% rename from src/org/thoughtcrime/securesms/contacts/avatars/GroupRecordContactPhoto.java rename to app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/GroupRecordContactPhoto.java diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java similarity index 100% rename from src/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java rename to app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java similarity index 100% rename from src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java rename to app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/SystemContactPhoto.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/SystemContactPhoto.java similarity index 100% rename from src/org/thoughtcrime/securesms/contacts/avatars/SystemContactPhoto.java rename to app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/SystemContactPhoto.java diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/TransparentContactPhoto.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/TransparentContactPhoto.java similarity index 100% rename from src/org/thoughtcrime/securesms/contacts/avatars/TransparentContactPhoto.java rename to app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/TransparentContactPhoto.java diff --git a/src/org/thoughtcrime/securesms/contacts/sync/DirectoryHelper.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/DirectoryHelper.java similarity index 100% rename from src/org/thoughtcrime/securesms/contacts/sync/DirectoryHelper.java rename to app/src/main/java/org/thoughtcrime/securesms/contacts/sync/DirectoryHelper.java diff --git a/src/org/thoughtcrime/securesms/contacts/sync/DirectoryHelperV1.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/DirectoryHelperV1.java similarity index 100% rename from src/org/thoughtcrime/securesms/contacts/sync/DirectoryHelperV1.java rename to app/src/main/java/org/thoughtcrime/securesms/contacts/sync/DirectoryHelperV1.java diff --git a/src/org/thoughtcrime/securesms/contacts/sync/StorageSyncHelper.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/StorageSyncHelper.java similarity index 100% rename from src/org/thoughtcrime/securesms/contacts/sync/StorageSyncHelper.java rename to app/src/main/java/org/thoughtcrime/securesms/contacts/sync/StorageSyncHelper.java diff --git a/src/org/thoughtcrime/securesms/contactshare/Contact.java b/app/src/main/java/org/thoughtcrime/securesms/contactshare/Contact.java similarity index 100% rename from src/org/thoughtcrime/securesms/contactshare/Contact.java rename to app/src/main/java/org/thoughtcrime/securesms/contactshare/Contact.java diff --git a/src/org/thoughtcrime/securesms/contactshare/ContactFieldAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactFieldAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/contactshare/ContactFieldAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactFieldAdapter.java diff --git a/src/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java b/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java similarity index 100% rename from src/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java rename to app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java diff --git a/src/org/thoughtcrime/securesms/contactshare/ContactNameEditActivity.java b/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactNameEditActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/contactshare/ContactNameEditActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactNameEditActivity.java diff --git a/src/org/thoughtcrime/securesms/contactshare/ContactNameEditViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactNameEditViewModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/contactshare/ContactNameEditViewModel.java rename to app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactNameEditViewModel.java diff --git a/src/org/thoughtcrime/securesms/contactshare/ContactShareEditActivity.java b/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactShareEditActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/contactshare/ContactShareEditActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactShareEditActivity.java diff --git a/src/org/thoughtcrime/securesms/contactshare/ContactShareEditAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactShareEditAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/contactshare/ContactShareEditAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactShareEditAdapter.java diff --git a/src/org/thoughtcrime/securesms/contactshare/ContactShareEditViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactShareEditViewModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/contactshare/ContactShareEditViewModel.java rename to app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactShareEditViewModel.java diff --git a/src/org/thoughtcrime/securesms/contactshare/ContactUtil.java b/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/contactshare/ContactUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactUtil.java diff --git a/src/org/thoughtcrime/securesms/contactshare/Selectable.java b/app/src/main/java/org/thoughtcrime/securesms/contactshare/Selectable.java similarity index 100% rename from src/org/thoughtcrime/securesms/contactshare/Selectable.java rename to app/src/main/java/org/thoughtcrime/securesms/contactshare/Selectable.java diff --git a/src/org/thoughtcrime/securesms/contactshare/SharedContactDetailsActivity.java b/app/src/main/java/org/thoughtcrime/securesms/contactshare/SharedContactDetailsActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/contactshare/SharedContactDetailsActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/contactshare/SharedContactDetailsActivity.java diff --git a/src/org/thoughtcrime/securesms/contactshare/SharedContactRepository.java b/app/src/main/java/org/thoughtcrime/securesms/contactshare/SharedContactRepository.java similarity index 100% rename from src/org/thoughtcrime/securesms/contactshare/SharedContactRepository.java rename to app/src/main/java/org/thoughtcrime/securesms/contactshare/SharedContactRepository.java diff --git a/src/org/thoughtcrime/securesms/contactshare/SimpleTextWatcher.java b/app/src/main/java/org/thoughtcrime/securesms/contactshare/SimpleTextWatcher.java similarity index 100% rename from src/org/thoughtcrime/securesms/contactshare/SimpleTextWatcher.java rename to app/src/main/java/org/thoughtcrime/securesms/contactshare/SimpleTextWatcher.java diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/conversation/ConversationActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/conversation/ConversationAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/conversation/ConversationFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java similarity index 100% rename from src/org/thoughtcrime/securesms/conversation/ConversationItem.java rename to app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationItemBodyBubble.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItemBodyBubble.java similarity index 100% rename from src/org/thoughtcrime/securesms/conversation/ConversationItemBodyBubble.java rename to app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItemBodyBubble.java diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationItemReactionBubbles.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItemReactionBubbles.java similarity index 100% rename from src/org/thoughtcrime/securesms/conversation/ConversationItemReactionBubbles.java rename to app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItemReactionBubbles.java diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationItemSwipeCallback.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItemSwipeCallback.java similarity index 100% rename from src/org/thoughtcrime/securesms/conversation/ConversationItemSwipeCallback.java rename to app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItemSwipeCallback.java diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationItemTouchListener.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItemTouchListener.java similarity index 100% rename from src/org/thoughtcrime/securesms/conversation/ConversationItemTouchListener.java rename to app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItemTouchListener.java diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java similarity index 100% rename from src/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java rename to app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java rename to app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationStickerSuggestionAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationStickerSuggestionAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/conversation/ConversationStickerSuggestionAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationStickerSuggestionAdapter.java diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationStickerViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationStickerViewModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/conversation/ConversationStickerViewModel.java rename to app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationStickerViewModel.java diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationSwipeAnimationHelper.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationSwipeAnimationHelper.java similarity index 100% rename from src/org/thoughtcrime/securesms/conversation/ConversationSwipeAnimationHelper.java rename to app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationSwipeAnimationHelper.java diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java similarity index 100% rename from src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java rename to app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java similarity index 100% rename from src/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java rename to app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java diff --git a/src/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java diff --git a/src/org/thoughtcrime/securesms/conversationlist/ConversationListArchiveFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListArchiveFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/conversationlist/ConversationListArchiveFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListArchiveFragment.java diff --git a/src/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java diff --git a/src/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java similarity index 100% rename from src/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java rename to app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java diff --git a/src/org/thoughtcrime/securesms/conversationlist/ConversationListItemAction.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItemAction.java similarity index 100% rename from src/org/thoughtcrime/securesms/conversationlist/ConversationListItemAction.java rename to app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItemAction.java diff --git a/src/org/thoughtcrime/securesms/conversationlist/ConversationListItemInboxZero.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItemInboxZero.java similarity index 100% rename from src/org/thoughtcrime/securesms/conversationlist/ConversationListItemInboxZero.java rename to app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItemInboxZero.java diff --git a/src/org/thoughtcrime/securesms/conversationlist/ConversationListSearchAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListSearchAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/conversationlist/ConversationListSearchAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListSearchAdapter.java diff --git a/src/org/thoughtcrime/securesms/conversationlist/ConversationListViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListViewModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/conversationlist/ConversationListViewModel.java rename to app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListViewModel.java diff --git a/src/org/thoughtcrime/securesms/conversationlist/model/MessageResult.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/model/MessageResult.java similarity index 100% rename from src/org/thoughtcrime/securesms/conversationlist/model/MessageResult.java rename to app/src/main/java/org/thoughtcrime/securesms/conversationlist/model/MessageResult.java diff --git a/src/org/thoughtcrime/securesms/conversationlist/model/SearchResult.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/model/SearchResult.java similarity index 100% rename from src/org/thoughtcrime/securesms/conversationlist/model/SearchResult.java rename to app/src/main/java/org/thoughtcrime/securesms/conversationlist/model/SearchResult.java diff --git a/src/org/thoughtcrime/securesms/crypto/AsymmetricMasterCipher.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/AsymmetricMasterCipher.java similarity index 100% rename from src/org/thoughtcrime/securesms/crypto/AsymmetricMasterCipher.java rename to app/src/main/java/org/thoughtcrime/securesms/crypto/AsymmetricMasterCipher.java diff --git a/src/org/thoughtcrime/securesms/crypto/AsymmetricMasterSecret.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/AsymmetricMasterSecret.java similarity index 100% rename from src/org/thoughtcrime/securesms/crypto/AsymmetricMasterSecret.java rename to app/src/main/java/org/thoughtcrime/securesms/crypto/AsymmetricMasterSecret.java diff --git a/src/org/thoughtcrime/securesms/crypto/AttachmentSecret.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/AttachmentSecret.java similarity index 100% rename from src/org/thoughtcrime/securesms/crypto/AttachmentSecret.java rename to app/src/main/java/org/thoughtcrime/securesms/crypto/AttachmentSecret.java diff --git a/src/org/thoughtcrime/securesms/crypto/AttachmentSecretProvider.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/AttachmentSecretProvider.java similarity index 100% rename from src/org/thoughtcrime/securesms/crypto/AttachmentSecretProvider.java rename to app/src/main/java/org/thoughtcrime/securesms/crypto/AttachmentSecretProvider.java diff --git a/src/org/thoughtcrime/securesms/crypto/ClassicDecryptingPartInputStream.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/ClassicDecryptingPartInputStream.java similarity index 100% rename from src/org/thoughtcrime/securesms/crypto/ClassicDecryptingPartInputStream.java rename to app/src/main/java/org/thoughtcrime/securesms/crypto/ClassicDecryptingPartInputStream.java diff --git a/src/org/thoughtcrime/securesms/crypto/DatabaseSecret.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/DatabaseSecret.java similarity index 100% rename from src/org/thoughtcrime/securesms/crypto/DatabaseSecret.java rename to app/src/main/java/org/thoughtcrime/securesms/crypto/DatabaseSecret.java diff --git a/src/org/thoughtcrime/securesms/crypto/DatabaseSecretProvider.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/DatabaseSecretProvider.java similarity index 100% rename from src/org/thoughtcrime/securesms/crypto/DatabaseSecretProvider.java rename to app/src/main/java/org/thoughtcrime/securesms/crypto/DatabaseSecretProvider.java diff --git a/src/org/thoughtcrime/securesms/crypto/IdentityKeyParcelable.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyParcelable.java similarity index 100% rename from src/org/thoughtcrime/securesms/crypto/IdentityKeyParcelable.java rename to app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyParcelable.java diff --git a/src/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java diff --git a/src/org/thoughtcrime/securesms/crypto/InvalidPassphraseException.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/InvalidPassphraseException.java similarity index 100% rename from src/org/thoughtcrime/securesms/crypto/InvalidPassphraseException.java rename to app/src/main/java/org/thoughtcrime/securesms/crypto/InvalidPassphraseException.java diff --git a/src/org/thoughtcrime/securesms/crypto/KeyStoreHelper.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/KeyStoreHelper.java similarity index 100% rename from src/org/thoughtcrime/securesms/crypto/KeyStoreHelper.java rename to app/src/main/java/org/thoughtcrime/securesms/crypto/KeyStoreHelper.java diff --git a/src/org/thoughtcrime/securesms/crypto/MasterCipher.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/MasterCipher.java similarity index 100% rename from src/org/thoughtcrime/securesms/crypto/MasterCipher.java rename to app/src/main/java/org/thoughtcrime/securesms/crypto/MasterCipher.java diff --git a/src/org/thoughtcrime/securesms/crypto/MasterSecret.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/MasterSecret.java similarity index 100% rename from src/org/thoughtcrime/securesms/crypto/MasterSecret.java rename to app/src/main/java/org/thoughtcrime/securesms/crypto/MasterSecret.java diff --git a/src/org/thoughtcrime/securesms/crypto/MasterSecretUtil.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/MasterSecretUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/crypto/MasterSecretUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/crypto/MasterSecretUtil.java diff --git a/src/org/thoughtcrime/securesms/crypto/ModernDecryptingPartInputStream.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/ModernDecryptingPartInputStream.java similarity index 100% rename from src/org/thoughtcrime/securesms/crypto/ModernDecryptingPartInputStream.java rename to app/src/main/java/org/thoughtcrime/securesms/crypto/ModernDecryptingPartInputStream.java diff --git a/src/org/thoughtcrime/securesms/crypto/ModernEncryptingPartOutputStream.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/ModernEncryptingPartOutputStream.java similarity index 100% rename from src/org/thoughtcrime/securesms/crypto/ModernEncryptingPartOutputStream.java rename to app/src/main/java/org/thoughtcrime/securesms/crypto/ModernEncryptingPartOutputStream.java diff --git a/src/org/thoughtcrime/securesms/crypto/PreKeyUtil.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/PreKeyUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/crypto/PreKeyUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/crypto/PreKeyUtil.java diff --git a/src/org/thoughtcrime/securesms/crypto/ProfileKeyUtil.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/ProfileKeyUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/crypto/ProfileKeyUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/crypto/ProfileKeyUtil.java diff --git a/src/org/thoughtcrime/securesms/crypto/PublicKey.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/PublicKey.java similarity index 100% rename from src/org/thoughtcrime/securesms/crypto/PublicKey.java rename to app/src/main/java/org/thoughtcrime/securesms/crypto/PublicKey.java diff --git a/src/org/thoughtcrime/securesms/crypto/SecurityEvent.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/SecurityEvent.java similarity index 100% rename from src/org/thoughtcrime/securesms/crypto/SecurityEvent.java rename to app/src/main/java/org/thoughtcrime/securesms/crypto/SecurityEvent.java diff --git a/src/org/thoughtcrime/securesms/crypto/SessionUtil.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/SessionUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/crypto/SessionUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/crypto/SessionUtil.java diff --git a/src/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java diff --git a/src/org/thoughtcrime/securesms/crypto/storage/SignalProtocolStoreImpl.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalProtocolStoreImpl.java similarity index 100% rename from src/org/thoughtcrime/securesms/crypto/storage/SignalProtocolStoreImpl.java rename to app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalProtocolStoreImpl.java diff --git a/src/org/thoughtcrime/securesms/crypto/storage/TextSecureIdentityKeyStore.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureIdentityKeyStore.java similarity index 100% rename from src/org/thoughtcrime/securesms/crypto/storage/TextSecureIdentityKeyStore.java rename to app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureIdentityKeyStore.java diff --git a/src/org/thoughtcrime/securesms/crypto/storage/TextSecurePreKeyStore.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecurePreKeyStore.java similarity index 100% rename from src/org/thoughtcrime/securesms/crypto/storage/TextSecurePreKeyStore.java rename to app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecurePreKeyStore.java diff --git a/src/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java similarity index 100% rename from src/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java rename to app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java diff --git a/src/org/thoughtcrime/securesms/database/ApnDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ApnDatabase.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/ApnDatabase.java rename to app/src/main/java/org/thoughtcrime/securesms/database/ApnDatabase.java diff --git a/src/org/thoughtcrime/securesms/database/AttachmentDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/AttachmentDatabase.java rename to app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java diff --git a/src/org/thoughtcrime/securesms/database/ContentValuesBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/database/ContentValuesBuilder.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/ContentValuesBuilder.java rename to app/src/main/java/org/thoughtcrime/securesms/database/ContentValuesBuilder.java diff --git a/src/org/thoughtcrime/securesms/database/CursorList.java b/app/src/main/java/org/thoughtcrime/securesms/database/CursorList.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/CursorList.java rename to app/src/main/java/org/thoughtcrime/securesms/database/CursorList.java diff --git a/src/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapter.java diff --git a/src/org/thoughtcrime/securesms/database/Database.java b/app/src/main/java/org/thoughtcrime/securesms/database/Database.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/Database.java rename to app/src/main/java/org/thoughtcrime/securesms/database/Database.java diff --git a/src/org/thoughtcrime/securesms/database/DatabaseContentProviders.java b/app/src/main/java/org/thoughtcrime/securesms/database/DatabaseContentProviders.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/DatabaseContentProviders.java rename to app/src/main/java/org/thoughtcrime/securesms/database/DatabaseContentProviders.java diff --git a/src/org/thoughtcrime/securesms/database/DatabaseFactory.java b/app/src/main/java/org/thoughtcrime/securesms/database/DatabaseFactory.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/DatabaseFactory.java rename to app/src/main/java/org/thoughtcrime/securesms/database/DatabaseFactory.java diff --git a/src/org/thoughtcrime/securesms/database/DraftDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/DraftDatabase.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/DraftDatabase.java rename to app/src/main/java/org/thoughtcrime/securesms/database/DraftDatabase.java diff --git a/src/org/thoughtcrime/securesms/database/EarlyReceiptCache.java b/app/src/main/java/org/thoughtcrime/securesms/database/EarlyReceiptCache.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/EarlyReceiptCache.java rename to app/src/main/java/org/thoughtcrime/securesms/database/EarlyReceiptCache.java diff --git a/src/org/thoughtcrime/securesms/database/FastCursorRecyclerViewAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/database/FastCursorRecyclerViewAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/FastCursorRecyclerViewAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/database/FastCursorRecyclerViewAdapter.java diff --git a/src/org/thoughtcrime/securesms/database/GroupDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/GroupDatabase.java rename to app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java diff --git a/src/org/thoughtcrime/securesms/database/GroupReceiptDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/GroupReceiptDatabase.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/GroupReceiptDatabase.java rename to app/src/main/java/org/thoughtcrime/securesms/database/GroupReceiptDatabase.java diff --git a/src/org/thoughtcrime/securesms/database/IdentityDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/IdentityDatabase.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/IdentityDatabase.java rename to app/src/main/java/org/thoughtcrime/securesms/database/IdentityDatabase.java diff --git a/src/org/thoughtcrime/securesms/database/JobDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/JobDatabase.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/JobDatabase.java rename to app/src/main/java/org/thoughtcrime/securesms/database/JobDatabase.java diff --git a/src/org/thoughtcrime/securesms/database/MediaDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MediaDatabase.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/MediaDatabase.java rename to app/src/main/java/org/thoughtcrime/securesms/database/MediaDatabase.java diff --git a/src/org/thoughtcrime/securesms/database/MessagingDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/MessagingDatabase.java rename to app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java diff --git a/src/org/thoughtcrime/securesms/database/MmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/MmsDatabase.java rename to app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java diff --git a/src/org/thoughtcrime/securesms/database/MmsSmsColumns.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsColumns.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/MmsSmsColumns.java rename to app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsColumns.java diff --git a/src/org/thoughtcrime/securesms/database/MmsSmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/MmsSmsDatabase.java rename to app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java diff --git a/src/org/thoughtcrime/securesms/database/NoExternalStorageException.java b/app/src/main/java/org/thoughtcrime/securesms/database/NoExternalStorageException.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/NoExternalStorageException.java rename to app/src/main/java/org/thoughtcrime/securesms/database/NoExternalStorageException.java diff --git a/src/org/thoughtcrime/securesms/database/NoSuchMessageException.java b/app/src/main/java/org/thoughtcrime/securesms/database/NoSuchMessageException.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/NoSuchMessageException.java rename to app/src/main/java/org/thoughtcrime/securesms/database/NoSuchMessageException.java diff --git a/src/org/thoughtcrime/securesms/database/NotInDirectoryException.java b/app/src/main/java/org/thoughtcrime/securesms/database/NotInDirectoryException.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/NotInDirectoryException.java rename to app/src/main/java/org/thoughtcrime/securesms/database/NotInDirectoryException.java diff --git a/src/org/thoughtcrime/securesms/database/ObservableContent.java b/app/src/main/java/org/thoughtcrime/securesms/database/ObservableContent.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/ObservableContent.java rename to app/src/main/java/org/thoughtcrime/securesms/database/ObservableContent.java diff --git a/src/org/thoughtcrime/securesms/database/OneTimePreKeyDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/OneTimePreKeyDatabase.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/OneTimePreKeyDatabase.java rename to app/src/main/java/org/thoughtcrime/securesms/database/OneTimePreKeyDatabase.java diff --git a/src/org/thoughtcrime/securesms/database/PushDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/PushDatabase.java rename to app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java diff --git a/src/org/thoughtcrime/securesms/database/RecipientDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/RecipientDatabase.java rename to app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java diff --git a/src/org/thoughtcrime/securesms/database/SearchDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SearchDatabase.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/SearchDatabase.java rename to app/src/main/java/org/thoughtcrime/securesms/database/SearchDatabase.java diff --git a/src/org/thoughtcrime/securesms/database/SessionDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SessionDatabase.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/SessionDatabase.java rename to app/src/main/java/org/thoughtcrime/securesms/database/SessionDatabase.java diff --git a/src/org/thoughtcrime/securesms/database/SignedPreKeyDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SignedPreKeyDatabase.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/SignedPreKeyDatabase.java rename to app/src/main/java/org/thoughtcrime/securesms/database/SignedPreKeyDatabase.java diff --git a/src/org/thoughtcrime/securesms/database/SmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/SmsDatabase.java rename to app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java diff --git a/src/org/thoughtcrime/securesms/database/SmsMigrator.java b/app/src/main/java/org/thoughtcrime/securesms/database/SmsMigrator.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/SmsMigrator.java rename to app/src/main/java/org/thoughtcrime/securesms/database/SmsMigrator.java diff --git a/src/org/thoughtcrime/securesms/database/StickerDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/StickerDatabase.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/StickerDatabase.java rename to app/src/main/java/org/thoughtcrime/securesms/database/StickerDatabase.java diff --git a/src/org/thoughtcrime/securesms/database/StorageKeyDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/StorageKeyDatabase.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/StorageKeyDatabase.java rename to app/src/main/java/org/thoughtcrime/securesms/database/StorageKeyDatabase.java diff --git a/src/org/thoughtcrime/securesms/database/ThreadDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/ThreadDatabase.java rename to app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java diff --git a/src/org/thoughtcrime/securesms/database/XmlBackup.java b/app/src/main/java/org/thoughtcrime/securesms/database/XmlBackup.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/XmlBackup.java rename to app/src/main/java/org/thoughtcrime/securesms/database/XmlBackup.java diff --git a/src/org/thoughtcrime/securesms/database/documents/Document.java b/app/src/main/java/org/thoughtcrime/securesms/database/documents/Document.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/documents/Document.java rename to app/src/main/java/org/thoughtcrime/securesms/database/documents/Document.java diff --git a/src/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatch.java b/app/src/main/java/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatch.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatch.java rename to app/src/main/java/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatch.java diff --git a/src/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatchList.java b/app/src/main/java/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatchList.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatchList.java rename to app/src/main/java/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatchList.java diff --git a/src/org/thoughtcrime/securesms/database/documents/NetworkFailure.java b/app/src/main/java/org/thoughtcrime/securesms/database/documents/NetworkFailure.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/documents/NetworkFailure.java rename to app/src/main/java/org/thoughtcrime/securesms/database/documents/NetworkFailure.java diff --git a/src/org/thoughtcrime/securesms/database/documents/NetworkFailureList.java b/app/src/main/java/org/thoughtcrime/securesms/database/documents/NetworkFailureList.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/documents/NetworkFailureList.java rename to app/src/main/java/org/thoughtcrime/securesms/database/documents/NetworkFailureList.java diff --git a/src/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java rename to app/src/main/java/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java diff --git a/src/org/thoughtcrime/securesms/database/helpers/PreKeyMigrationHelper.java b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/PreKeyMigrationHelper.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/helpers/PreKeyMigrationHelper.java rename to app/src/main/java/org/thoughtcrime/securesms/database/helpers/PreKeyMigrationHelper.java diff --git a/src/org/thoughtcrime/securesms/database/helpers/RecipientIdCleanupHelper.java b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/RecipientIdCleanupHelper.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/helpers/RecipientIdCleanupHelper.java rename to app/src/main/java/org/thoughtcrime/securesms/database/helpers/RecipientIdCleanupHelper.java diff --git a/src/org/thoughtcrime/securesms/database/helpers/RecipientIdMigrationHelper.java b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/RecipientIdMigrationHelper.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/helpers/RecipientIdMigrationHelper.java rename to app/src/main/java/org/thoughtcrime/securesms/database/helpers/RecipientIdMigrationHelper.java diff --git a/src/org/thoughtcrime/securesms/database/helpers/SQLCipherMigrationHelper.java b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherMigrationHelper.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/helpers/SQLCipherMigrationHelper.java rename to app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherMigrationHelper.java diff --git a/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java rename to app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java diff --git a/src/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java rename to app/src/main/java/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java diff --git a/src/org/thoughtcrime/securesms/database/identity/IdentityRecordList.java b/app/src/main/java/org/thoughtcrime/securesms/database/identity/IdentityRecordList.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/identity/IdentityRecordList.java rename to app/src/main/java/org/thoughtcrime/securesms/database/identity/IdentityRecordList.java diff --git a/src/org/thoughtcrime/securesms/database/loaders/BlockedContactsLoader.java b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/BlockedContactsLoader.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/loaders/BlockedContactsLoader.java rename to app/src/main/java/org/thoughtcrime/securesms/database/loaders/BlockedContactsLoader.java diff --git a/src/org/thoughtcrime/securesms/database/loaders/ConversationListLoader.java b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/ConversationListLoader.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/loaders/ConversationListLoader.java rename to app/src/main/java/org/thoughtcrime/securesms/database/loaders/ConversationListLoader.java diff --git a/src/org/thoughtcrime/securesms/database/loaders/ConversationLoader.java b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/ConversationLoader.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/loaders/ConversationLoader.java rename to app/src/main/java/org/thoughtcrime/securesms/database/loaders/ConversationLoader.java diff --git a/src/org/thoughtcrime/securesms/database/loaders/CountryListLoader.java b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/CountryListLoader.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/loaders/CountryListLoader.java rename to app/src/main/java/org/thoughtcrime/securesms/database/loaders/CountryListLoader.java diff --git a/src/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java rename to app/src/main/java/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java diff --git a/src/org/thoughtcrime/securesms/database/loaders/GroupedThreadMediaLoader.java b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/GroupedThreadMediaLoader.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/loaders/GroupedThreadMediaLoader.java rename to app/src/main/java/org/thoughtcrime/securesms/database/loaders/GroupedThreadMediaLoader.java diff --git a/src/org/thoughtcrime/securesms/database/loaders/MediaLoader.java b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/MediaLoader.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/loaders/MediaLoader.java rename to app/src/main/java/org/thoughtcrime/securesms/database/loaders/MediaLoader.java diff --git a/src/org/thoughtcrime/securesms/database/loaders/MessageDetailsLoader.java b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/MessageDetailsLoader.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/loaders/MessageDetailsLoader.java rename to app/src/main/java/org/thoughtcrime/securesms/database/loaders/MessageDetailsLoader.java diff --git a/src/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java rename to app/src/main/java/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java diff --git a/src/org/thoughtcrime/securesms/database/loaders/RecentPhotosLoader.java b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/RecentPhotosLoader.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/loaders/RecentPhotosLoader.java rename to app/src/main/java/org/thoughtcrime/securesms/database/loaders/RecentPhotosLoader.java diff --git a/src/org/thoughtcrime/securesms/database/loaders/RecipientMediaLoader.java b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/RecipientMediaLoader.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/loaders/RecipientMediaLoader.java rename to app/src/main/java/org/thoughtcrime/securesms/database/loaders/RecipientMediaLoader.java diff --git a/src/org/thoughtcrime/securesms/database/loaders/ThreadMediaLoader.java b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/ThreadMediaLoader.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/loaders/ThreadMediaLoader.java rename to app/src/main/java/org/thoughtcrime/securesms/database/loaders/ThreadMediaLoader.java diff --git a/src/org/thoughtcrime/securesms/database/model/DisplayRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/model/DisplayRecord.java rename to app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java diff --git a/src/org/thoughtcrime/securesms/database/model/IncomingSticker.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/IncomingSticker.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/model/IncomingSticker.java rename to app/src/main/java/org/thoughtcrime/securesms/database/model/IncomingSticker.java diff --git a/src/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java rename to app/src/main/java/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java diff --git a/src/org/thoughtcrime/securesms/database/model/MessageRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/model/MessageRecord.java rename to app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java diff --git a/src/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java rename to app/src/main/java/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java diff --git a/src/org/thoughtcrime/securesms/database/model/NotificationMmsMessageRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/NotificationMmsMessageRecord.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/model/NotificationMmsMessageRecord.java rename to app/src/main/java/org/thoughtcrime/securesms/database/model/NotificationMmsMessageRecord.java diff --git a/src/org/thoughtcrime/securesms/database/model/Quote.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/Quote.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/model/Quote.java rename to app/src/main/java/org/thoughtcrime/securesms/database/model/Quote.java diff --git a/src/org/thoughtcrime/securesms/database/model/ReactionRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/ReactionRecord.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/model/ReactionRecord.java rename to app/src/main/java/org/thoughtcrime/securesms/database/model/ReactionRecord.java diff --git a/src/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java rename to app/src/main/java/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java diff --git a/src/org/thoughtcrime/securesms/database/model/Sticker.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/Sticker.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/model/Sticker.java rename to app/src/main/java/org/thoughtcrime/securesms/database/model/Sticker.java diff --git a/src/org/thoughtcrime/securesms/database/model/StickerPackRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/StickerPackRecord.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/model/StickerPackRecord.java rename to app/src/main/java/org/thoughtcrime/securesms/database/model/StickerPackRecord.java diff --git a/src/org/thoughtcrime/securesms/database/model/StickerRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/StickerRecord.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/model/StickerRecord.java rename to app/src/main/java/org/thoughtcrime/securesms/database/model/StickerRecord.java diff --git a/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java similarity index 100% rename from src/org/thoughtcrime/securesms/database/model/ThreadRecord.java rename to app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java diff --git a/src/org/thoughtcrime/securesms/dependencies/ApplicationDependencies.java b/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencies.java similarity index 100% rename from src/org/thoughtcrime/securesms/dependencies/ApplicationDependencies.java rename to app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencies.java diff --git a/src/org/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider.java b/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider.java similarity index 100% rename from src/org/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider.java rename to app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider.java diff --git a/src/org/thoughtcrime/securesms/devicelist/Device.java b/app/src/main/java/org/thoughtcrime/securesms/devicelist/Device.java similarity index 100% rename from src/org/thoughtcrime/securesms/devicelist/Device.java rename to app/src/main/java/org/thoughtcrime/securesms/devicelist/Device.java diff --git a/src/org/thoughtcrime/securesms/events/PartProgressEvent.java b/app/src/main/java/org/thoughtcrime/securesms/events/PartProgressEvent.java similarity index 100% rename from src/org/thoughtcrime/securesms/events/PartProgressEvent.java rename to app/src/main/java/org/thoughtcrime/securesms/events/PartProgressEvent.java diff --git a/src/org/thoughtcrime/securesms/events/RedPhoneEvent.java b/app/src/main/java/org/thoughtcrime/securesms/events/RedPhoneEvent.java similarity index 100% rename from src/org/thoughtcrime/securesms/events/RedPhoneEvent.java rename to app/src/main/java/org/thoughtcrime/securesms/events/RedPhoneEvent.java diff --git a/src/org/thoughtcrime/securesms/events/ReminderUpdateEvent.java b/app/src/main/java/org/thoughtcrime/securesms/events/ReminderUpdateEvent.java similarity index 100% rename from src/org/thoughtcrime/securesms/events/ReminderUpdateEvent.java rename to app/src/main/java/org/thoughtcrime/securesms/events/ReminderUpdateEvent.java diff --git a/src/org/thoughtcrime/securesms/events/WebRtcViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/events/WebRtcViewModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/events/WebRtcViewModel.java rename to app/src/main/java/org/thoughtcrime/securesms/events/WebRtcViewModel.java diff --git a/src/org/thoughtcrime/securesms/experienceupgrades/StickersIntroFragment.java b/app/src/main/java/org/thoughtcrime/securesms/experienceupgrades/StickersIntroFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/experienceupgrades/StickersIntroFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/experienceupgrades/StickersIntroFragment.java diff --git a/src/org/thoughtcrime/securesms/gcm/FcmJobService.java b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmJobService.java similarity index 100% rename from src/org/thoughtcrime/securesms/gcm/FcmJobService.java rename to app/src/main/java/org/thoughtcrime/securesms/gcm/FcmJobService.java diff --git a/src/org/thoughtcrime/securesms/gcm/FcmService.java b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmService.java similarity index 100% rename from src/org/thoughtcrime/securesms/gcm/FcmService.java rename to app/src/main/java/org/thoughtcrime/securesms/gcm/FcmService.java diff --git a/src/org/thoughtcrime/securesms/gcm/FcmUtil.java b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/gcm/FcmUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/gcm/FcmUtil.java diff --git a/src/org/thoughtcrime/securesms/gcm/MessageRetriever.java b/app/src/main/java/org/thoughtcrime/securesms/gcm/MessageRetriever.java similarity index 100% rename from src/org/thoughtcrime/securesms/gcm/MessageRetriever.java rename to app/src/main/java/org/thoughtcrime/securesms/gcm/MessageRetriever.java diff --git a/src/org/thoughtcrime/securesms/gcm/RestStrategy.java b/app/src/main/java/org/thoughtcrime/securesms/gcm/RestStrategy.java similarity index 100% rename from src/org/thoughtcrime/securesms/gcm/RestStrategy.java rename to app/src/main/java/org/thoughtcrime/securesms/gcm/RestStrategy.java diff --git a/src/org/thoughtcrime/securesms/giph/model/ChunkedImageUrl.java b/app/src/main/java/org/thoughtcrime/securesms/giph/model/ChunkedImageUrl.java similarity index 100% rename from src/org/thoughtcrime/securesms/giph/model/ChunkedImageUrl.java rename to app/src/main/java/org/thoughtcrime/securesms/giph/model/ChunkedImageUrl.java diff --git a/src/org/thoughtcrime/securesms/giph/model/GiphyImage.java b/app/src/main/java/org/thoughtcrime/securesms/giph/model/GiphyImage.java similarity index 100% rename from src/org/thoughtcrime/securesms/giph/model/GiphyImage.java rename to app/src/main/java/org/thoughtcrime/securesms/giph/model/GiphyImage.java diff --git a/src/org/thoughtcrime/securesms/giph/model/GiphyResponse.java b/app/src/main/java/org/thoughtcrime/securesms/giph/model/GiphyResponse.java similarity index 100% rename from src/org/thoughtcrime/securesms/giph/model/GiphyResponse.java rename to app/src/main/java/org/thoughtcrime/securesms/giph/model/GiphyResponse.java diff --git a/src/org/thoughtcrime/securesms/giph/net/GiphyGifLoader.java b/app/src/main/java/org/thoughtcrime/securesms/giph/net/GiphyGifLoader.java similarity index 100% rename from src/org/thoughtcrime/securesms/giph/net/GiphyGifLoader.java rename to app/src/main/java/org/thoughtcrime/securesms/giph/net/GiphyGifLoader.java diff --git a/src/org/thoughtcrime/securesms/giph/net/GiphyLoader.java b/app/src/main/java/org/thoughtcrime/securesms/giph/net/GiphyLoader.java similarity index 100% rename from src/org/thoughtcrime/securesms/giph/net/GiphyLoader.java rename to app/src/main/java/org/thoughtcrime/securesms/giph/net/GiphyLoader.java diff --git a/src/org/thoughtcrime/securesms/giph/net/GiphyStickerLoader.java b/app/src/main/java/org/thoughtcrime/securesms/giph/net/GiphyStickerLoader.java similarity index 100% rename from src/org/thoughtcrime/securesms/giph/net/GiphyStickerLoader.java rename to app/src/main/java/org/thoughtcrime/securesms/giph/net/GiphyStickerLoader.java diff --git a/src/org/thoughtcrime/securesms/giph/ui/AspectRatioImageView.java b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/AspectRatioImageView.java similarity index 100% rename from src/org/thoughtcrime/securesms/giph/ui/AspectRatioImageView.java rename to app/src/main/java/org/thoughtcrime/securesms/giph/ui/AspectRatioImageView.java diff --git a/src/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java diff --git a/src/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbar.java b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbar.java similarity index 100% rename from src/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbar.java rename to app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbar.java diff --git a/src/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbarTextSecurePreferencesPersistence.java b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbarTextSecurePreferencesPersistence.java similarity index 100% rename from src/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbarTextSecurePreferencesPersistence.java rename to app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbarTextSecurePreferencesPersistence.java diff --git a/src/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java diff --git a/src/org/thoughtcrime/securesms/giph/ui/GiphyFragment.java b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/giph/ui/GiphyFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyFragment.java diff --git a/src/org/thoughtcrime/securesms/giph/ui/GiphyGifFragment.java b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyGifFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/giph/ui/GiphyGifFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyGifFragment.java diff --git a/src/org/thoughtcrime/securesms/giph/ui/GiphyStickerFragment.java b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyStickerFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/giph/ui/GiphyStickerFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyStickerFragment.java diff --git a/src/org/thoughtcrime/securesms/giph/util/InfiniteScrollListener.java b/app/src/main/java/org/thoughtcrime/securesms/giph/util/InfiniteScrollListener.java similarity index 100% rename from src/org/thoughtcrime/securesms/giph/util/InfiniteScrollListener.java rename to app/src/main/java/org/thoughtcrime/securesms/giph/util/InfiniteScrollListener.java diff --git a/src/org/thoughtcrime/securesms/giph/util/RecyclerViewPositionHelper.java b/app/src/main/java/org/thoughtcrime/securesms/giph/util/RecyclerViewPositionHelper.java similarity index 100% rename from src/org/thoughtcrime/securesms/giph/util/RecyclerViewPositionHelper.java rename to app/src/main/java/org/thoughtcrime/securesms/giph/util/RecyclerViewPositionHelper.java diff --git a/src/org/thoughtcrime/securesms/glide/ChunkedImageUrlFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/glide/ChunkedImageUrlFetcher.java similarity index 100% rename from src/org/thoughtcrime/securesms/glide/ChunkedImageUrlFetcher.java rename to app/src/main/java/org/thoughtcrime/securesms/glide/ChunkedImageUrlFetcher.java diff --git a/src/org/thoughtcrime/securesms/glide/ChunkedImageUrlLoader.java b/app/src/main/java/org/thoughtcrime/securesms/glide/ChunkedImageUrlLoader.java similarity index 100% rename from src/org/thoughtcrime/securesms/glide/ChunkedImageUrlLoader.java rename to app/src/main/java/org/thoughtcrime/securesms/glide/ChunkedImageUrlLoader.java diff --git a/src/org/thoughtcrime/securesms/glide/ContactPhotoFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/glide/ContactPhotoFetcher.java similarity index 100% rename from src/org/thoughtcrime/securesms/glide/ContactPhotoFetcher.java rename to app/src/main/java/org/thoughtcrime/securesms/glide/ContactPhotoFetcher.java diff --git a/src/org/thoughtcrime/securesms/glide/ContactPhotoLoader.java b/app/src/main/java/org/thoughtcrime/securesms/glide/ContactPhotoLoader.java similarity index 100% rename from src/org/thoughtcrime/securesms/glide/ContactPhotoLoader.java rename to app/src/main/java/org/thoughtcrime/securesms/glide/ContactPhotoLoader.java diff --git a/src/org/thoughtcrime/securesms/glide/OkHttpStreamFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/glide/OkHttpStreamFetcher.java similarity index 100% rename from src/org/thoughtcrime/securesms/glide/OkHttpStreamFetcher.java rename to app/src/main/java/org/thoughtcrime/securesms/glide/OkHttpStreamFetcher.java diff --git a/src/org/thoughtcrime/securesms/glide/OkHttpUrlLoader.java b/app/src/main/java/org/thoughtcrime/securesms/glide/OkHttpUrlLoader.java similarity index 100% rename from src/org/thoughtcrime/securesms/glide/OkHttpUrlLoader.java rename to app/src/main/java/org/thoughtcrime/securesms/glide/OkHttpUrlLoader.java diff --git a/src/org/thoughtcrime/securesms/glide/PaddedHeadersInterceptor.java b/app/src/main/java/org/thoughtcrime/securesms/glide/PaddedHeadersInterceptor.java similarity index 100% rename from src/org/thoughtcrime/securesms/glide/PaddedHeadersInterceptor.java rename to app/src/main/java/org/thoughtcrime/securesms/glide/PaddedHeadersInterceptor.java diff --git a/src/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapCacheDecoder.java b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapCacheDecoder.java similarity index 100% rename from src/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapCacheDecoder.java rename to app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapCacheDecoder.java diff --git a/src/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java similarity index 100% rename from src/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java rename to app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java diff --git a/src/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java similarity index 100% rename from src/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java rename to app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java diff --git a/src/org/thoughtcrime/securesms/glide/cache/EncryptedCoder.java b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedCoder.java similarity index 100% rename from src/org/thoughtcrime/securesms/glide/cache/EncryptedCoder.java rename to app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedCoder.java diff --git a/src/org/thoughtcrime/securesms/glide/cache/EncryptedGifCacheDecoder.java b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifCacheDecoder.java similarity index 100% rename from src/org/thoughtcrime/securesms/glide/cache/EncryptedGifCacheDecoder.java rename to app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifCacheDecoder.java diff --git a/src/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java similarity index 100% rename from src/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java rename to app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java diff --git a/src/org/thoughtcrime/securesms/groups/GroupManager.java b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManager.java similarity index 100% rename from src/org/thoughtcrime/securesms/groups/GroupManager.java rename to app/src/main/java/org/thoughtcrime/securesms/groups/GroupManager.java diff --git a/src/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java similarity index 100% rename from src/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java rename to app/src/main/java/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java diff --git a/src/org/thoughtcrime/securesms/groups/V1GroupManager.java b/app/src/main/java/org/thoughtcrime/securesms/groups/V1GroupManager.java similarity index 100% rename from src/org/thoughtcrime/securesms/groups/V1GroupManager.java rename to app/src/main/java/org/thoughtcrime/securesms/groups/V1GroupManager.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/Bounds.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/Bounds.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/Bounds.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/Bounds.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/CanvasMatrix.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/CanvasMatrix.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/CanvasMatrix.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/CanvasMatrix.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/ColorableRenderer.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/ColorableRenderer.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/ColorableRenderer.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/ColorableRenderer.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/DrawingSession.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/DrawingSession.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/DrawingSession.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/DrawingSession.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/EditSession.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/EditSession.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/EditSession.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/EditSession.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/ElementDragEditSession.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/ElementDragEditSession.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/ElementDragEditSession.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/ElementDragEditSession.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/ElementEditSession.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/ElementEditSession.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/ElementEditSession.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/ElementEditSession.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/ElementScaleEditSession.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/ElementScaleEditSession.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/ElementScaleEditSession.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/ElementScaleEditSession.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/HiddenEditText.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/HiddenEditText.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/HiddenEditText.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/HiddenEditText.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/ImageEditorView.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/ImageEditorView.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/ImageEditorView.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/ImageEditorView.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/Renderer.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/Renderer.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/Renderer.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/Renderer.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/RendererContext.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/RendererContext.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/RendererContext.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/RendererContext.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/ThumbDragEditSession.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/ThumbDragEditSession.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/ThumbDragEditSession.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/ThumbDragEditSession.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/UndoRedoStackListener.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/UndoRedoStackListener.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/UndoRedoStackListener.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/UndoRedoStackListener.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/AlphaAnimation.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/model/AlphaAnimation.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/model/AlphaAnimation.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/model/AlphaAnimation.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/AnimationMatrix.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/model/AnimationMatrix.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/model/AnimationMatrix.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/model/AnimationMatrix.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/Bisect.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/model/Bisect.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/model/Bisect.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/model/Bisect.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/CropThumbRenderer.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/model/CropThumbRenderer.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/model/CropThumbRenderer.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/model/CropThumbRenderer.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/EditorElement.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/model/EditorElement.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/model/EditorElement.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/model/EditorElement.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/EditorElementHierarchy.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/model/EditorElementHierarchy.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/model/EditorElementHierarchy.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/model/EditorElementHierarchy.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/EditorFlags.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/model/EditorFlags.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/model/EditorFlags.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/model/EditorFlags.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/EditorModel.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/model/EditorModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/model/EditorModel.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/model/EditorModel.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/ElementStack.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/model/ElementStack.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/model/ElementStack.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/model/ElementStack.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/InBoundsMemory.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/model/InBoundsMemory.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/model/InBoundsMemory.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/model/InBoundsMemory.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/ParcelUtils.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/model/ParcelUtils.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/model/ParcelUtils.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/model/ParcelUtils.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/ThumbRenderer.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/model/ThumbRenderer.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/model/ThumbRenderer.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/model/ThumbRenderer.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/UndoRedoStacks.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/model/UndoRedoStacks.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/model/UndoRedoStacks.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/model/UndoRedoStacks.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/renderers/AutomaticControlPointBezierLine.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/AutomaticControlPointBezierLine.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/renderers/AutomaticControlPointBezierLine.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/AutomaticControlPointBezierLine.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/renderers/BezierDrawingRenderer.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/BezierDrawingRenderer.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/renderers/BezierDrawingRenderer.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/BezierDrawingRenderer.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/renderers/CropAreaRenderer.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/CropAreaRenderer.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/renderers/CropAreaRenderer.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/CropAreaRenderer.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/renderers/InvalidateableRenderer.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/InvalidateableRenderer.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/renderers/InvalidateableRenderer.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/InvalidateableRenderer.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/renderers/InverseFillRenderer.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/InverseFillRenderer.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/renderers/InverseFillRenderer.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/InverseFillRenderer.java diff --git a/src/org/thoughtcrime/securesms/imageeditor/renderers/MultiLineTextRenderer.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/MultiLineTextRenderer.java similarity index 100% rename from src/org/thoughtcrime/securesms/imageeditor/renderers/MultiLineTextRenderer.java rename to app/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/MultiLineTextRenderer.java diff --git a/src/org/thoughtcrime/securesms/insights/InsightsAnimatorSetFactory.java b/app/src/main/java/org/thoughtcrime/securesms/insights/InsightsAnimatorSetFactory.java similarity index 100% rename from src/org/thoughtcrime/securesms/insights/InsightsAnimatorSetFactory.java rename to app/src/main/java/org/thoughtcrime/securesms/insights/InsightsAnimatorSetFactory.java diff --git a/src/org/thoughtcrime/securesms/insights/InsightsConstants.java b/app/src/main/java/org/thoughtcrime/securesms/insights/InsightsConstants.java similarity index 100% rename from src/org/thoughtcrime/securesms/insights/InsightsConstants.java rename to app/src/main/java/org/thoughtcrime/securesms/insights/InsightsConstants.java diff --git a/src/org/thoughtcrime/securesms/insights/InsightsDashboardDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/insights/InsightsDashboardDialogFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/insights/InsightsDashboardDialogFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/insights/InsightsDashboardDialogFragment.java diff --git a/src/org/thoughtcrime/securesms/insights/InsightsDashboardState.java b/app/src/main/java/org/thoughtcrime/securesms/insights/InsightsDashboardState.java similarity index 100% rename from src/org/thoughtcrime/securesms/insights/InsightsDashboardState.java rename to app/src/main/java/org/thoughtcrime/securesms/insights/InsightsDashboardState.java diff --git a/src/org/thoughtcrime/securesms/insights/InsightsDashboardViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/insights/InsightsDashboardViewModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/insights/InsightsDashboardViewModel.java rename to app/src/main/java/org/thoughtcrime/securesms/insights/InsightsDashboardViewModel.java diff --git a/src/org/thoughtcrime/securesms/insights/InsightsData.java b/app/src/main/java/org/thoughtcrime/securesms/insights/InsightsData.java similarity index 100% rename from src/org/thoughtcrime/securesms/insights/InsightsData.java rename to app/src/main/java/org/thoughtcrime/securesms/insights/InsightsData.java diff --git a/src/org/thoughtcrime/securesms/insights/InsightsInsecureRecipientsAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/insights/InsightsInsecureRecipientsAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/insights/InsightsInsecureRecipientsAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/insights/InsightsInsecureRecipientsAdapter.java diff --git a/src/org/thoughtcrime/securesms/insights/InsightsLauncher.java b/app/src/main/java/org/thoughtcrime/securesms/insights/InsightsLauncher.java similarity index 100% rename from src/org/thoughtcrime/securesms/insights/InsightsLauncher.java rename to app/src/main/java/org/thoughtcrime/securesms/insights/InsightsLauncher.java diff --git a/src/org/thoughtcrime/securesms/insights/InsightsModalDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/insights/InsightsModalDialogFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/insights/InsightsModalDialogFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/insights/InsightsModalDialogFragment.java diff --git a/src/org/thoughtcrime/securesms/insights/InsightsModalState.java b/app/src/main/java/org/thoughtcrime/securesms/insights/InsightsModalState.java similarity index 100% rename from src/org/thoughtcrime/securesms/insights/InsightsModalState.java rename to app/src/main/java/org/thoughtcrime/securesms/insights/InsightsModalState.java diff --git a/src/org/thoughtcrime/securesms/insights/InsightsModalViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/insights/InsightsModalViewModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/insights/InsightsModalViewModel.java rename to app/src/main/java/org/thoughtcrime/securesms/insights/InsightsModalViewModel.java diff --git a/src/org/thoughtcrime/securesms/insights/InsightsOptOut.java b/app/src/main/java/org/thoughtcrime/securesms/insights/InsightsOptOut.java similarity index 100% rename from src/org/thoughtcrime/securesms/insights/InsightsOptOut.java rename to app/src/main/java/org/thoughtcrime/securesms/insights/InsightsOptOut.java diff --git a/src/org/thoughtcrime/securesms/insights/InsightsRepository.java b/app/src/main/java/org/thoughtcrime/securesms/insights/InsightsRepository.java similarity index 100% rename from src/org/thoughtcrime/securesms/insights/InsightsRepository.java rename to app/src/main/java/org/thoughtcrime/securesms/insights/InsightsRepository.java diff --git a/src/org/thoughtcrime/securesms/insights/InsightsUserAvatar.java b/app/src/main/java/org/thoughtcrime/securesms/insights/InsightsUserAvatar.java similarity index 100% rename from src/org/thoughtcrime/securesms/insights/InsightsUserAvatar.java rename to app/src/main/java/org/thoughtcrime/securesms/insights/InsightsUserAvatar.java diff --git a/src/org/thoughtcrime/securesms/invites/InviteReminderModel.java b/app/src/main/java/org/thoughtcrime/securesms/invites/InviteReminderModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/invites/InviteReminderModel.java rename to app/src/main/java/org/thoughtcrime/securesms/invites/InviteReminderModel.java diff --git a/src/org/thoughtcrime/securesms/invites/InviteReminderRepository.java b/app/src/main/java/org/thoughtcrime/securesms/invites/InviteReminderRepository.java similarity index 100% rename from src/org/thoughtcrime/securesms/invites/InviteReminderRepository.java rename to app/src/main/java/org/thoughtcrime/securesms/invites/InviteReminderRepository.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/BootReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/BootReceiver.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/BootReceiver.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/BootReceiver.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/CompositeScheduler.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/CompositeScheduler.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/CompositeScheduler.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/CompositeScheduler.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/Constraint.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/Constraint.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/Constraint.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/Constraint.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/ConstraintInstantiator.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/ConstraintInstantiator.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/ConstraintInstantiator.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/ConstraintInstantiator.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/ConstraintObserver.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/ConstraintObserver.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/ConstraintObserver.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/ConstraintObserver.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/Data.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/Data.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/Data.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/Data.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/DependencyInjector.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/DependencyInjector.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/DependencyInjector.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/DependencyInjector.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/ExecutorFactory.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/ExecutorFactory.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/ExecutorFactory.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/ExecutorFactory.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/InAppScheduler.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/InAppScheduler.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/InAppScheduler.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/InAppScheduler.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/Job.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/Job.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/Job.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/Job.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/JobController.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobController.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/JobController.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobController.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/JobInstantiator.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobInstantiator.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/JobInstantiator.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobInstantiator.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/JobLogger.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobLogger.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/JobLogger.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobLogger.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/JobManager.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/JobManager.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/JobMigration.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobMigration.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/JobMigration.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobMigration.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/JobMigrator.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobMigrator.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/JobMigrator.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobMigrator.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/JobRunner.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobRunner.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/JobRunner.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobRunner.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/JobTracker.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobTracker.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/JobTracker.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobTracker.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/KeepAliveService.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/KeepAliveService.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/KeepAliveService.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/KeepAliveService.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/Scheduler.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/Scheduler.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/Scheduler.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/Scheduler.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraint.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraint.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraint.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraint.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraintObserver.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraintObserver.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraintObserver.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraintObserver.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/impl/DefaultExecutorFactory.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/DefaultExecutorFactory.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/impl/DefaultExecutorFactory.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/DefaultExecutorFactory.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializer.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializer.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializer.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializer.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraint.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraint.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraint.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraint.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraintObserver.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraintObserver.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraintObserver.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraintObserver.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/impl/NetworkOrCellServiceConstraint.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkOrCellServiceConstraint.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/impl/NetworkOrCellServiceConstraint.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkOrCellServiceConstraint.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraint.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraint.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraint.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraint.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraintObserver.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraintObserver.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraintObserver.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraintObserver.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/migrations/RecipientIdFollowUpJobMigration.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/migrations/RecipientIdFollowUpJobMigration.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/migrations/RecipientIdFollowUpJobMigration.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/migrations/RecipientIdFollowUpJobMigration.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/migrations/RecipientIdFollowUpJobMigration2.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/migrations/RecipientIdFollowUpJobMigration2.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/migrations/RecipientIdFollowUpJobMigration2.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/migrations/RecipientIdFollowUpJobMigration2.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/migrations/RecipientIdJobMigration.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/migrations/RecipientIdJobMigration.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/migrations/RecipientIdJobMigration.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/migrations/RecipientIdJobMigration.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/persistence/ConstraintSpec.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/ConstraintSpec.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/persistence/ConstraintSpec.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/ConstraintSpec.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/persistence/DependencySpec.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/DependencySpec.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/persistence/DependencySpec.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/DependencySpec.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/persistence/FullSpec.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/FullSpec.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/persistence/FullSpec.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/FullSpec.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/persistence/JobSpec.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/JobSpec.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/persistence/JobSpec.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/JobSpec.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/persistence/JobStorage.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/JobStorage.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/persistence/JobStorage.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/JobStorage.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/workmanager/DataMigrator.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/workmanager/DataMigrator.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/workmanager/DataMigrator.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/workmanager/DataMigrator.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/workmanager/WorkManagerDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/workmanager/WorkManagerDatabase.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/workmanager/WorkManagerDatabase.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/workmanager/WorkManagerDatabase.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/workmanager/WorkManagerFactoryMappings.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/workmanager/WorkManagerFactoryMappings.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/workmanager/WorkManagerFactoryMappings.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/workmanager/WorkManagerFactoryMappings.java diff --git a/src/org/thoughtcrime/securesms/jobmanager/workmanager/WorkManagerMigrator.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/workmanager/WorkManagerMigrator.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobmanager/workmanager/WorkManagerMigrator.java rename to app/src/main/java/org/thoughtcrime/securesms/jobmanager/workmanager/WorkManagerMigrator.java diff --git a/src/org/thoughtcrime/securesms/jobs/AttachmentCompressionJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCompressionJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/AttachmentCompressionJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCompressionJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/AttachmentCopyJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCopyJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/AttachmentCopyJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCopyJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/BaseJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/BaseJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/BaseJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/BaseJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/FailingJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/FailingJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/FailingJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/FailingJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/FastJobStorage.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/FastJobStorage.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/FastJobStorage.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/FastJobStorage.java diff --git a/src/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/JobManagerFactories.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/JobManagerFactories.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/JobManagerFactories.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/JobManagerFactories.java diff --git a/src/org/thoughtcrime/securesms/jobs/LocalBackupJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalBackupJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/LocalBackupJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/LocalBackupJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/MarkerJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MarkerJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/MarkerJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/MarkerJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/MmsSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsSendJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/MmsSendJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/MmsSendJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceKeysUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceKeysUpdateJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/MultiDeviceKeysUpdateJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceKeysUpdateJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceProfileContentUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileContentUpdateJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/MultiDeviceProfileContentUpdateJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileContentUpdateJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackOperationJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackOperationJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackOperationJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackOperationJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceStorageSyncRequestJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStorageSyncRequestJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/MultiDeviceStorageSyncRequestJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStorageSyncRequestJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceViewOnceOpenJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceViewOnceOpenJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/MultiDeviceViewOnceOpenJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceViewOnceOpenJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/PushNotificationReceiveJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushNotificationReceiveJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/PushNotificationReceiveJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/PushNotificationReceiveJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/PushReceivedJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushReceivedJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/PushReceivedJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/PushReceivedJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/PushSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/PushSendJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushTextSendJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/PushTextSendJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/ReactionSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/ReactionSendJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/ReactionSendJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/ReactionSendJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/RequestGroupInfoJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RequestGroupInfoJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/RequestGroupInfoJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/RequestGroupInfoJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/RotateCertificateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateCertificateJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/RotateCertificateJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/RotateCertificateJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/RotateProfileKeyJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateProfileKeyJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/RotateProfileKeyJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/RotateProfileKeyJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/SendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/SendJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/SendJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/SmsSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSendJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/SmsSendJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSendJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/SmsSentJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSentJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/SmsSentJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSentJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/StorageForcePushJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/StorageForcePushJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/StorageSyncJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/StorageSyncJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/TrimThreadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/TrimThreadJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/TrimThreadJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/TrimThreadJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/TypingSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/TypingSendJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/TypingSendJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/TypingSendJob.java diff --git a/src/org/thoughtcrime/securesms/jobs/UpdateApkJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/UpdateApkJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/jobs/UpdateApkJob.java rename to app/src/main/java/org/thoughtcrime/securesms/jobs/UpdateApkJob.java diff --git a/src/org/thoughtcrime/securesms/linkpreview/Link.java b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/Link.java similarity index 100% rename from src/org/thoughtcrime/securesms/linkpreview/Link.java rename to app/src/main/java/org/thoughtcrime/securesms/linkpreview/Link.java diff --git a/src/org/thoughtcrime/securesms/linkpreview/LinkPreview.java b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreview.java similarity index 100% rename from src/org/thoughtcrime/securesms/linkpreview/LinkPreview.java rename to app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreview.java diff --git a/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewDomains.java b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewDomains.java similarity index 100% rename from src/org/thoughtcrime/securesms/linkpreview/LinkPreviewDomains.java rename to app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewDomains.java diff --git a/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java similarity index 100% rename from src/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java rename to app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java diff --git a/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtil.java b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtil.java diff --git a/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java rename to app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java diff --git a/src/org/thoughtcrime/securesms/lock/RegistrationLockDialog.java b/app/src/main/java/org/thoughtcrime/securesms/lock/RegistrationLockDialog.java similarity index 100% rename from src/org/thoughtcrime/securesms/lock/RegistrationLockDialog.java rename to app/src/main/java/org/thoughtcrime/securesms/lock/RegistrationLockDialog.java diff --git a/src/org/thoughtcrime/securesms/lock/RegistrationLockReminders.java b/app/src/main/java/org/thoughtcrime/securesms/lock/RegistrationLockReminders.java similarity index 100% rename from src/org/thoughtcrime/securesms/lock/RegistrationLockReminders.java rename to app/src/main/java/org/thoughtcrime/securesms/lock/RegistrationLockReminders.java diff --git a/src/org/thoughtcrime/securesms/logging/AndroidLogger.java b/app/src/main/java/org/thoughtcrime/securesms/logging/AndroidLogger.java similarity index 100% rename from src/org/thoughtcrime/securesms/logging/AndroidLogger.java rename to app/src/main/java/org/thoughtcrime/securesms/logging/AndroidLogger.java diff --git a/src/org/thoughtcrime/securesms/logging/CustomSignalProtocolLogger.java b/app/src/main/java/org/thoughtcrime/securesms/logging/CustomSignalProtocolLogger.java similarity index 100% rename from src/org/thoughtcrime/securesms/logging/CustomSignalProtocolLogger.java rename to app/src/main/java/org/thoughtcrime/securesms/logging/CustomSignalProtocolLogger.java diff --git a/src/org/thoughtcrime/securesms/logging/GrowingBuffer.java b/app/src/main/java/org/thoughtcrime/securesms/logging/GrowingBuffer.java similarity index 100% rename from src/org/thoughtcrime/securesms/logging/GrowingBuffer.java rename to app/src/main/java/org/thoughtcrime/securesms/logging/GrowingBuffer.java diff --git a/src/org/thoughtcrime/securesms/logging/Log.java b/app/src/main/java/org/thoughtcrime/securesms/logging/Log.java similarity index 100% rename from src/org/thoughtcrime/securesms/logging/Log.java rename to app/src/main/java/org/thoughtcrime/securesms/logging/Log.java diff --git a/src/org/thoughtcrime/securesms/logging/LogFile.java b/app/src/main/java/org/thoughtcrime/securesms/logging/LogFile.java similarity index 100% rename from src/org/thoughtcrime/securesms/logging/LogFile.java rename to app/src/main/java/org/thoughtcrime/securesms/logging/LogFile.java diff --git a/src/org/thoughtcrime/securesms/logging/LogSecretProvider.java b/app/src/main/java/org/thoughtcrime/securesms/logging/LogSecretProvider.java similarity index 100% rename from src/org/thoughtcrime/securesms/logging/LogSecretProvider.java rename to app/src/main/java/org/thoughtcrime/securesms/logging/LogSecretProvider.java diff --git a/src/org/thoughtcrime/securesms/logging/PersistentLogger.java b/app/src/main/java/org/thoughtcrime/securesms/logging/PersistentLogger.java similarity index 100% rename from src/org/thoughtcrime/securesms/logging/PersistentLogger.java rename to app/src/main/java/org/thoughtcrime/securesms/logging/PersistentLogger.java diff --git a/src/org/thoughtcrime/securesms/logging/UncaughtExceptionLogger.java b/app/src/main/java/org/thoughtcrime/securesms/logging/UncaughtExceptionLogger.java similarity index 100% rename from src/org/thoughtcrime/securesms/logging/UncaughtExceptionLogger.java rename to app/src/main/java/org/thoughtcrime/securesms/logging/UncaughtExceptionLogger.java diff --git a/src/org/thoughtcrime/securesms/logsubmit/ShareIntentListAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/ShareIntentListAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/logsubmit/ShareIntentListAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/logsubmit/ShareIntentListAdapter.java diff --git a/src/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java diff --git a/src/org/thoughtcrime/securesms/logsubmit/util/Scrubber.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/util/Scrubber.java similarity index 100% rename from src/org/thoughtcrime/securesms/logsubmit/util/Scrubber.java rename to app/src/main/java/org/thoughtcrime/securesms/logsubmit/util/Scrubber.java diff --git a/src/org/thoughtcrime/securesms/longmessage/LongMessage.java b/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessage.java similarity index 100% rename from src/org/thoughtcrime/securesms/longmessage/LongMessage.java rename to app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessage.java diff --git a/src/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java b/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java diff --git a/src/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java b/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java similarity index 100% rename from src/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java rename to app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java diff --git a/src/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java rename to app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java diff --git a/src/org/thoughtcrime/securesms/maps/AddressData.java b/app/src/main/java/org/thoughtcrime/securesms/maps/AddressData.java similarity index 100% rename from src/org/thoughtcrime/securesms/maps/AddressData.java rename to app/src/main/java/org/thoughtcrime/securesms/maps/AddressData.java diff --git a/src/org/thoughtcrime/securesms/maps/LocationRetriever.java b/app/src/main/java/org/thoughtcrime/securesms/maps/LocationRetriever.java similarity index 100% rename from src/org/thoughtcrime/securesms/maps/LocationRetriever.java rename to app/src/main/java/org/thoughtcrime/securesms/maps/LocationRetriever.java diff --git a/src/org/thoughtcrime/securesms/maps/PlacePickerActivity.java b/app/src/main/java/org/thoughtcrime/securesms/maps/PlacePickerActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/maps/PlacePickerActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/maps/PlacePickerActivity.java diff --git a/src/org/thoughtcrime/securesms/maps/SingleAddressBottomSheet.java b/app/src/main/java/org/thoughtcrime/securesms/maps/SingleAddressBottomSheet.java similarity index 100% rename from src/org/thoughtcrime/securesms/maps/SingleAddressBottomSheet.java rename to app/src/main/java/org/thoughtcrime/securesms/maps/SingleAddressBottomSheet.java diff --git a/src/org/thoughtcrime/securesms/mediaoverview/MediaActions.java b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaActions.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediaoverview/MediaActions.java rename to app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaActions.java diff --git a/src/org/thoughtcrime/securesms/mediaoverview/MediaGalleryAllAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaGalleryAllAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediaoverview/MediaGalleryAllAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaGalleryAllAdapter.java diff --git a/src/org/thoughtcrime/securesms/mediaoverview/MediaOverviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediaoverview/MediaOverviewActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewActivity.java diff --git a/src/org/thoughtcrime/securesms/mediaoverview/MediaOverviewPageFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewPageFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediaoverview/MediaOverviewPageFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewPageFragment.java diff --git a/src/org/thoughtcrime/securesms/mediaoverview/MediaOverviewViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewViewModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediaoverview/MediaOverviewViewModel.java rename to app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewViewModel.java diff --git a/src/org/thoughtcrime/securesms/mediapreview/ImageMediaPreviewFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/ImageMediaPreviewFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediapreview/ImageMediaPreviewFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/mediapreview/ImageMediaPreviewFragment.java diff --git a/src/org/thoughtcrime/securesms/mediapreview/MediaPreviewFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediapreview/MediaPreviewFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewFragment.java diff --git a/src/org/thoughtcrime/securesms/mediapreview/MediaPreviewViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewViewModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediapreview/MediaPreviewViewModel.java rename to app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewViewModel.java diff --git a/src/org/thoughtcrime/securesms/mediapreview/MediaRailAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaRailAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediapreview/MediaRailAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaRailAdapter.java diff --git a/src/org/thoughtcrime/securesms/mediapreview/VideoMediaPreviewFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/VideoMediaPreviewFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediapreview/VideoMediaPreviewFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/mediapreview/VideoMediaPreviewFragment.java diff --git a/src/org/thoughtcrime/securesms/mediasend/Camera1Controller.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Controller.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/Camera1Controller.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Controller.java diff --git a/src/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java diff --git a/src/org/thoughtcrime/securesms/mediasend/CameraButtonView.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraButtonView.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/CameraButtonView.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraButtonView.java diff --git a/src/org/thoughtcrime/securesms/mediasend/CameraContactAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraContactAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/CameraContactAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraContactAdapter.java diff --git a/src/org/thoughtcrime/securesms/mediasend/CameraContactSelectionAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraContactSelectionAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/CameraContactSelectionAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraContactSelectionAdapter.java diff --git a/src/org/thoughtcrime/securesms/mediasend/CameraContactSelectionFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraContactSelectionFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/CameraContactSelectionFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraContactSelectionFragment.java diff --git a/src/org/thoughtcrime/securesms/mediasend/CameraContactSelectionViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraContactSelectionViewModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/CameraContactSelectionViewModel.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraContactSelectionViewModel.java diff --git a/src/org/thoughtcrime/securesms/mediasend/CameraContacts.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraContacts.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/CameraContacts.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraContacts.java diff --git a/src/org/thoughtcrime/securesms/mediasend/CameraContactsRepository.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraContactsRepository.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/CameraContactsRepository.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraContactsRepository.java diff --git a/src/org/thoughtcrime/securesms/mediasend/CameraFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/CameraFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraFragment.java diff --git a/src/org/thoughtcrime/securesms/mediasend/CameraXFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/CameraXFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java diff --git a/src/org/thoughtcrime/securesms/mediasend/CameraXSelfieFlashHelper.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXSelfieFlashHelper.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/CameraXSelfieFlashHelper.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXSelfieFlashHelper.java diff --git a/src/org/thoughtcrime/securesms/mediasend/CameraXVideoCaptureHelper.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXVideoCaptureHelper.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/CameraXVideoCaptureHelper.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXVideoCaptureHelper.java diff --git a/src/org/thoughtcrime/securesms/mediasend/FlipTransformation.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/FlipTransformation.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/FlipTransformation.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/FlipTransformation.java diff --git a/src/org/thoughtcrime/securesms/mediasend/LegacyCameraModels.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/LegacyCameraModels.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/LegacyCameraModels.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/LegacyCameraModels.java diff --git a/src/org/thoughtcrime/securesms/mediasend/Media.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/Media.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/Media.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/Media.java diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaFolder.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaFolder.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/MediaFolder.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaFolder.java diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerFolderAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerFolderAdapter.java diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerItemAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/MediaPickerItemAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerItemAdapter.java diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaRepository.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaRepository.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/MediaRepository.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaRepository.java diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendFragmentPagerAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragmentPagerAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/MediaSendFragmentPagerAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragmentPagerAdapter.java diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendGifFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendGifFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/MediaSendGifFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendGifFragment.java diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendPageFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendPageFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/MediaSendPageFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendPageFragment.java diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java diff --git a/src/org/thoughtcrime/securesms/mediasend/OrderEnforcer.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/OrderEnforcer.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/OrderEnforcer.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/OrderEnforcer.java diff --git a/src/org/thoughtcrime/securesms/mediasend/SimpleAnimationListener.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/SimpleAnimationListener.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/SimpleAnimationListener.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/SimpleAnimationListener.java diff --git a/src/org/thoughtcrime/securesms/mediasend/camerax/CameraXFlashToggleView.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXFlashToggleView.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/camerax/CameraXFlashToggleView.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXFlashToggleView.java diff --git a/src/org/thoughtcrime/securesms/mediasend/camerax/CameraXModule.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXModule.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/camerax/CameraXModule.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXModule.java diff --git a/src/org/thoughtcrime/securesms/mediasend/camerax/CameraXUtil.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/camerax/CameraXUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXUtil.java diff --git a/src/org/thoughtcrime/securesms/mediasend/camerax/CameraXView.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXView.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/camerax/CameraXView.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXView.java diff --git a/src/org/thoughtcrime/securesms/mediasend/camerax/FastCameraModels.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/FastCameraModels.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/camerax/FastCameraModels.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/FastCameraModels.java diff --git a/src/org/thoughtcrime/securesms/mediasend/camerax/TextureViewMeteringPointFactory.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/TextureViewMeteringPointFactory.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/camerax/TextureViewMeteringPointFactory.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/TextureViewMeteringPointFactory.java diff --git a/src/org/thoughtcrime/securesms/mediasend/camerax/VideoCapture.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/VideoCapture.java similarity index 100% rename from src/org/thoughtcrime/securesms/mediasend/camerax/VideoCapture.java rename to app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/VideoCapture.java diff --git a/src/org/thoughtcrime/securesms/messagerequests/MessageRequestFragment.java b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/messagerequests/MessageRequestFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestFragment.java diff --git a/src/org/thoughtcrime/securesms/messagerequests/MessageRequestFragmentRepository.java b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestFragmentRepository.java similarity index 100% rename from src/org/thoughtcrime/securesms/messagerequests/MessageRequestFragmentRepository.java rename to app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestFragmentRepository.java diff --git a/src/org/thoughtcrime/securesms/messagerequests/MessageRequestFragmentState.java b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestFragmentState.java similarity index 100% rename from src/org/thoughtcrime/securesms/messagerequests/MessageRequestFragmentState.java rename to app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestFragmentState.java diff --git a/src/org/thoughtcrime/securesms/messagerequests/MessageRequestFragmentViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestFragmentViewModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/messagerequests/MessageRequestFragmentViewModel.java rename to app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestFragmentViewModel.java diff --git a/src/org/thoughtcrime/securesms/migrations/ApplicationMigrationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/ApplicationMigrationActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/migrations/ApplicationMigrationActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/migrations/ApplicationMigrationActivity.java diff --git a/src/org/thoughtcrime/securesms/migrations/ApplicationMigrations.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/ApplicationMigrations.java similarity index 100% rename from src/org/thoughtcrime/securesms/migrations/ApplicationMigrations.java rename to app/src/main/java/org/thoughtcrime/securesms/migrations/ApplicationMigrations.java diff --git a/src/org/thoughtcrime/securesms/migrations/AvatarMigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/AvatarMigrationJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/migrations/AvatarMigrationJob.java rename to app/src/main/java/org/thoughtcrime/securesms/migrations/AvatarMigrationJob.java diff --git a/src/org/thoughtcrime/securesms/migrations/CachedAttachmentsMigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/CachedAttachmentsMigrationJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/migrations/CachedAttachmentsMigrationJob.java rename to app/src/main/java/org/thoughtcrime/securesms/migrations/CachedAttachmentsMigrationJob.java diff --git a/src/org/thoughtcrime/securesms/migrations/DatabaseMigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/DatabaseMigrationJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/migrations/DatabaseMigrationJob.java rename to app/src/main/java/org/thoughtcrime/securesms/migrations/DatabaseMigrationJob.java diff --git a/src/org/thoughtcrime/securesms/migrations/LegacyMigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/LegacyMigrationJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/migrations/LegacyMigrationJob.java rename to app/src/main/java/org/thoughtcrime/securesms/migrations/LegacyMigrationJob.java diff --git a/src/org/thoughtcrime/securesms/migrations/MigrationCompleteEvent.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/MigrationCompleteEvent.java similarity index 100% rename from src/org/thoughtcrime/securesms/migrations/MigrationCompleteEvent.java rename to app/src/main/java/org/thoughtcrime/securesms/migrations/MigrationCompleteEvent.java diff --git a/src/org/thoughtcrime/securesms/migrations/MigrationCompleteJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/MigrationCompleteJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/migrations/MigrationCompleteJob.java rename to app/src/main/java/org/thoughtcrime/securesms/migrations/MigrationCompleteJob.java diff --git a/src/org/thoughtcrime/securesms/migrations/MigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/MigrationJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/migrations/MigrationJob.java rename to app/src/main/java/org/thoughtcrime/securesms/migrations/MigrationJob.java diff --git a/src/org/thoughtcrime/securesms/migrations/RecipientSearchMigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/RecipientSearchMigrationJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/migrations/RecipientSearchMigrationJob.java rename to app/src/main/java/org/thoughtcrime/securesms/migrations/RecipientSearchMigrationJob.java diff --git a/src/org/thoughtcrime/securesms/migrations/RegistrationPinV2MigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/RegistrationPinV2MigrationJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/migrations/RegistrationPinV2MigrationJob.java rename to app/src/main/java/org/thoughtcrime/securesms/migrations/RegistrationPinV2MigrationJob.java diff --git a/src/org/thoughtcrime/securesms/migrations/StickerLaunchMigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/StickerLaunchMigrationJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/migrations/StickerLaunchMigrationJob.java rename to app/src/main/java/org/thoughtcrime/securesms/migrations/StickerLaunchMigrationJob.java diff --git a/src/org/thoughtcrime/securesms/migrations/UuidMigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/UuidMigrationJob.java similarity index 100% rename from src/org/thoughtcrime/securesms/migrations/UuidMigrationJob.java rename to app/src/main/java/org/thoughtcrime/securesms/migrations/UuidMigrationJob.java diff --git a/src/org/thoughtcrime/securesms/mms/ApnUnavailableException.java b/app/src/main/java/org/thoughtcrime/securesms/mms/ApnUnavailableException.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/ApnUnavailableException.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/ApnUnavailableException.java diff --git a/src/org/thoughtcrime/securesms/mms/AttachmentManager.java b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/AttachmentManager.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java diff --git a/src/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java diff --git a/src/org/thoughtcrime/securesms/mms/AttachmentStreamUriLoader.java b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamUriLoader.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/AttachmentStreamUriLoader.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamUriLoader.java diff --git a/src/org/thoughtcrime/securesms/mms/AudioSlide.java b/app/src/main/java/org/thoughtcrime/securesms/mms/AudioSlide.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/AudioSlide.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/AudioSlide.java diff --git a/src/org/thoughtcrime/securesms/mms/CompatMmsConnection.java b/app/src/main/java/org/thoughtcrime/securesms/mms/CompatMmsConnection.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/CompatMmsConnection.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/CompatMmsConnection.java diff --git a/src/org/thoughtcrime/securesms/mms/ContactPhotoLocalUriFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/mms/ContactPhotoLocalUriFetcher.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/ContactPhotoLocalUriFetcher.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/ContactPhotoLocalUriFetcher.java diff --git a/src/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java diff --git a/src/org/thoughtcrime/securesms/mms/DecryptableStreamUriLoader.java b/app/src/main/java/org/thoughtcrime/securesms/mms/DecryptableStreamUriLoader.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/DecryptableStreamUriLoader.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/DecryptableStreamUriLoader.java diff --git a/src/org/thoughtcrime/securesms/mms/DocumentSlide.java b/app/src/main/java/org/thoughtcrime/securesms/mms/DocumentSlide.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/DocumentSlide.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/DocumentSlide.java diff --git a/src/org/thoughtcrime/securesms/mms/GifSlide.java b/app/src/main/java/org/thoughtcrime/securesms/mms/GifSlide.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/GifSlide.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/GifSlide.java diff --git a/src/org/thoughtcrime/securesms/mms/ImageSlide.java b/app/src/main/java/org/thoughtcrime/securesms/mms/ImageSlide.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/ImageSlide.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/ImageSlide.java diff --git a/src/org/thoughtcrime/securesms/mms/IncomingLegacyMmsConnection.java b/app/src/main/java/org/thoughtcrime/securesms/mms/IncomingLegacyMmsConnection.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/IncomingLegacyMmsConnection.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/IncomingLegacyMmsConnection.java diff --git a/src/org/thoughtcrime/securesms/mms/IncomingLollipopMmsConnection.java b/app/src/main/java/org/thoughtcrime/securesms/mms/IncomingLollipopMmsConnection.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/IncomingLollipopMmsConnection.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/IncomingLollipopMmsConnection.java diff --git a/src/org/thoughtcrime/securesms/mms/IncomingMediaMessage.java b/app/src/main/java/org/thoughtcrime/securesms/mms/IncomingMediaMessage.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/IncomingMediaMessage.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/IncomingMediaMessage.java diff --git a/src/org/thoughtcrime/securesms/mms/IncomingMmsConnection.java b/app/src/main/java/org/thoughtcrime/securesms/mms/IncomingMmsConnection.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/IncomingMmsConnection.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/IncomingMmsConnection.java diff --git a/src/org/thoughtcrime/securesms/mms/LegacyMmsConnection.java b/app/src/main/java/org/thoughtcrime/securesms/mms/LegacyMmsConnection.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/LegacyMmsConnection.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/LegacyMmsConnection.java diff --git a/src/org/thoughtcrime/securesms/mms/LocationSlide.java b/app/src/main/java/org/thoughtcrime/securesms/mms/LocationSlide.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/LocationSlide.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/LocationSlide.java diff --git a/src/org/thoughtcrime/securesms/mms/LollipopMmsConnection.java b/app/src/main/java/org/thoughtcrime/securesms/mms/LollipopMmsConnection.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/LollipopMmsConnection.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/LollipopMmsConnection.java diff --git a/src/org/thoughtcrime/securesms/mms/MediaConstraints.java b/app/src/main/java/org/thoughtcrime/securesms/mms/MediaConstraints.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/MediaConstraints.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/MediaConstraints.java diff --git a/src/org/thoughtcrime/securesms/mms/MediaNotFoundException.java b/app/src/main/java/org/thoughtcrime/securesms/mms/MediaNotFoundException.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/MediaNotFoundException.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/MediaNotFoundException.java diff --git a/src/org/thoughtcrime/securesms/mms/MediaStream.java b/app/src/main/java/org/thoughtcrime/securesms/mms/MediaStream.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/MediaStream.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/MediaStream.java diff --git a/src/org/thoughtcrime/securesms/mms/MediaTooLargeException.java b/app/src/main/java/org/thoughtcrime/securesms/mms/MediaTooLargeException.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/MediaTooLargeException.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/MediaTooLargeException.java diff --git a/src/org/thoughtcrime/securesms/mms/MmsConfigManager.java b/app/src/main/java/org/thoughtcrime/securesms/mms/MmsConfigManager.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/MmsConfigManager.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/MmsConfigManager.java diff --git a/src/org/thoughtcrime/securesms/mms/MmsException.java b/app/src/main/java/org/thoughtcrime/securesms/mms/MmsException.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/MmsException.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/MmsException.java diff --git a/src/org/thoughtcrime/securesms/mms/MmsMediaConstraints.java b/app/src/main/java/org/thoughtcrime/securesms/mms/MmsMediaConstraints.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/MmsMediaConstraints.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/MmsMediaConstraints.java diff --git a/src/org/thoughtcrime/securesms/mms/MmsRadio.java b/app/src/main/java/org/thoughtcrime/securesms/mms/MmsRadio.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/MmsRadio.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/MmsRadio.java diff --git a/src/org/thoughtcrime/securesms/mms/MmsRadioException.java b/app/src/main/java/org/thoughtcrime/securesms/mms/MmsRadioException.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/MmsRadioException.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/MmsRadioException.java diff --git a/src/org/thoughtcrime/securesms/mms/MmsSendResult.java b/app/src/main/java/org/thoughtcrime/securesms/mms/MmsSendResult.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/MmsSendResult.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/MmsSendResult.java diff --git a/src/org/thoughtcrime/securesms/mms/MmsSlide.java b/app/src/main/java/org/thoughtcrime/securesms/mms/MmsSlide.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/MmsSlide.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/MmsSlide.java diff --git a/src/org/thoughtcrime/securesms/mms/OutgoingExpirationUpdateMessage.java b/app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingExpirationUpdateMessage.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/OutgoingExpirationUpdateMessage.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingExpirationUpdateMessage.java diff --git a/src/org/thoughtcrime/securesms/mms/OutgoingGroupMediaMessage.java b/app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingGroupMediaMessage.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/OutgoingGroupMediaMessage.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingGroupMediaMessage.java diff --git a/src/org/thoughtcrime/securesms/mms/OutgoingLegacyMmsConnection.java b/app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingLegacyMmsConnection.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/OutgoingLegacyMmsConnection.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingLegacyMmsConnection.java diff --git a/src/org/thoughtcrime/securesms/mms/OutgoingLollipopMmsConnection.java b/app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingLollipopMmsConnection.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/OutgoingLollipopMmsConnection.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingLollipopMmsConnection.java diff --git a/src/org/thoughtcrime/securesms/mms/OutgoingMediaMessage.java b/app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingMediaMessage.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/OutgoingMediaMessage.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingMediaMessage.java diff --git a/src/org/thoughtcrime/securesms/mms/OutgoingMmsConnection.java b/app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingMmsConnection.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/OutgoingMmsConnection.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingMmsConnection.java diff --git a/src/org/thoughtcrime/securesms/mms/OutgoingSecureMediaMessage.java b/app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingSecureMediaMessage.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/OutgoingSecureMediaMessage.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingSecureMediaMessage.java diff --git a/src/org/thoughtcrime/securesms/mms/PartAuthority.java b/app/src/main/java/org/thoughtcrime/securesms/mms/PartAuthority.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/PartAuthority.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/PartAuthority.java diff --git a/src/org/thoughtcrime/securesms/mms/PartParser.java b/app/src/main/java/org/thoughtcrime/securesms/mms/PartParser.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/PartParser.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/PartParser.java diff --git a/src/org/thoughtcrime/securesms/mms/PartUriParser.java b/app/src/main/java/org/thoughtcrime/securesms/mms/PartUriParser.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/PartUriParser.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/PartUriParser.java diff --git a/src/org/thoughtcrime/securesms/mms/PushMediaConstraints.java b/app/src/main/java/org/thoughtcrime/securesms/mms/PushMediaConstraints.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/PushMediaConstraints.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/PushMediaConstraints.java diff --git a/src/org/thoughtcrime/securesms/mms/QuoteId.java b/app/src/main/java/org/thoughtcrime/securesms/mms/QuoteId.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/QuoteId.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/QuoteId.java diff --git a/src/org/thoughtcrime/securesms/mms/QuoteModel.java b/app/src/main/java/org/thoughtcrime/securesms/mms/QuoteModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/QuoteModel.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/QuoteModel.java diff --git a/src/org/thoughtcrime/securesms/mms/SignalGlideModule.java b/app/src/main/java/org/thoughtcrime/securesms/mms/SignalGlideModule.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/SignalGlideModule.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/SignalGlideModule.java diff --git a/src/org/thoughtcrime/securesms/mms/Slide.java b/app/src/main/java/org/thoughtcrime/securesms/mms/Slide.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/Slide.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/Slide.java diff --git a/src/org/thoughtcrime/securesms/mms/SlideClickListener.java b/app/src/main/java/org/thoughtcrime/securesms/mms/SlideClickListener.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/SlideClickListener.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/SlideClickListener.java diff --git a/src/org/thoughtcrime/securesms/mms/SlideDeck.java b/app/src/main/java/org/thoughtcrime/securesms/mms/SlideDeck.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/SlideDeck.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/SlideDeck.java diff --git a/src/org/thoughtcrime/securesms/mms/SlidesClickedListener.java b/app/src/main/java/org/thoughtcrime/securesms/mms/SlidesClickedListener.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/SlidesClickedListener.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/SlidesClickedListener.java diff --git a/src/org/thoughtcrime/securesms/mms/StickerSlide.java b/app/src/main/java/org/thoughtcrime/securesms/mms/StickerSlide.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/StickerSlide.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/StickerSlide.java diff --git a/src/org/thoughtcrime/securesms/mms/TextSlide.java b/app/src/main/java/org/thoughtcrime/securesms/mms/TextSlide.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/TextSlide.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/TextSlide.java diff --git a/src/org/thoughtcrime/securesms/mms/VideoSlide.java b/app/src/main/java/org/thoughtcrime/securesms/mms/VideoSlide.java similarity index 100% rename from src/org/thoughtcrime/securesms/mms/VideoSlide.java rename to app/src/main/java/org/thoughtcrime/securesms/mms/VideoSlide.java diff --git a/src/org/thoughtcrime/securesms/net/CallRequestController.java b/app/src/main/java/org/thoughtcrime/securesms/net/CallRequestController.java similarity index 100% rename from src/org/thoughtcrime/securesms/net/CallRequestController.java rename to app/src/main/java/org/thoughtcrime/securesms/net/CallRequestController.java diff --git a/src/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java similarity index 100% rename from src/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java rename to app/src/main/java/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java diff --git a/src/org/thoughtcrime/securesms/net/CompositeRequestController.java b/app/src/main/java/org/thoughtcrime/securesms/net/CompositeRequestController.java similarity index 100% rename from src/org/thoughtcrime/securesms/net/CompositeRequestController.java rename to app/src/main/java/org/thoughtcrime/securesms/net/CompositeRequestController.java diff --git a/src/org/thoughtcrime/securesms/net/ContentProxySafetyInterceptor.java b/app/src/main/java/org/thoughtcrime/securesms/net/ContentProxySafetyInterceptor.java similarity index 100% rename from src/org/thoughtcrime/securesms/net/ContentProxySafetyInterceptor.java rename to app/src/main/java/org/thoughtcrime/securesms/net/ContentProxySafetyInterceptor.java diff --git a/src/org/thoughtcrime/securesms/net/ContentProxySelector.java b/app/src/main/java/org/thoughtcrime/securesms/net/ContentProxySelector.java similarity index 100% rename from src/org/thoughtcrime/securesms/net/ContentProxySelector.java rename to app/src/main/java/org/thoughtcrime/securesms/net/ContentProxySelector.java diff --git a/src/org/thoughtcrime/securesms/net/RequestController.java b/app/src/main/java/org/thoughtcrime/securesms/net/RequestController.java similarity index 100% rename from src/org/thoughtcrime/securesms/net/RequestController.java rename to app/src/main/java/org/thoughtcrime/securesms/net/RequestController.java diff --git a/src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java similarity index 100% rename from src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java rename to app/src/main/java/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java diff --git a/src/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java similarity index 100% rename from src/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java rename to app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java diff --git a/src/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java similarity index 100% rename from src/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java rename to app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java diff --git a/src/org/thoughtcrime/securesms/notifications/DeleteNotificationReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/DeleteNotificationReceiver.java similarity index 100% rename from src/org/thoughtcrime/securesms/notifications/DeleteNotificationReceiver.java rename to app/src/main/java/org/thoughtcrime/securesms/notifications/DeleteNotificationReceiver.java diff --git a/src/org/thoughtcrime/securesms/notifications/DoNotDisturbUtil.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/DoNotDisturbUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/notifications/DoNotDisturbUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/notifications/DoNotDisturbUtil.java diff --git a/src/org/thoughtcrime/securesms/notifications/FailedNotificationBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/FailedNotificationBuilder.java similarity index 100% rename from src/org/thoughtcrime/securesms/notifications/FailedNotificationBuilder.java rename to app/src/main/java/org/thoughtcrime/securesms/notifications/FailedNotificationBuilder.java diff --git a/src/org/thoughtcrime/securesms/notifications/LocaleChangedReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/LocaleChangedReceiver.java similarity index 100% rename from src/org/thoughtcrime/securesms/notifications/LocaleChangedReceiver.java rename to app/src/main/java/org/thoughtcrime/securesms/notifications/LocaleChangedReceiver.java diff --git a/src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java similarity index 100% rename from src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java rename to app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java diff --git a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/MessageNotifier.java similarity index 100% rename from src/org/thoughtcrime/securesms/notifications/MessageNotifier.java rename to app/src/main/java/org/thoughtcrime/securesms/notifications/MessageNotifier.java diff --git a/src/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java similarity index 100% rename from src/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java rename to app/src/main/java/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java diff --git a/src/org/thoughtcrime/securesms/notifications/NotificationChannels.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationChannels.java similarity index 100% rename from src/org/thoughtcrime/securesms/notifications/NotificationChannels.java rename to app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationChannels.java diff --git a/src/org/thoughtcrime/securesms/notifications/NotificationItem.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationItem.java similarity index 100% rename from src/org/thoughtcrime/securesms/notifications/NotificationItem.java rename to app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationItem.java diff --git a/src/org/thoughtcrime/securesms/notifications/NotificationState.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationState.java similarity index 100% rename from src/org/thoughtcrime/securesms/notifications/NotificationState.java rename to app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationState.java diff --git a/src/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java similarity index 100% rename from src/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java rename to app/src/main/java/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java diff --git a/src/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java similarity index 100% rename from src/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java rename to app/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java diff --git a/src/org/thoughtcrime/securesms/notifications/ReplyMethod.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/ReplyMethod.java similarity index 100% rename from src/org/thoughtcrime/securesms/notifications/ReplyMethod.java rename to app/src/main/java/org/thoughtcrime/securesms/notifications/ReplyMethod.java diff --git a/src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java similarity index 100% rename from src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java rename to app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java diff --git a/src/org/thoughtcrime/securesms/permissions/Permissions.java b/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java similarity index 100% rename from src/org/thoughtcrime/securesms/permissions/Permissions.java rename to app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java diff --git a/src/org/thoughtcrime/securesms/permissions/PermissionsRequest.java b/app/src/main/java/org/thoughtcrime/securesms/permissions/PermissionsRequest.java similarity index 100% rename from src/org/thoughtcrime/securesms/permissions/PermissionsRequest.java rename to app/src/main/java/org/thoughtcrime/securesms/permissions/PermissionsRequest.java diff --git a/src/org/thoughtcrime/securesms/permissions/RationaleDialog.java b/app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.java similarity index 100% rename from src/org/thoughtcrime/securesms/permissions/RationaleDialog.java rename to app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.java diff --git a/src/org/thoughtcrime/securesms/phonenumbers/NumberUtil.java b/app/src/main/java/org/thoughtcrime/securesms/phonenumbers/NumberUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/phonenumbers/NumberUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/phonenumbers/NumberUtil.java diff --git a/src/org/thoughtcrime/securesms/phonenumbers/PhoneNumberFormatter.java b/app/src/main/java/org/thoughtcrime/securesms/phonenumbers/PhoneNumberFormatter.java similarity index 100% rename from src/org/thoughtcrime/securesms/phonenumbers/PhoneNumberFormatter.java rename to app/src/main/java/org/thoughtcrime/securesms/phonenumbers/PhoneNumberFormatter.java diff --git a/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java diff --git a/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java diff --git a/src/org/thoughtcrime/securesms/preferences/AppearancePreferenceFragment.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/AppearancePreferenceFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/preferences/AppearancePreferenceFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/preferences/AppearancePreferenceFragment.java diff --git a/src/org/thoughtcrime/securesms/preferences/ApplicationPreferencesViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/ApplicationPreferencesViewModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/preferences/ApplicationPreferencesViewModel.java rename to app/src/main/java/org/thoughtcrime/securesms/preferences/ApplicationPreferencesViewModel.java diff --git a/src/org/thoughtcrime/securesms/preferences/BlockedContactListItem.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactListItem.java similarity index 100% rename from src/org/thoughtcrime/securesms/preferences/BlockedContactListItem.java rename to app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactListItem.java diff --git a/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java diff --git a/src/org/thoughtcrime/securesms/preferences/CorrectedPreferenceFragment.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/CorrectedPreferenceFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/preferences/CorrectedPreferenceFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/preferences/CorrectedPreferenceFragment.java diff --git a/src/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java diff --git a/src/org/thoughtcrime/securesms/preferences/MmsPreferencesActivity.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/MmsPreferencesActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/preferences/MmsPreferencesActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/preferences/MmsPreferencesActivity.java diff --git a/src/org/thoughtcrime/securesms/preferences/MmsPreferencesFragment.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/MmsPreferencesFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/preferences/MmsPreferencesFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/preferences/MmsPreferencesFragment.java diff --git a/src/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java diff --git a/src/org/thoughtcrime/securesms/preferences/SmsMmsPreferenceFragment.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/SmsMmsPreferenceFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/preferences/SmsMmsPreferenceFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/preferences/SmsMmsPreferenceFragment.java diff --git a/src/org/thoughtcrime/securesms/preferences/StoragePreferenceFragment.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/StoragePreferenceFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/preferences/StoragePreferenceFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/preferences/StoragePreferenceFragment.java diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreference.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreference.java similarity index 100% rename from src/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreference.java rename to app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreference.java diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreferenceDialogFragmentCompat.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreferenceDialogFragmentCompat.java similarity index 100% rename from src/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreferenceDialogFragmentCompat.java rename to app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreferenceDialogFragmentCompat.java diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/ContactPreference.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ContactPreference.java similarity index 100% rename from src/org/thoughtcrime/securesms/preferences/widgets/ContactPreference.java rename to app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ContactPreference.java diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/LEDColorListPreference.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/LEDColorListPreference.java similarity index 100% rename from src/org/thoughtcrime/securesms/preferences/widgets/LEDColorListPreference.java rename to app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/LEDColorListPreference.java diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/NotificationPrivacyPreference.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/NotificationPrivacyPreference.java similarity index 100% rename from src/org/thoughtcrime/securesms/preferences/widgets/NotificationPrivacyPreference.java rename to app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/NotificationPrivacyPreference.java diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java similarity index 100% rename from src/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java rename to app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/ProgressPreference.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ProgressPreference.java similarity index 100% rename from src/org/thoughtcrime/securesms/preferences/widgets/ProgressPreference.java rename to app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ProgressPreference.java diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/SignalListPreference.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/SignalListPreference.java similarity index 100% rename from src/org/thoughtcrime/securesms/preferences/widgets/SignalListPreference.java rename to app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/SignalListPreference.java diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/SignalPreference.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/SignalPreference.java similarity index 100% rename from src/org/thoughtcrime/securesms/preferences/widgets/SignalPreference.java rename to app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/SignalPreference.java diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/StorageGraphView.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/StorageGraphView.java similarity index 100% rename from src/org/thoughtcrime/securesms/preferences/widgets/StorageGraphView.java rename to app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/StorageGraphView.java diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/StoragePreferenceCategory.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/StoragePreferenceCategory.java similarity index 100% rename from src/org/thoughtcrime/securesms/preferences/widgets/StoragePreferenceCategory.java rename to app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/StoragePreferenceCategory.java diff --git a/src/org/thoughtcrime/securesms/profiles/AvatarHelper.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/AvatarHelper.java similarity index 100% rename from src/org/thoughtcrime/securesms/profiles/AvatarHelper.java rename to app/src/main/java/org/thoughtcrime/securesms/profiles/AvatarHelper.java diff --git a/src/org/thoughtcrime/securesms/profiles/GroupShareProfileView.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/GroupShareProfileView.java similarity index 100% rename from src/org/thoughtcrime/securesms/profiles/GroupShareProfileView.java rename to app/src/main/java/org/thoughtcrime/securesms/profiles/GroupShareProfileView.java diff --git a/src/org/thoughtcrime/securesms/profiles/ProfileMediaConstraints.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/ProfileMediaConstraints.java similarity index 100% rename from src/org/thoughtcrime/securesms/profiles/ProfileMediaConstraints.java rename to app/src/main/java/org/thoughtcrime/securesms/profiles/ProfileMediaConstraints.java diff --git a/src/org/thoughtcrime/securesms/profiles/SystemProfileUtil.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/SystemProfileUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/profiles/SystemProfileUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/profiles/SystemProfileUtil.java diff --git a/src/org/thoughtcrime/securesms/profiles/UnknownSenderView.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/UnknownSenderView.java similarity index 100% rename from src/org/thoughtcrime/securesms/profiles/UnknownSenderView.java rename to app/src/main/java/org/thoughtcrime/securesms/profiles/UnknownSenderView.java diff --git a/src/org/thoughtcrime/securesms/providers/BlobProvider.java b/app/src/main/java/org/thoughtcrime/securesms/providers/BlobProvider.java similarity index 100% rename from src/org/thoughtcrime/securesms/providers/BlobProvider.java rename to app/src/main/java/org/thoughtcrime/securesms/providers/BlobProvider.java diff --git a/src/org/thoughtcrime/securesms/providers/DeprecatedPersistentBlobProvider.java b/app/src/main/java/org/thoughtcrime/securesms/providers/DeprecatedPersistentBlobProvider.java similarity index 100% rename from src/org/thoughtcrime/securesms/providers/DeprecatedPersistentBlobProvider.java rename to app/src/main/java/org/thoughtcrime/securesms/providers/DeprecatedPersistentBlobProvider.java diff --git a/src/org/thoughtcrime/securesms/providers/MmsBodyProvider.java b/app/src/main/java/org/thoughtcrime/securesms/providers/MmsBodyProvider.java similarity index 100% rename from src/org/thoughtcrime/securesms/providers/MmsBodyProvider.java rename to app/src/main/java/org/thoughtcrime/securesms/providers/MmsBodyProvider.java diff --git a/src/org/thoughtcrime/securesms/providers/PartProvider.java b/app/src/main/java/org/thoughtcrime/securesms/providers/PartProvider.java similarity index 100% rename from src/org/thoughtcrime/securesms/providers/PartProvider.java rename to app/src/main/java/org/thoughtcrime/securesms/providers/PartProvider.java diff --git a/src/org/thoughtcrime/securesms/push/AccountManagerFactory.java b/app/src/main/java/org/thoughtcrime/securesms/push/AccountManagerFactory.java similarity index 100% rename from src/org/thoughtcrime/securesms/push/AccountManagerFactory.java rename to app/src/main/java/org/thoughtcrime/securesms/push/AccountManagerFactory.java diff --git a/src/org/thoughtcrime/securesms/push/DomainFrontingTrustStore.java b/app/src/main/java/org/thoughtcrime/securesms/push/DomainFrontingTrustStore.java similarity index 100% rename from src/org/thoughtcrime/securesms/push/DomainFrontingTrustStore.java rename to app/src/main/java/org/thoughtcrime/securesms/push/DomainFrontingTrustStore.java diff --git a/src/org/thoughtcrime/securesms/push/IasTrustStore.java b/app/src/main/java/org/thoughtcrime/securesms/push/IasTrustStore.java similarity index 100% rename from src/org/thoughtcrime/securesms/push/IasTrustStore.java rename to app/src/main/java/org/thoughtcrime/securesms/push/IasTrustStore.java diff --git a/src/org/thoughtcrime/securesms/push/SecurityEventListener.java b/app/src/main/java/org/thoughtcrime/securesms/push/SecurityEventListener.java similarity index 100% rename from src/org/thoughtcrime/securesms/push/SecurityEventListener.java rename to app/src/main/java/org/thoughtcrime/securesms/push/SecurityEventListener.java diff --git a/src/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.java b/app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.java similarity index 100% rename from src/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.java rename to app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.java diff --git a/src/org/thoughtcrime/securesms/push/SignalServiceTrustStore.java b/app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceTrustStore.java similarity index 100% rename from src/org/thoughtcrime/securesms/push/SignalServiceTrustStore.java rename to app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceTrustStore.java diff --git a/src/org/thoughtcrime/securesms/qr/QrCode.java b/app/src/main/java/org/thoughtcrime/securesms/qr/QrCode.java similarity index 100% rename from src/org/thoughtcrime/securesms/qr/QrCode.java rename to app/src/main/java/org/thoughtcrime/securesms/qr/QrCode.java diff --git a/src/org/thoughtcrime/securesms/qr/ScanListener.java b/app/src/main/java/org/thoughtcrime/securesms/qr/ScanListener.java similarity index 100% rename from src/org/thoughtcrime/securesms/qr/ScanListener.java rename to app/src/main/java/org/thoughtcrime/securesms/qr/ScanListener.java diff --git a/src/org/thoughtcrime/securesms/qr/ScanningThread.java b/app/src/main/java/org/thoughtcrime/securesms/qr/ScanningThread.java similarity index 100% rename from src/org/thoughtcrime/securesms/qr/ScanningThread.java rename to app/src/main/java/org/thoughtcrime/securesms/qr/ScanningThread.java diff --git a/src/org/thoughtcrime/securesms/reactions/EmojiCount.java b/app/src/main/java/org/thoughtcrime/securesms/reactions/EmojiCount.java similarity index 100% rename from src/org/thoughtcrime/securesms/reactions/EmojiCount.java rename to app/src/main/java/org/thoughtcrime/securesms/reactions/EmojiCount.java diff --git a/src/org/thoughtcrime/securesms/reactions/ReactionEmojiCountAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionEmojiCountAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/reactions/ReactionEmojiCountAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionEmojiCountAdapter.java diff --git a/src/org/thoughtcrime/securesms/reactions/ReactionRecipientsAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionRecipientsAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/reactions/ReactionRecipientsAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionRecipientsAdapter.java diff --git a/src/org/thoughtcrime/securesms/reactions/ReactionsBottomSheetDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionsBottomSheetDialogFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/reactions/ReactionsBottomSheetDialogFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionsBottomSheetDialogFragment.java diff --git a/src/org/thoughtcrime/securesms/reactions/ReactionsLoader.java b/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionsLoader.java similarity index 100% rename from src/org/thoughtcrime/securesms/reactions/ReactionsLoader.java rename to app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionsLoader.java diff --git a/src/org/thoughtcrime/securesms/reactions/ReactionsViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionsViewModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/reactions/ReactionsViewModel.java rename to app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionsViewModel.java diff --git a/src/org/thoughtcrime/securesms/recipients/LiveRecipient.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipient.java similarity index 100% rename from src/org/thoughtcrime/securesms/recipients/LiveRecipient.java rename to app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipient.java diff --git a/src/org/thoughtcrime/securesms/recipients/LiveRecipientCache.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipientCache.java similarity index 100% rename from src/org/thoughtcrime/securesms/recipients/LiveRecipientCache.java rename to app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipientCache.java diff --git a/src/org/thoughtcrime/securesms/recipients/Recipient.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java similarity index 100% rename from src/org/thoughtcrime/securesms/recipients/Recipient.java rename to app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java diff --git a/src/org/thoughtcrime/securesms/recipients/RecipientDetails.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientDetails.java similarity index 100% rename from src/org/thoughtcrime/securesms/recipients/RecipientDetails.java rename to app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientDetails.java diff --git a/src/org/thoughtcrime/securesms/recipients/RecipientExporter.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientExporter.java similarity index 100% rename from src/org/thoughtcrime/securesms/recipients/RecipientExporter.java rename to app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientExporter.java diff --git a/src/org/thoughtcrime/securesms/recipients/RecipientForeverObserver.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientForeverObserver.java similarity index 100% rename from src/org/thoughtcrime/securesms/recipients/RecipientForeverObserver.java rename to app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientForeverObserver.java diff --git a/src/org/thoughtcrime/securesms/recipients/RecipientFormattingException.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientFormattingException.java similarity index 100% rename from src/org/thoughtcrime/securesms/recipients/RecipientFormattingException.java rename to app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientFormattingException.java diff --git a/src/org/thoughtcrime/securesms/recipients/RecipientId.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientId.java similarity index 100% rename from src/org/thoughtcrime/securesms/recipients/RecipientId.java rename to app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientId.java diff --git a/src/org/thoughtcrime/securesms/recipients/RecipientModifiedListener.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientModifiedListener.java similarity index 100% rename from src/org/thoughtcrime/securesms/recipients/RecipientModifiedListener.java rename to app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientModifiedListener.java diff --git a/src/org/thoughtcrime/securesms/recipients/RecipientUtil.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/recipients/RecipientUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientUtil.java diff --git a/src/org/thoughtcrime/securesms/recipients/RecipientsFormatter.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientsFormatter.java similarity index 100% rename from src/org/thoughtcrime/securesms/recipients/RecipientsFormatter.java rename to app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientsFormatter.java diff --git a/src/org/thoughtcrime/securesms/registration/PushChallengeRequest.java b/app/src/main/java/org/thoughtcrime/securesms/registration/PushChallengeRequest.java similarity index 100% rename from src/org/thoughtcrime/securesms/registration/PushChallengeRequest.java rename to app/src/main/java/org/thoughtcrime/securesms/registration/PushChallengeRequest.java diff --git a/src/org/thoughtcrime/securesms/registration/ReceivedSmsEvent.java b/app/src/main/java/org/thoughtcrime/securesms/registration/ReceivedSmsEvent.java similarity index 100% rename from src/org/thoughtcrime/securesms/registration/ReceivedSmsEvent.java rename to app/src/main/java/org/thoughtcrime/securesms/registration/ReceivedSmsEvent.java diff --git a/src/org/thoughtcrime/securesms/registration/RegistrationNavigationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationNavigationActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/registration/RegistrationNavigationActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationNavigationActivity.java diff --git a/src/org/thoughtcrime/securesms/registration/fragments/BaseRegistrationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/BaseRegistrationFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/registration/fragments/BaseRegistrationFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/registration/fragments/BaseRegistrationFragment.java diff --git a/src/org/thoughtcrime/securesms/registration/fragments/CaptchaFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/CaptchaFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/registration/fragments/CaptchaFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/registration/fragments/CaptchaFragment.java diff --git a/src/org/thoughtcrime/securesms/registration/fragments/CountryPickerFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/CountryPickerFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/registration/fragments/CountryPickerFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/registration/fragments/CountryPickerFragment.java diff --git a/src/org/thoughtcrime/securesms/registration/fragments/EnterCodeFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterCodeFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/registration/fragments/EnterCodeFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterCodeFragment.java diff --git a/src/org/thoughtcrime/securesms/registration/fragments/EnterPhoneNumberFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterPhoneNumberFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/registration/fragments/EnterPhoneNumberFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterPhoneNumberFragment.java diff --git a/src/org/thoughtcrime/securesms/registration/fragments/RegistrationCompleteFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationCompleteFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/registration/fragments/RegistrationCompleteFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationCompleteFragment.java diff --git a/src/org/thoughtcrime/securesms/registration/fragments/RegistrationConstants.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationConstants.java similarity index 100% rename from src/org/thoughtcrime/securesms/registration/fragments/RegistrationConstants.java rename to app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationConstants.java diff --git a/src/org/thoughtcrime/securesms/registration/fragments/RegistrationLockFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationLockFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/registration/fragments/RegistrationLockFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationLockFragment.java diff --git a/src/org/thoughtcrime/securesms/registration/fragments/RestoreBackupFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RestoreBackupFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/registration/fragments/RestoreBackupFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RestoreBackupFragment.java diff --git a/src/org/thoughtcrime/securesms/registration/fragments/WelcomeFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/WelcomeFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/registration/fragments/WelcomeFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/registration/fragments/WelcomeFragment.java diff --git a/src/org/thoughtcrime/securesms/registration/service/CodeVerificationRequest.java b/app/src/main/java/org/thoughtcrime/securesms/registration/service/CodeVerificationRequest.java similarity index 100% rename from src/org/thoughtcrime/securesms/registration/service/CodeVerificationRequest.java rename to app/src/main/java/org/thoughtcrime/securesms/registration/service/CodeVerificationRequest.java diff --git a/src/org/thoughtcrime/securesms/registration/service/Credentials.java b/app/src/main/java/org/thoughtcrime/securesms/registration/service/Credentials.java similarity index 100% rename from src/org/thoughtcrime/securesms/registration/service/Credentials.java rename to app/src/main/java/org/thoughtcrime/securesms/registration/service/Credentials.java diff --git a/src/org/thoughtcrime/securesms/registration/service/KeyBackupSystemWrongPinException.java b/app/src/main/java/org/thoughtcrime/securesms/registration/service/KeyBackupSystemWrongPinException.java similarity index 100% rename from src/org/thoughtcrime/securesms/registration/service/KeyBackupSystemWrongPinException.java rename to app/src/main/java/org/thoughtcrime/securesms/registration/service/KeyBackupSystemWrongPinException.java diff --git a/src/org/thoughtcrime/securesms/registration/service/RegistrationCodeRequest.java b/app/src/main/java/org/thoughtcrime/securesms/registration/service/RegistrationCodeRequest.java similarity index 100% rename from src/org/thoughtcrime/securesms/registration/service/RegistrationCodeRequest.java rename to app/src/main/java/org/thoughtcrime/securesms/registration/service/RegistrationCodeRequest.java diff --git a/src/org/thoughtcrime/securesms/registration/service/RegistrationService.java b/app/src/main/java/org/thoughtcrime/securesms/registration/service/RegistrationService.java similarity index 100% rename from src/org/thoughtcrime/securesms/registration/service/RegistrationService.java rename to app/src/main/java/org/thoughtcrime/securesms/registration/service/RegistrationService.java diff --git a/src/org/thoughtcrime/securesms/registration/viewmodel/LocalCodeRequestRateLimiter.java b/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/LocalCodeRequestRateLimiter.java similarity index 100% rename from src/org/thoughtcrime/securesms/registration/viewmodel/LocalCodeRequestRateLimiter.java rename to app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/LocalCodeRequestRateLimiter.java diff --git a/src/org/thoughtcrime/securesms/registration/viewmodel/NumberViewState.java b/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/NumberViewState.java similarity index 100% rename from src/org/thoughtcrime/securesms/registration/viewmodel/NumberViewState.java rename to app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/NumberViewState.java diff --git a/src/org/thoughtcrime/securesms/registration/viewmodel/RegistrationViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/RegistrationViewModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/registration/viewmodel/RegistrationViewModel.java rename to app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/RegistrationViewModel.java diff --git a/src/org/thoughtcrime/securesms/revealable/ViewOnceExpirationInfo.java b/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceExpirationInfo.java similarity index 100% rename from src/org/thoughtcrime/securesms/revealable/ViewOnceExpirationInfo.java rename to app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceExpirationInfo.java diff --git a/src/org/thoughtcrime/securesms/revealable/ViewOnceMessageActivity.java b/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/revealable/ViewOnceMessageActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageActivity.java diff --git a/src/org/thoughtcrime/securesms/revealable/ViewOnceMessageManager.java b/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageManager.java similarity index 100% rename from src/org/thoughtcrime/securesms/revealable/ViewOnceMessageManager.java rename to app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageManager.java diff --git a/src/org/thoughtcrime/securesms/revealable/ViewOnceMessageRepository.java b/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageRepository.java similarity index 100% rename from src/org/thoughtcrime/securesms/revealable/ViewOnceMessageRepository.java rename to app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageRepository.java diff --git a/src/org/thoughtcrime/securesms/revealable/ViewOnceMessageView.java b/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageView.java similarity index 100% rename from src/org/thoughtcrime/securesms/revealable/ViewOnceMessageView.java rename to app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageView.java diff --git a/src/org/thoughtcrime/securesms/revealable/ViewOnceMessageViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageViewModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/revealable/ViewOnceMessageViewModel.java rename to app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageViewModel.java diff --git a/src/org/thoughtcrime/securesms/revealable/ViewOnceUtil.java b/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/revealable/ViewOnceUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceUtil.java diff --git a/src/org/thoughtcrime/securesms/ringrtc/CallConnectionWrapper.java b/app/src/main/java/org/thoughtcrime/securesms/ringrtc/CallConnectionWrapper.java similarity index 100% rename from src/org/thoughtcrime/securesms/ringrtc/CallConnectionWrapper.java rename to app/src/main/java/org/thoughtcrime/securesms/ringrtc/CallConnectionWrapper.java diff --git a/src/org/thoughtcrime/securesms/ringrtc/CameraState.java b/app/src/main/java/org/thoughtcrime/securesms/ringrtc/CameraState.java similarity index 100% rename from src/org/thoughtcrime/securesms/ringrtc/CameraState.java rename to app/src/main/java/org/thoughtcrime/securesms/ringrtc/CameraState.java diff --git a/src/org/thoughtcrime/securesms/ringrtc/MessageRecipient.java b/app/src/main/java/org/thoughtcrime/securesms/ringrtc/MessageRecipient.java similarity index 100% rename from src/org/thoughtcrime/securesms/ringrtc/MessageRecipient.java rename to app/src/main/java/org/thoughtcrime/securesms/ringrtc/MessageRecipient.java diff --git a/src/org/thoughtcrime/securesms/ringrtc/RingRtcLogger.java b/app/src/main/java/org/thoughtcrime/securesms/ringrtc/RingRtcLogger.java similarity index 100% rename from src/org/thoughtcrime/securesms/ringrtc/RingRtcLogger.java rename to app/src/main/java/org/thoughtcrime/securesms/ringrtc/RingRtcLogger.java diff --git a/src/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java b/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java diff --git a/src/org/thoughtcrime/securesms/scribbles/ImageEditorFragmentViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragmentViewModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/scribbles/ImageEditorFragmentViewModel.java rename to app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragmentViewModel.java diff --git a/src/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java b/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java similarity index 100% rename from src/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java rename to app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java diff --git a/src/org/thoughtcrime/securesms/scribbles/ImageEditorStickerSelectActivity.java b/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorStickerSelectActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/scribbles/ImageEditorStickerSelectActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorStickerSelectActivity.java diff --git a/src/org/thoughtcrime/securesms/scribbles/UriGlideRenderer.java b/app/src/main/java/org/thoughtcrime/securesms/scribbles/UriGlideRenderer.java similarity index 100% rename from src/org/thoughtcrime/securesms/scribbles/UriGlideRenderer.java rename to app/src/main/java/org/thoughtcrime/securesms/scribbles/UriGlideRenderer.java diff --git a/src/org/thoughtcrime/securesms/scribbles/widget/ColorPaletteAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/scribbles/widget/ColorPaletteAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/scribbles/widget/ColorPaletteAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/scribbles/widget/ColorPaletteAdapter.java diff --git a/src/org/thoughtcrime/securesms/scribbles/widget/VerticalSlideColorPicker.java b/app/src/main/java/org/thoughtcrime/securesms/scribbles/widget/VerticalSlideColorPicker.java similarity index 100% rename from src/org/thoughtcrime/securesms/scribbles/widget/VerticalSlideColorPicker.java rename to app/src/main/java/org/thoughtcrime/securesms/scribbles/widget/VerticalSlideColorPicker.java diff --git a/src/org/thoughtcrime/securesms/search/SearchRepository.java b/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java similarity index 100% rename from src/org/thoughtcrime/securesms/search/SearchRepository.java rename to app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java diff --git a/src/org/thoughtcrime/securesms/service/AccountAuthenticatorService.java b/app/src/main/java/org/thoughtcrime/securesms/service/AccountAuthenticatorService.java similarity index 100% rename from src/org/thoughtcrime/securesms/service/AccountAuthenticatorService.java rename to app/src/main/java/org/thoughtcrime/securesms/service/AccountAuthenticatorService.java diff --git a/src/org/thoughtcrime/securesms/service/AccountVerificationTimeoutException.java b/app/src/main/java/org/thoughtcrime/securesms/service/AccountVerificationTimeoutException.java similarity index 100% rename from src/org/thoughtcrime/securesms/service/AccountVerificationTimeoutException.java rename to app/src/main/java/org/thoughtcrime/securesms/service/AccountVerificationTimeoutException.java diff --git a/src/org/thoughtcrime/securesms/service/ApplicationMigrationService.java b/app/src/main/java/org/thoughtcrime/securesms/service/ApplicationMigrationService.java similarity index 100% rename from src/org/thoughtcrime/securesms/service/ApplicationMigrationService.java rename to app/src/main/java/org/thoughtcrime/securesms/service/ApplicationMigrationService.java diff --git a/src/org/thoughtcrime/securesms/service/BootReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/service/BootReceiver.java similarity index 100% rename from src/org/thoughtcrime/securesms/service/BootReceiver.java rename to app/src/main/java/org/thoughtcrime/securesms/service/BootReceiver.java diff --git a/src/org/thoughtcrime/securesms/service/ContactsSyncAdapterService.java b/app/src/main/java/org/thoughtcrime/securesms/service/ContactsSyncAdapterService.java similarity index 100% rename from src/org/thoughtcrime/securesms/service/ContactsSyncAdapterService.java rename to app/src/main/java/org/thoughtcrime/securesms/service/ContactsSyncAdapterService.java diff --git a/src/org/thoughtcrime/securesms/service/DirectShareService.java b/app/src/main/java/org/thoughtcrime/securesms/service/DirectShareService.java similarity index 100% rename from src/org/thoughtcrime/securesms/service/DirectShareService.java rename to app/src/main/java/org/thoughtcrime/securesms/service/DirectShareService.java diff --git a/src/org/thoughtcrime/securesms/service/DirectoryRefreshListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/DirectoryRefreshListener.java similarity index 100% rename from src/org/thoughtcrime/securesms/service/DirectoryRefreshListener.java rename to app/src/main/java/org/thoughtcrime/securesms/service/DirectoryRefreshListener.java diff --git a/src/org/thoughtcrime/securesms/service/ExpirationListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/ExpirationListener.java similarity index 100% rename from src/org/thoughtcrime/securesms/service/ExpirationListener.java rename to app/src/main/java/org/thoughtcrime/securesms/service/ExpirationListener.java diff --git a/src/org/thoughtcrime/securesms/service/ExpiringMessageManager.java b/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java similarity index 100% rename from src/org/thoughtcrime/securesms/service/ExpiringMessageManager.java rename to app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java diff --git a/src/org/thoughtcrime/securesms/service/GenericForegroundService.java b/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java similarity index 100% rename from src/org/thoughtcrime/securesms/service/GenericForegroundService.java rename to app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java diff --git a/src/org/thoughtcrime/securesms/service/IncomingMessageObserver.java b/app/src/main/java/org/thoughtcrime/securesms/service/IncomingMessageObserver.java similarity index 100% rename from src/org/thoughtcrime/securesms/service/IncomingMessageObserver.java rename to app/src/main/java/org/thoughtcrime/securesms/service/IncomingMessageObserver.java diff --git a/src/org/thoughtcrime/securesms/service/KeyCachingService.java b/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java similarity index 100% rename from src/org/thoughtcrime/securesms/service/KeyCachingService.java rename to app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java diff --git a/src/org/thoughtcrime/securesms/service/LocalBackupListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/LocalBackupListener.java similarity index 100% rename from src/org/thoughtcrime/securesms/service/LocalBackupListener.java rename to app/src/main/java/org/thoughtcrime/securesms/service/LocalBackupListener.java diff --git a/src/org/thoughtcrime/securesms/service/MmsListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/MmsListener.java similarity index 100% rename from src/org/thoughtcrime/securesms/service/MmsListener.java rename to app/src/main/java/org/thoughtcrime/securesms/service/MmsListener.java diff --git a/src/org/thoughtcrime/securesms/service/NotificationController.java b/app/src/main/java/org/thoughtcrime/securesms/service/NotificationController.java similarity index 100% rename from src/org/thoughtcrime/securesms/service/NotificationController.java rename to app/src/main/java/org/thoughtcrime/securesms/service/NotificationController.java diff --git a/src/org/thoughtcrime/securesms/service/PanicResponderListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/PanicResponderListener.java similarity index 100% rename from src/org/thoughtcrime/securesms/service/PanicResponderListener.java rename to app/src/main/java/org/thoughtcrime/securesms/service/PanicResponderListener.java diff --git a/src/org/thoughtcrime/securesms/service/PersistentAlarmManagerListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/PersistentAlarmManagerListener.java similarity index 100% rename from src/org/thoughtcrime/securesms/service/PersistentAlarmManagerListener.java rename to app/src/main/java/org/thoughtcrime/securesms/service/PersistentAlarmManagerListener.java diff --git a/src/org/thoughtcrime/securesms/service/PersistentConnectionBootListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/PersistentConnectionBootListener.java similarity index 100% rename from src/org/thoughtcrime/securesms/service/PersistentConnectionBootListener.java rename to app/src/main/java/org/thoughtcrime/securesms/service/PersistentConnectionBootListener.java diff --git a/src/org/thoughtcrime/securesms/service/QuickResponseService.java b/app/src/main/java/org/thoughtcrime/securesms/service/QuickResponseService.java similarity index 100% rename from src/org/thoughtcrime/securesms/service/QuickResponseService.java rename to app/src/main/java/org/thoughtcrime/securesms/service/QuickResponseService.java diff --git a/src/org/thoughtcrime/securesms/service/RotateSenderCertificateListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/RotateSenderCertificateListener.java similarity index 100% rename from src/org/thoughtcrime/securesms/service/RotateSenderCertificateListener.java rename to app/src/main/java/org/thoughtcrime/securesms/service/RotateSenderCertificateListener.java diff --git a/src/org/thoughtcrime/securesms/service/RotateSignedPreKeyListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/RotateSignedPreKeyListener.java similarity index 100% rename from src/org/thoughtcrime/securesms/service/RotateSignedPreKeyListener.java rename to app/src/main/java/org/thoughtcrime/securesms/service/RotateSignedPreKeyListener.java diff --git a/src/org/thoughtcrime/securesms/service/SmsDeliveryListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/SmsDeliveryListener.java similarity index 100% rename from src/org/thoughtcrime/securesms/service/SmsDeliveryListener.java rename to app/src/main/java/org/thoughtcrime/securesms/service/SmsDeliveryListener.java diff --git a/src/org/thoughtcrime/securesms/service/SmsListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/SmsListener.java similarity index 100% rename from src/org/thoughtcrime/securesms/service/SmsListener.java rename to app/src/main/java/org/thoughtcrime/securesms/service/SmsListener.java diff --git a/src/org/thoughtcrime/securesms/service/TimedEventManager.java b/app/src/main/java/org/thoughtcrime/securesms/service/TimedEventManager.java similarity index 100% rename from src/org/thoughtcrime/securesms/service/TimedEventManager.java rename to app/src/main/java/org/thoughtcrime/securesms/service/TimedEventManager.java diff --git a/src/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java similarity index 100% rename from src/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java rename to app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java diff --git a/src/org/thoughtcrime/securesms/service/UpdateApkRefreshListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkRefreshListener.java similarity index 100% rename from src/org/thoughtcrime/securesms/service/UpdateApkRefreshListener.java rename to app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkRefreshListener.java diff --git a/src/org/thoughtcrime/securesms/service/VerificationCodeParser.java b/app/src/main/java/org/thoughtcrime/securesms/service/VerificationCodeParser.java similarity index 100% rename from src/org/thoughtcrime/securesms/service/VerificationCodeParser.java rename to app/src/main/java/org/thoughtcrime/securesms/service/VerificationCodeParser.java diff --git a/src/org/thoughtcrime/securesms/service/WebRtcCallService.java b/app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.java similarity index 100% rename from src/org/thoughtcrime/securesms/service/WebRtcCallService.java rename to app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.java diff --git a/src/org/thoughtcrime/securesms/sms/IncomingEncryptedMessage.java b/app/src/main/java/org/thoughtcrime/securesms/sms/IncomingEncryptedMessage.java similarity index 100% rename from src/org/thoughtcrime/securesms/sms/IncomingEncryptedMessage.java rename to app/src/main/java/org/thoughtcrime/securesms/sms/IncomingEncryptedMessage.java diff --git a/src/org/thoughtcrime/securesms/sms/IncomingEndSessionMessage.java b/app/src/main/java/org/thoughtcrime/securesms/sms/IncomingEndSessionMessage.java similarity index 100% rename from src/org/thoughtcrime/securesms/sms/IncomingEndSessionMessage.java rename to app/src/main/java/org/thoughtcrime/securesms/sms/IncomingEndSessionMessage.java diff --git a/src/org/thoughtcrime/securesms/sms/IncomingGroupMessage.java b/app/src/main/java/org/thoughtcrime/securesms/sms/IncomingGroupMessage.java similarity index 100% rename from src/org/thoughtcrime/securesms/sms/IncomingGroupMessage.java rename to app/src/main/java/org/thoughtcrime/securesms/sms/IncomingGroupMessage.java diff --git a/src/org/thoughtcrime/securesms/sms/IncomingIdentityDefaultMessage.java b/app/src/main/java/org/thoughtcrime/securesms/sms/IncomingIdentityDefaultMessage.java similarity index 100% rename from src/org/thoughtcrime/securesms/sms/IncomingIdentityDefaultMessage.java rename to app/src/main/java/org/thoughtcrime/securesms/sms/IncomingIdentityDefaultMessage.java diff --git a/src/org/thoughtcrime/securesms/sms/IncomingIdentityUpdateMessage.java b/app/src/main/java/org/thoughtcrime/securesms/sms/IncomingIdentityUpdateMessage.java similarity index 100% rename from src/org/thoughtcrime/securesms/sms/IncomingIdentityUpdateMessage.java rename to app/src/main/java/org/thoughtcrime/securesms/sms/IncomingIdentityUpdateMessage.java diff --git a/src/org/thoughtcrime/securesms/sms/IncomingIdentityVerifiedMessage.java b/app/src/main/java/org/thoughtcrime/securesms/sms/IncomingIdentityVerifiedMessage.java similarity index 100% rename from src/org/thoughtcrime/securesms/sms/IncomingIdentityVerifiedMessage.java rename to app/src/main/java/org/thoughtcrime/securesms/sms/IncomingIdentityVerifiedMessage.java diff --git a/src/org/thoughtcrime/securesms/sms/IncomingJoinedMessage.java b/app/src/main/java/org/thoughtcrime/securesms/sms/IncomingJoinedMessage.java similarity index 100% rename from src/org/thoughtcrime/securesms/sms/IncomingJoinedMessage.java rename to app/src/main/java/org/thoughtcrime/securesms/sms/IncomingJoinedMessage.java diff --git a/src/org/thoughtcrime/securesms/sms/IncomingPreKeyBundleMessage.java b/app/src/main/java/org/thoughtcrime/securesms/sms/IncomingPreKeyBundleMessage.java similarity index 100% rename from src/org/thoughtcrime/securesms/sms/IncomingPreKeyBundleMessage.java rename to app/src/main/java/org/thoughtcrime/securesms/sms/IncomingPreKeyBundleMessage.java diff --git a/src/org/thoughtcrime/securesms/sms/IncomingTextMessage.java b/app/src/main/java/org/thoughtcrime/securesms/sms/IncomingTextMessage.java similarity index 100% rename from src/org/thoughtcrime/securesms/sms/IncomingTextMessage.java rename to app/src/main/java/org/thoughtcrime/securesms/sms/IncomingTextMessage.java diff --git a/src/org/thoughtcrime/securesms/sms/MessageSender.java b/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java similarity index 100% rename from src/org/thoughtcrime/securesms/sms/MessageSender.java rename to app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java diff --git a/src/org/thoughtcrime/securesms/sms/OutgoingEncryptedMessage.java b/app/src/main/java/org/thoughtcrime/securesms/sms/OutgoingEncryptedMessage.java similarity index 100% rename from src/org/thoughtcrime/securesms/sms/OutgoingEncryptedMessage.java rename to app/src/main/java/org/thoughtcrime/securesms/sms/OutgoingEncryptedMessage.java diff --git a/src/org/thoughtcrime/securesms/sms/OutgoingEndSessionMessage.java b/app/src/main/java/org/thoughtcrime/securesms/sms/OutgoingEndSessionMessage.java similarity index 100% rename from src/org/thoughtcrime/securesms/sms/OutgoingEndSessionMessage.java rename to app/src/main/java/org/thoughtcrime/securesms/sms/OutgoingEndSessionMessage.java diff --git a/src/org/thoughtcrime/securesms/sms/OutgoingIdentityDefaultMessage.java b/app/src/main/java/org/thoughtcrime/securesms/sms/OutgoingIdentityDefaultMessage.java similarity index 100% rename from src/org/thoughtcrime/securesms/sms/OutgoingIdentityDefaultMessage.java rename to app/src/main/java/org/thoughtcrime/securesms/sms/OutgoingIdentityDefaultMessage.java diff --git a/src/org/thoughtcrime/securesms/sms/OutgoingIdentityVerifiedMessage.java b/app/src/main/java/org/thoughtcrime/securesms/sms/OutgoingIdentityVerifiedMessage.java similarity index 100% rename from src/org/thoughtcrime/securesms/sms/OutgoingIdentityVerifiedMessage.java rename to app/src/main/java/org/thoughtcrime/securesms/sms/OutgoingIdentityVerifiedMessage.java diff --git a/src/org/thoughtcrime/securesms/sms/OutgoingKeyExchangeMessage.java b/app/src/main/java/org/thoughtcrime/securesms/sms/OutgoingKeyExchangeMessage.java similarity index 100% rename from src/org/thoughtcrime/securesms/sms/OutgoingKeyExchangeMessage.java rename to app/src/main/java/org/thoughtcrime/securesms/sms/OutgoingKeyExchangeMessage.java diff --git a/src/org/thoughtcrime/securesms/sms/OutgoingPrekeyBundleMessage.java b/app/src/main/java/org/thoughtcrime/securesms/sms/OutgoingPrekeyBundleMessage.java similarity index 100% rename from src/org/thoughtcrime/securesms/sms/OutgoingPrekeyBundleMessage.java rename to app/src/main/java/org/thoughtcrime/securesms/sms/OutgoingPrekeyBundleMessage.java diff --git a/src/org/thoughtcrime/securesms/sms/OutgoingTextMessage.java b/app/src/main/java/org/thoughtcrime/securesms/sms/OutgoingTextMessage.java similarity index 100% rename from src/org/thoughtcrime/securesms/sms/OutgoingTextMessage.java rename to app/src/main/java/org/thoughtcrime/securesms/sms/OutgoingTextMessage.java diff --git a/src/org/thoughtcrime/securesms/sms/TelephonyServiceState.java b/app/src/main/java/org/thoughtcrime/securesms/sms/TelephonyServiceState.java similarity index 100% rename from src/org/thoughtcrime/securesms/sms/TelephonyServiceState.java rename to app/src/main/java/org/thoughtcrime/securesms/sms/TelephonyServiceState.java diff --git a/src/org/thoughtcrime/securesms/stickers/BlessedPacks.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/BlessedPacks.java similarity index 100% rename from src/org/thoughtcrime/securesms/stickers/BlessedPacks.java rename to app/src/main/java/org/thoughtcrime/securesms/stickers/BlessedPacks.java diff --git a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardPageAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardPageAdapter.java diff --git a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageFragment.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardPageFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardPageFragment.java diff --git a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardPageViewModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageViewModel.java rename to app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardPageViewModel.java diff --git a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardProvider.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardProvider.java similarity index 100% rename from src/org/thoughtcrime/securesms/stickers/StickerKeyboardProvider.java rename to app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardProvider.java diff --git a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardRepository.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardRepository.java similarity index 100% rename from src/org/thoughtcrime/securesms/stickers/StickerKeyboardRepository.java rename to app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardRepository.java diff --git a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardViewModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/stickers/StickerKeyboardViewModel.java rename to app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardViewModel.java diff --git a/src/org/thoughtcrime/securesms/stickers/StickerLocator.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerLocator.java similarity index 100% rename from src/org/thoughtcrime/securesms/stickers/StickerLocator.java rename to app/src/main/java/org/thoughtcrime/securesms/stickers/StickerLocator.java diff --git a/src/org/thoughtcrime/securesms/stickers/StickerManagementActivity.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/stickers/StickerManagementActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementActivity.java diff --git a/src/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java diff --git a/src/org/thoughtcrime/securesms/stickers/StickerManagementRepository.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementRepository.java similarity index 100% rename from src/org/thoughtcrime/securesms/stickers/StickerManagementRepository.java rename to app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementRepository.java diff --git a/src/org/thoughtcrime/securesms/stickers/StickerManagementViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementViewModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/stickers/StickerManagementViewModel.java rename to app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementViewModel.java diff --git a/src/org/thoughtcrime/securesms/stickers/StickerManifest.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManifest.java similarity index 100% rename from src/org/thoughtcrime/securesms/stickers/StickerManifest.java rename to app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManifest.java diff --git a/src/org/thoughtcrime/securesms/stickers/StickerPackInstallEvent.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackInstallEvent.java similarity index 100% rename from src/org/thoughtcrime/securesms/stickers/StickerPackInstallEvent.java rename to app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackInstallEvent.java diff --git a/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java similarity index 100% rename from src/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java diff --git a/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/stickers/StickerPackPreviewAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewAdapter.java diff --git a/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java similarity index 100% rename from src/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java rename to app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java diff --git a/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewViewModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/stickers/StickerPackPreviewViewModel.java rename to app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewViewModel.java diff --git a/src/org/thoughtcrime/securesms/stickers/StickerPreviewPopup.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPreviewPopup.java similarity index 100% rename from src/org/thoughtcrime/securesms/stickers/StickerPreviewPopup.java rename to app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPreviewPopup.java diff --git a/src/org/thoughtcrime/securesms/stickers/StickerRemoteUri.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerRemoteUri.java similarity index 100% rename from src/org/thoughtcrime/securesms/stickers/StickerRemoteUri.java rename to app/src/main/java/org/thoughtcrime/securesms/stickers/StickerRemoteUri.java diff --git a/src/org/thoughtcrime/securesms/stickers/StickerRemoteUriFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerRemoteUriFetcher.java similarity index 100% rename from src/org/thoughtcrime/securesms/stickers/StickerRemoteUriFetcher.java rename to app/src/main/java/org/thoughtcrime/securesms/stickers/StickerRemoteUriFetcher.java diff --git a/src/org/thoughtcrime/securesms/stickers/StickerRemoteUriLoader.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerRemoteUriLoader.java similarity index 100% rename from src/org/thoughtcrime/securesms/stickers/StickerRemoteUriLoader.java rename to app/src/main/java/org/thoughtcrime/securesms/stickers/StickerRemoteUriLoader.java diff --git a/src/org/thoughtcrime/securesms/stickers/StickerRolloverTouchListener.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerRolloverTouchListener.java similarity index 100% rename from src/org/thoughtcrime/securesms/stickers/StickerRolloverTouchListener.java rename to app/src/main/java/org/thoughtcrime/securesms/stickers/StickerRolloverTouchListener.java diff --git a/src/org/thoughtcrime/securesms/stickers/StickerSearchRepository.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerSearchRepository.java similarity index 100% rename from src/org/thoughtcrime/securesms/stickers/StickerSearchRepository.java rename to app/src/main/java/org/thoughtcrime/securesms/stickers/StickerSearchRepository.java diff --git a/src/org/thoughtcrime/securesms/stickers/StickerUrl.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerUrl.java similarity index 100% rename from src/org/thoughtcrime/securesms/stickers/StickerUrl.java rename to app/src/main/java/org/thoughtcrime/securesms/stickers/StickerUrl.java diff --git a/src/org/thoughtcrime/securesms/transport/InsecureFallbackApprovalException.java b/app/src/main/java/org/thoughtcrime/securesms/transport/InsecureFallbackApprovalException.java similarity index 100% rename from src/org/thoughtcrime/securesms/transport/InsecureFallbackApprovalException.java rename to app/src/main/java/org/thoughtcrime/securesms/transport/InsecureFallbackApprovalException.java diff --git a/src/org/thoughtcrime/securesms/transport/RetryLaterException.java b/app/src/main/java/org/thoughtcrime/securesms/transport/RetryLaterException.java similarity index 100% rename from src/org/thoughtcrime/securesms/transport/RetryLaterException.java rename to app/src/main/java/org/thoughtcrime/securesms/transport/RetryLaterException.java diff --git a/src/org/thoughtcrime/securesms/transport/UndeliverableMessageException.java b/app/src/main/java/org/thoughtcrime/securesms/transport/UndeliverableMessageException.java similarity index 100% rename from src/org/thoughtcrime/securesms/transport/UndeliverableMessageException.java rename to app/src/main/java/org/thoughtcrime/securesms/transport/UndeliverableMessageException.java diff --git a/src/org/thoughtcrime/securesms/usernames/ProfileEditActivityV2.java b/app/src/main/java/org/thoughtcrime/securesms/usernames/ProfileEditActivityV2.java similarity index 100% rename from src/org/thoughtcrime/securesms/usernames/ProfileEditActivityV2.java rename to app/src/main/java/org/thoughtcrime/securesms/usernames/ProfileEditActivityV2.java diff --git a/src/org/thoughtcrime/securesms/usernames/ProfileEditOverviewFragment.java b/app/src/main/java/org/thoughtcrime/securesms/usernames/ProfileEditOverviewFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/usernames/ProfileEditOverviewFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/usernames/ProfileEditOverviewFragment.java diff --git a/src/org/thoughtcrime/securesms/usernames/ProfileEditOverviewRepository.java b/app/src/main/java/org/thoughtcrime/securesms/usernames/ProfileEditOverviewRepository.java similarity index 100% rename from src/org/thoughtcrime/securesms/usernames/ProfileEditOverviewRepository.java rename to app/src/main/java/org/thoughtcrime/securesms/usernames/ProfileEditOverviewRepository.java diff --git a/src/org/thoughtcrime/securesms/usernames/ProfileEditOverviewViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/usernames/ProfileEditOverviewViewModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/usernames/ProfileEditOverviewViewModel.java rename to app/src/main/java/org/thoughtcrime/securesms/usernames/ProfileEditOverviewViewModel.java diff --git a/src/org/thoughtcrime/securesms/usernames/profile/ProfileEditNameFragment.java b/app/src/main/java/org/thoughtcrime/securesms/usernames/profile/ProfileEditNameFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/usernames/profile/ProfileEditNameFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/usernames/profile/ProfileEditNameFragment.java diff --git a/src/org/thoughtcrime/securesms/usernames/profile/ProfileEditNameRepository.java b/app/src/main/java/org/thoughtcrime/securesms/usernames/profile/ProfileEditNameRepository.java similarity index 100% rename from src/org/thoughtcrime/securesms/usernames/profile/ProfileEditNameRepository.java rename to app/src/main/java/org/thoughtcrime/securesms/usernames/profile/ProfileEditNameRepository.java diff --git a/src/org/thoughtcrime/securesms/usernames/profile/ProfileEditNameViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/usernames/profile/ProfileEditNameViewModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/usernames/profile/ProfileEditNameViewModel.java rename to app/src/main/java/org/thoughtcrime/securesms/usernames/profile/ProfileEditNameViewModel.java diff --git a/src/org/thoughtcrime/securesms/usernames/username/UsernameEditFragment.java b/app/src/main/java/org/thoughtcrime/securesms/usernames/username/UsernameEditFragment.java similarity index 100% rename from src/org/thoughtcrime/securesms/usernames/username/UsernameEditFragment.java rename to app/src/main/java/org/thoughtcrime/securesms/usernames/username/UsernameEditFragment.java diff --git a/src/org/thoughtcrime/securesms/usernames/username/UsernameEditRepository.java b/app/src/main/java/org/thoughtcrime/securesms/usernames/username/UsernameEditRepository.java similarity index 100% rename from src/org/thoughtcrime/securesms/usernames/username/UsernameEditRepository.java rename to app/src/main/java/org/thoughtcrime/securesms/usernames/username/UsernameEditRepository.java diff --git a/src/org/thoughtcrime/securesms/usernames/username/UsernameEditViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/usernames/username/UsernameEditViewModel.java similarity index 100% rename from src/org/thoughtcrime/securesms/usernames/username/UsernameEditViewModel.java rename to app/src/main/java/org/thoughtcrime/securesms/usernames/username/UsernameEditViewModel.java diff --git a/src/org/thoughtcrime/securesms/util/AbstractCursorLoader.java b/app/src/main/java/org/thoughtcrime/securesms/util/AbstractCursorLoader.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/AbstractCursorLoader.java rename to app/src/main/java/org/thoughtcrime/securesms/util/AbstractCursorLoader.java diff --git a/src/org/thoughtcrime/securesms/util/AccessibilityUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/AccessibilityUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/AccessibilityUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/util/AccessibilityUtil.java diff --git a/src/org/thoughtcrime/securesms/util/AlarmSleepTimer.java b/app/src/main/java/org/thoughtcrime/securesms/util/AlarmSleepTimer.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/AlarmSleepTimer.java rename to app/src/main/java/org/thoughtcrime/securesms/util/AlarmSleepTimer.java diff --git a/src/org/thoughtcrime/securesms/util/AsyncLoader.java b/app/src/main/java/org/thoughtcrime/securesms/util/AsyncLoader.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/AsyncLoader.java rename to app/src/main/java/org/thoughtcrime/securesms/util/AsyncLoader.java diff --git a/src/org/thoughtcrime/securesms/util/AttachmentUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/AttachmentUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java diff --git a/src/org/thoughtcrime/securesms/util/AvatarUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/AvatarUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/AvatarUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/util/AvatarUtil.java diff --git a/src/org/thoughtcrime/securesms/util/BackupUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/BackupUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.java diff --git a/src/org/thoughtcrime/securesms/util/Base64.java b/app/src/main/java/org/thoughtcrime/securesms/util/Base64.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/Base64.java rename to app/src/main/java/org/thoughtcrime/securesms/util/Base64.java diff --git a/src/org/thoughtcrime/securesms/util/BitmapDecodingException.java b/app/src/main/java/org/thoughtcrime/securesms/util/BitmapDecodingException.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/BitmapDecodingException.java rename to app/src/main/java/org/thoughtcrime/securesms/util/BitmapDecodingException.java diff --git a/src/org/thoughtcrime/securesms/util/BitmapUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/BitmapUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/BitmapUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/util/BitmapUtil.java diff --git a/src/org/thoughtcrime/securesms/util/BucketInfo.java b/app/src/main/java/org/thoughtcrime/securesms/util/BucketInfo.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/BucketInfo.java rename to app/src/main/java/org/thoughtcrime/securesms/util/BucketInfo.java diff --git a/src/org/thoughtcrime/securesms/util/CalendarDateOnly.java b/app/src/main/java/org/thoughtcrime/securesms/util/CalendarDateOnly.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/CalendarDateOnly.java rename to app/src/main/java/org/thoughtcrime/securesms/util/CalendarDateOnly.java diff --git a/src/org/thoughtcrime/securesms/util/CharacterCalculator.java b/app/src/main/java/org/thoughtcrime/securesms/util/CharacterCalculator.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/CharacterCalculator.java rename to app/src/main/java/org/thoughtcrime/securesms/util/CharacterCalculator.java diff --git a/src/org/thoughtcrime/securesms/util/CloseableLiveData.java b/app/src/main/java/org/thoughtcrime/securesms/util/CloseableLiveData.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/CloseableLiveData.java rename to app/src/main/java/org/thoughtcrime/securesms/util/CloseableLiveData.java diff --git a/src/org/thoughtcrime/securesms/util/CommunicationActions.java b/app/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/CommunicationActions.java rename to app/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java diff --git a/src/org/thoughtcrime/securesms/util/Conversions.java b/app/src/main/java/org/thoughtcrime/securesms/util/Conversions.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/Conversions.java rename to app/src/main/java/org/thoughtcrime/securesms/util/Conversions.java diff --git a/src/org/thoughtcrime/securesms/util/DateUtils.java b/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/DateUtils.java rename to app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java diff --git a/src/org/thoughtcrime/securesms/util/Debouncer.java b/app/src/main/java/org/thoughtcrime/securesms/util/Debouncer.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/Debouncer.java rename to app/src/main/java/org/thoughtcrime/securesms/util/Debouncer.java diff --git a/src/org/thoughtcrime/securesms/util/DelimiterUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/DelimiterUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/DelimiterUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/util/DelimiterUtil.java diff --git a/src/org/thoughtcrime/securesms/util/Dialogs.java b/app/src/main/java/org/thoughtcrime/securesms/util/Dialogs.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/Dialogs.java rename to app/src/main/java/org/thoughtcrime/securesms/util/Dialogs.java diff --git a/src/org/thoughtcrime/securesms/util/DynamicDarkActionBarTheme.java b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicDarkActionBarTheme.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/DynamicDarkActionBarTheme.java rename to app/src/main/java/org/thoughtcrime/securesms/util/DynamicDarkActionBarTheme.java diff --git a/src/org/thoughtcrime/securesms/util/DynamicDarkToolbarTheme.java b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicDarkToolbarTheme.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/DynamicDarkToolbarTheme.java rename to app/src/main/java/org/thoughtcrime/securesms/util/DynamicDarkToolbarTheme.java diff --git a/src/org/thoughtcrime/securesms/util/DynamicIntroTheme.java b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicIntroTheme.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/DynamicIntroTheme.java rename to app/src/main/java/org/thoughtcrime/securesms/util/DynamicIntroTheme.java diff --git a/src/org/thoughtcrime/securesms/util/DynamicLanguage.java b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicLanguage.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/DynamicLanguage.java rename to app/src/main/java/org/thoughtcrime/securesms/util/DynamicLanguage.java diff --git a/src/org/thoughtcrime/securesms/util/DynamicNoActionBarInviteTheme.java b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicNoActionBarInviteTheme.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/DynamicNoActionBarInviteTheme.java rename to app/src/main/java/org/thoughtcrime/securesms/util/DynamicNoActionBarInviteTheme.java diff --git a/src/org/thoughtcrime/securesms/util/DynamicNoActionBarTheme.java b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicNoActionBarTheme.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/DynamicNoActionBarTheme.java rename to app/src/main/java/org/thoughtcrime/securesms/util/DynamicNoActionBarTheme.java diff --git a/src/org/thoughtcrime/securesms/util/DynamicRegistrationTheme.java b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicRegistrationTheme.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/DynamicRegistrationTheme.java rename to app/src/main/java/org/thoughtcrime/securesms/util/DynamicRegistrationTheme.java diff --git a/src/org/thoughtcrime/securesms/util/DynamicTheme.java b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicTheme.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/DynamicTheme.java rename to app/src/main/java/org/thoughtcrime/securesms/util/DynamicTheme.java diff --git a/src/org/thoughtcrime/securesms/util/ExpirationUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/ExpirationUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/ExpirationUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/util/ExpirationUtil.java diff --git a/src/org/thoughtcrime/securesms/util/FeatureFlags.java b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/FeatureFlags.java rename to app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java diff --git a/src/org/thoughtcrime/securesms/util/FileProviderUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/FileProviderUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/FileProviderUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/util/FileProviderUtil.java diff --git a/src/org/thoughtcrime/securesms/util/FileUtils.java b/app/src/main/java/org/thoughtcrime/securesms/util/FileUtils.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/FileUtils.java rename to app/src/main/java/org/thoughtcrime/securesms/util/FileUtils.java diff --git a/src/org/thoughtcrime/securesms/util/FrameRateTracker.java b/app/src/main/java/org/thoughtcrime/securesms/util/FrameRateTracker.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/FrameRateTracker.java rename to app/src/main/java/org/thoughtcrime/securesms/util/FrameRateTracker.java diff --git a/src/org/thoughtcrime/securesms/util/Function3.java b/app/src/main/java/org/thoughtcrime/securesms/util/Function3.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/Function3.java rename to app/src/main/java/org/thoughtcrime/securesms/util/Function3.java diff --git a/src/org/thoughtcrime/securesms/util/FutureTaskListener.java b/app/src/main/java/org/thoughtcrime/securesms/util/FutureTaskListener.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/FutureTaskListener.java rename to app/src/main/java/org/thoughtcrime/securesms/util/FutureTaskListener.java diff --git a/src/org/thoughtcrime/securesms/util/GroupUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/GroupUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/GroupUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/util/GroupUtil.java diff --git a/src/org/thoughtcrime/securesms/util/Hex.java b/app/src/main/java/org/thoughtcrime/securesms/util/Hex.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/Hex.java rename to app/src/main/java/org/thoughtcrime/securesms/util/Hex.java diff --git a/src/org/thoughtcrime/securesms/util/IOFunction.java b/app/src/main/java/org/thoughtcrime/securesms/util/IOFunction.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/IOFunction.java rename to app/src/main/java/org/thoughtcrime/securesms/util/IOFunction.java diff --git a/src/org/thoughtcrime/securesms/util/IasKeyStore.java b/app/src/main/java/org/thoughtcrime/securesms/util/IasKeyStore.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/IasKeyStore.java rename to app/src/main/java/org/thoughtcrime/securesms/util/IasKeyStore.java diff --git a/src/org/thoughtcrime/securesms/util/IdentityUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/IdentityUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/IdentityUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/util/IdentityUtil.java diff --git a/src/org/thoughtcrime/securesms/util/IntentUtils.java b/app/src/main/java/org/thoughtcrime/securesms/util/IntentUtils.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/IntentUtils.java rename to app/src/main/java/org/thoughtcrime/securesms/util/IntentUtils.java diff --git a/src/org/thoughtcrime/securesms/util/JsonUtils.java b/app/src/main/java/org/thoughtcrime/securesms/util/JsonUtils.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/JsonUtils.java rename to app/src/main/java/org/thoughtcrime/securesms/util/JsonUtils.java diff --git a/src/org/thoughtcrime/securesms/util/LRUCache.java b/app/src/main/java/org/thoughtcrime/securesms/util/LRUCache.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/LRUCache.java rename to app/src/main/java/org/thoughtcrime/securesms/util/LRUCache.java diff --git a/src/org/thoughtcrime/securesms/util/LimitedInputStream.java b/app/src/main/java/org/thoughtcrime/securesms/util/LimitedInputStream.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/LimitedInputStream.java rename to app/src/main/java/org/thoughtcrime/securesms/util/LimitedInputStream.java diff --git a/src/org/thoughtcrime/securesms/util/LinkedBlockingLifoQueue.java b/app/src/main/java/org/thoughtcrime/securesms/util/LinkedBlockingLifoQueue.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/LinkedBlockingLifoQueue.java rename to app/src/main/java/org/thoughtcrime/securesms/util/LinkedBlockingLifoQueue.java diff --git a/src/org/thoughtcrime/securesms/util/ListenableFutureTask.java b/app/src/main/java/org/thoughtcrime/securesms/util/ListenableFutureTask.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/ListenableFutureTask.java rename to app/src/main/java/org/thoughtcrime/securesms/util/ListenableFutureTask.java diff --git a/src/org/thoughtcrime/securesms/util/LongClickCopySpan.java b/app/src/main/java/org/thoughtcrime/securesms/util/LongClickCopySpan.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/LongClickCopySpan.java rename to app/src/main/java/org/thoughtcrime/securesms/util/LongClickCopySpan.java diff --git a/src/org/thoughtcrime/securesms/util/LongClickMovementMethod.java b/app/src/main/java/org/thoughtcrime/securesms/util/LongClickMovementMethod.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/LongClickMovementMethod.java rename to app/src/main/java/org/thoughtcrime/securesms/util/LongClickMovementMethod.java diff --git a/src/org/thoughtcrime/securesms/util/MathUtils.java b/app/src/main/java/org/thoughtcrime/securesms/util/MathUtils.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/MathUtils.java rename to app/src/main/java/org/thoughtcrime/securesms/util/MathUtils.java diff --git a/src/org/thoughtcrime/securesms/util/MediaMetadataRetrieverUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/MediaMetadataRetrieverUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/MediaMetadataRetrieverUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/util/MediaMetadataRetrieverUtil.java diff --git a/src/org/thoughtcrime/securesms/util/MediaUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/MediaUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java diff --git a/src/org/thoughtcrime/securesms/util/MemoryFileDescriptor.java b/app/src/main/java/org/thoughtcrime/securesms/util/MemoryFileDescriptor.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/MemoryFileDescriptor.java rename to app/src/main/java/org/thoughtcrime/securesms/util/MemoryFileDescriptor.java diff --git a/src/org/thoughtcrime/securesms/util/MemoryFileUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/MemoryFileUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/MemoryFileUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/util/MemoryFileUtil.java diff --git a/src/org/thoughtcrime/securesms/util/MessageRecordUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/MessageRecordUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/MessageRecordUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/util/MessageRecordUtil.java diff --git a/src/org/thoughtcrime/securesms/util/MmsCharacterCalculator.java b/app/src/main/java/org/thoughtcrime/securesms/util/MmsCharacterCalculator.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/MmsCharacterCalculator.java rename to app/src/main/java/org/thoughtcrime/securesms/util/MmsCharacterCalculator.java diff --git a/src/org/thoughtcrime/securesms/util/ObservingLiveData.java b/app/src/main/java/org/thoughtcrime/securesms/util/ObservingLiveData.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/ObservingLiveData.java rename to app/src/main/java/org/thoughtcrime/securesms/util/ObservingLiveData.java diff --git a/src/org/thoughtcrime/securesms/util/ParcelUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/ParcelUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/ParcelUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/util/ParcelUtil.java diff --git a/src/org/thoughtcrime/securesms/util/PlayServicesUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/PlayServicesUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/PlayServicesUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/util/PlayServicesUtil.java diff --git a/src/org/thoughtcrime/securesms/util/PowerManagerCompat.java b/app/src/main/java/org/thoughtcrime/securesms/util/PowerManagerCompat.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/PowerManagerCompat.java rename to app/src/main/java/org/thoughtcrime/securesms/util/PowerManagerCompat.java diff --git a/src/org/thoughtcrime/securesms/util/ProfileUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/ProfileUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/ProfileUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/util/ProfileUtil.java diff --git a/src/org/thoughtcrime/securesms/util/PushCharacterCalculator.java b/app/src/main/java/org/thoughtcrime/securesms/util/PushCharacterCalculator.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/PushCharacterCalculator.java rename to app/src/main/java/org/thoughtcrime/securesms/util/PushCharacterCalculator.java diff --git a/src/org/thoughtcrime/securesms/util/RedPhoneCallTypes.java b/app/src/main/java/org/thoughtcrime/securesms/util/RedPhoneCallTypes.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/RedPhoneCallTypes.java rename to app/src/main/java/org/thoughtcrime/securesms/util/RedPhoneCallTypes.java diff --git a/src/org/thoughtcrime/securesms/util/ResUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/ResUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/ResUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/util/ResUtil.java diff --git a/src/org/thoughtcrime/securesms/util/Rfc5724Uri.java b/app/src/main/java/org/thoughtcrime/securesms/util/Rfc5724Uri.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/Rfc5724Uri.java rename to app/src/main/java/org/thoughtcrime/securesms/util/Rfc5724Uri.java diff --git a/src/org/thoughtcrime/securesms/util/SaveAttachmentTask.java b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/SaveAttachmentTask.java rename to app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java diff --git a/src/org/thoughtcrime/securesms/util/SearchUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/SearchUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/SearchUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/util/SearchUtil.java diff --git a/src/org/thoughtcrime/securesms/util/SelectedRecipientsAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/util/SelectedRecipientsAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/SelectedRecipientsAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/util/SelectedRecipientsAdapter.java diff --git a/src/org/thoughtcrime/securesms/util/ServiceUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/ServiceUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/ServiceUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/util/ServiceUtil.java diff --git a/src/org/thoughtcrime/securesms/util/SetUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/SetUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/SetUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/util/SetUtil.java diff --git a/src/org/thoughtcrime/securesms/util/ShortCodeUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/ShortCodeUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/ShortCodeUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/util/ShortCodeUtil.java diff --git a/src/org/thoughtcrime/securesms/util/SingleLiveEvent.java b/app/src/main/java/org/thoughtcrime/securesms/util/SingleLiveEvent.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/SingleLiveEvent.java rename to app/src/main/java/org/thoughtcrime/securesms/util/SingleLiveEvent.java diff --git a/src/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java b/app/src/main/java/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java rename to app/src/main/java/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java diff --git a/src/org/thoughtcrime/securesms/util/SoftHashMap.java b/app/src/main/java/org/thoughtcrime/securesms/util/SoftHashMap.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/SoftHashMap.java rename to app/src/main/java/org/thoughtcrime/securesms/util/SoftHashMap.java diff --git a/src/org/thoughtcrime/securesms/util/SpanUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/SpanUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/SpanUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/util/SpanUtil.java diff --git a/src/org/thoughtcrime/securesms/util/SqlUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/SqlUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/SqlUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/util/SqlUtil.java diff --git a/src/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java b/app/src/main/java/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java rename to app/src/main/java/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java diff --git a/src/org/thoughtcrime/securesms/util/Stopwatch.java b/app/src/main/java/org/thoughtcrime/securesms/util/Stopwatch.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/Stopwatch.java rename to app/src/main/java/org/thoughtcrime/securesms/util/Stopwatch.java diff --git a/src/org/thoughtcrime/securesms/util/StorageUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/StorageUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/StorageUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/util/StorageUtil.java diff --git a/src/org/thoughtcrime/securesms/util/TaggedFutureTask.java b/app/src/main/java/org/thoughtcrime/securesms/util/TaggedFutureTask.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/TaggedFutureTask.java rename to app/src/main/java/org/thoughtcrime/securesms/util/TaggedFutureTask.java diff --git a/src/org/thoughtcrime/securesms/util/TelephonyUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/TelephonyUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/TelephonyUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/util/TelephonyUtil.java diff --git a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java b/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/TextSecurePreferences.java rename to app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java diff --git a/src/org/thoughtcrime/securesms/util/ThemeUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/ThemeUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/ThemeUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/util/ThemeUtil.java diff --git a/src/org/thoughtcrime/securesms/util/Throttler.java b/app/src/main/java/org/thoughtcrime/securesms/util/Throttler.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/Throttler.java rename to app/src/main/java/org/thoughtcrime/securesms/util/Throttler.java diff --git a/src/org/thoughtcrime/securesms/util/Trimmer.java b/app/src/main/java/org/thoughtcrime/securesms/util/Trimmer.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/Trimmer.java rename to app/src/main/java/org/thoughtcrime/securesms/util/Trimmer.java diff --git a/src/org/thoughtcrime/securesms/util/UsernameUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/UsernameUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/UsernameUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/util/UsernameUtil.java diff --git a/src/org/thoughtcrime/securesms/util/Util.java b/app/src/main/java/org/thoughtcrime/securesms/util/Util.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/Util.java rename to app/src/main/java/org/thoughtcrime/securesms/util/Util.java diff --git a/src/org/thoughtcrime/securesms/util/VerifySpan.java b/app/src/main/java/org/thoughtcrime/securesms/util/VerifySpan.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/VerifySpan.java rename to app/src/main/java/org/thoughtcrime/securesms/util/VerifySpan.java diff --git a/src/org/thoughtcrime/securesms/util/VersionTracker.java b/app/src/main/java/org/thoughtcrime/securesms/util/VersionTracker.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/VersionTracker.java rename to app/src/main/java/org/thoughtcrime/securesms/util/VersionTracker.java diff --git a/src/org/thoughtcrime/securesms/util/ViewUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/ViewUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/ViewUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/util/ViewUtil.java diff --git a/src/org/thoughtcrime/securesms/util/WakeLockUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/WakeLockUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/WakeLockUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/util/WakeLockUtil.java diff --git a/src/org/thoughtcrime/securesms/util/WindowUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/WindowUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/WindowUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/util/WindowUtil.java diff --git a/src/org/thoughtcrime/securesms/util/WorkerThread.java b/app/src/main/java/org/thoughtcrime/securesms/util/WorkerThread.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/WorkerThread.java rename to app/src/main/java/org/thoughtcrime/securesms/util/WorkerThread.java diff --git a/src/org/thoughtcrime/securesms/util/adapter/FixedViewsAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/util/adapter/FixedViewsAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/adapter/FixedViewsAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/util/adapter/FixedViewsAdapter.java diff --git a/src/org/thoughtcrime/securesms/util/adapter/RecyclerViewConcatenateAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/util/adapter/RecyclerViewConcatenateAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/adapter/RecyclerViewConcatenateAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/util/adapter/RecyclerViewConcatenateAdapter.java diff --git a/src/org/thoughtcrime/securesms/util/adapter/RecyclerViewConcatenateAdapterStickyHeader.java b/app/src/main/java/org/thoughtcrime/securesms/util/adapter/RecyclerViewConcatenateAdapterStickyHeader.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/adapter/RecyclerViewConcatenateAdapterStickyHeader.java rename to app/src/main/java/org/thoughtcrime/securesms/util/adapter/RecyclerViewConcatenateAdapterStickyHeader.java diff --git a/src/org/thoughtcrime/securesms/util/adapter/SectionedRecyclerViewAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/util/adapter/SectionedRecyclerViewAdapter.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/adapter/SectionedRecyclerViewAdapter.java rename to app/src/main/java/org/thoughtcrime/securesms/util/adapter/SectionedRecyclerViewAdapter.java diff --git a/src/org/thoughtcrime/securesms/util/adapter/StableIdGenerator.java b/app/src/main/java/org/thoughtcrime/securesms/util/adapter/StableIdGenerator.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/adapter/StableIdGenerator.java rename to app/src/main/java/org/thoughtcrime/securesms/util/adapter/StableIdGenerator.java diff --git a/src/org/thoughtcrime/securesms/util/concurrent/AssertedSuccessListener.java b/app/src/main/java/org/thoughtcrime/securesms/util/concurrent/AssertedSuccessListener.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/concurrent/AssertedSuccessListener.java rename to app/src/main/java/org/thoughtcrime/securesms/util/concurrent/AssertedSuccessListener.java diff --git a/src/org/thoughtcrime/securesms/util/concurrent/ListenableFuture.java b/app/src/main/java/org/thoughtcrime/securesms/util/concurrent/ListenableFuture.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/concurrent/ListenableFuture.java rename to app/src/main/java/org/thoughtcrime/securesms/util/concurrent/ListenableFuture.java diff --git a/src/org/thoughtcrime/securesms/util/concurrent/SettableFuture.java b/app/src/main/java/org/thoughtcrime/securesms/util/concurrent/SettableFuture.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/concurrent/SettableFuture.java rename to app/src/main/java/org/thoughtcrime/securesms/util/concurrent/SettableFuture.java diff --git a/src/org/thoughtcrime/securesms/util/concurrent/SignalExecutors.java b/app/src/main/java/org/thoughtcrime/securesms/util/concurrent/SignalExecutors.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/concurrent/SignalExecutors.java rename to app/src/main/java/org/thoughtcrime/securesms/util/concurrent/SignalExecutors.java diff --git a/src/org/thoughtcrime/securesms/util/concurrent/SimpleTask.java b/app/src/main/java/org/thoughtcrime/securesms/util/concurrent/SimpleTask.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/concurrent/SimpleTask.java rename to app/src/main/java/org/thoughtcrime/securesms/util/concurrent/SimpleTask.java diff --git a/src/org/thoughtcrime/securesms/util/dualsim/SubscriptionInfoCompat.java b/app/src/main/java/org/thoughtcrime/securesms/util/dualsim/SubscriptionInfoCompat.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/dualsim/SubscriptionInfoCompat.java rename to app/src/main/java/org/thoughtcrime/securesms/util/dualsim/SubscriptionInfoCompat.java diff --git a/src/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java b/app/src/main/java/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java rename to app/src/main/java/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java diff --git a/src/org/thoughtcrime/securesms/util/dynamiclanguage/DynamicLanguageActivityHelper.java b/app/src/main/java/org/thoughtcrime/securesms/util/dynamiclanguage/DynamicLanguageActivityHelper.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/dynamiclanguage/DynamicLanguageActivityHelper.java rename to app/src/main/java/org/thoughtcrime/securesms/util/dynamiclanguage/DynamicLanguageActivityHelper.java diff --git a/src/org/thoughtcrime/securesms/util/dynamiclanguage/DynamicLanguageContextWrapper.java b/app/src/main/java/org/thoughtcrime/securesms/util/dynamiclanguage/DynamicLanguageContextWrapper.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/dynamiclanguage/DynamicLanguageContextWrapper.java rename to app/src/main/java/org/thoughtcrime/securesms/util/dynamiclanguage/DynamicLanguageContextWrapper.java diff --git a/src/org/thoughtcrime/securesms/util/dynamiclanguage/LanguageString.java b/app/src/main/java/org/thoughtcrime/securesms/util/dynamiclanguage/LanguageString.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/dynamiclanguage/LanguageString.java rename to app/src/main/java/org/thoughtcrime/securesms/util/dynamiclanguage/LanguageString.java diff --git a/src/org/thoughtcrime/securesms/util/dynamiclanguage/LocaleParser.java b/app/src/main/java/org/thoughtcrime/securesms/util/dynamiclanguage/LocaleParser.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/dynamiclanguage/LocaleParser.java rename to app/src/main/java/org/thoughtcrime/securesms/util/dynamiclanguage/LocaleParser.java diff --git a/src/org/thoughtcrime/securesms/util/livedata/LiveDataPair.java b/app/src/main/java/org/thoughtcrime/securesms/util/livedata/LiveDataPair.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/livedata/LiveDataPair.java rename to app/src/main/java/org/thoughtcrime/securesms/util/livedata/LiveDataPair.java diff --git a/src/org/thoughtcrime/securesms/util/spans/CenterAlignedRelativeSizeSpan.java b/app/src/main/java/org/thoughtcrime/securesms/util/spans/CenterAlignedRelativeSizeSpan.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/spans/CenterAlignedRelativeSizeSpan.java rename to app/src/main/java/org/thoughtcrime/securesms/util/spans/CenterAlignedRelativeSizeSpan.java diff --git a/src/org/thoughtcrime/securesms/util/task/ProgressDialogAsyncTask.java b/app/src/main/java/org/thoughtcrime/securesms/util/task/ProgressDialogAsyncTask.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/task/ProgressDialogAsyncTask.java rename to app/src/main/java/org/thoughtcrime/securesms/util/task/ProgressDialogAsyncTask.java diff --git a/src/org/thoughtcrime/securesms/util/task/SnackbarAsyncTask.java b/app/src/main/java/org/thoughtcrime/securesms/util/task/SnackbarAsyncTask.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/task/SnackbarAsyncTask.java rename to app/src/main/java/org/thoughtcrime/securesms/util/task/SnackbarAsyncTask.java diff --git a/src/org/thoughtcrime/securesms/util/views/SimpleProgressDialog.java b/app/src/main/java/org/thoughtcrime/securesms/util/views/SimpleProgressDialog.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/views/SimpleProgressDialog.java rename to app/src/main/java/org/thoughtcrime/securesms/util/views/SimpleProgressDialog.java diff --git a/src/org/thoughtcrime/securesms/util/views/Stub.java b/app/src/main/java/org/thoughtcrime/securesms/util/views/Stub.java similarity index 100% rename from src/org/thoughtcrime/securesms/util/views/Stub.java rename to app/src/main/java/org/thoughtcrime/securesms/util/views/Stub.java diff --git a/src/org/thoughtcrime/securesms/video/ByteArrayMediaDataSource.java b/app/src/main/java/org/thoughtcrime/securesms/video/ByteArrayMediaDataSource.java similarity index 100% rename from src/org/thoughtcrime/securesms/video/ByteArrayMediaDataSource.java rename to app/src/main/java/org/thoughtcrime/securesms/video/ByteArrayMediaDataSource.java diff --git a/src/org/thoughtcrime/securesms/video/ClassicEncryptedMediaDataSource.java b/app/src/main/java/org/thoughtcrime/securesms/video/ClassicEncryptedMediaDataSource.java similarity index 100% rename from src/org/thoughtcrime/securesms/video/ClassicEncryptedMediaDataSource.java rename to app/src/main/java/org/thoughtcrime/securesms/video/ClassicEncryptedMediaDataSource.java diff --git a/src/org/thoughtcrime/securesms/video/EncryptedMediaDataSource.java b/app/src/main/java/org/thoughtcrime/securesms/video/EncryptedMediaDataSource.java similarity index 100% rename from src/org/thoughtcrime/securesms/video/EncryptedMediaDataSource.java rename to app/src/main/java/org/thoughtcrime/securesms/video/EncryptedMediaDataSource.java diff --git a/src/org/thoughtcrime/securesms/video/InMemoryTranscoder.java b/app/src/main/java/org/thoughtcrime/securesms/video/InMemoryTranscoder.java similarity index 100% rename from src/org/thoughtcrime/securesms/video/InMemoryTranscoder.java rename to app/src/main/java/org/thoughtcrime/securesms/video/InMemoryTranscoder.java diff --git a/src/org/thoughtcrime/securesms/video/ModernEncryptedMediaDataSource.java b/app/src/main/java/org/thoughtcrime/securesms/video/ModernEncryptedMediaDataSource.java similarity index 100% rename from src/org/thoughtcrime/securesms/video/ModernEncryptedMediaDataSource.java rename to app/src/main/java/org/thoughtcrime/securesms/video/ModernEncryptedMediaDataSource.java diff --git a/src/org/thoughtcrime/securesms/video/VideoPlayer.java b/app/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java similarity index 100% rename from src/org/thoughtcrime/securesms/video/VideoPlayer.java rename to app/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java diff --git a/src/org/thoughtcrime/securesms/video/VideoSizeException.java b/app/src/main/java/org/thoughtcrime/securesms/video/VideoSizeException.java similarity index 100% rename from src/org/thoughtcrime/securesms/video/VideoSizeException.java rename to app/src/main/java/org/thoughtcrime/securesms/video/VideoSizeException.java diff --git a/src/org/thoughtcrime/securesms/video/VideoSourceException.java b/app/src/main/java/org/thoughtcrime/securesms/video/VideoSourceException.java similarity index 100% rename from src/org/thoughtcrime/securesms/video/VideoSourceException.java rename to app/src/main/java/org/thoughtcrime/securesms/video/VideoSourceException.java diff --git a/src/org/thoughtcrime/securesms/video/VideoUtil.java b/app/src/main/java/org/thoughtcrime/securesms/video/VideoUtil.java similarity index 100% rename from src/org/thoughtcrime/securesms/video/VideoUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/video/VideoUtil.java diff --git a/src/org/thoughtcrime/securesms/video/exo/AttachmentDataSource.java b/app/src/main/java/org/thoughtcrime/securesms/video/exo/AttachmentDataSource.java similarity index 100% rename from src/org/thoughtcrime/securesms/video/exo/AttachmentDataSource.java rename to app/src/main/java/org/thoughtcrime/securesms/video/exo/AttachmentDataSource.java diff --git a/src/org/thoughtcrime/securesms/video/exo/AttachmentDataSourceFactory.java b/app/src/main/java/org/thoughtcrime/securesms/video/exo/AttachmentDataSourceFactory.java similarity index 100% rename from src/org/thoughtcrime/securesms/video/exo/AttachmentDataSourceFactory.java rename to app/src/main/java/org/thoughtcrime/securesms/video/exo/AttachmentDataSourceFactory.java diff --git a/src/org/thoughtcrime/securesms/video/exo/BlobDataSource.java b/app/src/main/java/org/thoughtcrime/securesms/video/exo/BlobDataSource.java similarity index 100% rename from src/org/thoughtcrime/securesms/video/exo/BlobDataSource.java rename to app/src/main/java/org/thoughtcrime/securesms/video/exo/BlobDataSource.java diff --git a/src/org/thoughtcrime/securesms/video/exo/PartDataSource.java b/app/src/main/java/org/thoughtcrime/securesms/video/exo/PartDataSource.java similarity index 100% rename from src/org/thoughtcrime/securesms/video/exo/PartDataSource.java rename to app/src/main/java/org/thoughtcrime/securesms/video/exo/PartDataSource.java diff --git a/src/org/thoughtcrime/securesms/video/videoconverter/AndroidMuxer.java b/app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/AndroidMuxer.java similarity index 100% rename from src/org/thoughtcrime/securesms/video/videoconverter/AndroidMuxer.java rename to app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/AndroidMuxer.java diff --git a/src/org/thoughtcrime/securesms/video/videoconverter/AudioTrackConverter.java b/app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/AudioTrackConverter.java similarity index 100% rename from src/org/thoughtcrime/securesms/video/videoconverter/AudioTrackConverter.java rename to app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/AudioTrackConverter.java diff --git a/src/org/thoughtcrime/securesms/video/videoconverter/EncodingException.java b/app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/EncodingException.java similarity index 100% rename from src/org/thoughtcrime/securesms/video/videoconverter/EncodingException.java rename to app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/EncodingException.java diff --git a/src/org/thoughtcrime/securesms/video/videoconverter/InputSurface.java b/app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/InputSurface.java similarity index 100% rename from src/org/thoughtcrime/securesms/video/videoconverter/InputSurface.java rename to app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/InputSurface.java diff --git a/src/org/thoughtcrime/securesms/video/videoconverter/MediaConverter.java b/app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/MediaConverter.java similarity index 100% rename from src/org/thoughtcrime/securesms/video/videoconverter/MediaConverter.java rename to app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/MediaConverter.java diff --git a/src/org/thoughtcrime/securesms/video/videoconverter/Muxer.java b/app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/Muxer.java similarity index 100% rename from src/org/thoughtcrime/securesms/video/videoconverter/Muxer.java rename to app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/Muxer.java diff --git a/src/org/thoughtcrime/securesms/video/videoconverter/OutputSurface.java b/app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/OutputSurface.java similarity index 100% rename from src/org/thoughtcrime/securesms/video/videoconverter/OutputSurface.java rename to app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/OutputSurface.java diff --git a/src/org/thoughtcrime/securesms/video/videoconverter/Preconditions.java b/app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/Preconditions.java similarity index 100% rename from src/org/thoughtcrime/securesms/video/videoconverter/Preconditions.java rename to app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/Preconditions.java diff --git a/src/org/thoughtcrime/securesms/video/videoconverter/TextureRender.java b/app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/TextureRender.java similarity index 100% rename from src/org/thoughtcrime/securesms/video/videoconverter/TextureRender.java rename to app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/TextureRender.java diff --git a/src/org/thoughtcrime/securesms/video/videoconverter/TranscodingException.java b/app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/TranscodingException.java similarity index 100% rename from src/org/thoughtcrime/securesms/video/videoconverter/TranscodingException.java rename to app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/TranscodingException.java diff --git a/src/org/thoughtcrime/securesms/video/videoconverter/VideoTrackConverter.java b/app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/VideoTrackConverter.java similarity index 100% rename from src/org/thoughtcrime/securesms/video/videoconverter/VideoTrackConverter.java rename to app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/VideoTrackConverter.java diff --git a/src/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java similarity index 100% rename from src/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java rename to app/src/main/java/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java diff --git a/src/org/thoughtcrime/securesms/webrtc/IncomingPstnCallReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/webrtc/IncomingPstnCallReceiver.java similarity index 100% rename from src/org/thoughtcrime/securesms/webrtc/IncomingPstnCallReceiver.java rename to app/src/main/java/org/thoughtcrime/securesms/webrtc/IncomingPstnCallReceiver.java diff --git a/src/org/thoughtcrime/securesms/webrtc/UncaughtExceptionHandlerManager.java b/app/src/main/java/org/thoughtcrime/securesms/webrtc/UncaughtExceptionHandlerManager.java similarity index 100% rename from src/org/thoughtcrime/securesms/webrtc/UncaughtExceptionHandlerManager.java rename to app/src/main/java/org/thoughtcrime/securesms/webrtc/UncaughtExceptionHandlerManager.java diff --git a/src/org/thoughtcrime/securesms/webrtc/VoiceCallShare.java b/app/src/main/java/org/thoughtcrime/securesms/webrtc/VoiceCallShare.java similarity index 100% rename from src/org/thoughtcrime/securesms/webrtc/VoiceCallShare.java rename to app/src/main/java/org/thoughtcrime/securesms/webrtc/VoiceCallShare.java diff --git a/src/org/thoughtcrime/securesms/webrtc/audio/BluetoothStateManager.java b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/BluetoothStateManager.java similarity index 100% rename from src/org/thoughtcrime/securesms/webrtc/audio/BluetoothStateManager.java rename to app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/BluetoothStateManager.java diff --git a/src/org/thoughtcrime/securesms/webrtc/audio/IncomingRinger.java b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/IncomingRinger.java similarity index 100% rename from src/org/thoughtcrime/securesms/webrtc/audio/IncomingRinger.java rename to app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/IncomingRinger.java diff --git a/src/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java similarity index 100% rename from src/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java rename to app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java diff --git a/src/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.java b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.java similarity index 100% rename from src/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.java rename to app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.java diff --git a/src/org/thoughtcrime/securesms/webrtc/locks/AccelerometerListener.java b/app/src/main/java/org/thoughtcrime/securesms/webrtc/locks/AccelerometerListener.java similarity index 100% rename from src/org/thoughtcrime/securesms/webrtc/locks/AccelerometerListener.java rename to app/src/main/java/org/thoughtcrime/securesms/webrtc/locks/AccelerometerListener.java diff --git a/src/org/thoughtcrime/securesms/webrtc/locks/LockManager.java b/app/src/main/java/org/thoughtcrime/securesms/webrtc/locks/LockManager.java similarity index 100% rename from src/org/thoughtcrime/securesms/webrtc/locks/LockManager.java rename to app/src/main/java/org/thoughtcrime/securesms/webrtc/locks/LockManager.java diff --git a/src/org/thoughtcrime/securesms/webrtc/locks/ProximityLock.java b/app/src/main/java/org/thoughtcrime/securesms/webrtc/locks/ProximityLock.java similarity index 100% rename from src/org/thoughtcrime/securesms/webrtc/locks/ProximityLock.java rename to app/src/main/java/org/thoughtcrime/securesms/webrtc/locks/ProximityLock.java diff --git a/protobuf/Backups.proto b/app/src/main/proto/Backups.proto similarity index 100% rename from protobuf/Backups.proto rename to app/src/main/proto/Backups.proto diff --git a/protobuf/Database.proto b/app/src/main/proto/Database.proto similarity index 100% rename from protobuf/Database.proto rename to app/src/main/proto/Database.proto diff --git a/protobuf/DeviceName.proto b/app/src/main/proto/DeviceName.proto similarity index 100% rename from protobuf/DeviceName.proto rename to app/src/main/proto/DeviceName.proto diff --git a/res/anim-ldrtl/slide_from_end.xml b/app/src/main/res/anim-ldrtl/slide_from_end.xml similarity index 100% rename from res/anim-ldrtl/slide_from_end.xml rename to app/src/main/res/anim-ldrtl/slide_from_end.xml diff --git a/res/anim-ldrtl/slide_from_start.xml b/app/src/main/res/anim-ldrtl/slide_from_start.xml similarity index 100% rename from res/anim-ldrtl/slide_from_start.xml rename to app/src/main/res/anim-ldrtl/slide_from_start.xml diff --git a/res/anim-ldrtl/slide_to_end.xml b/app/src/main/res/anim-ldrtl/slide_to_end.xml similarity index 100% rename from res/anim-ldrtl/slide_to_end.xml rename to app/src/main/res/anim-ldrtl/slide_to_end.xml diff --git a/res/anim-ldrtl/slide_to_start.xml b/app/src/main/res/anim-ldrtl/slide_to_start.xml similarity index 100% rename from res/anim-ldrtl/slide_to_start.xml rename to app/src/main/res/anim-ldrtl/slide_to_start.xml diff --git a/res/anim/animation_toggle_in.xml b/app/src/main/res/anim/animation_toggle_in.xml similarity index 100% rename from res/anim/animation_toggle_in.xml rename to app/src/main/res/anim/animation_toggle_in.xml diff --git a/res/anim/animation_toggle_out.xml b/app/src/main/res/anim/animation_toggle_out.xml similarity index 100% rename from res/anim/animation_toggle_out.xml rename to app/src/main/res/anim/animation_toggle_out.xml diff --git a/res/anim/camera_capture_button_grow.xml b/app/src/main/res/anim/camera_capture_button_grow.xml similarity index 100% rename from res/anim/camera_capture_button_grow.xml rename to app/src/main/res/anim/camera_capture_button_grow.xml diff --git a/res/anim/camera_capture_button_shrink.xml b/app/src/main/res/anim/camera_capture_button_shrink.xml similarity index 100% rename from res/anim/camera_capture_button_shrink.xml rename to app/src/main/res/anim/camera_capture_button_shrink.xml diff --git a/res/anim/camera_slide_from_bottom.xml b/app/src/main/res/anim/camera_slide_from_bottom.xml similarity index 100% rename from res/anim/camera_slide_from_bottom.xml rename to app/src/main/res/anim/camera_slide_from_bottom.xml diff --git a/res/anim/camera_slide_to_bottom.xml b/app/src/main/res/anim/camera_slide_to_bottom.xml similarity index 100% rename from res/anim/camera_slide_to_bottom.xml rename to app/src/main/res/anim/camera_slide_to_bottom.xml diff --git a/res/anim/fade_in.xml b/app/src/main/res/anim/fade_in.xml similarity index 100% rename from res/anim/fade_in.xml rename to app/src/main/res/anim/fade_in.xml diff --git a/res/anim/fade_out.xml b/app/src/main/res/anim/fade_out.xml similarity index 100% rename from res/anim/fade_out.xml rename to app/src/main/res/anim/fade_out.xml diff --git a/res/anim/fade_scale_in.xml b/app/src/main/res/anim/fade_scale_in.xml similarity index 100% rename from res/anim/fade_scale_in.xml rename to app/src/main/res/anim/fade_scale_in.xml diff --git a/res/anim/fade_scale_out.xml b/app/src/main/res/anim/fade_scale_out.xml similarity index 100% rename from res/anim/fade_scale_out.xml rename to app/src/main/res/anim/fade_scale_out.xml diff --git a/res/anim/slide_from_bottom.xml b/app/src/main/res/anim/slide_from_bottom.xml similarity index 100% rename from res/anim/slide_from_bottom.xml rename to app/src/main/res/anim/slide_from_bottom.xml diff --git a/res/anim/slide_from_end.xml b/app/src/main/res/anim/slide_from_end.xml similarity index 100% rename from res/anim/slide_from_end.xml rename to app/src/main/res/anim/slide_from_end.xml diff --git a/res/anim/slide_from_start.xml b/app/src/main/res/anim/slide_from_start.xml similarity index 100% rename from res/anim/slide_from_start.xml rename to app/src/main/res/anim/slide_from_start.xml diff --git a/res/anim/slide_from_top.xml b/app/src/main/res/anim/slide_from_top.xml similarity index 100% rename from res/anim/slide_from_top.xml rename to app/src/main/res/anim/slide_from_top.xml diff --git a/res/anim/slide_to_bottom.xml b/app/src/main/res/anim/slide_to_bottom.xml similarity index 100% rename from res/anim/slide_to_bottom.xml rename to app/src/main/res/anim/slide_to_bottom.xml diff --git a/res/anim/slide_to_end.xml b/app/src/main/res/anim/slide_to_end.xml similarity index 100% rename from res/anim/slide_to_end.xml rename to app/src/main/res/anim/slide_to_end.xml diff --git a/res/anim/slide_to_start.xml b/app/src/main/res/anim/slide_to_start.xml similarity index 100% rename from res/anim/slide_to_start.xml rename to app/src/main/res/anim/slide_to_start.xml diff --git a/res/anim/slide_to_top.xml b/app/src/main/res/anim/slide_to_top.xml similarity index 100% rename from res/anim/slide_to_top.xml rename to app/src/main/res/anim/slide_to_top.xml diff --git a/res/anim/stationary.xml b/app/src/main/res/anim/stationary.xml similarity index 100% rename from res/anim/stationary.xml rename to app/src/main/res/anim/stationary.xml diff --git a/res/animator/reactions_scrubber_hide.xml b/app/src/main/res/animator/reactions_scrubber_hide.xml similarity index 100% rename from res/animator/reactions_scrubber_hide.xml rename to app/src/main/res/animator/reactions_scrubber_hide.xml diff --git a/res/animator/reactions_scrubber_reveal.xml b/app/src/main/res/animator/reactions_scrubber_reveal.xml similarity index 100% rename from res/animator/reactions_scrubber_reveal.xml rename to app/src/main/res/animator/reactions_scrubber_reveal.xml diff --git a/res/animator/rotate_90_animation.xml b/app/src/main/res/animator/rotate_90_animation.xml similarity index 100% rename from res/animator/rotate_90_animation.xml rename to app/src/main/res/animator/rotate_90_animation.xml diff --git a/res/animator/rotate_minus_90_animation.xml b/app/src/main/res/animator/rotate_minus_90_animation.xml similarity index 100% rename from res/animator/rotate_minus_90_animation.xml rename to app/src/main/res/animator/rotate_minus_90_animation.xml diff --git a/res/color/text_color_dark_theme.xml b/app/src/main/res/color/text_color_dark_theme.xml similarity index 100% rename from res/color/text_color_dark_theme.xml rename to app/src/main/res/color/text_color_dark_theme.xml diff --git a/res/color/text_color_secondary_dark_theme.xml b/app/src/main/res/color/text_color_secondary_dark_theme.xml similarity index 100% rename from res/color/text_color_secondary_dark_theme.xml rename to app/src/main/res/color/text_color_secondary_dark_theme.xml diff --git a/res/drawable-hdpi/baseline_account_circle_white_24.webp b/app/src/main/res/drawable-hdpi/baseline_account_circle_white_24.webp similarity index 100% rename from res/drawable-hdpi/baseline_account_circle_white_24.webp rename to app/src/main/res/drawable-hdpi/baseline_account_circle_white_24.webp diff --git a/res/drawable-hdpi/baseline_email_white_24.webp b/app/src/main/res/drawable-hdpi/baseline_email_white_24.webp similarity index 100% rename from res/drawable-hdpi/baseline_email_white_24.webp rename to app/src/main/res/drawable-hdpi/baseline_email_white_24.webp diff --git a/res/drawable-hdpi/check.webp b/app/src/main/res/drawable-hdpi/check.webp similarity index 100% rename from res/drawable-hdpi/check.webp rename to app/src/main/res/drawable-hdpi/check.webp diff --git a/res/drawable-hdpi/clear_profile_avatar.webp b/app/src/main/res/drawable-hdpi/clear_profile_avatar.webp similarity index 100% rename from res/drawable-hdpi/clear_profile_avatar.webp rename to app/src/main/res/drawable-hdpi/clear_profile_avatar.webp diff --git a/res/drawable-hdpi/conversation_list_empty_state.webp b/app/src/main/res/drawable-hdpi/conversation_list_empty_state.webp similarity index 100% rename from res/drawable-hdpi/conversation_list_empty_state.webp rename to app/src/main/res/drawable-hdpi/conversation_list_empty_state.webp diff --git a/res/drawable-hdpi/divet_lower_right_dark.webp b/app/src/main/res/drawable-hdpi/divet_lower_right_dark.webp similarity index 100% rename from res/drawable-hdpi/divet_lower_right_dark.webp rename to app/src/main/res/drawable-hdpi/divet_lower_right_dark.webp diff --git a/res/drawable-hdpi/divet_lower_right_light.webp b/app/src/main/res/drawable-hdpi/divet_lower_right_light.webp similarity index 100% rename from res/drawable-hdpi/divet_lower_right_light.webp rename to app/src/main/res/drawable-hdpi/divet_lower_right_light.webp diff --git a/res/drawable-hdpi/empty_inbox_1.webp b/app/src/main/res/drawable-hdpi/empty_inbox_1.webp similarity index 100% rename from res/drawable-hdpi/empty_inbox_1.webp rename to app/src/main/res/drawable-hdpi/empty_inbox_1.webp diff --git a/res/drawable-hdpi/empty_inbox_2.webp b/app/src/main/res/drawable-hdpi/empty_inbox_2.webp similarity index 100% rename from res/drawable-hdpi/empty_inbox_2.webp rename to app/src/main/res/drawable-hdpi/empty_inbox_2.webp diff --git a/res/drawable-hdpi/empty_inbox_3.webp b/app/src/main/res/drawable-hdpi/empty_inbox_3.webp similarity index 100% rename from res/drawable-hdpi/empty_inbox_3.webp rename to app/src/main/res/drawable-hdpi/empty_inbox_3.webp diff --git a/res/drawable-hdpi/empty_inbox_4.webp b/app/src/main/res/drawable-hdpi/empty_inbox_4.webp similarity index 100% rename from res/drawable-hdpi/empty_inbox_4.webp rename to app/src/main/res/drawable-hdpi/empty_inbox_4.webp diff --git a/res/drawable-hdpi/empty_inbox_5.webp b/app/src/main/res/drawable-hdpi/empty_inbox_5.webp similarity index 100% rename from res/drawable-hdpi/empty_inbox_5.webp rename to app/src/main/res/drawable-hdpi/empty_inbox_5.webp diff --git a/res/drawable-hdpi/flash_auto_32.webp b/app/src/main/res/drawable-hdpi/flash_auto_32.webp similarity index 100% rename from res/drawable-hdpi/flash_auto_32.webp rename to app/src/main/res/drawable-hdpi/flash_auto_32.webp diff --git a/res/drawable-hdpi/flash_off_32.webp b/app/src/main/res/drawable-hdpi/flash_off_32.webp similarity index 100% rename from res/drawable-hdpi/flash_off_32.webp rename to app/src/main/res/drawable-hdpi/flash_off_32.webp diff --git a/res/drawable-hdpi/flash_on_32.webp b/app/src/main/res/drawable-hdpi/flash_on_32.webp similarity index 100% rename from res/drawable-hdpi/flash_on_32.webp rename to app/src/main/res/drawable-hdpi/flash_on_32.webp diff --git a/res/drawable-hdpi/ic_account_box_dark.webp b/app/src/main/res/drawable-hdpi/ic_account_box_dark.webp similarity index 100% rename from res/drawable-hdpi/ic_account_box_dark.webp rename to app/src/main/res/drawable-hdpi/ic_account_box_dark.webp diff --git a/res/drawable-hdpi/ic_account_box_light.webp b/app/src/main/res/drawable-hdpi/ic_account_box_light.webp similarity index 100% rename from res/drawable-hdpi/ic_account_box_light.webp rename to app/src/main/res/drawable-hdpi/ic_account_box_light.webp diff --git a/res/drawable-hdpi/ic_action_warning_red.webp b/app/src/main/res/drawable-hdpi/ic_action_warning_red.webp similarity index 100% rename from res/drawable-hdpi/ic_action_warning_red.webp rename to app/src/main/res/drawable-hdpi/ic_action_warning_red.webp diff --git a/res/drawable-hdpi/ic_add_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_add_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_add_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_add_white_24dp.webp diff --git a/res/drawable-hdpi/ic_add_white_original_24dp.webp b/app/src/main/res/drawable-hdpi/ic_add_white_original_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_add_white_original_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_add_white_original_24dp.webp diff --git a/res/drawable-hdpi/ic_arrow_forward_dark.webp b/app/src/main/res/drawable-hdpi/ic_arrow_forward_dark.webp similarity index 100% rename from res/drawable-hdpi/ic_arrow_forward_dark.webp rename to app/src/main/res/drawable-hdpi/ic_arrow_forward_dark.webp diff --git a/res/drawable-hdpi/ic_arrow_forward_light.webp b/app/src/main/res/drawable-hdpi/ic_arrow_forward_light.webp similarity index 100% rename from res/drawable-hdpi/ic_arrow_forward_light.webp rename to app/src/main/res/drawable-hdpi/ic_arrow_forward_light.webp diff --git a/res/drawable-hdpi/ic_arrow_right.webp b/app/src/main/res/drawable-hdpi/ic_arrow_right.webp similarity index 100% rename from res/drawable-hdpi/ic_arrow_right.webp rename to app/src/main/res/drawable-hdpi/ic_arrow_right.webp diff --git a/res/drawable-hdpi/ic_attach_grey600_24dp.png b/app/src/main/res/drawable-hdpi/ic_attach_grey600_24dp.png similarity index 100% rename from res/drawable-hdpi/ic_attach_grey600_24dp.png rename to app/src/main/res/drawable-hdpi/ic_attach_grey600_24dp.png diff --git a/res/drawable-hdpi/ic_attach_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_attach_white_24dp.png similarity index 100% rename from res/drawable-hdpi/ic_attach_white_24dp.png rename to app/src/main/res/drawable-hdpi/ic_attach_white_24dp.png diff --git a/res/drawable-hdpi/ic_audio_dark.webp b/app/src/main/res/drawable-hdpi/ic_audio_dark.webp similarity index 100% rename from res/drawable-hdpi/ic_audio_dark.webp rename to app/src/main/res/drawable-hdpi/ic_audio_dark.webp diff --git a/res/drawable-hdpi/ic_audio_light.webp b/app/src/main/res/drawable-hdpi/ic_audio_light.webp similarity index 100% rename from res/drawable-hdpi/ic_audio_light.webp rename to app/src/main/res/drawable-hdpi/ic_audio_light.webp diff --git a/res/drawable-hdpi/ic_backspace_grey600_24dp.png b/app/src/main/res/drawable-hdpi/ic_backspace_grey600_24dp.png similarity index 100% rename from res/drawable-hdpi/ic_backspace_grey600_24dp.png rename to app/src/main/res/drawable-hdpi/ic_backspace_grey600_24dp.png diff --git a/res/drawable-hdpi/ic_block_grey600_18dp.webp b/app/src/main/res/drawable-hdpi/ic_block_grey600_18dp.webp similarity index 100% rename from res/drawable-hdpi/ic_block_grey600_18dp.webp rename to app/src/main/res/drawable-hdpi/ic_block_grey600_18dp.webp diff --git a/res/drawable-hdpi/ic_block_white_18dp.webp b/app/src/main/res/drawable-hdpi/ic_block_white_18dp.webp similarity index 100% rename from res/drawable-hdpi/ic_block_white_18dp.webp rename to app/src/main/res/drawable-hdpi/ic_block_white_18dp.webp diff --git a/res/drawable-hdpi/ic_block_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_block_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_block_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_block_white_24dp.webp diff --git a/res/drawable-hdpi/ic_bluetooth_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_bluetooth_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_bluetooth_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_bluetooth_white_24dp.webp diff --git a/res/drawable-hdpi/ic_broken_link.webp b/app/src/main/res/drawable-hdpi/ic_broken_link.webp similarity index 100% rename from res/drawable-hdpi/ic_broken_link.webp rename to app/src/main/res/drawable-hdpi/ic_broken_link.webp diff --git a/res/drawable-hdpi/ic_brush_highlight_32.webp b/app/src/main/res/drawable-hdpi/ic_brush_highlight_32.webp similarity index 100% rename from res/drawable-hdpi/ic_brush_highlight_32.webp rename to app/src/main/res/drawable-hdpi/ic_brush_highlight_32.webp diff --git a/res/drawable-hdpi/ic_brush_marker_32.webp b/app/src/main/res/drawable-hdpi/ic_brush_marker_32.webp similarity index 100% rename from res/drawable-hdpi/ic_brush_marker_32.webp rename to app/src/main/res/drawable-hdpi/ic_brush_marker_32.webp diff --git a/res/drawable-hdpi/ic_call_end_grey600_32dp.webp b/app/src/main/res/drawable-hdpi/ic_call_end_grey600_32dp.webp similarity index 100% rename from res/drawable-hdpi/ic_call_end_grey600_32dp.webp rename to app/src/main/res/drawable-hdpi/ic_call_end_grey600_32dp.webp diff --git a/res/drawable-hdpi/ic_call_end_white_48dp.webp b/app/src/main/res/drawable-hdpi/ic_call_end_white_48dp.webp similarity index 100% rename from res/drawable-hdpi/ic_call_end_white_48dp.webp rename to app/src/main/res/drawable-hdpi/ic_call_end_white_48dp.webp diff --git a/res/drawable-hdpi/ic_call_made_grey600_24dp.webp b/app/src/main/res/drawable-hdpi/ic_call_made_grey600_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_call_made_grey600_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_call_made_grey600_24dp.webp diff --git a/res/drawable-hdpi/ic_call_missed_grey600_24dp.webp b/app/src/main/res/drawable-hdpi/ic_call_missed_grey600_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_call_missed_grey600_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_call_missed_grey600_24dp.webp diff --git a/res/drawable-hdpi/ic_call_received_grey600_24dp.webp b/app/src/main/res/drawable-hdpi/ic_call_received_grey600_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_call_received_grey600_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_call_received_grey600_24dp.webp diff --git a/res/drawable-hdpi/ic_call_secure_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_call_secure_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_call_secure_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_call_secure_white_24dp.webp diff --git a/res/drawable-hdpi/ic_call_split_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_call_split_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_call_split_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_call_split_white_24dp.webp diff --git a/res/drawable-hdpi/ic_camera_alt_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_camera_alt_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_camera_alt_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_camera_alt_white_24dp.webp diff --git a/res/drawable-hdpi/ic_camera_shutter.webp b/app/src/main/res/drawable-hdpi/ic_camera_shutter.webp similarity index 100% rename from res/drawable-hdpi/ic_camera_shutter.webp rename to app/src/main/res/drawable-hdpi/ic_camera_shutter.webp diff --git a/res/drawable-hdpi/ic_camera_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_camera_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_camera_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_camera_white_24dp.webp diff --git a/res/drawable-hdpi/ic_caption_28.webp b/app/src/main/res/drawable-hdpi/ic_caption_28.webp similarity index 100% rename from res/drawable-hdpi/ic_caption_28.webp rename to app/src/main/res/drawable-hdpi/ic_caption_28.webp diff --git a/res/drawable-hdpi/ic_check_circle_32.webp b/app/src/main/res/drawable-hdpi/ic_check_circle_32.webp similarity index 100% rename from res/drawable-hdpi/ic_check_circle_32.webp rename to app/src/main/res/drawable-hdpi/ic_check_circle_32.webp diff --git a/res/drawable-hdpi/ic_check_circle_white_18dp.webp b/app/src/main/res/drawable-hdpi/ic_check_circle_white_18dp.webp similarity index 100% rename from res/drawable-hdpi/ic_check_circle_white_18dp.webp rename to app/src/main/res/drawable-hdpi/ic_check_circle_white_18dp.webp diff --git a/res/drawable-hdpi/ic_check_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_check_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_check_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_check_white_24dp.webp diff --git a/res/drawable-hdpi/ic_check_white_48dp.webp b/app/src/main/res/drawable-hdpi/ic_check_white_48dp.webp similarity index 100% rename from res/drawable-hdpi/ic_check_white_48dp.webp rename to app/src/main/res/drawable-hdpi/ic_check_white_48dp.webp diff --git a/res/drawable-hdpi/ic_circle_fill_white_48dp.webp b/app/src/main/res/drawable-hdpi/ic_circle_fill_white_48dp.webp similarity index 100% rename from res/drawable-hdpi/ic_circle_fill_white_48dp.webp rename to app/src/main/res/drawable-hdpi/ic_circle_fill_white_48dp.webp diff --git a/res/drawable-hdpi/ic_clear_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_clear_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_clear_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_clear_white_24dp.webp diff --git a/res/drawable-hdpi/ic_close_grey600_32dp.webp b/app/src/main/res/drawable-hdpi/ic_close_grey600_32dp.webp similarity index 100% rename from res/drawable-hdpi/ic_close_grey600_32dp.webp rename to app/src/main/res/drawable-hdpi/ic_close_grey600_32dp.webp diff --git a/res/drawable-hdpi/ic_close_white_18dp.webp b/app/src/main/res/drawable-hdpi/ic_close_white_18dp.webp similarity index 100% rename from res/drawable-hdpi/ic_close_white_18dp.webp rename to app/src/main/res/drawable-hdpi/ic_close_white_18dp.webp diff --git a/res/drawable-hdpi/ic_close_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_close_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_close_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_close_white_24dp.webp diff --git a/res/drawable-hdpi/ic_close_white_48dp.webp b/app/src/main/res/drawable-hdpi/ic_close_white_48dp.webp similarity index 100% rename from res/drawable-hdpi/ic_close_white_48dp.webp rename to app/src/main/res/drawable-hdpi/ic_close_white_48dp.webp diff --git a/res/drawable-hdpi/ic_contact_picture.webp b/app/src/main/res/drawable-hdpi/ic_contact_picture.webp similarity index 100% rename from res/drawable-hdpi/ic_contact_picture.webp rename to app/src/main/res/drawable-hdpi/ic_contact_picture.webp diff --git a/res/drawable-hdpi/ic_contact_picture_large.webp b/app/src/main/res/drawable-hdpi/ic_contact_picture_large.webp similarity index 100% rename from res/drawable-hdpi/ic_contact_picture_large.webp rename to app/src/main/res/drawable-hdpi/ic_contact_picture_large.webp diff --git a/res/drawable-hdpi/ic_contacts_white_48dp.webp b/app/src/main/res/drawable-hdpi/ic_contacts_white_48dp.webp similarity index 100% rename from res/drawable-hdpi/ic_contacts_white_48dp.webp rename to app/src/main/res/drawable-hdpi/ic_contacts_white_48dp.webp diff --git a/res/drawable-hdpi/ic_content_copy_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_content_copy_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_content_copy_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_content_copy_white_24dp.webp diff --git a/res/drawable-hdpi/ic_create_album_outline_32.webp b/app/src/main/res/drawable-hdpi/ic_create_album_outline_32.webp similarity index 100% rename from res/drawable-hdpi/ic_create_album_outline_32.webp rename to app/src/main/res/drawable-hdpi/ic_create_album_outline_32.webp diff --git a/res/drawable-hdpi/ic_create_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_create_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_create_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_create_white_24dp.webp diff --git a/res/drawable-hdpi/ic_crop_32.webp b/app/src/main/res/drawable-hdpi/ic_crop_32.webp similarity index 100% rename from res/drawable-hdpi/ic_crop_32.webp rename to app/src/main/res/drawable-hdpi/ic_crop_32.webp diff --git a/res/drawable-hdpi/ic_crop_lock_32.webp b/app/src/main/res/drawable-hdpi/ic_crop_lock_32.webp similarity index 100% rename from res/drawable-hdpi/ic_crop_lock_32.webp rename to app/src/main/res/drawable-hdpi/ic_crop_lock_32.webp diff --git a/res/drawable-hdpi/ic_crop_unlock_32.webp b/app/src/main/res/drawable-hdpi/ic_crop_unlock_32.webp similarity index 100% rename from res/drawable-hdpi/ic_crop_unlock_32.webp rename to app/src/main/res/drawable-hdpi/ic_crop_unlock_32.webp diff --git a/res/drawable-hdpi/ic_delivery_status_delivered.webp b/app/src/main/res/drawable-hdpi/ic_delivery_status_delivered.webp similarity index 100% rename from res/drawable-hdpi/ic_delivery_status_delivered.webp rename to app/src/main/res/drawable-hdpi/ic_delivery_status_delivered.webp diff --git a/res/drawable-hdpi/ic_delivery_status_read.webp b/app/src/main/res/drawable-hdpi/ic_delivery_status_read.webp similarity index 100% rename from res/drawable-hdpi/ic_delivery_status_read.webp rename to app/src/main/res/drawable-hdpi/ic_delivery_status_read.webp diff --git a/res/drawable-hdpi/ic_delivery_status_sending.webp b/app/src/main/res/drawable-hdpi/ic_delivery_status_sending.webp similarity index 100% rename from res/drawable-hdpi/ic_delivery_status_sending.webp rename to app/src/main/res/drawable-hdpi/ic_delivery_status_sending.webp diff --git a/res/drawable-hdpi/ic_delivery_status_sent.webp b/app/src/main/res/drawable-hdpi/ic_delivery_status_sent.webp similarity index 100% rename from res/drawable-hdpi/ic_delivery_status_sent.webp rename to app/src/main/res/drawable-hdpi/ic_delivery_status_sent.webp diff --git a/res/drawable-hdpi/ic_devices_white.webp b/app/src/main/res/drawable-hdpi/ic_devices_white.webp similarity index 100% rename from res/drawable-hdpi/ic_devices_white.webp rename to app/src/main/res/drawable-hdpi/ic_devices_white.webp diff --git a/res/drawable-hdpi/ic_document_large_dark.webp b/app/src/main/res/drawable-hdpi/ic_document_large_dark.webp similarity index 100% rename from res/drawable-hdpi/ic_document_large_dark.webp rename to app/src/main/res/drawable-hdpi/ic_document_large_dark.webp diff --git a/res/drawable-hdpi/ic_document_large_light.webp b/app/src/main/res/drawable-hdpi/ic_document_large_light.webp similarity index 100% rename from res/drawable-hdpi/ic_document_large_light.webp rename to app/src/main/res/drawable-hdpi/ic_document_large_light.webp diff --git a/res/drawable-hdpi/ic_document_small_dark.webp b/app/src/main/res/drawable-hdpi/ic_document_small_dark.webp similarity index 100% rename from res/drawable-hdpi/ic_document_small_dark.webp rename to app/src/main/res/drawable-hdpi/ic_document_small_dark.webp diff --git a/res/drawable-hdpi/ic_document_small_light.webp b/app/src/main/res/drawable-hdpi/ic_document_small_light.webp similarity index 100% rename from res/drawable-hdpi/ic_document_small_light.webp rename to app/src/main/res/drawable-hdpi/ic_document_small_light.webp diff --git a/res/drawable-hdpi/ic_download_32.png b/app/src/main/res/drawable-hdpi/ic_download_32.png similarity index 100% rename from res/drawable-hdpi/ic_download_32.png rename to app/src/main/res/drawable-hdpi/ic_download_32.png diff --git a/res/drawable-hdpi/ic_download_circle_fill_white_48dp.webp b/app/src/main/res/drawable-hdpi/ic_download_circle_fill_white_48dp.webp similarity index 100% rename from res/drawable-hdpi/ic_download_circle_fill_white_48dp.webp rename to app/src/main/res/drawable-hdpi/ic_download_circle_fill_white_48dp.webp diff --git a/res/drawable-hdpi/ic_emoji_32.webp b/app/src/main/res/drawable-hdpi/ic_emoji_32.webp similarity index 100% rename from res/drawable-hdpi/ic_emoji_32.webp rename to app/src/main/res/drawable-hdpi/ic_emoji_32.webp diff --git a/res/drawable-hdpi/ic_error.webp b/app/src/main/res/drawable-hdpi/ic_error.webp similarity index 100% rename from res/drawable-hdpi/ic_error.webp rename to app/src/main/res/drawable-hdpi/ic_error.webp diff --git a/res/drawable-hdpi/ic_face_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_face_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_face_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_face_white_24dp.webp diff --git a/res/drawable-hdpi/ic_favorite_grey600_24dp.webp b/app/src/main/res/drawable-hdpi/ic_favorite_grey600_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_favorite_grey600_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_favorite_grey600_24dp.webp diff --git a/res/drawable-hdpi/ic_fingerprint_white_48dp.webp b/app/src/main/res/drawable-hdpi/ic_fingerprint_white_48dp.webp similarity index 100% rename from res/drawable-hdpi/ic_fingerprint_white_48dp.webp rename to app/src/main/res/drawable-hdpi/ic_fingerprint_white_48dp.webp diff --git a/res/drawable-hdpi/ic_flip_32.webp b/app/src/main/res/drawable-hdpi/ic_flip_32.webp similarity index 100% rename from res/drawable-hdpi/ic_flip_32.webp rename to app/src/main/res/drawable-hdpi/ic_flip_32.webp diff --git a/res/drawable-hdpi/ic_folder_white_48dp.webp b/app/src/main/res/drawable-hdpi/ic_folder_white_48dp.webp similarity index 100% rename from res/drawable-hdpi/ic_folder_white_48dp.webp rename to app/src/main/res/drawable-hdpi/ic_folder_white_48dp.webp diff --git a/res/drawable-hdpi/ic_gif_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_gif_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_gif_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_gif_white_24dp.webp diff --git a/res/drawable-hdpi/ic_headset_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_headset_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_headset_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_headset_white_24dp.webp diff --git a/res/drawable-hdpi/ic_image_dark.webp b/app/src/main/res/drawable-hdpi/ic_image_dark.webp similarity index 100% rename from res/drawable-hdpi/ic_image_dark.webp rename to app/src/main/res/drawable-hdpi/ic_image_dark.webp diff --git a/res/drawable-hdpi/ic_image_light.webp b/app/src/main/res/drawable-hdpi/ic_image_light.webp similarity index 100% rename from res/drawable-hdpi/ic_image_light.webp rename to app/src/main/res/drawable-hdpi/ic_image_light.webp diff --git a/res/drawable-hdpi/ic_image_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_image_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_image_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_image_white_24dp.webp diff --git a/res/drawable-hdpi/ic_info_outline_dark.webp b/app/src/main/res/drawable-hdpi/ic_info_outline_dark.webp similarity index 100% rename from res/drawable-hdpi/ic_info_outline_dark.webp rename to app/src/main/res/drawable-hdpi/ic_info_outline_dark.webp diff --git a/res/drawable-hdpi/ic_info_outline_light.webp b/app/src/main/res/drawable-hdpi/ic_info_outline_light.webp similarity index 100% rename from res/drawable-hdpi/ic_info_outline_light.webp rename to app/src/main/res/drawable-hdpi/ic_info_outline_light.webp diff --git a/res/drawable-hdpi/ic_info_outline_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_info_outline_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_info_outline_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_info_outline_white_24dp.webp diff --git a/res/drawable-hdpi/ic_insert_drive_file_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_insert_drive_file_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_insert_drive_file_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_insert_drive_file_white_24dp.webp diff --git a/res/drawable-hdpi/ic_keyboard_arrow_down_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_keyboard_arrow_down_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_keyboard_arrow_down_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_keyboard_arrow_down_white_24dp.webp diff --git a/res/drawable-hdpi/ic_keyboard_arrow_left_grey600_24dp.webp b/app/src/main/res/drawable-hdpi/ic_keyboard_arrow_left_grey600_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_keyboard_arrow_left_grey600_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_keyboard_arrow_left_grey600_24dp.webp diff --git a/res/drawable-hdpi/ic_keyboard_arrow_up_white_36dp.webp b/app/src/main/res/drawable-hdpi/ic_keyboard_arrow_up_white_36dp.webp similarity index 100% rename from res/drawable-hdpi/ic_keyboard_arrow_up_white_36dp.webp rename to app/src/main/res/drawable-hdpi/ic_keyboard_arrow_up_white_36dp.webp diff --git a/res/drawable-hdpi/ic_keyboard_grey600_24dp.webp b/app/src/main/res/drawable-hdpi/ic_keyboard_grey600_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_keyboard_grey600_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_keyboard_grey600_24dp.webp diff --git a/res/drawable-hdpi/ic_launch_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_launch_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_launch_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_launch_white_24dp.webp diff --git a/res/drawable-hdpi/ic_location_on_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_location_on_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_location_on_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_location_on_white_24dp.webp diff --git a/res/drawable-hdpi/ic_lock_white_18dp.webp b/app/src/main/res/drawable-hdpi/ic_lock_white_18dp.webp similarity index 100% rename from res/drawable-hdpi/ic_lock_white_18dp.webp rename to app/src/main/res/drawable-hdpi/ic_lock_white_18dp.webp diff --git a/res/drawable-hdpi/ic_lock_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_lock_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_lock_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_lock_white_24dp.webp diff --git a/res/drawable-hdpi/ic_lock_white_48dp.webp b/app/src/main/res/drawable-hdpi/ic_lock_white_48dp.webp similarity index 100% rename from res/drawable-hdpi/ic_lock_white_48dp.webp rename to app/src/main/res/drawable-hdpi/ic_lock_white_48dp.webp diff --git a/res/drawable-hdpi/ic_menu_add_field_holo_light.webp b/app/src/main/res/drawable-hdpi/ic_menu_add_field_holo_light.webp similarity index 100% rename from res/drawable-hdpi/ic_menu_add_field_holo_light.webp rename to app/src/main/res/drawable-hdpi/ic_menu_add_field_holo_light.webp diff --git a/res/drawable-hdpi/ic_menu_lock_dark.webp b/app/src/main/res/drawable-hdpi/ic_menu_lock_dark.webp similarity index 100% rename from res/drawable-hdpi/ic_menu_lock_dark.webp rename to app/src/main/res/drawable-hdpi/ic_menu_lock_dark.webp diff --git a/res/drawable-hdpi/ic_menu_login.webp b/app/src/main/res/drawable-hdpi/ic_menu_login.webp similarity index 100% rename from res/drawable-hdpi/ic_menu_login.webp rename to app/src/main/res/drawable-hdpi/ic_menu_login.webp diff --git a/res/drawable-hdpi/ic_menu_remove_holo_light.webp b/app/src/main/res/drawable-hdpi/ic_menu_remove_holo_light.webp similarity index 100% rename from res/drawable-hdpi/ic_menu_remove_holo_light.webp rename to app/src/main/res/drawable-hdpi/ic_menu_remove_holo_light.webp diff --git a/res/drawable-hdpi/ic_menu_search_holo_light.webp b/app/src/main/res/drawable-hdpi/ic_menu_search_holo_light.webp similarity index 100% rename from res/drawable-hdpi/ic_menu_search_holo_light.webp rename to app/src/main/res/drawable-hdpi/ic_menu_search_holo_light.webp diff --git a/res/drawable-hdpi/ic_mic_off_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_mic_off_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_mic_off_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_mic_off_white_24dp.webp diff --git a/res/drawable-hdpi/ic_missing_thumbnail_picture.webp b/app/src/main/res/drawable-hdpi/ic_missing_thumbnail_picture.webp similarity index 100% rename from res/drawable-hdpi/ic_missing_thumbnail_picture.webp rename to app/src/main/res/drawable-hdpi/ic_missing_thumbnail_picture.webp diff --git a/res/drawable-hdpi/ic_movie_creation_dark.webp b/app/src/main/res/drawable-hdpi/ic_movie_creation_dark.webp similarity index 100% rename from res/drawable-hdpi/ic_movie_creation_dark.webp rename to app/src/main/res/drawable-hdpi/ic_movie_creation_dark.webp diff --git a/res/drawable-hdpi/ic_movie_creation_light.webp b/app/src/main/res/drawable-hdpi/ic_movie_creation_light.webp similarity index 100% rename from res/drawable-hdpi/ic_movie_creation_light.webp rename to app/src/main/res/drawable-hdpi/ic_movie_creation_light.webp diff --git a/res/drawable-hdpi/ic_note_to_self.webp b/app/src/main/res/drawable-hdpi/ic_note_to_self.webp similarity index 100% rename from res/drawable-hdpi/ic_note_to_self.webp rename to app/src/main/res/drawable-hdpi/ic_note_to_self.webp diff --git a/res/drawable-hdpi/ic_pause_circle_fill_white_48dp.webp b/app/src/main/res/drawable-hdpi/ic_pause_circle_fill_white_48dp.webp similarity index 100% rename from res/drawable-hdpi/ic_pause_circle_fill_white_48dp.webp rename to app/src/main/res/drawable-hdpi/ic_pause_circle_fill_white_48dp.webp diff --git a/res/drawable-hdpi/ic_person_add_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_person_add_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_person_add_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_person_add_white_24dp.webp diff --git a/res/drawable-hdpi/ic_person_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_person_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_person_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_person_white_24dp.webp diff --git a/res/drawable-hdpi/ic_phone_grey600_32dp.webp b/app/src/main/res/drawable-hdpi/ic_phone_grey600_32dp.webp similarity index 100% rename from res/drawable-hdpi/ic_phone_grey600_32dp.webp rename to app/src/main/res/drawable-hdpi/ic_phone_grey600_32dp.webp diff --git a/res/drawable-hdpi/ic_photo_library_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_photo_library_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_photo_library_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_photo_library_white_24dp.webp diff --git a/res/drawable-hdpi/ic_play_circle_fill_white_48dp.webp b/app/src/main/res/drawable-hdpi/ic_play_circle_fill_white_48dp.webp similarity index 100% rename from res/drawable-hdpi/ic_play_circle_fill_white_48dp.webp rename to app/src/main/res/drawable-hdpi/ic_play_circle_fill_white_48dp.webp diff --git a/res/drawable-hdpi/ic_plus_28.webp b/app/src/main/res/drawable-hdpi/ic_plus_28.webp similarity index 100% rename from res/drawable-hdpi/ic_plus_28.webp rename to app/src/main/res/drawable-hdpi/ic_plus_28.webp diff --git a/res/drawable-hdpi/ic_profile_camera.webp b/app/src/main/res/drawable-hdpi/ic_profile_camera.webp similarity index 100% rename from res/drawable-hdpi/ic_profile_camera.webp rename to app/src/main/res/drawable-hdpi/ic_profile_camera.webp diff --git a/res/drawable-hdpi/ic_refresh_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_refresh_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_refresh_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_refresh_white_24dp.webp diff --git a/res/drawable-hdpi/ic_reply.webp b/app/src/main/res/drawable-hdpi/ic_reply.webp similarity index 100% rename from res/drawable-hdpi/ic_reply.webp rename to app/src/main/res/drawable-hdpi/ic_reply.webp diff --git a/res/drawable-hdpi/ic_reply_white_36dp.webp b/app/src/main/res/drawable-hdpi/ic_reply_white_36dp.webp similarity index 100% rename from res/drawable-hdpi/ic_reply_white_36dp.webp rename to app/src/main/res/drawable-hdpi/ic_reply_white_36dp.webp diff --git a/res/drawable-hdpi/ic_rotate_32.webp b/app/src/main/res/drawable-hdpi/ic_rotate_32.webp similarity index 100% rename from res/drawable-hdpi/ic_rotate_32.webp rename to app/src/main/res/drawable-hdpi/ic_rotate_32.webp diff --git a/res/drawable-hdpi/ic_scroll_down.webp b/app/src/main/res/drawable-hdpi/ic_scroll_down.webp similarity index 100% rename from res/drawable-hdpi/ic_scroll_down.webp rename to app/src/main/res/drawable-hdpi/ic_scroll_down.webp diff --git a/res/drawable-hdpi/ic_select_all_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_select_all_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_select_all_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_select_all_white_24dp.webp diff --git a/res/drawable-hdpi/ic_select_off.webp b/app/src/main/res/drawable-hdpi/ic_select_off.webp similarity index 100% rename from res/drawable-hdpi/ic_select_off.webp rename to app/src/main/res/drawable-hdpi/ic_select_off.webp diff --git a/res/drawable-hdpi/ic_select_on.webp b/app/src/main/res/drawable-hdpi/ic_select_on.webp similarity index 100% rename from res/drawable-hdpi/ic_select_on.webp rename to app/src/main/res/drawable-hdpi/ic_select_on.webp diff --git a/res/drawable-hdpi/ic_share_black_18dp.webp b/app/src/main/res/drawable-hdpi/ic_share_black_18dp.webp similarity index 100% rename from res/drawable-hdpi/ic_share_black_18dp.webp rename to app/src/main/res/drawable-hdpi/ic_share_black_18dp.webp diff --git a/res/drawable-hdpi/ic_share_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_share_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_share_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_share_white_24dp.webp diff --git a/res/drawable-hdpi/ic_signal_background_connection.webp b/app/src/main/res/drawable-hdpi/ic_signal_background_connection.webp similarity index 100% rename from res/drawable-hdpi/ic_signal_background_connection.webp rename to app/src/main/res/drawable-hdpi/ic_signal_background_connection.webp diff --git a/res/drawable-hdpi/ic_signal_backup.webp b/app/src/main/res/drawable-hdpi/ic_signal_backup.webp similarity index 100% rename from res/drawable-hdpi/ic_signal_backup.webp rename to app/src/main/res/drawable-hdpi/ic_signal_backup.webp diff --git a/res/drawable-hdpi/ic_signal_downloading.webp b/app/src/main/res/drawable-hdpi/ic_signal_downloading.webp similarity index 100% rename from res/drawable-hdpi/ic_signal_downloading.webp rename to app/src/main/res/drawable-hdpi/ic_signal_downloading.webp diff --git a/res/drawable-hdpi/ic_signal_grey_24dp.webp b/app/src/main/res/drawable-hdpi/ic_signal_grey_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_signal_grey_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_signal_grey_24dp.webp diff --git a/res/drawable-hdpi/ic_sticker_32.webp b/app/src/main/res/drawable-hdpi/ic_sticker_32.webp similarity index 100% rename from res/drawable-hdpi/ic_sticker_32.webp rename to app/src/main/res/drawable-hdpi/ic_sticker_32.webp diff --git a/res/drawable-hdpi/ic_switch_camera_32.webp b/app/src/main/res/drawable-hdpi/ic_switch_camera_32.webp similarity index 100% rename from res/drawable-hdpi/ic_switch_camera_32.webp rename to app/src/main/res/drawable-hdpi/ic_switch_camera_32.webp diff --git a/res/drawable-hdpi/ic_text_32.webp b/app/src/main/res/drawable-hdpi/ic_text_32.webp similarity index 100% rename from res/drawable-hdpi/ic_text_32.webp rename to app/src/main/res/drawable-hdpi/ic_text_32.webp diff --git a/res/drawable-hdpi/ic_trash_filled_32.webp b/app/src/main/res/drawable-hdpi/ic_trash_filled_32.webp similarity index 100% rename from res/drawable-hdpi/ic_trash_filled_32.webp rename to app/src/main/res/drawable-hdpi/ic_trash_filled_32.webp diff --git a/res/drawable-hdpi/ic_unarchive_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_unarchive_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_unarchive_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_unarchive_white_24dp.webp diff --git a/res/drawable-hdpi/ic_unarchive_white_36dp.webp b/app/src/main/res/drawable-hdpi/ic_unarchive_white_36dp.webp similarity index 100% rename from res/drawable-hdpi/ic_unarchive_white_36dp.webp rename to app/src/main/res/drawable-hdpi/ic_unarchive_white_36dp.webp diff --git a/res/drawable-hdpi/ic_undo_32.webp b/app/src/main/res/drawable-hdpi/ic_undo_32.webp similarity index 100% rename from res/drawable-hdpi/ic_undo_32.webp rename to app/src/main/res/drawable-hdpi/ic_undo_32.webp diff --git a/res/drawable-hdpi/ic_unidentified_delivery.webp b/app/src/main/res/drawable-hdpi/ic_unidentified_delivery.webp similarity index 100% rename from res/drawable-hdpi/ic_unidentified_delivery.webp rename to app/src/main/res/drawable-hdpi/ic_unidentified_delivery.webp diff --git a/res/drawable-hdpi/ic_unlocked_white_18dp.webp b/app/src/main/res/drawable-hdpi/ic_unlocked_white_18dp.webp similarity index 100% rename from res/drawable-hdpi/ic_unlocked_white_18dp.webp rename to app/src/main/res/drawable-hdpi/ic_unlocked_white_18dp.webp diff --git a/res/drawable-hdpi/ic_unlocked_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_unlocked_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_unlocked_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_unlocked_white_24dp.webp diff --git a/res/drawable-hdpi/ic_video_dark.webp b/app/src/main/res/drawable-hdpi/ic_video_dark.webp similarity index 100% rename from res/drawable-hdpi/ic_video_dark.webp rename to app/src/main/res/drawable-hdpi/ic_video_dark.webp diff --git a/res/drawable-hdpi/ic_video_light.webp b/app/src/main/res/drawable-hdpi/ic_video_light.webp similarity index 100% rename from res/drawable-hdpi/ic_video_light.webp rename to app/src/main/res/drawable-hdpi/ic_video_light.webp diff --git a/res/drawable-hdpi/ic_view_infinite_32.png b/app/src/main/res/drawable-hdpi/ic_view_infinite_32.png similarity index 100% rename from res/drawable-hdpi/ic_view_infinite_32.png rename to app/src/main/res/drawable-hdpi/ic_view_infinite_32.png diff --git a/res/drawable-hdpi/ic_view_once_32.png b/app/src/main/res/drawable-hdpi/ic_view_once_32.png similarity index 100% rename from res/drawable-hdpi/ic_view_once_32.png rename to app/src/main/res/drawable-hdpi/ic_view_once_32.png diff --git a/res/drawable-hdpi/ic_visibility_grey600_24dp.webp b/app/src/main/res/drawable-hdpi/ic_visibility_grey600_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_visibility_grey600_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_visibility_grey600_24dp.webp diff --git a/res/drawable-hdpi/ic_visibility_off_grey600_24dp.webp b/app/src/main/res/drawable-hdpi/ic_visibility_off_grey600_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_visibility_off_grey600_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_visibility_off_grey600_24dp.webp diff --git a/res/drawable-hdpi/ic_visibility_off_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_visibility_off_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_visibility_off_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_visibility_off_white_24dp.webp diff --git a/res/drawable-hdpi/ic_visibility_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_visibility_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_visibility_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_visibility_white_24dp.webp diff --git a/res/drawable-hdpi/ic_volume_off_grey600_18dp.webp b/app/src/main/res/drawable-hdpi/ic_volume_off_grey600_18dp.webp similarity index 100% rename from res/drawable-hdpi/ic_volume_off_grey600_18dp.webp rename to app/src/main/res/drawable-hdpi/ic_volume_off_grey600_18dp.webp diff --git a/res/drawable-hdpi/ic_volume_off_white_18dp.webp b/app/src/main/res/drawable-hdpi/ic_volume_off_white_18dp.webp similarity index 100% rename from res/drawable-hdpi/ic_volume_off_white_18dp.webp rename to app/src/main/res/drawable-hdpi/ic_volume_off_white_18dp.webp diff --git a/res/drawable-hdpi/ic_volume_up_dark.webp b/app/src/main/res/drawable-hdpi/ic_volume_up_dark.webp similarity index 100% rename from res/drawable-hdpi/ic_volume_up_dark.webp rename to app/src/main/res/drawable-hdpi/ic_volume_up_dark.webp diff --git a/res/drawable-hdpi/ic_volume_up_light.webp b/app/src/main/res/drawable-hdpi/ic_volume_up_light.webp similarity index 100% rename from res/drawable-hdpi/ic_volume_up_light.webp rename to app/src/main/res/drawable-hdpi/ic_volume_up_light.webp diff --git a/res/drawable-hdpi/ic_volume_up_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_volume_up_white_24dp.webp similarity index 100% rename from res/drawable-hdpi/ic_volume_up_white_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_volume_up_white_24dp.webp diff --git a/res/drawable-hdpi/ic_warning_dark.webp b/app/src/main/res/drawable-hdpi/ic_warning_dark.webp similarity index 100% rename from res/drawable-hdpi/ic_warning_dark.webp rename to app/src/main/res/drawable-hdpi/ic_warning_dark.webp diff --git a/res/drawable-hdpi/ic_warning_light.webp b/app/src/main/res/drawable-hdpi/ic_warning_light.webp similarity index 100% rename from res/drawable-hdpi/ic_warning_light.webp rename to app/src/main/res/drawable-hdpi/ic_warning_light.webp diff --git a/res/drawable-hdpi/ic_x_28.webp b/app/src/main/res/drawable-hdpi/ic_x_28.webp similarity index 100% rename from res/drawable-hdpi/ic_x_28.webp rename to app/src/main/res/drawable-hdpi/ic_x_28.webp diff --git a/res/drawable-hdpi/icon_cached.webp b/app/src/main/res/drawable-hdpi/icon_cached.webp similarity index 100% rename from res/drawable-hdpi/icon_cached.webp rename to app/src/main/res/drawable-hdpi/icon_cached.webp diff --git a/res/drawable-hdpi/icon_dialog.webp b/app/src/main/res/drawable-hdpi/icon_dialog.webp similarity index 100% rename from res/drawable-hdpi/icon_dialog.webp rename to app/src/main/res/drawable-hdpi/icon_dialog.webp diff --git a/res/drawable-hdpi/icon_notification.webp b/app/src/main/res/drawable-hdpi/icon_notification.webp similarity index 100% rename from res/drawable-hdpi/icon_notification.webp rename to app/src/main/res/drawable-hdpi/icon_notification.webp diff --git a/res/drawable-hdpi/icon_transparent.webp b/app/src/main/res/drawable-hdpi/icon_transparent.webp similarity index 100% rename from res/drawable-hdpi/icon_transparent.webp rename to app/src/main/res/drawable-hdpi/icon_transparent.webp diff --git a/res/drawable-hdpi/import_database.webp b/app/src/main/res/drawable-hdpi/import_database.webp similarity index 100% rename from res/drawable-hdpi/import_database.webp rename to app/src/main/res/drawable-hdpi/import_database.webp diff --git a/res/drawable-hdpi/inbox_zero.webp b/app/src/main/res/drawable-hdpi/inbox_zero.webp similarity index 100% rename from res/drawable-hdpi/inbox_zero.webp rename to app/src/main/res/drawable-hdpi/inbox_zero.webp diff --git a/res/drawable-hdpi/lockscreen_watermark_dark.webp b/app/src/main/res/drawable-hdpi/lockscreen_watermark_dark.webp similarity index 100% rename from res/drawable-hdpi/lockscreen_watermark_dark.webp rename to app/src/main/res/drawable-hdpi/lockscreen_watermark_dark.webp diff --git a/res/drawable-hdpi/lockscreen_watermark_light.webp b/app/src/main/res/drawable-hdpi/lockscreen_watermark_light.webp similarity index 100% rename from res/drawable-hdpi/lockscreen_watermark_light.webp rename to app/src/main/res/drawable-hdpi/lockscreen_watermark_light.webp diff --git a/res/drawable-hdpi/love_heart.webp b/app/src/main/res/drawable-hdpi/love_heart.webp similarity index 100% rename from res/drawable-hdpi/love_heart.webp rename to app/src/main/res/drawable-hdpi/love_heart.webp diff --git a/res/drawable-hdpi/marker_shadow.webp b/app/src/main/res/drawable-hdpi/marker_shadow.webp similarity index 100% rename from res/drawable-hdpi/marker_shadow.webp rename to app/src/main/res/drawable-hdpi/marker_shadow.webp diff --git a/res/drawable-hdpi/message_24dp.webp b/app/src/main/res/drawable-hdpi/message_24dp.webp similarity index 100% rename from res/drawable-hdpi/message_24dp.webp rename to app/src/main/res/drawable-hdpi/message_24dp.webp diff --git a/res/drawable-hdpi/no_contacts.png b/app/src/main/res/drawable-hdpi/no_contacts.png similarity index 100% rename from res/drawable-hdpi/no_contacts.png rename to app/src/main/res/drawable-hdpi/no_contacts.png diff --git a/res/drawable-hdpi/notify_panel_notification_icon_bg.webp b/app/src/main/res/drawable-hdpi/notify_panel_notification_icon_bg.webp similarity index 100% rename from res/drawable-hdpi/notify_panel_notification_icon_bg.webp rename to app/src/main/res/drawable-hdpi/notify_panel_notification_icon_bg.webp diff --git a/res/drawable-hdpi/phone_24dp.webp b/app/src/main/res/drawable-hdpi/phone_24dp.webp similarity index 100% rename from res/drawable-hdpi/phone_24dp.webp rename to app/src/main/res/drawable-hdpi/phone_24dp.webp diff --git a/res/drawable-hdpi/poweredby_giphy.webp b/app/src/main/res/drawable-hdpi/poweredby_giphy.webp similarity index 100% rename from res/drawable-hdpi/poweredby_giphy.webp rename to app/src/main/res/drawable-hdpi/poweredby_giphy.webp diff --git a/res/drawable-hdpi/profile_splash.webp b/app/src/main/res/drawable-hdpi/profile_splash.webp similarity index 100% rename from res/drawable-hdpi/profile_splash.webp rename to app/src/main/res/drawable-hdpi/profile_splash.webp diff --git a/res/drawable-hdpi/quick_camera_front.webp b/app/src/main/res/drawable-hdpi/quick_camera_front.webp similarity index 100% rename from res/drawable-hdpi/quick_camera_front.webp rename to app/src/main/res/drawable-hdpi/quick_camera_front.webp diff --git a/res/drawable-hdpi/quick_camera_rear.webp b/app/src/main/res/drawable-hdpi/quick_camera_rear.webp similarity index 100% rename from res/drawable-hdpi/quick_camera_rear.webp rename to app/src/main/res/drawable-hdpi/quick_camera_rear.webp diff --git a/res/drawable-hdpi/video_splash.webp b/app/src/main/res/drawable-hdpi/video_splash.webp similarity index 100% rename from res/drawable-hdpi/video_splash.webp rename to app/src/main/res/drawable-hdpi/video_splash.webp diff --git a/res/drawable-hdpi/welcome.webp b/app/src/main/res/drawable-hdpi/welcome.webp similarity index 100% rename from res/drawable-hdpi/welcome.webp rename to app/src/main/res/drawable-hdpi/welcome.webp diff --git a/res/drawable-ldrtl-hdpi/ic_keyboard_arrow_left_grey600_24dp.webp b/app/src/main/res/drawable-ldrtl-hdpi/ic_keyboard_arrow_left_grey600_24dp.webp similarity index 100% rename from res/drawable-ldrtl-hdpi/ic_keyboard_arrow_left_grey600_24dp.webp rename to app/src/main/res/drawable-ldrtl-hdpi/ic_keyboard_arrow_left_grey600_24dp.webp diff --git a/res/drawable-ldrtl-xhdpi/ic_keyboard_arrow_left_grey600_24dp.webp b/app/src/main/res/drawable-ldrtl-xhdpi/ic_keyboard_arrow_left_grey600_24dp.webp similarity index 100% rename from res/drawable-ldrtl-xhdpi/ic_keyboard_arrow_left_grey600_24dp.webp rename to app/src/main/res/drawable-ldrtl-xhdpi/ic_keyboard_arrow_left_grey600_24dp.webp diff --git a/res/drawable-ldrtl-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.webp b/app/src/main/res/drawable-ldrtl-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.webp similarity index 100% rename from res/drawable-ldrtl-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.webp rename to app/src/main/res/drawable-ldrtl-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.webp diff --git a/res/drawable-ldrtl-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.webp b/app/src/main/res/drawable-ldrtl-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.webp similarity index 100% rename from res/drawable-ldrtl-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.webp rename to app/src/main/res/drawable-ldrtl-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.webp diff --git a/res/drawable-mdpi/baseline_account_circle_white_24.webp b/app/src/main/res/drawable-mdpi/baseline_account_circle_white_24.webp similarity index 100% rename from res/drawable-mdpi/baseline_account_circle_white_24.webp rename to app/src/main/res/drawable-mdpi/baseline_account_circle_white_24.webp diff --git a/res/drawable-mdpi/baseline_email_white_24.webp b/app/src/main/res/drawable-mdpi/baseline_email_white_24.webp similarity index 100% rename from res/drawable-mdpi/baseline_email_white_24.webp rename to app/src/main/res/drawable-mdpi/baseline_email_white_24.webp diff --git a/res/drawable-mdpi/check.webp b/app/src/main/res/drawable-mdpi/check.webp similarity index 100% rename from res/drawable-mdpi/check.webp rename to app/src/main/res/drawable-mdpi/check.webp diff --git a/res/drawable-mdpi/clear_profile_avatar.webp b/app/src/main/res/drawable-mdpi/clear_profile_avatar.webp similarity index 100% rename from res/drawable-mdpi/clear_profile_avatar.webp rename to app/src/main/res/drawable-mdpi/clear_profile_avatar.webp diff --git a/res/drawable-mdpi/conversation_list_empty_state.webp b/app/src/main/res/drawable-mdpi/conversation_list_empty_state.webp similarity index 100% rename from res/drawable-mdpi/conversation_list_empty_state.webp rename to app/src/main/res/drawable-mdpi/conversation_list_empty_state.webp diff --git a/res/drawable-mdpi/divet_lower_right_dark.webp b/app/src/main/res/drawable-mdpi/divet_lower_right_dark.webp similarity index 100% rename from res/drawable-mdpi/divet_lower_right_dark.webp rename to app/src/main/res/drawable-mdpi/divet_lower_right_dark.webp diff --git a/res/drawable-mdpi/divet_lower_right_light.webp b/app/src/main/res/drawable-mdpi/divet_lower_right_light.webp similarity index 100% rename from res/drawable-mdpi/divet_lower_right_light.webp rename to app/src/main/res/drawable-mdpi/divet_lower_right_light.webp diff --git a/res/drawable-mdpi/empty_inbox_1.webp b/app/src/main/res/drawable-mdpi/empty_inbox_1.webp similarity index 100% rename from res/drawable-mdpi/empty_inbox_1.webp rename to app/src/main/res/drawable-mdpi/empty_inbox_1.webp diff --git a/res/drawable-mdpi/empty_inbox_2.webp b/app/src/main/res/drawable-mdpi/empty_inbox_2.webp similarity index 100% rename from res/drawable-mdpi/empty_inbox_2.webp rename to app/src/main/res/drawable-mdpi/empty_inbox_2.webp diff --git a/res/drawable-mdpi/empty_inbox_3.webp b/app/src/main/res/drawable-mdpi/empty_inbox_3.webp similarity index 100% rename from res/drawable-mdpi/empty_inbox_3.webp rename to app/src/main/res/drawable-mdpi/empty_inbox_3.webp diff --git a/res/drawable-mdpi/empty_inbox_4.webp b/app/src/main/res/drawable-mdpi/empty_inbox_4.webp similarity index 100% rename from res/drawable-mdpi/empty_inbox_4.webp rename to app/src/main/res/drawable-mdpi/empty_inbox_4.webp diff --git a/res/drawable-mdpi/empty_inbox_5.webp b/app/src/main/res/drawable-mdpi/empty_inbox_5.webp similarity index 100% rename from res/drawable-mdpi/empty_inbox_5.webp rename to app/src/main/res/drawable-mdpi/empty_inbox_5.webp diff --git a/res/drawable-mdpi/flash_auto_32.webp b/app/src/main/res/drawable-mdpi/flash_auto_32.webp similarity index 100% rename from res/drawable-mdpi/flash_auto_32.webp rename to app/src/main/res/drawable-mdpi/flash_auto_32.webp diff --git a/res/drawable-mdpi/flash_off_32.webp b/app/src/main/res/drawable-mdpi/flash_off_32.webp similarity index 100% rename from res/drawable-mdpi/flash_off_32.webp rename to app/src/main/res/drawable-mdpi/flash_off_32.webp diff --git a/res/drawable-mdpi/flash_on_32.webp b/app/src/main/res/drawable-mdpi/flash_on_32.webp similarity index 100% rename from res/drawable-mdpi/flash_on_32.webp rename to app/src/main/res/drawable-mdpi/flash_on_32.webp diff --git a/res/drawable-mdpi/ic_account_box_dark.webp b/app/src/main/res/drawable-mdpi/ic_account_box_dark.webp similarity index 100% rename from res/drawable-mdpi/ic_account_box_dark.webp rename to app/src/main/res/drawable-mdpi/ic_account_box_dark.webp diff --git a/res/drawable-mdpi/ic_account_box_light.webp b/app/src/main/res/drawable-mdpi/ic_account_box_light.webp similarity index 100% rename from res/drawable-mdpi/ic_account_box_light.webp rename to app/src/main/res/drawable-mdpi/ic_account_box_light.webp diff --git a/res/drawable-mdpi/ic_action_warning_red.webp b/app/src/main/res/drawable-mdpi/ic_action_warning_red.webp similarity index 100% rename from res/drawable-mdpi/ic_action_warning_red.webp rename to app/src/main/res/drawable-mdpi/ic_action_warning_red.webp diff --git a/res/drawable-mdpi/ic_add_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_add_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_add_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_add_white_24dp.webp diff --git a/res/drawable-mdpi/ic_add_white_original_24dp.webp b/app/src/main/res/drawable-mdpi/ic_add_white_original_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_add_white_original_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_add_white_original_24dp.webp diff --git a/res/drawable-mdpi/ic_archive_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_archive_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_archive_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_archive_white_24dp.webp diff --git a/res/drawable-mdpi/ic_arrow_forward_dark.webp b/app/src/main/res/drawable-mdpi/ic_arrow_forward_dark.webp similarity index 100% rename from res/drawable-mdpi/ic_arrow_forward_dark.webp rename to app/src/main/res/drawable-mdpi/ic_arrow_forward_dark.webp diff --git a/res/drawable-mdpi/ic_arrow_forward_light.webp b/app/src/main/res/drawable-mdpi/ic_arrow_forward_light.webp similarity index 100% rename from res/drawable-mdpi/ic_arrow_forward_light.webp rename to app/src/main/res/drawable-mdpi/ic_arrow_forward_light.webp diff --git a/res/drawable-mdpi/ic_arrow_right.webp b/app/src/main/res/drawable-mdpi/ic_arrow_right.webp similarity index 100% rename from res/drawable-mdpi/ic_arrow_right.webp rename to app/src/main/res/drawable-mdpi/ic_arrow_right.webp diff --git a/res/drawable-mdpi/ic_attach_grey600_24dp.png b/app/src/main/res/drawable-mdpi/ic_attach_grey600_24dp.png similarity index 100% rename from res/drawable-mdpi/ic_attach_grey600_24dp.png rename to app/src/main/res/drawable-mdpi/ic_attach_grey600_24dp.png diff --git a/res/drawable-mdpi/ic_attach_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_attach_white_24dp.png similarity index 100% rename from res/drawable-mdpi/ic_attach_white_24dp.png rename to app/src/main/res/drawable-mdpi/ic_attach_white_24dp.png diff --git a/res/drawable-mdpi/ic_audio_dark.webp b/app/src/main/res/drawable-mdpi/ic_audio_dark.webp similarity index 100% rename from res/drawable-mdpi/ic_audio_dark.webp rename to app/src/main/res/drawable-mdpi/ic_audio_dark.webp diff --git a/res/drawable-mdpi/ic_audio_light.png b/app/src/main/res/drawable-mdpi/ic_audio_light.png similarity index 100% rename from res/drawable-mdpi/ic_audio_light.png rename to app/src/main/res/drawable-mdpi/ic_audio_light.png diff --git a/res/drawable-mdpi/ic_backspace_grey600_24dp.png b/app/src/main/res/drawable-mdpi/ic_backspace_grey600_24dp.png similarity index 100% rename from res/drawable-mdpi/ic_backspace_grey600_24dp.png rename to app/src/main/res/drawable-mdpi/ic_backspace_grey600_24dp.png diff --git a/res/drawable-mdpi/ic_block_grey600_18dp.webp b/app/src/main/res/drawable-mdpi/ic_block_grey600_18dp.webp similarity index 100% rename from res/drawable-mdpi/ic_block_grey600_18dp.webp rename to app/src/main/res/drawable-mdpi/ic_block_grey600_18dp.webp diff --git a/res/drawable-mdpi/ic_block_white_18dp.webp b/app/src/main/res/drawable-mdpi/ic_block_white_18dp.webp similarity index 100% rename from res/drawable-mdpi/ic_block_white_18dp.webp rename to app/src/main/res/drawable-mdpi/ic_block_white_18dp.webp diff --git a/res/drawable-mdpi/ic_block_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_block_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_block_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_block_white_24dp.webp diff --git a/res/drawable-mdpi/ic_bluetooth_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_bluetooth_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_bluetooth_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_bluetooth_white_24dp.webp diff --git a/res/drawable-mdpi/ic_broken_link.webp b/app/src/main/res/drawable-mdpi/ic_broken_link.webp similarity index 100% rename from res/drawable-mdpi/ic_broken_link.webp rename to app/src/main/res/drawable-mdpi/ic_broken_link.webp diff --git a/res/drawable-mdpi/ic_brush_highlight_32.webp b/app/src/main/res/drawable-mdpi/ic_brush_highlight_32.webp similarity index 100% rename from res/drawable-mdpi/ic_brush_highlight_32.webp rename to app/src/main/res/drawable-mdpi/ic_brush_highlight_32.webp diff --git a/res/drawable-mdpi/ic_brush_marker_32.webp b/app/src/main/res/drawable-mdpi/ic_brush_marker_32.webp similarity index 100% rename from res/drawable-mdpi/ic_brush_marker_32.webp rename to app/src/main/res/drawable-mdpi/ic_brush_marker_32.webp diff --git a/res/drawable-mdpi/ic_call_end_grey600_32dp.webp b/app/src/main/res/drawable-mdpi/ic_call_end_grey600_32dp.webp similarity index 100% rename from res/drawable-mdpi/ic_call_end_grey600_32dp.webp rename to app/src/main/res/drawable-mdpi/ic_call_end_grey600_32dp.webp diff --git a/res/drawable-mdpi/ic_call_end_white_48dp.webp b/app/src/main/res/drawable-mdpi/ic_call_end_white_48dp.webp similarity index 100% rename from res/drawable-mdpi/ic_call_end_white_48dp.webp rename to app/src/main/res/drawable-mdpi/ic_call_end_white_48dp.webp diff --git a/res/drawable-mdpi/ic_call_made_grey600_24dp.webp b/app/src/main/res/drawable-mdpi/ic_call_made_grey600_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_call_made_grey600_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_call_made_grey600_24dp.webp diff --git a/res/drawable-mdpi/ic_call_missed_grey600_24dp.webp b/app/src/main/res/drawable-mdpi/ic_call_missed_grey600_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_call_missed_grey600_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_call_missed_grey600_24dp.webp diff --git a/res/drawable-mdpi/ic_call_received_grey600_24dp.webp b/app/src/main/res/drawable-mdpi/ic_call_received_grey600_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_call_received_grey600_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_call_received_grey600_24dp.webp diff --git a/res/drawable-mdpi/ic_call_secure_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_call_secure_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_call_secure_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_call_secure_white_24dp.webp diff --git a/res/drawable-mdpi/ic_call_split_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_call_split_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_call_split_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_call_split_white_24dp.webp diff --git a/res/drawable-mdpi/ic_camera_alt_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_camera_alt_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_camera_alt_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_camera_alt_white_24dp.webp diff --git a/res/drawable-mdpi/ic_camera_shutter.webp b/app/src/main/res/drawable-mdpi/ic_camera_shutter.webp similarity index 100% rename from res/drawable-mdpi/ic_camera_shutter.webp rename to app/src/main/res/drawable-mdpi/ic_camera_shutter.webp diff --git a/res/drawable-mdpi/ic_camera_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_camera_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_camera_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_camera_white_24dp.webp diff --git a/res/drawable-mdpi/ic_caption_28.webp b/app/src/main/res/drawable-mdpi/ic_caption_28.webp similarity index 100% rename from res/drawable-mdpi/ic_caption_28.webp rename to app/src/main/res/drawable-mdpi/ic_caption_28.webp diff --git a/res/drawable-mdpi/ic_check_circle_32.webp b/app/src/main/res/drawable-mdpi/ic_check_circle_32.webp similarity index 100% rename from res/drawable-mdpi/ic_check_circle_32.webp rename to app/src/main/res/drawable-mdpi/ic_check_circle_32.webp diff --git a/res/drawable-mdpi/ic_check_circle_white_18dp.webp b/app/src/main/res/drawable-mdpi/ic_check_circle_white_18dp.webp similarity index 100% rename from res/drawable-mdpi/ic_check_circle_white_18dp.webp rename to app/src/main/res/drawable-mdpi/ic_check_circle_white_18dp.webp diff --git a/res/drawable-mdpi/ic_check_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_check_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_check_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_check_white_24dp.webp diff --git a/res/drawable-mdpi/ic_check_white_48dp.webp b/app/src/main/res/drawable-mdpi/ic_check_white_48dp.webp similarity index 100% rename from res/drawable-mdpi/ic_check_white_48dp.webp rename to app/src/main/res/drawable-mdpi/ic_check_white_48dp.webp diff --git a/res/drawable-mdpi/ic_circle_fill_white_48dp.webp b/app/src/main/res/drawable-mdpi/ic_circle_fill_white_48dp.webp similarity index 100% rename from res/drawable-mdpi/ic_circle_fill_white_48dp.webp rename to app/src/main/res/drawable-mdpi/ic_circle_fill_white_48dp.webp diff --git a/res/drawable-mdpi/ic_clear_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_clear_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_clear_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_clear_white_24dp.webp diff --git a/res/drawable-mdpi/ic_close_grey600_32dp.webp b/app/src/main/res/drawable-mdpi/ic_close_grey600_32dp.webp similarity index 100% rename from res/drawable-mdpi/ic_close_grey600_32dp.webp rename to app/src/main/res/drawable-mdpi/ic_close_grey600_32dp.webp diff --git a/res/drawable-mdpi/ic_close_white_18dp.webp b/app/src/main/res/drawable-mdpi/ic_close_white_18dp.webp similarity index 100% rename from res/drawable-mdpi/ic_close_white_18dp.webp rename to app/src/main/res/drawable-mdpi/ic_close_white_18dp.webp diff --git a/res/drawable-mdpi/ic_close_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_close_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_close_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_close_white_24dp.webp diff --git a/res/drawable-mdpi/ic_close_white_48dp.webp b/app/src/main/res/drawable-mdpi/ic_close_white_48dp.webp similarity index 100% rename from res/drawable-mdpi/ic_close_white_48dp.webp rename to app/src/main/res/drawable-mdpi/ic_close_white_48dp.webp diff --git a/res/drawable-mdpi/ic_contact_picture.webp b/app/src/main/res/drawable-mdpi/ic_contact_picture.webp similarity index 100% rename from res/drawable-mdpi/ic_contact_picture.webp rename to app/src/main/res/drawable-mdpi/ic_contact_picture.webp diff --git a/res/drawable-mdpi/ic_contact_picture_large.webp b/app/src/main/res/drawable-mdpi/ic_contact_picture_large.webp similarity index 100% rename from res/drawable-mdpi/ic_contact_picture_large.webp rename to app/src/main/res/drawable-mdpi/ic_contact_picture_large.webp diff --git a/res/drawable-mdpi/ic_contacts_white_48dp.webp b/app/src/main/res/drawable-mdpi/ic_contacts_white_48dp.webp similarity index 100% rename from res/drawable-mdpi/ic_contacts_white_48dp.webp rename to app/src/main/res/drawable-mdpi/ic_contacts_white_48dp.webp diff --git a/res/drawable-mdpi/ic_content_copy_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_content_copy_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_content_copy_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_content_copy_white_24dp.webp diff --git a/res/drawable-mdpi/ic_create_album_outline_32.webp b/app/src/main/res/drawable-mdpi/ic_create_album_outline_32.webp similarity index 100% rename from res/drawable-mdpi/ic_create_album_outline_32.webp rename to app/src/main/res/drawable-mdpi/ic_create_album_outline_32.webp diff --git a/res/drawable-mdpi/ic_create_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_create_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_create_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_create_white_24dp.webp diff --git a/res/drawable-mdpi/ic_crop_32.webp b/app/src/main/res/drawable-mdpi/ic_crop_32.webp similarity index 100% rename from res/drawable-mdpi/ic_crop_32.webp rename to app/src/main/res/drawable-mdpi/ic_crop_32.webp diff --git a/res/drawable-mdpi/ic_crop_lock_32.webp b/app/src/main/res/drawable-mdpi/ic_crop_lock_32.webp similarity index 100% rename from res/drawable-mdpi/ic_crop_lock_32.webp rename to app/src/main/res/drawable-mdpi/ic_crop_lock_32.webp diff --git a/res/drawable-mdpi/ic_crop_unlock_32.webp b/app/src/main/res/drawable-mdpi/ic_crop_unlock_32.webp similarity index 100% rename from res/drawable-mdpi/ic_crop_unlock_32.webp rename to app/src/main/res/drawable-mdpi/ic_crop_unlock_32.webp diff --git a/res/drawable-mdpi/ic_delivery_status_delivered.webp b/app/src/main/res/drawable-mdpi/ic_delivery_status_delivered.webp similarity index 100% rename from res/drawable-mdpi/ic_delivery_status_delivered.webp rename to app/src/main/res/drawable-mdpi/ic_delivery_status_delivered.webp diff --git a/res/drawable-mdpi/ic_delivery_status_read.webp b/app/src/main/res/drawable-mdpi/ic_delivery_status_read.webp similarity index 100% rename from res/drawable-mdpi/ic_delivery_status_read.webp rename to app/src/main/res/drawable-mdpi/ic_delivery_status_read.webp diff --git a/res/drawable-mdpi/ic_delivery_status_sending.webp b/app/src/main/res/drawable-mdpi/ic_delivery_status_sending.webp similarity index 100% rename from res/drawable-mdpi/ic_delivery_status_sending.webp rename to app/src/main/res/drawable-mdpi/ic_delivery_status_sending.webp diff --git a/res/drawable-mdpi/ic_delivery_status_sent.webp b/app/src/main/res/drawable-mdpi/ic_delivery_status_sent.webp similarity index 100% rename from res/drawable-mdpi/ic_delivery_status_sent.webp rename to app/src/main/res/drawable-mdpi/ic_delivery_status_sent.webp diff --git a/res/drawable-mdpi/ic_devices_white.webp b/app/src/main/res/drawable-mdpi/ic_devices_white.webp similarity index 100% rename from res/drawable-mdpi/ic_devices_white.webp rename to app/src/main/res/drawable-mdpi/ic_devices_white.webp diff --git a/res/drawable-mdpi/ic_document_large_dark.webp b/app/src/main/res/drawable-mdpi/ic_document_large_dark.webp similarity index 100% rename from res/drawable-mdpi/ic_document_large_dark.webp rename to app/src/main/res/drawable-mdpi/ic_document_large_dark.webp diff --git a/res/drawable-mdpi/ic_document_large_light.webp b/app/src/main/res/drawable-mdpi/ic_document_large_light.webp similarity index 100% rename from res/drawable-mdpi/ic_document_large_light.webp rename to app/src/main/res/drawable-mdpi/ic_document_large_light.webp diff --git a/res/drawable-mdpi/ic_document_small_dark.webp b/app/src/main/res/drawable-mdpi/ic_document_small_dark.webp similarity index 100% rename from res/drawable-mdpi/ic_document_small_dark.webp rename to app/src/main/res/drawable-mdpi/ic_document_small_dark.webp diff --git a/res/drawable-mdpi/ic_document_small_light.webp b/app/src/main/res/drawable-mdpi/ic_document_small_light.webp similarity index 100% rename from res/drawable-mdpi/ic_document_small_light.webp rename to app/src/main/res/drawable-mdpi/ic_document_small_light.webp diff --git a/res/drawable-mdpi/ic_download_32.png b/app/src/main/res/drawable-mdpi/ic_download_32.png similarity index 100% rename from res/drawable-mdpi/ic_download_32.png rename to app/src/main/res/drawable-mdpi/ic_download_32.png diff --git a/res/drawable-mdpi/ic_download_circle_fill_white_48dp.webp b/app/src/main/res/drawable-mdpi/ic_download_circle_fill_white_48dp.webp similarity index 100% rename from res/drawable-mdpi/ic_download_circle_fill_white_48dp.webp rename to app/src/main/res/drawable-mdpi/ic_download_circle_fill_white_48dp.webp diff --git a/res/drawable-mdpi/ic_emoji_32.webp b/app/src/main/res/drawable-mdpi/ic_emoji_32.webp similarity index 100% rename from res/drawable-mdpi/ic_emoji_32.webp rename to app/src/main/res/drawable-mdpi/ic_emoji_32.webp diff --git a/res/drawable-mdpi/ic_error.webp b/app/src/main/res/drawable-mdpi/ic_error.webp similarity index 100% rename from res/drawable-mdpi/ic_error.webp rename to app/src/main/res/drawable-mdpi/ic_error.webp diff --git a/res/drawable-mdpi/ic_face_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_face_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_face_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_face_white_24dp.webp diff --git a/res/drawable-mdpi/ic_favorite_grey600_24dp.webp b/app/src/main/res/drawable-mdpi/ic_favorite_grey600_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_favorite_grey600_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_favorite_grey600_24dp.webp diff --git a/res/drawable-mdpi/ic_fingerprint_white_48dp.webp b/app/src/main/res/drawable-mdpi/ic_fingerprint_white_48dp.webp similarity index 100% rename from res/drawable-mdpi/ic_fingerprint_white_48dp.webp rename to app/src/main/res/drawable-mdpi/ic_fingerprint_white_48dp.webp diff --git a/res/drawable-mdpi/ic_flip_32.webp b/app/src/main/res/drawable-mdpi/ic_flip_32.webp similarity index 100% rename from res/drawable-mdpi/ic_flip_32.webp rename to app/src/main/res/drawable-mdpi/ic_flip_32.webp diff --git a/res/drawable-mdpi/ic_folder_white_48dp.webp b/app/src/main/res/drawable-mdpi/ic_folder_white_48dp.webp similarity index 100% rename from res/drawable-mdpi/ic_folder_white_48dp.webp rename to app/src/main/res/drawable-mdpi/ic_folder_white_48dp.webp diff --git a/res/drawable-mdpi/ic_gif_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_gif_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_gif_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_gif_white_24dp.webp diff --git a/res/drawable-mdpi/ic_headset_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_headset_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_headset_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_headset_white_24dp.webp diff --git a/res/drawable-mdpi/ic_image_dark.webp b/app/src/main/res/drawable-mdpi/ic_image_dark.webp similarity index 100% rename from res/drawable-mdpi/ic_image_dark.webp rename to app/src/main/res/drawable-mdpi/ic_image_dark.webp diff --git a/res/drawable-mdpi/ic_image_light.webp b/app/src/main/res/drawable-mdpi/ic_image_light.webp similarity index 100% rename from res/drawable-mdpi/ic_image_light.webp rename to app/src/main/res/drawable-mdpi/ic_image_light.webp diff --git a/res/drawable-mdpi/ic_image_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_image_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_image_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_image_white_24dp.webp diff --git a/res/drawable-mdpi/ic_info_outline_dark.webp b/app/src/main/res/drawable-mdpi/ic_info_outline_dark.webp similarity index 100% rename from res/drawable-mdpi/ic_info_outline_dark.webp rename to app/src/main/res/drawable-mdpi/ic_info_outline_dark.webp diff --git a/res/drawable-mdpi/ic_info_outline_light.webp b/app/src/main/res/drawable-mdpi/ic_info_outline_light.webp similarity index 100% rename from res/drawable-mdpi/ic_info_outline_light.webp rename to app/src/main/res/drawable-mdpi/ic_info_outline_light.webp diff --git a/res/drawable-mdpi/ic_info_outline_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_info_outline_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_info_outline_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_info_outline_white_24dp.webp diff --git a/res/drawable-mdpi/ic_insert_drive_file_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_insert_drive_file_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_insert_drive_file_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_insert_drive_file_white_24dp.webp diff --git a/res/drawable-mdpi/ic_keyboard_arrow_down_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_keyboard_arrow_down_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_keyboard_arrow_down_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_keyboard_arrow_down_white_24dp.webp diff --git a/res/drawable-mdpi/ic_keyboard_arrow_left_grey600_24dp.webp b/app/src/main/res/drawable-mdpi/ic_keyboard_arrow_left_grey600_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_keyboard_arrow_left_grey600_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_keyboard_arrow_left_grey600_24dp.webp diff --git a/res/drawable-mdpi/ic_keyboard_arrow_up_white_36dp.webp b/app/src/main/res/drawable-mdpi/ic_keyboard_arrow_up_white_36dp.webp similarity index 100% rename from res/drawable-mdpi/ic_keyboard_arrow_up_white_36dp.webp rename to app/src/main/res/drawable-mdpi/ic_keyboard_arrow_up_white_36dp.webp diff --git a/res/drawable-mdpi/ic_keyboard_grey600_24dp.webp b/app/src/main/res/drawable-mdpi/ic_keyboard_grey600_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_keyboard_grey600_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_keyboard_grey600_24dp.webp diff --git a/res/drawable-mdpi/ic_launch_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_launch_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_launch_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_launch_white_24dp.webp diff --git a/res/drawable-mdpi/ic_location_on_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_location_on_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_location_on_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_location_on_white_24dp.webp diff --git a/res/drawable-mdpi/ic_lock_white_18dp.webp b/app/src/main/res/drawable-mdpi/ic_lock_white_18dp.webp similarity index 100% rename from res/drawable-mdpi/ic_lock_white_18dp.webp rename to app/src/main/res/drawable-mdpi/ic_lock_white_18dp.webp diff --git a/res/drawable-mdpi/ic_lock_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_lock_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_lock_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_lock_white_24dp.webp diff --git a/res/drawable-mdpi/ic_lock_white_48dp.webp b/app/src/main/res/drawable-mdpi/ic_lock_white_48dp.webp similarity index 100% rename from res/drawable-mdpi/ic_lock_white_48dp.webp rename to app/src/main/res/drawable-mdpi/ic_lock_white_48dp.webp diff --git a/res/drawable-mdpi/ic_menu_add_field_holo_light.webp b/app/src/main/res/drawable-mdpi/ic_menu_add_field_holo_light.webp similarity index 100% rename from res/drawable-mdpi/ic_menu_add_field_holo_light.webp rename to app/src/main/res/drawable-mdpi/ic_menu_add_field_holo_light.webp diff --git a/res/drawable-mdpi/ic_menu_lock_dark.webp b/app/src/main/res/drawable-mdpi/ic_menu_lock_dark.webp similarity index 100% rename from res/drawable-mdpi/ic_menu_lock_dark.webp rename to app/src/main/res/drawable-mdpi/ic_menu_lock_dark.webp diff --git a/res/drawable-mdpi/ic_menu_login.png b/app/src/main/res/drawable-mdpi/ic_menu_login.png similarity index 100% rename from res/drawable-mdpi/ic_menu_login.png rename to app/src/main/res/drawable-mdpi/ic_menu_login.png diff --git a/res/drawable-mdpi/ic_menu_remove_holo_light.webp b/app/src/main/res/drawable-mdpi/ic_menu_remove_holo_light.webp similarity index 100% rename from res/drawable-mdpi/ic_menu_remove_holo_light.webp rename to app/src/main/res/drawable-mdpi/ic_menu_remove_holo_light.webp diff --git a/res/drawable-mdpi/ic_menu_search_holo_light.webp b/app/src/main/res/drawable-mdpi/ic_menu_search_holo_light.webp similarity index 100% rename from res/drawable-mdpi/ic_menu_search_holo_light.webp rename to app/src/main/res/drawable-mdpi/ic_menu_search_holo_light.webp diff --git a/res/drawable-mdpi/ic_message_outline_24.webp b/app/src/main/res/drawable-mdpi/ic_message_outline_24.webp similarity index 100% rename from res/drawable-mdpi/ic_message_outline_24.webp rename to app/src/main/res/drawable-mdpi/ic_message_outline_24.webp diff --git a/res/drawable-mdpi/ic_message_solid_24.webp b/app/src/main/res/drawable-mdpi/ic_message_solid_24.webp similarity index 100% rename from res/drawable-mdpi/ic_message_solid_24.webp rename to app/src/main/res/drawable-mdpi/ic_message_solid_24.webp diff --git a/res/drawable-mdpi/ic_mic_off_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_mic_off_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_mic_off_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_mic_off_white_24dp.webp diff --git a/res/drawable-mdpi/ic_missing_thumbnail_picture.webp b/app/src/main/res/drawable-mdpi/ic_missing_thumbnail_picture.webp similarity index 100% rename from res/drawable-mdpi/ic_missing_thumbnail_picture.webp rename to app/src/main/res/drawable-mdpi/ic_missing_thumbnail_picture.webp diff --git a/res/drawable-mdpi/ic_movie_creation_dark.webp b/app/src/main/res/drawable-mdpi/ic_movie_creation_dark.webp similarity index 100% rename from res/drawable-mdpi/ic_movie_creation_dark.webp rename to app/src/main/res/drawable-mdpi/ic_movie_creation_dark.webp diff --git a/res/drawable-mdpi/ic_movie_creation_light.webp b/app/src/main/res/drawable-mdpi/ic_movie_creation_light.webp similarity index 100% rename from res/drawable-mdpi/ic_movie_creation_light.webp rename to app/src/main/res/drawable-mdpi/ic_movie_creation_light.webp diff --git a/res/drawable-mdpi/ic_note_to_self.webp b/app/src/main/res/drawable-mdpi/ic_note_to_self.webp similarity index 100% rename from res/drawable-mdpi/ic_note_to_self.webp rename to app/src/main/res/drawable-mdpi/ic_note_to_self.webp diff --git a/res/drawable-mdpi/ic_pause_circle_fill_white_48dp.webp b/app/src/main/res/drawable-mdpi/ic_pause_circle_fill_white_48dp.webp similarity index 100% rename from res/drawable-mdpi/ic_pause_circle_fill_white_48dp.webp rename to app/src/main/res/drawable-mdpi/ic_pause_circle_fill_white_48dp.webp diff --git a/res/drawable-mdpi/ic_person_add_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_person_add_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_person_add_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_person_add_white_24dp.webp diff --git a/res/drawable-mdpi/ic_person_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_person_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_person_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_person_white_24dp.webp diff --git a/res/drawable-mdpi/ic_phone_grey600_32dp.webp b/app/src/main/res/drawable-mdpi/ic_phone_grey600_32dp.webp similarity index 100% rename from res/drawable-mdpi/ic_phone_grey600_32dp.webp rename to app/src/main/res/drawable-mdpi/ic_phone_grey600_32dp.webp diff --git a/res/drawable-mdpi/ic_photo_library_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_photo_library_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_photo_library_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_photo_library_white_24dp.webp diff --git a/res/drawable-mdpi/ic_play_circle_fill_white_48dp.webp b/app/src/main/res/drawable-mdpi/ic_play_circle_fill_white_48dp.webp similarity index 100% rename from res/drawable-mdpi/ic_play_circle_fill_white_48dp.webp rename to app/src/main/res/drawable-mdpi/ic_play_circle_fill_white_48dp.webp diff --git a/res/drawable-mdpi/ic_plus_28.webp b/app/src/main/res/drawable-mdpi/ic_plus_28.webp similarity index 100% rename from res/drawable-mdpi/ic_plus_28.webp rename to app/src/main/res/drawable-mdpi/ic_plus_28.webp diff --git a/res/drawable-mdpi/ic_profile_camera.webp b/app/src/main/res/drawable-mdpi/ic_profile_camera.webp similarity index 100% rename from res/drawable-mdpi/ic_profile_camera.webp rename to app/src/main/res/drawable-mdpi/ic_profile_camera.webp diff --git a/res/drawable-mdpi/ic_refresh_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_refresh_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_refresh_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_refresh_white_24dp.webp diff --git a/res/drawable-mdpi/ic_reply.webp b/app/src/main/res/drawable-mdpi/ic_reply.webp similarity index 100% rename from res/drawable-mdpi/ic_reply.webp rename to app/src/main/res/drawable-mdpi/ic_reply.webp diff --git a/res/drawable-mdpi/ic_reply_white_36dp.webp b/app/src/main/res/drawable-mdpi/ic_reply_white_36dp.webp similarity index 100% rename from res/drawable-mdpi/ic_reply_white_36dp.webp rename to app/src/main/res/drawable-mdpi/ic_reply_white_36dp.webp diff --git a/res/drawable-mdpi/ic_rotate_32.webp b/app/src/main/res/drawable-mdpi/ic_rotate_32.webp similarity index 100% rename from res/drawable-mdpi/ic_rotate_32.webp rename to app/src/main/res/drawable-mdpi/ic_rotate_32.webp diff --git a/res/drawable-mdpi/ic_scroll_down.webp b/app/src/main/res/drawable-mdpi/ic_scroll_down.webp similarity index 100% rename from res/drawable-mdpi/ic_scroll_down.webp rename to app/src/main/res/drawable-mdpi/ic_scroll_down.webp diff --git a/res/drawable-mdpi/ic_select_all_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_select_all_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_select_all_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_select_all_white_24dp.webp diff --git a/res/drawable-mdpi/ic_select_off.webp b/app/src/main/res/drawable-mdpi/ic_select_off.webp similarity index 100% rename from res/drawable-mdpi/ic_select_off.webp rename to app/src/main/res/drawable-mdpi/ic_select_off.webp diff --git a/res/drawable-mdpi/ic_select_on.webp b/app/src/main/res/drawable-mdpi/ic_select_on.webp similarity index 100% rename from res/drawable-mdpi/ic_select_on.webp rename to app/src/main/res/drawable-mdpi/ic_select_on.webp diff --git a/res/drawable-mdpi/ic_share_black_18dp.webp b/app/src/main/res/drawable-mdpi/ic_share_black_18dp.webp similarity index 100% rename from res/drawable-mdpi/ic_share_black_18dp.webp rename to app/src/main/res/drawable-mdpi/ic_share_black_18dp.webp diff --git a/res/drawable-mdpi/ic_share_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_share_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_share_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_share_white_24dp.webp diff --git a/res/drawable-mdpi/ic_signal_background_connection.webp b/app/src/main/res/drawable-mdpi/ic_signal_background_connection.webp similarity index 100% rename from res/drawable-mdpi/ic_signal_background_connection.webp rename to app/src/main/res/drawable-mdpi/ic_signal_background_connection.webp diff --git a/res/drawable-mdpi/ic_signal_backup.webp b/app/src/main/res/drawable-mdpi/ic_signal_backup.webp similarity index 100% rename from res/drawable-mdpi/ic_signal_backup.webp rename to app/src/main/res/drawable-mdpi/ic_signal_backup.webp diff --git a/res/drawable-mdpi/ic_signal_downloading.webp b/app/src/main/res/drawable-mdpi/ic_signal_downloading.webp similarity index 100% rename from res/drawable-mdpi/ic_signal_downloading.webp rename to app/src/main/res/drawable-mdpi/ic_signal_downloading.webp diff --git a/res/drawable-mdpi/ic_signal_grey_24dp.webp b/app/src/main/res/drawable-mdpi/ic_signal_grey_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_signal_grey_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_signal_grey_24dp.webp diff --git a/res/drawable-mdpi/ic_switch_camera_32.webp b/app/src/main/res/drawable-mdpi/ic_switch_camera_32.webp similarity index 100% rename from res/drawable-mdpi/ic_switch_camera_32.webp rename to app/src/main/res/drawable-mdpi/ic_switch_camera_32.webp diff --git a/res/drawable-mdpi/ic_text_32.webp b/app/src/main/res/drawable-mdpi/ic_text_32.webp similarity index 100% rename from res/drawable-mdpi/ic_text_32.webp rename to app/src/main/res/drawable-mdpi/ic_text_32.webp diff --git a/res/drawable-mdpi/ic_trash_filled_32.webp b/app/src/main/res/drawable-mdpi/ic_trash_filled_32.webp similarity index 100% rename from res/drawable-mdpi/ic_trash_filled_32.webp rename to app/src/main/res/drawable-mdpi/ic_trash_filled_32.webp diff --git a/res/drawable-mdpi/ic_unarchive_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_unarchive_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_unarchive_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_unarchive_white_24dp.webp diff --git a/res/drawable-mdpi/ic_unarchive_white_36dp.webp b/app/src/main/res/drawable-mdpi/ic_unarchive_white_36dp.webp similarity index 100% rename from res/drawable-mdpi/ic_unarchive_white_36dp.webp rename to app/src/main/res/drawable-mdpi/ic_unarchive_white_36dp.webp diff --git a/res/drawable-mdpi/ic_undo_32.webp b/app/src/main/res/drawable-mdpi/ic_undo_32.webp similarity index 100% rename from res/drawable-mdpi/ic_undo_32.webp rename to app/src/main/res/drawable-mdpi/ic_undo_32.webp diff --git a/res/drawable-mdpi/ic_unidentified_delivery.webp b/app/src/main/res/drawable-mdpi/ic_unidentified_delivery.webp similarity index 100% rename from res/drawable-mdpi/ic_unidentified_delivery.webp rename to app/src/main/res/drawable-mdpi/ic_unidentified_delivery.webp diff --git a/res/drawable-mdpi/ic_unlocked_white_18dp.webp b/app/src/main/res/drawable-mdpi/ic_unlocked_white_18dp.webp similarity index 100% rename from res/drawable-mdpi/ic_unlocked_white_18dp.webp rename to app/src/main/res/drawable-mdpi/ic_unlocked_white_18dp.webp diff --git a/res/drawable-mdpi/ic_unlocked_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_unlocked_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_unlocked_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_unlocked_white_24dp.webp diff --git a/res/drawable-mdpi/ic_video_dark.webp b/app/src/main/res/drawable-mdpi/ic_video_dark.webp similarity index 100% rename from res/drawable-mdpi/ic_video_dark.webp rename to app/src/main/res/drawable-mdpi/ic_video_dark.webp diff --git a/res/drawable-mdpi/ic_video_light.webp b/app/src/main/res/drawable-mdpi/ic_video_light.webp similarity index 100% rename from res/drawable-mdpi/ic_video_light.webp rename to app/src/main/res/drawable-mdpi/ic_video_light.webp diff --git a/res/drawable-mdpi/ic_view_infinite_32.png b/app/src/main/res/drawable-mdpi/ic_view_infinite_32.png similarity index 100% rename from res/drawable-mdpi/ic_view_infinite_32.png rename to app/src/main/res/drawable-mdpi/ic_view_infinite_32.png diff --git a/res/drawable-mdpi/ic_view_once_32.png b/app/src/main/res/drawable-mdpi/ic_view_once_32.png similarity index 100% rename from res/drawable-mdpi/ic_view_once_32.png rename to app/src/main/res/drawable-mdpi/ic_view_once_32.png diff --git a/res/drawable-mdpi/ic_visibility_grey600_24dp.png b/app/src/main/res/drawable-mdpi/ic_visibility_grey600_24dp.png similarity index 100% rename from res/drawable-mdpi/ic_visibility_grey600_24dp.png rename to app/src/main/res/drawable-mdpi/ic_visibility_grey600_24dp.png diff --git a/res/drawable-mdpi/ic_visibility_off_grey600_24dp.webp b/app/src/main/res/drawable-mdpi/ic_visibility_off_grey600_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_visibility_off_grey600_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_visibility_off_grey600_24dp.webp diff --git a/res/drawable-mdpi/ic_visibility_off_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_visibility_off_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_visibility_off_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_visibility_off_white_24dp.webp diff --git a/res/drawable-mdpi/ic_visibility_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_visibility_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_visibility_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_visibility_white_24dp.webp diff --git a/res/drawable-mdpi/ic_volume_off_grey600_18dp.webp b/app/src/main/res/drawable-mdpi/ic_volume_off_grey600_18dp.webp similarity index 100% rename from res/drawable-mdpi/ic_volume_off_grey600_18dp.webp rename to app/src/main/res/drawable-mdpi/ic_volume_off_grey600_18dp.webp diff --git a/res/drawable-mdpi/ic_volume_off_white_18dp.webp b/app/src/main/res/drawable-mdpi/ic_volume_off_white_18dp.webp similarity index 100% rename from res/drawable-mdpi/ic_volume_off_white_18dp.webp rename to app/src/main/res/drawable-mdpi/ic_volume_off_white_18dp.webp diff --git a/res/drawable-mdpi/ic_volume_up_dark.webp b/app/src/main/res/drawable-mdpi/ic_volume_up_dark.webp similarity index 100% rename from res/drawable-mdpi/ic_volume_up_dark.webp rename to app/src/main/res/drawable-mdpi/ic_volume_up_dark.webp diff --git a/res/drawable-mdpi/ic_volume_up_light.webp b/app/src/main/res/drawable-mdpi/ic_volume_up_light.webp similarity index 100% rename from res/drawable-mdpi/ic_volume_up_light.webp rename to app/src/main/res/drawable-mdpi/ic_volume_up_light.webp diff --git a/res/drawable-mdpi/ic_volume_up_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_volume_up_white_24dp.webp similarity index 100% rename from res/drawable-mdpi/ic_volume_up_white_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_volume_up_white_24dp.webp diff --git a/res/drawable-mdpi/ic_warning_dark.webp b/app/src/main/res/drawable-mdpi/ic_warning_dark.webp similarity index 100% rename from res/drawable-mdpi/ic_warning_dark.webp rename to app/src/main/res/drawable-mdpi/ic_warning_dark.webp diff --git a/res/drawable-mdpi/ic_warning_light.webp b/app/src/main/res/drawable-mdpi/ic_warning_light.webp similarity index 100% rename from res/drawable-mdpi/ic_warning_light.webp rename to app/src/main/res/drawable-mdpi/ic_warning_light.webp diff --git a/res/drawable-mdpi/ic_x_28.webp b/app/src/main/res/drawable-mdpi/ic_x_28.webp similarity index 100% rename from res/drawable-mdpi/ic_x_28.webp rename to app/src/main/res/drawable-mdpi/ic_x_28.webp diff --git a/res/drawable-mdpi/icon_cached.webp b/app/src/main/res/drawable-mdpi/icon_cached.webp similarity index 100% rename from res/drawable-mdpi/icon_cached.webp rename to app/src/main/res/drawable-mdpi/icon_cached.webp diff --git a/res/drawable-mdpi/icon_dialog.webp b/app/src/main/res/drawable-mdpi/icon_dialog.webp similarity index 100% rename from res/drawable-mdpi/icon_dialog.webp rename to app/src/main/res/drawable-mdpi/icon_dialog.webp diff --git a/res/drawable-mdpi/icon_notification.webp b/app/src/main/res/drawable-mdpi/icon_notification.webp similarity index 100% rename from res/drawable-mdpi/icon_notification.webp rename to app/src/main/res/drawable-mdpi/icon_notification.webp diff --git a/res/drawable-mdpi/icon_transparent.webp b/app/src/main/res/drawable-mdpi/icon_transparent.webp similarity index 100% rename from res/drawable-mdpi/icon_transparent.webp rename to app/src/main/res/drawable-mdpi/icon_transparent.webp diff --git a/res/drawable-mdpi/import_database.webp b/app/src/main/res/drawable-mdpi/import_database.webp similarity index 100% rename from res/drawable-mdpi/import_database.webp rename to app/src/main/res/drawable-mdpi/import_database.webp diff --git a/res/drawable-mdpi/inbox_zero.webp b/app/src/main/res/drawable-mdpi/inbox_zero.webp similarity index 100% rename from res/drawable-mdpi/inbox_zero.webp rename to app/src/main/res/drawable-mdpi/inbox_zero.webp diff --git a/res/drawable-mdpi/lockscreen_watermark_dark.webp b/app/src/main/res/drawable-mdpi/lockscreen_watermark_dark.webp similarity index 100% rename from res/drawable-mdpi/lockscreen_watermark_dark.webp rename to app/src/main/res/drawable-mdpi/lockscreen_watermark_dark.webp diff --git a/res/drawable-mdpi/lockscreen_watermark_light.webp b/app/src/main/res/drawable-mdpi/lockscreen_watermark_light.webp similarity index 100% rename from res/drawable-mdpi/lockscreen_watermark_light.webp rename to app/src/main/res/drawable-mdpi/lockscreen_watermark_light.webp diff --git a/res/drawable-mdpi/love_heart.webp b/app/src/main/res/drawable-mdpi/love_heart.webp similarity index 100% rename from res/drawable-mdpi/love_heart.webp rename to app/src/main/res/drawable-mdpi/love_heart.webp diff --git a/res/drawable-mdpi/marker_shadow.webp b/app/src/main/res/drawable-mdpi/marker_shadow.webp similarity index 100% rename from res/drawable-mdpi/marker_shadow.webp rename to app/src/main/res/drawable-mdpi/marker_shadow.webp diff --git a/res/drawable-mdpi/message_24dp.webp b/app/src/main/res/drawable-mdpi/message_24dp.webp similarity index 100% rename from res/drawable-mdpi/message_24dp.webp rename to app/src/main/res/drawable-mdpi/message_24dp.webp diff --git a/res/drawable-mdpi/no_contacts.png b/app/src/main/res/drawable-mdpi/no_contacts.png similarity index 100% rename from res/drawable-mdpi/no_contacts.png rename to app/src/main/res/drawable-mdpi/no_contacts.png diff --git a/res/drawable-mdpi/notify_panel_notification_icon_bg.webp b/app/src/main/res/drawable-mdpi/notify_panel_notification_icon_bg.webp similarity index 100% rename from res/drawable-mdpi/notify_panel_notification_icon_bg.webp rename to app/src/main/res/drawable-mdpi/notify_panel_notification_icon_bg.webp diff --git a/res/drawable-mdpi/phone_24dp.webp b/app/src/main/res/drawable-mdpi/phone_24dp.webp similarity index 100% rename from res/drawable-mdpi/phone_24dp.webp rename to app/src/main/res/drawable-mdpi/phone_24dp.webp diff --git a/res/drawable-mdpi/poweredby_giphy.webp b/app/src/main/res/drawable-mdpi/poweredby_giphy.webp similarity index 100% rename from res/drawable-mdpi/poweredby_giphy.webp rename to app/src/main/res/drawable-mdpi/poweredby_giphy.webp diff --git a/res/drawable-mdpi/profile_splash.webp b/app/src/main/res/drawable-mdpi/profile_splash.webp similarity index 100% rename from res/drawable-mdpi/profile_splash.webp rename to app/src/main/res/drawable-mdpi/profile_splash.webp diff --git a/res/drawable-mdpi/quick_camera_front.webp b/app/src/main/res/drawable-mdpi/quick_camera_front.webp similarity index 100% rename from res/drawable-mdpi/quick_camera_front.webp rename to app/src/main/res/drawable-mdpi/quick_camera_front.webp diff --git a/res/drawable-mdpi/quick_camera_rear.webp b/app/src/main/res/drawable-mdpi/quick_camera_rear.webp similarity index 100% rename from res/drawable-mdpi/quick_camera_rear.webp rename to app/src/main/res/drawable-mdpi/quick_camera_rear.webp diff --git a/res/drawable-mdpi/reaction_scrubber_angry_48.webp b/app/src/main/res/drawable-mdpi/reaction_scrubber_angry_48.webp similarity index 100% rename from res/drawable-mdpi/reaction_scrubber_angry_48.webp rename to app/src/main/res/drawable-mdpi/reaction_scrubber_angry_48.webp diff --git a/res/drawable-mdpi/reaction_scrubber_dislike_48.webp b/app/src/main/res/drawable-mdpi/reaction_scrubber_dislike_48.webp similarity index 100% rename from res/drawable-mdpi/reaction_scrubber_dislike_48.webp rename to app/src/main/res/drawable-mdpi/reaction_scrubber_dislike_48.webp diff --git a/res/drawable-mdpi/reaction_scrubber_haha_48.webp b/app/src/main/res/drawable-mdpi/reaction_scrubber_haha_48.webp similarity index 100% rename from res/drawable-mdpi/reaction_scrubber_haha_48.webp rename to app/src/main/res/drawable-mdpi/reaction_scrubber_haha_48.webp diff --git a/res/drawable-mdpi/reaction_scrubber_like_48.webp b/app/src/main/res/drawable-mdpi/reaction_scrubber_like_48.webp similarity index 100% rename from res/drawable-mdpi/reaction_scrubber_like_48.webp rename to app/src/main/res/drawable-mdpi/reaction_scrubber_like_48.webp diff --git a/res/drawable-mdpi/reaction_scrubber_love_48.webp b/app/src/main/res/drawable-mdpi/reaction_scrubber_love_48.webp similarity index 100% rename from res/drawable-mdpi/reaction_scrubber_love_48.webp rename to app/src/main/res/drawable-mdpi/reaction_scrubber_love_48.webp diff --git a/res/drawable-mdpi/reaction_scrubber_sad_48.webp b/app/src/main/res/drawable-mdpi/reaction_scrubber_sad_48.webp similarity index 100% rename from res/drawable-mdpi/reaction_scrubber_sad_48.webp rename to app/src/main/res/drawable-mdpi/reaction_scrubber_sad_48.webp diff --git a/res/drawable-mdpi/reaction_scrubber_wow_48.webp b/app/src/main/res/drawable-mdpi/reaction_scrubber_wow_48.webp similarity index 100% rename from res/drawable-mdpi/reaction_scrubber_wow_48.webp rename to app/src/main/res/drawable-mdpi/reaction_scrubber_wow_48.webp diff --git a/res/drawable-mdpi/sticker_32.webp b/app/src/main/res/drawable-mdpi/sticker_32.webp similarity index 100% rename from res/drawable-mdpi/sticker_32.webp rename to app/src/main/res/drawable-mdpi/sticker_32.webp diff --git a/res/drawable-mdpi/video_splash.webp b/app/src/main/res/drawable-mdpi/video_splash.webp similarity index 100% rename from res/drawable-mdpi/video_splash.webp rename to app/src/main/res/drawable-mdpi/video_splash.webp diff --git a/res/drawable-mdpi/webrtc_video_mute_24.webp b/app/src/main/res/drawable-mdpi/webrtc_video_mute_24.webp similarity index 100% rename from res/drawable-mdpi/webrtc_video_mute_24.webp rename to app/src/main/res/drawable-mdpi/webrtc_video_mute_24.webp diff --git a/res/drawable-mdpi/welcome.webp b/app/src/main/res/drawable-mdpi/welcome.webp similarity index 100% rename from res/drawable-mdpi/welcome.webp rename to app/src/main/res/drawable-mdpi/welcome.webp diff --git a/res/drawable-nodpi/link_preview_splash.webp b/app/src/main/res/drawable-nodpi/link_preview_splash.webp similarity index 100% rename from res/drawable-nodpi/link_preview_splash.webp rename to app/src/main/res/drawable-nodpi/link_preview_splash.webp diff --git a/res/drawable-v21/camera_send_button_background.xml b/app/src/main/res/drawable-v21/camera_send_button_background.xml similarity index 100% rename from res/drawable-v21/camera_send_button_background.xml rename to app/src/main/res/drawable-v21/camera_send_button_background.xml diff --git a/res/drawable-v21/circle_touch_highlight_background.xml b/app/src/main/res/drawable-v21/circle_touch_highlight_background.xml similarity index 100% rename from res/drawable-v21/circle_touch_highlight_background.xml rename to app/src/main/res/drawable-v21/circle_touch_highlight_background.xml diff --git a/res/drawable-v21/conversation_list_item_background.xml b/app/src/main/res/drawable-v21/conversation_list_item_background.xml similarity index 100% rename from res/drawable-v21/conversation_list_item_background.xml rename to app/src/main/res/drawable-v21/conversation_list_item_background.xml diff --git a/res/drawable-v21/conversation_list_item_background_dark.xml b/app/src/main/res/drawable-v21/conversation_list_item_background_dark.xml similarity index 100% rename from res/drawable-v21/conversation_list_item_background_dark.xml rename to app/src/main/res/drawable-v21/conversation_list_item_background_dark.xml diff --git a/res/drawable-v21/cta_button_background.xml b/app/src/main/res/drawable-v21/cta_button_background.xml similarity index 100% rename from res/drawable-v21/cta_button_background.xml rename to app/src/main/res/drawable-v21/cta_button_background.xml diff --git a/res/drawable-v21/dialog_background.xml b/app/src/main/res/drawable-v21/dialog_background.xml similarity index 100% rename from res/drawable-v21/dialog_background.xml rename to app/src/main/res/drawable-v21/dialog_background.xml diff --git a/res/drawable-v21/media_camera_button_background.xml b/app/src/main/res/drawable-v21/media_camera_button_background.xml similarity index 100% rename from res/drawable-v21/media_camera_button_background.xml rename to app/src/main/res/drawable-v21/media_camera_button_background.xml diff --git a/res/drawable-v21/media_continue_button_background.xml b/app/src/main/res/drawable-v21/media_continue_button_background.xml similarity index 100% rename from res/drawable-v21/media_continue_button_background.xml rename to app/src/main/res/drawable-v21/media_continue_button_background.xml diff --git a/res/drawable-v21/media_count_button_background.xml b/app/src/main/res/drawable-v21/media_count_button_background.xml similarity index 100% rename from res/drawable-v21/media_count_button_background.xml rename to app/src/main/res/drawable-v21/media_count_button_background.xml diff --git a/res/drawable-v21/mediarail_button_background.xml b/app/src/main/res/drawable-v21/mediarail_button_background.xml similarity index 100% rename from res/drawable-v21/mediarail_button_background.xml rename to app/src/main/res/drawable-v21/mediarail_button_background.xml diff --git a/res/drawable-v21/sticker_button_dark.xml b/app/src/main/res/drawable-v21/sticker_button_dark.xml similarity index 100% rename from res/drawable-v21/sticker_button_dark.xml rename to app/src/main/res/drawable-v21/sticker_button_dark.xml diff --git a/res/drawable-v21/sticker_button_light.xml b/app/src/main/res/drawable-v21/sticker_button_light.xml similarity index 100% rename from res/drawable-v21/sticker_button_light.xml rename to app/src/main/res/drawable-v21/sticker_button_light.xml diff --git a/res/drawable-v21/touch_highlight_background.xml b/app/src/main/res/drawable-v21/touch_highlight_background.xml similarity index 100% rename from res/drawable-v21/touch_highlight_background.xml rename to app/src/main/res/drawable-v21/touch_highlight_background.xml diff --git a/res/drawable-xhdpi/baseline_account_circle_white_24.webp b/app/src/main/res/drawable-xhdpi/baseline_account_circle_white_24.webp similarity index 100% rename from res/drawable-xhdpi/baseline_account_circle_white_24.webp rename to app/src/main/res/drawable-xhdpi/baseline_account_circle_white_24.webp diff --git a/res/drawable-xhdpi/baseline_email_white_24.webp b/app/src/main/res/drawable-xhdpi/baseline_email_white_24.webp similarity index 100% rename from res/drawable-xhdpi/baseline_email_white_24.webp rename to app/src/main/res/drawable-xhdpi/baseline_email_white_24.webp diff --git a/res/drawable-xhdpi/check.webp b/app/src/main/res/drawable-xhdpi/check.webp similarity index 100% rename from res/drawable-xhdpi/check.webp rename to app/src/main/res/drawable-xhdpi/check.webp diff --git a/res/drawable-xhdpi/clear_profile_avatar.webp b/app/src/main/res/drawable-xhdpi/clear_profile_avatar.webp similarity index 100% rename from res/drawable-xhdpi/clear_profile_avatar.webp rename to app/src/main/res/drawable-xhdpi/clear_profile_avatar.webp diff --git a/res/drawable-xhdpi/conversation_list_empty_state.webp b/app/src/main/res/drawable-xhdpi/conversation_list_empty_state.webp similarity index 100% rename from res/drawable-xhdpi/conversation_list_empty_state.webp rename to app/src/main/res/drawable-xhdpi/conversation_list_empty_state.webp diff --git a/res/drawable-xhdpi/divet_lower_right_dark.webp b/app/src/main/res/drawable-xhdpi/divet_lower_right_dark.webp similarity index 100% rename from res/drawable-xhdpi/divet_lower_right_dark.webp rename to app/src/main/res/drawable-xhdpi/divet_lower_right_dark.webp diff --git a/res/drawable-xhdpi/divet_lower_right_light.webp b/app/src/main/res/drawable-xhdpi/divet_lower_right_light.webp similarity index 100% rename from res/drawable-xhdpi/divet_lower_right_light.webp rename to app/src/main/res/drawable-xhdpi/divet_lower_right_light.webp diff --git a/res/drawable-xhdpi/empty_inbox_1.webp b/app/src/main/res/drawable-xhdpi/empty_inbox_1.webp similarity index 100% rename from res/drawable-xhdpi/empty_inbox_1.webp rename to app/src/main/res/drawable-xhdpi/empty_inbox_1.webp diff --git a/res/drawable-xhdpi/empty_inbox_2.webp b/app/src/main/res/drawable-xhdpi/empty_inbox_2.webp similarity index 100% rename from res/drawable-xhdpi/empty_inbox_2.webp rename to app/src/main/res/drawable-xhdpi/empty_inbox_2.webp diff --git a/res/drawable-xhdpi/empty_inbox_3.webp b/app/src/main/res/drawable-xhdpi/empty_inbox_3.webp similarity index 100% rename from res/drawable-xhdpi/empty_inbox_3.webp rename to app/src/main/res/drawable-xhdpi/empty_inbox_3.webp diff --git a/res/drawable-xhdpi/empty_inbox_4.webp b/app/src/main/res/drawable-xhdpi/empty_inbox_4.webp similarity index 100% rename from res/drawable-xhdpi/empty_inbox_4.webp rename to app/src/main/res/drawable-xhdpi/empty_inbox_4.webp diff --git a/res/drawable-xhdpi/empty_inbox_5.webp b/app/src/main/res/drawable-xhdpi/empty_inbox_5.webp similarity index 100% rename from res/drawable-xhdpi/empty_inbox_5.webp rename to app/src/main/res/drawable-xhdpi/empty_inbox_5.webp diff --git a/res/drawable-xhdpi/flash_auto_32.webp b/app/src/main/res/drawable-xhdpi/flash_auto_32.webp similarity index 100% rename from res/drawable-xhdpi/flash_auto_32.webp rename to app/src/main/res/drawable-xhdpi/flash_auto_32.webp diff --git a/res/drawable-xhdpi/flash_off_32.webp b/app/src/main/res/drawable-xhdpi/flash_off_32.webp similarity index 100% rename from res/drawable-xhdpi/flash_off_32.webp rename to app/src/main/res/drawable-xhdpi/flash_off_32.webp diff --git a/res/drawable-xhdpi/flash_on_32.webp b/app/src/main/res/drawable-xhdpi/flash_on_32.webp similarity index 100% rename from res/drawable-xhdpi/flash_on_32.webp rename to app/src/main/res/drawable-xhdpi/flash_on_32.webp diff --git a/res/drawable-xhdpi/ic_account_box_dark.webp b/app/src/main/res/drawable-xhdpi/ic_account_box_dark.webp similarity index 100% rename from res/drawable-xhdpi/ic_account_box_dark.webp rename to app/src/main/res/drawable-xhdpi/ic_account_box_dark.webp diff --git a/res/drawable-xhdpi/ic_account_box_light.webp b/app/src/main/res/drawable-xhdpi/ic_account_box_light.webp similarity index 100% rename from res/drawable-xhdpi/ic_account_box_light.webp rename to app/src/main/res/drawable-xhdpi/ic_account_box_light.webp diff --git a/res/drawable-xhdpi/ic_action_warning_red.webp b/app/src/main/res/drawable-xhdpi/ic_action_warning_red.webp similarity index 100% rename from res/drawable-xhdpi/ic_action_warning_red.webp rename to app/src/main/res/drawable-xhdpi/ic_action_warning_red.webp diff --git a/res/drawable-xhdpi/ic_add_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_add_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_add_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_add_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_add_white_original_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_add_white_original_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_add_white_original_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_add_white_original_24dp.webp diff --git a/res/drawable-xhdpi/ic_archive_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_archive_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_archive_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_archive_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_arrow_forward_dark.webp b/app/src/main/res/drawable-xhdpi/ic_arrow_forward_dark.webp similarity index 100% rename from res/drawable-xhdpi/ic_arrow_forward_dark.webp rename to app/src/main/res/drawable-xhdpi/ic_arrow_forward_dark.webp diff --git a/res/drawable-xhdpi/ic_arrow_forward_light.webp b/app/src/main/res/drawable-xhdpi/ic_arrow_forward_light.webp similarity index 100% rename from res/drawable-xhdpi/ic_arrow_forward_light.webp rename to app/src/main/res/drawable-xhdpi/ic_arrow_forward_light.webp diff --git a/res/drawable-xhdpi/ic_arrow_right.webp b/app/src/main/res/drawable-xhdpi/ic_arrow_right.webp similarity index 100% rename from res/drawable-xhdpi/ic_arrow_right.webp rename to app/src/main/res/drawable-xhdpi/ic_arrow_right.webp diff --git a/res/drawable-xhdpi/ic_attach_grey600_24dp.png b/app/src/main/res/drawable-xhdpi/ic_attach_grey600_24dp.png similarity index 100% rename from res/drawable-xhdpi/ic_attach_grey600_24dp.png rename to app/src/main/res/drawable-xhdpi/ic_attach_grey600_24dp.png diff --git a/res/drawable-xhdpi/ic_attach_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_attach_white_24dp.png similarity index 100% rename from res/drawable-xhdpi/ic_attach_white_24dp.png rename to app/src/main/res/drawable-xhdpi/ic_attach_white_24dp.png diff --git a/res/drawable-xhdpi/ic_audio_dark.webp b/app/src/main/res/drawable-xhdpi/ic_audio_dark.webp similarity index 100% rename from res/drawable-xhdpi/ic_audio_dark.webp rename to app/src/main/res/drawable-xhdpi/ic_audio_dark.webp diff --git a/res/drawable-xhdpi/ic_audio_light.webp b/app/src/main/res/drawable-xhdpi/ic_audio_light.webp similarity index 100% rename from res/drawable-xhdpi/ic_audio_light.webp rename to app/src/main/res/drawable-xhdpi/ic_audio_light.webp diff --git a/res/drawable-xhdpi/ic_backspace_grey600_24dp.png b/app/src/main/res/drawable-xhdpi/ic_backspace_grey600_24dp.png similarity index 100% rename from res/drawable-xhdpi/ic_backspace_grey600_24dp.png rename to app/src/main/res/drawable-xhdpi/ic_backspace_grey600_24dp.png diff --git a/res/drawable-xhdpi/ic_block_grey600_18dp.webp b/app/src/main/res/drawable-xhdpi/ic_block_grey600_18dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_block_grey600_18dp.webp rename to app/src/main/res/drawable-xhdpi/ic_block_grey600_18dp.webp diff --git a/res/drawable-xhdpi/ic_block_white_18dp.webp b/app/src/main/res/drawable-xhdpi/ic_block_white_18dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_block_white_18dp.webp rename to app/src/main/res/drawable-xhdpi/ic_block_white_18dp.webp diff --git a/res/drawable-xhdpi/ic_block_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_block_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_block_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_block_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_bluetooth_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_bluetooth_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_bluetooth_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_bluetooth_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_broken_link.webp b/app/src/main/res/drawable-xhdpi/ic_broken_link.webp similarity index 100% rename from res/drawable-xhdpi/ic_broken_link.webp rename to app/src/main/res/drawable-xhdpi/ic_broken_link.webp diff --git a/res/drawable-xhdpi/ic_brush_highlight_32.webp b/app/src/main/res/drawable-xhdpi/ic_brush_highlight_32.webp similarity index 100% rename from res/drawable-xhdpi/ic_brush_highlight_32.webp rename to app/src/main/res/drawable-xhdpi/ic_brush_highlight_32.webp diff --git a/res/drawable-xhdpi/ic_brush_marker_32.webp b/app/src/main/res/drawable-xhdpi/ic_brush_marker_32.webp similarity index 100% rename from res/drawable-xhdpi/ic_brush_marker_32.webp rename to app/src/main/res/drawable-xhdpi/ic_brush_marker_32.webp diff --git a/res/drawable-xhdpi/ic_call_end_grey600_32dp.webp b/app/src/main/res/drawable-xhdpi/ic_call_end_grey600_32dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_call_end_grey600_32dp.webp rename to app/src/main/res/drawable-xhdpi/ic_call_end_grey600_32dp.webp diff --git a/res/drawable-xhdpi/ic_call_end_white_48dp.webp b/app/src/main/res/drawable-xhdpi/ic_call_end_white_48dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_call_end_white_48dp.webp rename to app/src/main/res/drawable-xhdpi/ic_call_end_white_48dp.webp diff --git a/res/drawable-xhdpi/ic_call_made_grey600_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_call_made_grey600_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_call_made_grey600_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_call_made_grey600_24dp.webp diff --git a/res/drawable-xhdpi/ic_call_missed_grey600_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_call_missed_grey600_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_call_missed_grey600_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_call_missed_grey600_24dp.webp diff --git a/res/drawable-xhdpi/ic_call_received_grey600_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_call_received_grey600_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_call_received_grey600_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_call_received_grey600_24dp.webp diff --git a/res/drawable-xhdpi/ic_call_secure_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_call_secure_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_call_secure_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_call_secure_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_call_split_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_call_split_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_call_split_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_call_split_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_camera_alt_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_camera_alt_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_camera_alt_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_camera_alt_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_camera_shutter.webp b/app/src/main/res/drawable-xhdpi/ic_camera_shutter.webp similarity index 100% rename from res/drawable-xhdpi/ic_camera_shutter.webp rename to app/src/main/res/drawable-xhdpi/ic_camera_shutter.webp diff --git a/res/drawable-xhdpi/ic_camera_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_camera_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_camera_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_camera_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_caption_28.webp b/app/src/main/res/drawable-xhdpi/ic_caption_28.webp similarity index 100% rename from res/drawable-xhdpi/ic_caption_28.webp rename to app/src/main/res/drawable-xhdpi/ic_caption_28.webp diff --git a/res/drawable-xhdpi/ic_check_circle_32.webp b/app/src/main/res/drawable-xhdpi/ic_check_circle_32.webp similarity index 100% rename from res/drawable-xhdpi/ic_check_circle_32.webp rename to app/src/main/res/drawable-xhdpi/ic_check_circle_32.webp diff --git a/res/drawable-xhdpi/ic_check_circle_white_18dp.webp b/app/src/main/res/drawable-xhdpi/ic_check_circle_white_18dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_check_circle_white_18dp.webp rename to app/src/main/res/drawable-xhdpi/ic_check_circle_white_18dp.webp diff --git a/res/drawable-xhdpi/ic_check_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_check_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_check_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_check_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_check_white_48dp.webp b/app/src/main/res/drawable-xhdpi/ic_check_white_48dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_check_white_48dp.webp rename to app/src/main/res/drawable-xhdpi/ic_check_white_48dp.webp diff --git a/res/drawable-xhdpi/ic_circle_fill_white_48dp.webp b/app/src/main/res/drawable-xhdpi/ic_circle_fill_white_48dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_circle_fill_white_48dp.webp rename to app/src/main/res/drawable-xhdpi/ic_circle_fill_white_48dp.webp diff --git a/res/drawable-xhdpi/ic_clear_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_clear_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_clear_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_clear_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_close_grey600_32dp.webp b/app/src/main/res/drawable-xhdpi/ic_close_grey600_32dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_close_grey600_32dp.webp rename to app/src/main/res/drawable-xhdpi/ic_close_grey600_32dp.webp diff --git a/res/drawable-xhdpi/ic_close_white_18dp.webp b/app/src/main/res/drawable-xhdpi/ic_close_white_18dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_close_white_18dp.webp rename to app/src/main/res/drawable-xhdpi/ic_close_white_18dp.webp diff --git a/res/drawable-xhdpi/ic_close_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_close_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_close_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_close_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_close_white_48dp.webp b/app/src/main/res/drawable-xhdpi/ic_close_white_48dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_close_white_48dp.webp rename to app/src/main/res/drawable-xhdpi/ic_close_white_48dp.webp diff --git a/res/drawable-xhdpi/ic_contact_picture.webp b/app/src/main/res/drawable-xhdpi/ic_contact_picture.webp similarity index 100% rename from res/drawable-xhdpi/ic_contact_picture.webp rename to app/src/main/res/drawable-xhdpi/ic_contact_picture.webp diff --git a/res/drawable-xhdpi/ic_contact_picture_large.webp b/app/src/main/res/drawable-xhdpi/ic_contact_picture_large.webp similarity index 100% rename from res/drawable-xhdpi/ic_contact_picture_large.webp rename to app/src/main/res/drawable-xhdpi/ic_contact_picture_large.webp diff --git a/res/drawable-xhdpi/ic_contacts_white_48dp.webp b/app/src/main/res/drawable-xhdpi/ic_contacts_white_48dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_contacts_white_48dp.webp rename to app/src/main/res/drawable-xhdpi/ic_contacts_white_48dp.webp diff --git a/res/drawable-xhdpi/ic_content_copy_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_content_copy_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_content_copy_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_content_copy_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_create_album_outline_32.webp b/app/src/main/res/drawable-xhdpi/ic_create_album_outline_32.webp similarity index 100% rename from res/drawable-xhdpi/ic_create_album_outline_32.webp rename to app/src/main/res/drawable-xhdpi/ic_create_album_outline_32.webp diff --git a/res/drawable-xhdpi/ic_create_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_create_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_create_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_create_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_crop_32.webp b/app/src/main/res/drawable-xhdpi/ic_crop_32.webp similarity index 100% rename from res/drawable-xhdpi/ic_crop_32.webp rename to app/src/main/res/drawable-xhdpi/ic_crop_32.webp diff --git a/res/drawable-xhdpi/ic_crop_lock_32.webp b/app/src/main/res/drawable-xhdpi/ic_crop_lock_32.webp similarity index 100% rename from res/drawable-xhdpi/ic_crop_lock_32.webp rename to app/src/main/res/drawable-xhdpi/ic_crop_lock_32.webp diff --git a/res/drawable-xhdpi/ic_crop_unlock_32.webp b/app/src/main/res/drawable-xhdpi/ic_crop_unlock_32.webp similarity index 100% rename from res/drawable-xhdpi/ic_crop_unlock_32.webp rename to app/src/main/res/drawable-xhdpi/ic_crop_unlock_32.webp diff --git a/res/drawable-xhdpi/ic_delivery_status_delivered.webp b/app/src/main/res/drawable-xhdpi/ic_delivery_status_delivered.webp similarity index 100% rename from res/drawable-xhdpi/ic_delivery_status_delivered.webp rename to app/src/main/res/drawable-xhdpi/ic_delivery_status_delivered.webp diff --git a/res/drawable-xhdpi/ic_delivery_status_read.webp b/app/src/main/res/drawable-xhdpi/ic_delivery_status_read.webp similarity index 100% rename from res/drawable-xhdpi/ic_delivery_status_read.webp rename to app/src/main/res/drawable-xhdpi/ic_delivery_status_read.webp diff --git a/res/drawable-xhdpi/ic_delivery_status_sending.webp b/app/src/main/res/drawable-xhdpi/ic_delivery_status_sending.webp similarity index 100% rename from res/drawable-xhdpi/ic_delivery_status_sending.webp rename to app/src/main/res/drawable-xhdpi/ic_delivery_status_sending.webp diff --git a/res/drawable-xhdpi/ic_delivery_status_sent.webp b/app/src/main/res/drawable-xhdpi/ic_delivery_status_sent.webp similarity index 100% rename from res/drawable-xhdpi/ic_delivery_status_sent.webp rename to app/src/main/res/drawable-xhdpi/ic_delivery_status_sent.webp diff --git a/res/drawable-xhdpi/ic_devices_white.webp b/app/src/main/res/drawable-xhdpi/ic_devices_white.webp similarity index 100% rename from res/drawable-xhdpi/ic_devices_white.webp rename to app/src/main/res/drawable-xhdpi/ic_devices_white.webp diff --git a/res/drawable-xhdpi/ic_document_large_dark.webp b/app/src/main/res/drawable-xhdpi/ic_document_large_dark.webp similarity index 100% rename from res/drawable-xhdpi/ic_document_large_dark.webp rename to app/src/main/res/drawable-xhdpi/ic_document_large_dark.webp diff --git a/res/drawable-xhdpi/ic_document_large_light.webp b/app/src/main/res/drawable-xhdpi/ic_document_large_light.webp similarity index 100% rename from res/drawable-xhdpi/ic_document_large_light.webp rename to app/src/main/res/drawable-xhdpi/ic_document_large_light.webp diff --git a/res/drawable-xhdpi/ic_document_small_dark.webp b/app/src/main/res/drawable-xhdpi/ic_document_small_dark.webp similarity index 100% rename from res/drawable-xhdpi/ic_document_small_dark.webp rename to app/src/main/res/drawable-xhdpi/ic_document_small_dark.webp diff --git a/res/drawable-xhdpi/ic_document_small_light.webp b/app/src/main/res/drawable-xhdpi/ic_document_small_light.webp similarity index 100% rename from res/drawable-xhdpi/ic_document_small_light.webp rename to app/src/main/res/drawable-xhdpi/ic_document_small_light.webp diff --git a/res/drawable-xhdpi/ic_download_32.png b/app/src/main/res/drawable-xhdpi/ic_download_32.png similarity index 100% rename from res/drawable-xhdpi/ic_download_32.png rename to app/src/main/res/drawable-xhdpi/ic_download_32.png diff --git a/res/drawable-xhdpi/ic_download_circle_fill_white_48dp.webp b/app/src/main/res/drawable-xhdpi/ic_download_circle_fill_white_48dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_download_circle_fill_white_48dp.webp rename to app/src/main/res/drawable-xhdpi/ic_download_circle_fill_white_48dp.webp diff --git a/res/drawable-xhdpi/ic_emoji_32.webp b/app/src/main/res/drawable-xhdpi/ic_emoji_32.webp similarity index 100% rename from res/drawable-xhdpi/ic_emoji_32.webp rename to app/src/main/res/drawable-xhdpi/ic_emoji_32.webp diff --git a/res/drawable-xhdpi/ic_error.webp b/app/src/main/res/drawable-xhdpi/ic_error.webp similarity index 100% rename from res/drawable-xhdpi/ic_error.webp rename to app/src/main/res/drawable-xhdpi/ic_error.webp diff --git a/res/drawable-xhdpi/ic_face_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_face_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_face_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_face_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_favorite_grey600_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_favorite_grey600_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_favorite_grey600_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_favorite_grey600_24dp.webp diff --git a/res/drawable-xhdpi/ic_fingerprint_white_48dp.webp b/app/src/main/res/drawable-xhdpi/ic_fingerprint_white_48dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_fingerprint_white_48dp.webp rename to app/src/main/res/drawable-xhdpi/ic_fingerprint_white_48dp.webp diff --git a/res/drawable-xhdpi/ic_flip_32.webp b/app/src/main/res/drawable-xhdpi/ic_flip_32.webp similarity index 100% rename from res/drawable-xhdpi/ic_flip_32.webp rename to app/src/main/res/drawable-xhdpi/ic_flip_32.webp diff --git a/res/drawable-xhdpi/ic_folder_white_48dp.webp b/app/src/main/res/drawable-xhdpi/ic_folder_white_48dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_folder_white_48dp.webp rename to app/src/main/res/drawable-xhdpi/ic_folder_white_48dp.webp diff --git a/res/drawable-xhdpi/ic_gif_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_gif_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_gif_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_gif_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_headset_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_headset_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_headset_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_headset_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_image_dark.webp b/app/src/main/res/drawable-xhdpi/ic_image_dark.webp similarity index 100% rename from res/drawable-xhdpi/ic_image_dark.webp rename to app/src/main/res/drawable-xhdpi/ic_image_dark.webp diff --git a/res/drawable-xhdpi/ic_image_light.webp b/app/src/main/res/drawable-xhdpi/ic_image_light.webp similarity index 100% rename from res/drawable-xhdpi/ic_image_light.webp rename to app/src/main/res/drawable-xhdpi/ic_image_light.webp diff --git a/res/drawable-xhdpi/ic_image_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_image_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_image_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_image_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_info_outline_dark.webp b/app/src/main/res/drawable-xhdpi/ic_info_outline_dark.webp similarity index 100% rename from res/drawable-xhdpi/ic_info_outline_dark.webp rename to app/src/main/res/drawable-xhdpi/ic_info_outline_dark.webp diff --git a/res/drawable-xhdpi/ic_info_outline_light.webp b/app/src/main/res/drawable-xhdpi/ic_info_outline_light.webp similarity index 100% rename from res/drawable-xhdpi/ic_info_outline_light.webp rename to app/src/main/res/drawable-xhdpi/ic_info_outline_light.webp diff --git a/res/drawable-xhdpi/ic_info_outline_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_info_outline_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_info_outline_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_info_outline_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_insert_drive_file_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_insert_drive_file_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_insert_drive_file_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_insert_drive_file_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_keyboard_arrow_down_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_keyboard_arrow_down_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_keyboard_arrow_down_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_keyboard_arrow_down_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_keyboard_arrow_left_grey600_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_keyboard_arrow_left_grey600_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_keyboard_arrow_left_grey600_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_keyboard_arrow_left_grey600_24dp.webp diff --git a/res/drawable-xhdpi/ic_keyboard_arrow_up_white_36dp.webp b/app/src/main/res/drawable-xhdpi/ic_keyboard_arrow_up_white_36dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_keyboard_arrow_up_white_36dp.webp rename to app/src/main/res/drawable-xhdpi/ic_keyboard_arrow_up_white_36dp.webp diff --git a/res/drawable-xhdpi/ic_keyboard_grey600_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_keyboard_grey600_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_keyboard_grey600_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_keyboard_grey600_24dp.webp diff --git a/res/drawable-xhdpi/ic_launch_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_launch_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_launch_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_launch_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_location_on_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_location_on_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_location_on_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_location_on_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_lock_white_18dp.webp b/app/src/main/res/drawable-xhdpi/ic_lock_white_18dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_lock_white_18dp.webp rename to app/src/main/res/drawable-xhdpi/ic_lock_white_18dp.webp diff --git a/res/drawable-xhdpi/ic_lock_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_lock_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_lock_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_lock_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_lock_white_48dp.webp b/app/src/main/res/drawable-xhdpi/ic_lock_white_48dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_lock_white_48dp.webp rename to app/src/main/res/drawable-xhdpi/ic_lock_white_48dp.webp diff --git a/res/drawable-xhdpi/ic_menu_add_field_holo_light.webp b/app/src/main/res/drawable-xhdpi/ic_menu_add_field_holo_light.webp similarity index 100% rename from res/drawable-xhdpi/ic_menu_add_field_holo_light.webp rename to app/src/main/res/drawable-xhdpi/ic_menu_add_field_holo_light.webp diff --git a/res/drawable-xhdpi/ic_menu_lock_dark.webp b/app/src/main/res/drawable-xhdpi/ic_menu_lock_dark.webp similarity index 100% rename from res/drawable-xhdpi/ic_menu_lock_dark.webp rename to app/src/main/res/drawable-xhdpi/ic_menu_lock_dark.webp diff --git a/res/drawable-xhdpi/ic_menu_login.webp b/app/src/main/res/drawable-xhdpi/ic_menu_login.webp similarity index 100% rename from res/drawable-xhdpi/ic_menu_login.webp rename to app/src/main/res/drawable-xhdpi/ic_menu_login.webp diff --git a/res/drawable-xhdpi/ic_menu_remove_holo_light.webp b/app/src/main/res/drawable-xhdpi/ic_menu_remove_holo_light.webp similarity index 100% rename from res/drawable-xhdpi/ic_menu_remove_holo_light.webp rename to app/src/main/res/drawable-xhdpi/ic_menu_remove_holo_light.webp diff --git a/res/drawable-xhdpi/ic_menu_search_holo_light.webp b/app/src/main/res/drawable-xhdpi/ic_menu_search_holo_light.webp similarity index 100% rename from res/drawable-xhdpi/ic_menu_search_holo_light.webp rename to app/src/main/res/drawable-xhdpi/ic_menu_search_holo_light.webp diff --git a/res/drawable-xhdpi/ic_message_outline_24.webp b/app/src/main/res/drawable-xhdpi/ic_message_outline_24.webp similarity index 100% rename from res/drawable-xhdpi/ic_message_outline_24.webp rename to app/src/main/res/drawable-xhdpi/ic_message_outline_24.webp diff --git a/res/drawable-xhdpi/ic_message_solid_24.webp b/app/src/main/res/drawable-xhdpi/ic_message_solid_24.webp similarity index 100% rename from res/drawable-xhdpi/ic_message_solid_24.webp rename to app/src/main/res/drawable-xhdpi/ic_message_solid_24.webp diff --git a/res/drawable-xhdpi/ic_mic_off_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_mic_off_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_mic_off_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_mic_off_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_missing_thumbnail_picture.webp b/app/src/main/res/drawable-xhdpi/ic_missing_thumbnail_picture.webp similarity index 100% rename from res/drawable-xhdpi/ic_missing_thumbnail_picture.webp rename to app/src/main/res/drawable-xhdpi/ic_missing_thumbnail_picture.webp diff --git a/res/drawable-xhdpi/ic_movie_creation_dark.webp b/app/src/main/res/drawable-xhdpi/ic_movie_creation_dark.webp similarity index 100% rename from res/drawable-xhdpi/ic_movie_creation_dark.webp rename to app/src/main/res/drawable-xhdpi/ic_movie_creation_dark.webp diff --git a/res/drawable-xhdpi/ic_movie_creation_light.webp b/app/src/main/res/drawable-xhdpi/ic_movie_creation_light.webp similarity index 100% rename from res/drawable-xhdpi/ic_movie_creation_light.webp rename to app/src/main/res/drawable-xhdpi/ic_movie_creation_light.webp diff --git a/res/drawable-xhdpi/ic_note_to_self.webp b/app/src/main/res/drawable-xhdpi/ic_note_to_self.webp similarity index 100% rename from res/drawable-xhdpi/ic_note_to_self.webp rename to app/src/main/res/drawable-xhdpi/ic_note_to_self.webp diff --git a/res/drawable-xhdpi/ic_pause_circle_fill_white_48dp.webp b/app/src/main/res/drawable-xhdpi/ic_pause_circle_fill_white_48dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_pause_circle_fill_white_48dp.webp rename to app/src/main/res/drawable-xhdpi/ic_pause_circle_fill_white_48dp.webp diff --git a/res/drawable-xhdpi/ic_person_add_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_person_add_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_person_add_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_person_add_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_person_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_person_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_person_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_person_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_phone_grey600_32dp.webp b/app/src/main/res/drawable-xhdpi/ic_phone_grey600_32dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_phone_grey600_32dp.webp rename to app/src/main/res/drawable-xhdpi/ic_phone_grey600_32dp.webp diff --git a/res/drawable-xhdpi/ic_photo_library_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_photo_library_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_photo_library_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_photo_library_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_play_circle_fill_white_48dp.webp b/app/src/main/res/drawable-xhdpi/ic_play_circle_fill_white_48dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_play_circle_fill_white_48dp.webp rename to app/src/main/res/drawable-xhdpi/ic_play_circle_fill_white_48dp.webp diff --git a/res/drawable-xhdpi/ic_plus_28.webp b/app/src/main/res/drawable-xhdpi/ic_plus_28.webp similarity index 100% rename from res/drawable-xhdpi/ic_plus_28.webp rename to app/src/main/res/drawable-xhdpi/ic_plus_28.webp diff --git a/res/drawable-xhdpi/ic_profile_camera.webp b/app/src/main/res/drawable-xhdpi/ic_profile_camera.webp similarity index 100% rename from res/drawable-xhdpi/ic_profile_camera.webp rename to app/src/main/res/drawable-xhdpi/ic_profile_camera.webp diff --git a/res/drawable-xhdpi/ic_refresh_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_refresh_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_reply.webp b/app/src/main/res/drawable-xhdpi/ic_reply.webp similarity index 100% rename from res/drawable-xhdpi/ic_reply.webp rename to app/src/main/res/drawable-xhdpi/ic_reply.webp diff --git a/res/drawable-xhdpi/ic_reply_white_36dp.webp b/app/src/main/res/drawable-xhdpi/ic_reply_white_36dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_reply_white_36dp.webp rename to app/src/main/res/drawable-xhdpi/ic_reply_white_36dp.webp diff --git a/res/drawable-xhdpi/ic_rotate_32.webp b/app/src/main/res/drawable-xhdpi/ic_rotate_32.webp similarity index 100% rename from res/drawable-xhdpi/ic_rotate_32.webp rename to app/src/main/res/drawable-xhdpi/ic_rotate_32.webp diff --git a/res/drawable-xhdpi/ic_scroll_down.webp b/app/src/main/res/drawable-xhdpi/ic_scroll_down.webp similarity index 100% rename from res/drawable-xhdpi/ic_scroll_down.webp rename to app/src/main/res/drawable-xhdpi/ic_scroll_down.webp diff --git a/res/drawable-xhdpi/ic_select_all_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_select_all_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_select_all_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_select_all_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_select_off.webp b/app/src/main/res/drawable-xhdpi/ic_select_off.webp similarity index 100% rename from res/drawable-xhdpi/ic_select_off.webp rename to app/src/main/res/drawable-xhdpi/ic_select_off.webp diff --git a/res/drawable-xhdpi/ic_select_on.webp b/app/src/main/res/drawable-xhdpi/ic_select_on.webp similarity index 100% rename from res/drawable-xhdpi/ic_select_on.webp rename to app/src/main/res/drawable-xhdpi/ic_select_on.webp diff --git a/res/drawable-xhdpi/ic_share_black_18dp.webp b/app/src/main/res/drawable-xhdpi/ic_share_black_18dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_share_black_18dp.webp rename to app/src/main/res/drawable-xhdpi/ic_share_black_18dp.webp diff --git a/res/drawable-xhdpi/ic_share_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_share_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_share_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_share_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_signal_background_connection.webp b/app/src/main/res/drawable-xhdpi/ic_signal_background_connection.webp similarity index 100% rename from res/drawable-xhdpi/ic_signal_background_connection.webp rename to app/src/main/res/drawable-xhdpi/ic_signal_background_connection.webp diff --git a/res/drawable-xhdpi/ic_signal_backup.webp b/app/src/main/res/drawable-xhdpi/ic_signal_backup.webp similarity index 100% rename from res/drawable-xhdpi/ic_signal_backup.webp rename to app/src/main/res/drawable-xhdpi/ic_signal_backup.webp diff --git a/res/drawable-xhdpi/ic_signal_downloading.webp b/app/src/main/res/drawable-xhdpi/ic_signal_downloading.webp similarity index 100% rename from res/drawable-xhdpi/ic_signal_downloading.webp rename to app/src/main/res/drawable-xhdpi/ic_signal_downloading.webp diff --git a/res/drawable-xhdpi/ic_signal_grey_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_signal_grey_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_signal_grey_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_signal_grey_24dp.webp diff --git a/res/drawable-xhdpi/ic_switch_camera_32.webp b/app/src/main/res/drawable-xhdpi/ic_switch_camera_32.webp similarity index 100% rename from res/drawable-xhdpi/ic_switch_camera_32.webp rename to app/src/main/res/drawable-xhdpi/ic_switch_camera_32.webp diff --git a/res/drawable-xhdpi/ic_text_32.webp b/app/src/main/res/drawable-xhdpi/ic_text_32.webp similarity index 100% rename from res/drawable-xhdpi/ic_text_32.webp rename to app/src/main/res/drawable-xhdpi/ic_text_32.webp diff --git a/res/drawable-xhdpi/ic_trash_filled_32.webp b/app/src/main/res/drawable-xhdpi/ic_trash_filled_32.webp similarity index 100% rename from res/drawable-xhdpi/ic_trash_filled_32.webp rename to app/src/main/res/drawable-xhdpi/ic_trash_filled_32.webp diff --git a/res/drawable-xhdpi/ic_unarchive_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_unarchive_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_unarchive_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_unarchive_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_unarchive_white_36dp.webp b/app/src/main/res/drawable-xhdpi/ic_unarchive_white_36dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_unarchive_white_36dp.webp rename to app/src/main/res/drawable-xhdpi/ic_unarchive_white_36dp.webp diff --git a/res/drawable-xhdpi/ic_undo_32.webp b/app/src/main/res/drawable-xhdpi/ic_undo_32.webp similarity index 100% rename from res/drawable-xhdpi/ic_undo_32.webp rename to app/src/main/res/drawable-xhdpi/ic_undo_32.webp diff --git a/res/drawable-xhdpi/ic_unidentified_delivery.webp b/app/src/main/res/drawable-xhdpi/ic_unidentified_delivery.webp similarity index 100% rename from res/drawable-xhdpi/ic_unidentified_delivery.webp rename to app/src/main/res/drawable-xhdpi/ic_unidentified_delivery.webp diff --git a/res/drawable-xhdpi/ic_unlocked_white_18dp.webp b/app/src/main/res/drawable-xhdpi/ic_unlocked_white_18dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_unlocked_white_18dp.webp rename to app/src/main/res/drawable-xhdpi/ic_unlocked_white_18dp.webp diff --git a/res/drawable-xhdpi/ic_unlocked_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_unlocked_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_unlocked_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_unlocked_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_video_dark.webp b/app/src/main/res/drawable-xhdpi/ic_video_dark.webp similarity index 100% rename from res/drawable-xhdpi/ic_video_dark.webp rename to app/src/main/res/drawable-xhdpi/ic_video_dark.webp diff --git a/res/drawable-xhdpi/ic_video_light.webp b/app/src/main/res/drawable-xhdpi/ic_video_light.webp similarity index 100% rename from res/drawable-xhdpi/ic_video_light.webp rename to app/src/main/res/drawable-xhdpi/ic_video_light.webp diff --git a/res/drawable-xhdpi/ic_view_infinite_32.png b/app/src/main/res/drawable-xhdpi/ic_view_infinite_32.png similarity index 100% rename from res/drawable-xhdpi/ic_view_infinite_32.png rename to app/src/main/res/drawable-xhdpi/ic_view_infinite_32.png diff --git a/res/drawable-xhdpi/ic_view_once_32.png b/app/src/main/res/drawable-xhdpi/ic_view_once_32.png similarity index 100% rename from res/drawable-xhdpi/ic_view_once_32.png rename to app/src/main/res/drawable-xhdpi/ic_view_once_32.png diff --git a/res/drawable-xhdpi/ic_visibility_grey600_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_visibility_grey600_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_visibility_grey600_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_visibility_grey600_24dp.webp diff --git a/res/drawable-xhdpi/ic_visibility_off_grey600_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_visibility_off_grey600_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_visibility_off_grey600_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_visibility_off_grey600_24dp.webp diff --git a/res/drawable-xhdpi/ic_visibility_off_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_visibility_off_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_visibility_off_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_visibility_off_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_visibility_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_visibility_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_visibility_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_visibility_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_volume_off_grey600_18dp.webp b/app/src/main/res/drawable-xhdpi/ic_volume_off_grey600_18dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_volume_off_grey600_18dp.webp rename to app/src/main/res/drawable-xhdpi/ic_volume_off_grey600_18dp.webp diff --git a/res/drawable-xhdpi/ic_volume_off_white_18dp.webp b/app/src/main/res/drawable-xhdpi/ic_volume_off_white_18dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_volume_off_white_18dp.webp rename to app/src/main/res/drawable-xhdpi/ic_volume_off_white_18dp.webp diff --git a/res/drawable-xhdpi/ic_volume_up_dark.webp b/app/src/main/res/drawable-xhdpi/ic_volume_up_dark.webp similarity index 100% rename from res/drawable-xhdpi/ic_volume_up_dark.webp rename to app/src/main/res/drawable-xhdpi/ic_volume_up_dark.webp diff --git a/res/drawable-xhdpi/ic_volume_up_light.webp b/app/src/main/res/drawable-xhdpi/ic_volume_up_light.webp similarity index 100% rename from res/drawable-xhdpi/ic_volume_up_light.webp rename to app/src/main/res/drawable-xhdpi/ic_volume_up_light.webp diff --git a/res/drawable-xhdpi/ic_volume_up_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_volume_up_white_24dp.webp similarity index 100% rename from res/drawable-xhdpi/ic_volume_up_white_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_volume_up_white_24dp.webp diff --git a/res/drawable-xhdpi/ic_warning_dark.webp b/app/src/main/res/drawable-xhdpi/ic_warning_dark.webp similarity index 100% rename from res/drawable-xhdpi/ic_warning_dark.webp rename to app/src/main/res/drawable-xhdpi/ic_warning_dark.webp diff --git a/res/drawable-xhdpi/ic_warning_light.webp b/app/src/main/res/drawable-xhdpi/ic_warning_light.webp similarity index 100% rename from res/drawable-xhdpi/ic_warning_light.webp rename to app/src/main/res/drawable-xhdpi/ic_warning_light.webp diff --git a/res/drawable-xhdpi/ic_x_28.webp b/app/src/main/res/drawable-xhdpi/ic_x_28.webp similarity index 100% rename from res/drawable-xhdpi/ic_x_28.webp rename to app/src/main/res/drawable-xhdpi/ic_x_28.webp diff --git a/res/drawable-xhdpi/icon_cached.webp b/app/src/main/res/drawable-xhdpi/icon_cached.webp similarity index 100% rename from res/drawable-xhdpi/icon_cached.webp rename to app/src/main/res/drawable-xhdpi/icon_cached.webp diff --git a/res/drawable-xhdpi/icon_dialog.webp b/app/src/main/res/drawable-xhdpi/icon_dialog.webp similarity index 100% rename from res/drawable-xhdpi/icon_dialog.webp rename to app/src/main/res/drawable-xhdpi/icon_dialog.webp diff --git a/res/drawable-xhdpi/icon_notification.webp b/app/src/main/res/drawable-xhdpi/icon_notification.webp similarity index 100% rename from res/drawable-xhdpi/icon_notification.webp rename to app/src/main/res/drawable-xhdpi/icon_notification.webp diff --git a/res/drawable-xhdpi/icon_transparent.webp b/app/src/main/res/drawable-xhdpi/icon_transparent.webp similarity index 100% rename from res/drawable-xhdpi/icon_transparent.webp rename to app/src/main/res/drawable-xhdpi/icon_transparent.webp diff --git a/res/drawable-xhdpi/import_database.webp b/app/src/main/res/drawable-xhdpi/import_database.webp similarity index 100% rename from res/drawable-xhdpi/import_database.webp rename to app/src/main/res/drawable-xhdpi/import_database.webp diff --git a/res/drawable-xhdpi/inbox_zero.webp b/app/src/main/res/drawable-xhdpi/inbox_zero.webp similarity index 100% rename from res/drawable-xhdpi/inbox_zero.webp rename to app/src/main/res/drawable-xhdpi/inbox_zero.webp diff --git a/res/drawable-xhdpi/lockscreen_watermark_dark.webp b/app/src/main/res/drawable-xhdpi/lockscreen_watermark_dark.webp similarity index 100% rename from res/drawable-xhdpi/lockscreen_watermark_dark.webp rename to app/src/main/res/drawable-xhdpi/lockscreen_watermark_dark.webp diff --git a/res/drawable-xhdpi/lockscreen_watermark_light.webp b/app/src/main/res/drawable-xhdpi/lockscreen_watermark_light.webp similarity index 100% rename from res/drawable-xhdpi/lockscreen_watermark_light.webp rename to app/src/main/res/drawable-xhdpi/lockscreen_watermark_light.webp diff --git a/res/drawable-xhdpi/love_heart.webp b/app/src/main/res/drawable-xhdpi/love_heart.webp similarity index 100% rename from res/drawable-xhdpi/love_heart.webp rename to app/src/main/res/drawable-xhdpi/love_heart.webp diff --git a/res/drawable-xhdpi/marker_shadow.webp b/app/src/main/res/drawable-xhdpi/marker_shadow.webp similarity index 100% rename from res/drawable-xhdpi/marker_shadow.webp rename to app/src/main/res/drawable-xhdpi/marker_shadow.webp diff --git a/res/drawable-xhdpi/message_24dp.webp b/app/src/main/res/drawable-xhdpi/message_24dp.webp similarity index 100% rename from res/drawable-xhdpi/message_24dp.webp rename to app/src/main/res/drawable-xhdpi/message_24dp.webp diff --git a/res/drawable-xhdpi/no_contacts.png b/app/src/main/res/drawable-xhdpi/no_contacts.png similarity index 100% rename from res/drawable-xhdpi/no_contacts.png rename to app/src/main/res/drawable-xhdpi/no_contacts.png diff --git a/res/drawable-xhdpi/notify_panel_notification_icon_bg.webp b/app/src/main/res/drawable-xhdpi/notify_panel_notification_icon_bg.webp similarity index 100% rename from res/drawable-xhdpi/notify_panel_notification_icon_bg.webp rename to app/src/main/res/drawable-xhdpi/notify_panel_notification_icon_bg.webp diff --git a/res/drawable-xhdpi/phone_24dp.webp b/app/src/main/res/drawable-xhdpi/phone_24dp.webp similarity index 100% rename from res/drawable-xhdpi/phone_24dp.webp rename to app/src/main/res/drawable-xhdpi/phone_24dp.webp diff --git a/res/drawable-xhdpi/poweredby_giphy.webp b/app/src/main/res/drawable-xhdpi/poweredby_giphy.webp similarity index 100% rename from res/drawable-xhdpi/poweredby_giphy.webp rename to app/src/main/res/drawable-xhdpi/poweredby_giphy.webp diff --git a/res/drawable-xhdpi/profile_splash.webp b/app/src/main/res/drawable-xhdpi/profile_splash.webp similarity index 100% rename from res/drawable-xhdpi/profile_splash.webp rename to app/src/main/res/drawable-xhdpi/profile_splash.webp diff --git a/res/drawable-xhdpi/quick_camera_front.webp b/app/src/main/res/drawable-xhdpi/quick_camera_front.webp similarity index 100% rename from res/drawable-xhdpi/quick_camera_front.webp rename to app/src/main/res/drawable-xhdpi/quick_camera_front.webp diff --git a/res/drawable-xhdpi/quick_camera_rear.webp b/app/src/main/res/drawable-xhdpi/quick_camera_rear.webp similarity index 100% rename from res/drawable-xhdpi/quick_camera_rear.webp rename to app/src/main/res/drawable-xhdpi/quick_camera_rear.webp diff --git a/res/drawable-xhdpi/reaction_scrubber_angry_48.webp b/app/src/main/res/drawable-xhdpi/reaction_scrubber_angry_48.webp similarity index 100% rename from res/drawable-xhdpi/reaction_scrubber_angry_48.webp rename to app/src/main/res/drawable-xhdpi/reaction_scrubber_angry_48.webp diff --git a/res/drawable-xhdpi/reaction_scrubber_dislike_48.webp b/app/src/main/res/drawable-xhdpi/reaction_scrubber_dislike_48.webp similarity index 100% rename from res/drawable-xhdpi/reaction_scrubber_dislike_48.webp rename to app/src/main/res/drawable-xhdpi/reaction_scrubber_dislike_48.webp diff --git a/res/drawable-xhdpi/reaction_scrubber_haha_48.webp b/app/src/main/res/drawable-xhdpi/reaction_scrubber_haha_48.webp similarity index 100% rename from res/drawable-xhdpi/reaction_scrubber_haha_48.webp rename to app/src/main/res/drawable-xhdpi/reaction_scrubber_haha_48.webp diff --git a/res/drawable-xhdpi/reaction_scrubber_like_48.webp b/app/src/main/res/drawable-xhdpi/reaction_scrubber_like_48.webp similarity index 100% rename from res/drawable-xhdpi/reaction_scrubber_like_48.webp rename to app/src/main/res/drawable-xhdpi/reaction_scrubber_like_48.webp diff --git a/res/drawable-xhdpi/reaction_scrubber_love_48.webp b/app/src/main/res/drawable-xhdpi/reaction_scrubber_love_48.webp similarity index 100% rename from res/drawable-xhdpi/reaction_scrubber_love_48.webp rename to app/src/main/res/drawable-xhdpi/reaction_scrubber_love_48.webp diff --git a/res/drawable-xhdpi/reaction_scrubber_sad_48.webp b/app/src/main/res/drawable-xhdpi/reaction_scrubber_sad_48.webp similarity index 100% rename from res/drawable-xhdpi/reaction_scrubber_sad_48.webp rename to app/src/main/res/drawable-xhdpi/reaction_scrubber_sad_48.webp diff --git a/res/drawable-xhdpi/reaction_scrubber_wow_48.webp b/app/src/main/res/drawable-xhdpi/reaction_scrubber_wow_48.webp similarity index 100% rename from res/drawable-xhdpi/reaction_scrubber_wow_48.webp rename to app/src/main/res/drawable-xhdpi/reaction_scrubber_wow_48.webp diff --git a/res/drawable-xhdpi/sticker_32.webp b/app/src/main/res/drawable-xhdpi/sticker_32.webp similarity index 100% rename from res/drawable-xhdpi/sticker_32.webp rename to app/src/main/res/drawable-xhdpi/sticker_32.webp diff --git a/res/drawable-xhdpi/video_splash.webp b/app/src/main/res/drawable-xhdpi/video_splash.webp similarity index 100% rename from res/drawable-xhdpi/video_splash.webp rename to app/src/main/res/drawable-xhdpi/video_splash.webp diff --git a/res/drawable-xhdpi/webrtc_video_mute_24.webp b/app/src/main/res/drawable-xhdpi/webrtc_video_mute_24.webp similarity index 100% rename from res/drawable-xhdpi/webrtc_video_mute_24.webp rename to app/src/main/res/drawable-xhdpi/webrtc_video_mute_24.webp diff --git a/res/drawable-xhdpi/welcome.webp b/app/src/main/res/drawable-xhdpi/welcome.webp similarity index 100% rename from res/drawable-xhdpi/welcome.webp rename to app/src/main/res/drawable-xhdpi/welcome.webp diff --git a/res/drawable-xxhdpi/baseline_account_circle_white_24.webp b/app/src/main/res/drawable-xxhdpi/baseline_account_circle_white_24.webp similarity index 100% rename from res/drawable-xxhdpi/baseline_account_circle_white_24.webp rename to app/src/main/res/drawable-xxhdpi/baseline_account_circle_white_24.webp diff --git a/res/drawable-xxhdpi/baseline_email_white_24.webp b/app/src/main/res/drawable-xxhdpi/baseline_email_white_24.webp similarity index 100% rename from res/drawable-xxhdpi/baseline_email_white_24.webp rename to app/src/main/res/drawable-xxhdpi/baseline_email_white_24.webp diff --git a/res/drawable-xxhdpi/check.webp b/app/src/main/res/drawable-xxhdpi/check.webp similarity index 100% rename from res/drawable-xxhdpi/check.webp rename to app/src/main/res/drawable-xxhdpi/check.webp diff --git a/res/drawable-xxhdpi/clear_profile_avatar.webp b/app/src/main/res/drawable-xxhdpi/clear_profile_avatar.webp similarity index 100% rename from res/drawable-xxhdpi/clear_profile_avatar.webp rename to app/src/main/res/drawable-xxhdpi/clear_profile_avatar.webp diff --git a/res/drawable-xxhdpi/conversation_list_empty_state.webp b/app/src/main/res/drawable-xxhdpi/conversation_list_empty_state.webp similarity index 100% rename from res/drawable-xxhdpi/conversation_list_empty_state.webp rename to app/src/main/res/drawable-xxhdpi/conversation_list_empty_state.webp diff --git a/res/drawable-xxhdpi/divet_lower_right_dark.webp b/app/src/main/res/drawable-xxhdpi/divet_lower_right_dark.webp similarity index 100% rename from res/drawable-xxhdpi/divet_lower_right_dark.webp rename to app/src/main/res/drawable-xxhdpi/divet_lower_right_dark.webp diff --git a/res/drawable-xxhdpi/divet_lower_right_light.webp b/app/src/main/res/drawable-xxhdpi/divet_lower_right_light.webp similarity index 100% rename from res/drawable-xxhdpi/divet_lower_right_light.webp rename to app/src/main/res/drawable-xxhdpi/divet_lower_right_light.webp diff --git a/res/drawable-xxhdpi/empty_inbox_1.webp b/app/src/main/res/drawable-xxhdpi/empty_inbox_1.webp similarity index 100% rename from res/drawable-xxhdpi/empty_inbox_1.webp rename to app/src/main/res/drawable-xxhdpi/empty_inbox_1.webp diff --git a/res/drawable-xxhdpi/empty_inbox_2.webp b/app/src/main/res/drawable-xxhdpi/empty_inbox_2.webp similarity index 100% rename from res/drawable-xxhdpi/empty_inbox_2.webp rename to app/src/main/res/drawable-xxhdpi/empty_inbox_2.webp diff --git a/res/drawable-xxhdpi/empty_inbox_3.webp b/app/src/main/res/drawable-xxhdpi/empty_inbox_3.webp similarity index 100% rename from res/drawable-xxhdpi/empty_inbox_3.webp rename to app/src/main/res/drawable-xxhdpi/empty_inbox_3.webp diff --git a/res/drawable-xxhdpi/empty_inbox_4.webp b/app/src/main/res/drawable-xxhdpi/empty_inbox_4.webp similarity index 100% rename from res/drawable-xxhdpi/empty_inbox_4.webp rename to app/src/main/res/drawable-xxhdpi/empty_inbox_4.webp diff --git a/res/drawable-xxhdpi/empty_inbox_5.webp b/app/src/main/res/drawable-xxhdpi/empty_inbox_5.webp similarity index 100% rename from res/drawable-xxhdpi/empty_inbox_5.webp rename to app/src/main/res/drawable-xxhdpi/empty_inbox_5.webp diff --git a/res/drawable-xxhdpi/flash_auto_32.webp b/app/src/main/res/drawable-xxhdpi/flash_auto_32.webp similarity index 100% rename from res/drawable-xxhdpi/flash_auto_32.webp rename to app/src/main/res/drawable-xxhdpi/flash_auto_32.webp diff --git a/res/drawable-xxhdpi/flash_off_32.webp b/app/src/main/res/drawable-xxhdpi/flash_off_32.webp similarity index 100% rename from res/drawable-xxhdpi/flash_off_32.webp rename to app/src/main/res/drawable-xxhdpi/flash_off_32.webp diff --git a/res/drawable-xxhdpi/flash_on_32.webp b/app/src/main/res/drawable-xxhdpi/flash_on_32.webp similarity index 100% rename from res/drawable-xxhdpi/flash_on_32.webp rename to app/src/main/res/drawable-xxhdpi/flash_on_32.webp diff --git a/res/drawable-xxhdpi/ic_account_box_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_account_box_dark.webp similarity index 100% rename from res/drawable-xxhdpi/ic_account_box_dark.webp rename to app/src/main/res/drawable-xxhdpi/ic_account_box_dark.webp diff --git a/res/drawable-xxhdpi/ic_account_box_light.webp b/app/src/main/res/drawable-xxhdpi/ic_account_box_light.webp similarity index 100% rename from res/drawable-xxhdpi/ic_account_box_light.webp rename to app/src/main/res/drawable-xxhdpi/ic_account_box_light.webp diff --git a/res/drawable-xxhdpi/ic_action_warning_red.webp b/app/src/main/res/drawable-xxhdpi/ic_action_warning_red.webp similarity index 100% rename from res/drawable-xxhdpi/ic_action_warning_red.webp rename to app/src/main/res/drawable-xxhdpi/ic_action_warning_red.webp diff --git a/res/drawable-xxhdpi/ic_add_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_add_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_add_white_original_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_add_white_original_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_add_white_original_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_add_white_original_24dp.webp diff --git a/res/drawable-xxhdpi/ic_archive_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_archive_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_archive_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_archive_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_arrow_forward_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_arrow_forward_dark.webp similarity index 100% rename from res/drawable-xxhdpi/ic_arrow_forward_dark.webp rename to app/src/main/res/drawable-xxhdpi/ic_arrow_forward_dark.webp diff --git a/res/drawable-xxhdpi/ic_arrow_forward_light.webp b/app/src/main/res/drawable-xxhdpi/ic_arrow_forward_light.webp similarity index 100% rename from res/drawable-xxhdpi/ic_arrow_forward_light.webp rename to app/src/main/res/drawable-xxhdpi/ic_arrow_forward_light.webp diff --git a/res/drawable-xxhdpi/ic_arrow_right.webp b/app/src/main/res/drawable-xxhdpi/ic_arrow_right.webp similarity index 100% rename from res/drawable-xxhdpi/ic_arrow_right.webp rename to app/src/main/res/drawable-xxhdpi/ic_arrow_right.webp diff --git a/res/drawable-xxhdpi/ic_attach_grey600_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_attach_grey600_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_attach_grey600_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_attach_grey600_24dp.webp diff --git a/res/drawable-xxhdpi/ic_attach_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_attach_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_attach_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_attach_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_audio_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_audio_dark.webp similarity index 100% rename from res/drawable-xxhdpi/ic_audio_dark.webp rename to app/src/main/res/drawable-xxhdpi/ic_audio_dark.webp diff --git a/res/drawable-xxhdpi/ic_audio_light.webp b/app/src/main/res/drawable-xxhdpi/ic_audio_light.webp similarity index 100% rename from res/drawable-xxhdpi/ic_audio_light.webp rename to app/src/main/res/drawable-xxhdpi/ic_audio_light.webp diff --git a/res/drawable-xxhdpi/ic_backspace_grey600_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_backspace_grey600_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_backspace_grey600_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_backspace_grey600_24dp.webp diff --git a/res/drawable-xxhdpi/ic_block_grey600_18dp.webp b/app/src/main/res/drawable-xxhdpi/ic_block_grey600_18dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_block_grey600_18dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_block_grey600_18dp.webp diff --git a/res/drawable-xxhdpi/ic_block_white_18dp.webp b/app/src/main/res/drawable-xxhdpi/ic_block_white_18dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_block_white_18dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_block_white_18dp.webp diff --git a/res/drawable-xxhdpi/ic_block_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_block_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_block_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_block_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_bluetooth_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_bluetooth_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_bluetooth_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_bluetooth_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_broken_link.webp b/app/src/main/res/drawable-xxhdpi/ic_broken_link.webp similarity index 100% rename from res/drawable-xxhdpi/ic_broken_link.webp rename to app/src/main/res/drawable-xxhdpi/ic_broken_link.webp diff --git a/res/drawable-xxhdpi/ic_brush_highlight_32.webp b/app/src/main/res/drawable-xxhdpi/ic_brush_highlight_32.webp similarity index 100% rename from res/drawable-xxhdpi/ic_brush_highlight_32.webp rename to app/src/main/res/drawable-xxhdpi/ic_brush_highlight_32.webp diff --git a/res/drawable-xxhdpi/ic_brush_marker_32.webp b/app/src/main/res/drawable-xxhdpi/ic_brush_marker_32.webp similarity index 100% rename from res/drawable-xxhdpi/ic_brush_marker_32.webp rename to app/src/main/res/drawable-xxhdpi/ic_brush_marker_32.webp diff --git a/res/drawable-xxhdpi/ic_call_end_grey600_32dp.webp b/app/src/main/res/drawable-xxhdpi/ic_call_end_grey600_32dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_call_end_grey600_32dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_call_end_grey600_32dp.webp diff --git a/res/drawable-xxhdpi/ic_call_end_white_48dp.webp b/app/src/main/res/drawable-xxhdpi/ic_call_end_white_48dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_call_end_white_48dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_call_end_white_48dp.webp diff --git a/res/drawable-xxhdpi/ic_call_made_grey600_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_call_made_grey600_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_call_made_grey600_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_call_made_grey600_24dp.webp diff --git a/res/drawable-xxhdpi/ic_call_missed_grey600_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_call_missed_grey600_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_call_missed_grey600_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_call_missed_grey600_24dp.webp diff --git a/res/drawable-xxhdpi/ic_call_received_grey600_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_call_received_grey600_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_call_received_grey600_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_call_received_grey600_24dp.webp diff --git a/res/drawable-xxhdpi/ic_call_secure_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_call_secure_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_call_secure_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_call_secure_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_call_split_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_call_split_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_call_split_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_call_split_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_camera_alt_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_camera_alt_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_camera_alt_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_camera_alt_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_camera_shutter.webp b/app/src/main/res/drawable-xxhdpi/ic_camera_shutter.webp similarity index 100% rename from res/drawable-xxhdpi/ic_camera_shutter.webp rename to app/src/main/res/drawable-xxhdpi/ic_camera_shutter.webp diff --git a/res/drawable-xxhdpi/ic_camera_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_camera_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_camera_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_camera_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_caption_28.webp b/app/src/main/res/drawable-xxhdpi/ic_caption_28.webp similarity index 100% rename from res/drawable-xxhdpi/ic_caption_28.webp rename to app/src/main/res/drawable-xxhdpi/ic_caption_28.webp diff --git a/res/drawable-xxhdpi/ic_check_circle_32.webp b/app/src/main/res/drawable-xxhdpi/ic_check_circle_32.webp similarity index 100% rename from res/drawable-xxhdpi/ic_check_circle_32.webp rename to app/src/main/res/drawable-xxhdpi/ic_check_circle_32.webp diff --git a/res/drawable-xxhdpi/ic_check_circle_white_18dp.webp b/app/src/main/res/drawable-xxhdpi/ic_check_circle_white_18dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_check_circle_white_18dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_check_circle_white_18dp.webp diff --git a/res/drawable-xxhdpi/ic_check_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_check_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_check_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_check_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_check_white_48dp.webp b/app/src/main/res/drawable-xxhdpi/ic_check_white_48dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_check_white_48dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_check_white_48dp.webp diff --git a/res/drawable-xxhdpi/ic_circle_fill_white_48dp.webp b/app/src/main/res/drawable-xxhdpi/ic_circle_fill_white_48dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_circle_fill_white_48dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_circle_fill_white_48dp.webp diff --git a/res/drawable-xxhdpi/ic_clear_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_clear_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_clear_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_clear_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_close_grey600_32dp.webp b/app/src/main/res/drawable-xxhdpi/ic_close_grey600_32dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_close_grey600_32dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_close_grey600_32dp.webp diff --git a/res/drawable-xxhdpi/ic_close_white_18dp.webp b/app/src/main/res/drawable-xxhdpi/ic_close_white_18dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_close_white_18dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_close_white_18dp.webp diff --git a/res/drawable-xxhdpi/ic_close_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_close_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_close_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_close_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_close_white_48dp.webp b/app/src/main/res/drawable-xxhdpi/ic_close_white_48dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_close_white_48dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_close_white_48dp.webp diff --git a/res/drawable-xxhdpi/ic_contact_picture.webp b/app/src/main/res/drawable-xxhdpi/ic_contact_picture.webp similarity index 100% rename from res/drawable-xxhdpi/ic_contact_picture.webp rename to app/src/main/res/drawable-xxhdpi/ic_contact_picture.webp diff --git a/res/drawable-xxhdpi/ic_contact_picture_large.webp b/app/src/main/res/drawable-xxhdpi/ic_contact_picture_large.webp similarity index 100% rename from res/drawable-xxhdpi/ic_contact_picture_large.webp rename to app/src/main/res/drawable-xxhdpi/ic_contact_picture_large.webp diff --git a/res/drawable-xxhdpi/ic_contacts_white_48dp.webp b/app/src/main/res/drawable-xxhdpi/ic_contacts_white_48dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_contacts_white_48dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_contacts_white_48dp.webp diff --git a/res/drawable-xxhdpi/ic_content_copy_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_content_copy_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_content_copy_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_content_copy_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_create_album_outline_32.webp b/app/src/main/res/drawable-xxhdpi/ic_create_album_outline_32.webp similarity index 100% rename from res/drawable-xxhdpi/ic_create_album_outline_32.webp rename to app/src/main/res/drawable-xxhdpi/ic_create_album_outline_32.webp diff --git a/res/drawable-xxhdpi/ic_create_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_create_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_create_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_create_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_crop_32.webp b/app/src/main/res/drawable-xxhdpi/ic_crop_32.webp similarity index 100% rename from res/drawable-xxhdpi/ic_crop_32.webp rename to app/src/main/res/drawable-xxhdpi/ic_crop_32.webp diff --git a/res/drawable-xxhdpi/ic_crop_lock_32.webp b/app/src/main/res/drawable-xxhdpi/ic_crop_lock_32.webp similarity index 100% rename from res/drawable-xxhdpi/ic_crop_lock_32.webp rename to app/src/main/res/drawable-xxhdpi/ic_crop_lock_32.webp diff --git a/res/drawable-xxhdpi/ic_crop_unlock_32.webp b/app/src/main/res/drawable-xxhdpi/ic_crop_unlock_32.webp similarity index 100% rename from res/drawable-xxhdpi/ic_crop_unlock_32.webp rename to app/src/main/res/drawable-xxhdpi/ic_crop_unlock_32.webp diff --git a/res/drawable-xxhdpi/ic_delivery_status_delivered.webp b/app/src/main/res/drawable-xxhdpi/ic_delivery_status_delivered.webp similarity index 100% rename from res/drawable-xxhdpi/ic_delivery_status_delivered.webp rename to app/src/main/res/drawable-xxhdpi/ic_delivery_status_delivered.webp diff --git a/res/drawable-xxhdpi/ic_delivery_status_read.webp b/app/src/main/res/drawable-xxhdpi/ic_delivery_status_read.webp similarity index 100% rename from res/drawable-xxhdpi/ic_delivery_status_read.webp rename to app/src/main/res/drawable-xxhdpi/ic_delivery_status_read.webp diff --git a/res/drawable-xxhdpi/ic_delivery_status_sending.webp b/app/src/main/res/drawable-xxhdpi/ic_delivery_status_sending.webp similarity index 100% rename from res/drawable-xxhdpi/ic_delivery_status_sending.webp rename to app/src/main/res/drawable-xxhdpi/ic_delivery_status_sending.webp diff --git a/res/drawable-xxhdpi/ic_delivery_status_sent.webp b/app/src/main/res/drawable-xxhdpi/ic_delivery_status_sent.webp similarity index 100% rename from res/drawable-xxhdpi/ic_delivery_status_sent.webp rename to app/src/main/res/drawable-xxhdpi/ic_delivery_status_sent.webp diff --git a/res/drawable-xxhdpi/ic_devices_white.webp b/app/src/main/res/drawable-xxhdpi/ic_devices_white.webp similarity index 100% rename from res/drawable-xxhdpi/ic_devices_white.webp rename to app/src/main/res/drawable-xxhdpi/ic_devices_white.webp diff --git a/res/drawable-xxhdpi/ic_document_large_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_document_large_dark.webp similarity index 100% rename from res/drawable-xxhdpi/ic_document_large_dark.webp rename to app/src/main/res/drawable-xxhdpi/ic_document_large_dark.webp diff --git a/res/drawable-xxhdpi/ic_document_large_light.webp b/app/src/main/res/drawable-xxhdpi/ic_document_large_light.webp similarity index 100% rename from res/drawable-xxhdpi/ic_document_large_light.webp rename to app/src/main/res/drawable-xxhdpi/ic_document_large_light.webp diff --git a/res/drawable-xxhdpi/ic_document_small_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_document_small_dark.webp similarity index 100% rename from res/drawable-xxhdpi/ic_document_small_dark.webp rename to app/src/main/res/drawable-xxhdpi/ic_document_small_dark.webp diff --git a/res/drawable-xxhdpi/ic_document_small_light.webp b/app/src/main/res/drawable-xxhdpi/ic_document_small_light.webp similarity index 100% rename from res/drawable-xxhdpi/ic_document_small_light.webp rename to app/src/main/res/drawable-xxhdpi/ic_document_small_light.webp diff --git a/res/drawable-xxhdpi/ic_download_32.png b/app/src/main/res/drawable-xxhdpi/ic_download_32.png similarity index 100% rename from res/drawable-xxhdpi/ic_download_32.png rename to app/src/main/res/drawable-xxhdpi/ic_download_32.png diff --git a/res/drawable-xxhdpi/ic_download_circle_fill_white_48dp.webp b/app/src/main/res/drawable-xxhdpi/ic_download_circle_fill_white_48dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_download_circle_fill_white_48dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_download_circle_fill_white_48dp.webp diff --git a/res/drawable-xxhdpi/ic_emoji_32.webp b/app/src/main/res/drawable-xxhdpi/ic_emoji_32.webp similarity index 100% rename from res/drawable-xxhdpi/ic_emoji_32.webp rename to app/src/main/res/drawable-xxhdpi/ic_emoji_32.webp diff --git a/res/drawable-xxhdpi/ic_error.webp b/app/src/main/res/drawable-xxhdpi/ic_error.webp similarity index 100% rename from res/drawable-xxhdpi/ic_error.webp rename to app/src/main/res/drawable-xxhdpi/ic_error.webp diff --git a/res/drawable-xxhdpi/ic_error_white_18dp.webp b/app/src/main/res/drawable-xxhdpi/ic_error_white_18dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_error_white_18dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_error_white_18dp.webp diff --git a/res/drawable-xxhdpi/ic_face_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_face_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_face_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_face_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_favorite_grey600_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_favorite_grey600_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_favorite_grey600_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_favorite_grey600_24dp.webp diff --git a/res/drawable-xxhdpi/ic_fingerprint_white_48dp.webp b/app/src/main/res/drawable-xxhdpi/ic_fingerprint_white_48dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_fingerprint_white_48dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_fingerprint_white_48dp.webp diff --git a/res/drawable-xxhdpi/ic_flip_32.webp b/app/src/main/res/drawable-xxhdpi/ic_flip_32.webp similarity index 100% rename from res/drawable-xxhdpi/ic_flip_32.webp rename to app/src/main/res/drawable-xxhdpi/ic_flip_32.webp diff --git a/res/drawable-xxhdpi/ic_folder_white_48dp.webp b/app/src/main/res/drawable-xxhdpi/ic_folder_white_48dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_folder_white_48dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_folder_white_48dp.webp diff --git a/res/drawable-xxhdpi/ic_gif_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_gif_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_gif_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_gif_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_headset_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_headset_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_headset_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_headset_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_image_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_image_dark.webp similarity index 100% rename from res/drawable-xxhdpi/ic_image_dark.webp rename to app/src/main/res/drawable-xxhdpi/ic_image_dark.webp diff --git a/res/drawable-xxhdpi/ic_image_light.webp b/app/src/main/res/drawable-xxhdpi/ic_image_light.webp similarity index 100% rename from res/drawable-xxhdpi/ic_image_light.webp rename to app/src/main/res/drawable-xxhdpi/ic_image_light.webp diff --git a/res/drawable-xxhdpi/ic_image_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_image_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_image_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_image_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_info_outline_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_info_outline_dark.webp similarity index 100% rename from res/drawable-xxhdpi/ic_info_outline_dark.webp rename to app/src/main/res/drawable-xxhdpi/ic_info_outline_dark.webp diff --git a/res/drawable-xxhdpi/ic_info_outline_light.webp b/app/src/main/res/drawable-xxhdpi/ic_info_outline_light.webp similarity index 100% rename from res/drawable-xxhdpi/ic_info_outline_light.webp rename to app/src/main/res/drawable-xxhdpi/ic_info_outline_light.webp diff --git a/res/drawable-xxhdpi/ic_info_outline_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_info_outline_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_info_outline_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_info_outline_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_insert_drive_file_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_insert_drive_file_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_insert_drive_file_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_insert_drive_file_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_keyboard_arrow_down_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_down_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_keyboard_arrow_down_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_down_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.webp diff --git a/res/drawable-xxhdpi/ic_keyboard_arrow_up_white_36dp.webp b/app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_up_white_36dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_keyboard_arrow_up_white_36dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_up_white_36dp.webp diff --git a/res/drawable-xxhdpi/ic_keyboard_grey600_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_keyboard_grey600_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_keyboard_grey600_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_keyboard_grey600_24dp.webp diff --git a/res/drawable-xxhdpi/ic_launch_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_launch_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_launch_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_launch_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_location_on_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_location_on_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_location_on_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_location_on_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_lock_white_18dp.webp b/app/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_lock_white_18dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.webp diff --git a/res/drawable-xxhdpi/ic_lock_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_lock_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_lock_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_lock_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_lock_white_48dp.webp b/app/src/main/res/drawable-xxhdpi/ic_lock_white_48dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_lock_white_48dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_lock_white_48dp.webp diff --git a/res/drawable-xxhdpi/ic_menu_lock_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_menu_lock_dark.webp similarity index 100% rename from res/drawable-xxhdpi/ic_menu_lock_dark.webp rename to app/src/main/res/drawable-xxhdpi/ic_menu_lock_dark.webp diff --git a/res/drawable-xxhdpi/ic_menu_remove_holo_light.webp b/app/src/main/res/drawable-xxhdpi/ic_menu_remove_holo_light.webp similarity index 100% rename from res/drawable-xxhdpi/ic_menu_remove_holo_light.webp rename to app/src/main/res/drawable-xxhdpi/ic_menu_remove_holo_light.webp diff --git a/res/drawable-xxhdpi/ic_menu_search_holo_light.webp b/app/src/main/res/drawable-xxhdpi/ic_menu_search_holo_light.webp similarity index 100% rename from res/drawable-xxhdpi/ic_menu_search_holo_light.webp rename to app/src/main/res/drawable-xxhdpi/ic_menu_search_holo_light.webp diff --git a/res/drawable-xxhdpi/ic_message_outline_24.webp b/app/src/main/res/drawable-xxhdpi/ic_message_outline_24.webp similarity index 100% rename from res/drawable-xxhdpi/ic_message_outline_24.webp rename to app/src/main/res/drawable-xxhdpi/ic_message_outline_24.webp diff --git a/res/drawable-xxhdpi/ic_message_solid_24.webp b/app/src/main/res/drawable-xxhdpi/ic_message_solid_24.webp similarity index 100% rename from res/drawable-xxhdpi/ic_message_solid_24.webp rename to app/src/main/res/drawable-xxhdpi/ic_message_solid_24.webp diff --git a/res/drawable-xxhdpi/ic_mic_off_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_mic_off_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_mic_off_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_mic_off_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_missing_thumbnail_picture.webp b/app/src/main/res/drawable-xxhdpi/ic_missing_thumbnail_picture.webp similarity index 100% rename from res/drawable-xxhdpi/ic_missing_thumbnail_picture.webp rename to app/src/main/res/drawable-xxhdpi/ic_missing_thumbnail_picture.webp diff --git a/res/drawable-xxhdpi/ic_movie_creation_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_movie_creation_dark.webp similarity index 100% rename from res/drawable-xxhdpi/ic_movie_creation_dark.webp rename to app/src/main/res/drawable-xxhdpi/ic_movie_creation_dark.webp diff --git a/res/drawable-xxhdpi/ic_movie_creation_light.webp b/app/src/main/res/drawable-xxhdpi/ic_movie_creation_light.webp similarity index 100% rename from res/drawable-xxhdpi/ic_movie_creation_light.webp rename to app/src/main/res/drawable-xxhdpi/ic_movie_creation_light.webp diff --git a/res/drawable-xxhdpi/ic_note_to_self.webp b/app/src/main/res/drawable-xxhdpi/ic_note_to_self.webp similarity index 100% rename from res/drawable-xxhdpi/ic_note_to_self.webp rename to app/src/main/res/drawable-xxhdpi/ic_note_to_self.webp diff --git a/res/drawable-xxhdpi/ic_pause_circle_fill_white_48dp.webp b/app/src/main/res/drawable-xxhdpi/ic_pause_circle_fill_white_48dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_pause_circle_fill_white_48dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_pause_circle_fill_white_48dp.webp diff --git a/res/drawable-xxhdpi/ic_person_add_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_person_add_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_person_add_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_person_add_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_person_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_person_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_person_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_person_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_phone_grey600_32dp.webp b/app/src/main/res/drawable-xxhdpi/ic_phone_grey600_32dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_phone_grey600_32dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_phone_grey600_32dp.webp diff --git a/res/drawable-xxhdpi/ic_photo_library_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_photo_library_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_photo_library_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_photo_library_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_play_circle_fill_white_48dp.webp b/app/src/main/res/drawable-xxhdpi/ic_play_circle_fill_white_48dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_play_circle_fill_white_48dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_play_circle_fill_white_48dp.webp diff --git a/res/drawable-xxhdpi/ic_plus_28.webp b/app/src/main/res/drawable-xxhdpi/ic_plus_28.webp similarity index 100% rename from res/drawable-xxhdpi/ic_plus_28.webp rename to app/src/main/res/drawable-xxhdpi/ic_plus_28.webp diff --git a/res/drawable-xxhdpi/ic_profile_camera.webp b/app/src/main/res/drawable-xxhdpi/ic_profile_camera.webp similarity index 100% rename from res/drawable-xxhdpi/ic_profile_camera.webp rename to app/src/main/res/drawable-xxhdpi/ic_profile_camera.webp diff --git a/res/drawable-xxhdpi/ic_refresh_white_18dp.webp b/app/src/main/res/drawable-xxhdpi/ic_refresh_white_18dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_refresh_white_18dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_refresh_white_18dp.webp diff --git a/res/drawable-xxhdpi/ic_refresh_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_refresh_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_reply.webp b/app/src/main/res/drawable-xxhdpi/ic_reply.webp similarity index 100% rename from res/drawable-xxhdpi/ic_reply.webp rename to app/src/main/res/drawable-xxhdpi/ic_reply.webp diff --git a/res/drawable-xxhdpi/ic_reply_white_36dp.webp b/app/src/main/res/drawable-xxhdpi/ic_reply_white_36dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_reply_white_36dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_reply_white_36dp.webp diff --git a/res/drawable-xxhdpi/ic_rotate_32.webp b/app/src/main/res/drawable-xxhdpi/ic_rotate_32.webp similarity index 100% rename from res/drawable-xxhdpi/ic_rotate_32.webp rename to app/src/main/res/drawable-xxhdpi/ic_rotate_32.webp diff --git a/res/drawable-xxhdpi/ic_scroll_down.webp b/app/src/main/res/drawable-xxhdpi/ic_scroll_down.webp similarity index 100% rename from res/drawable-xxhdpi/ic_scroll_down.webp rename to app/src/main/res/drawable-xxhdpi/ic_scroll_down.webp diff --git a/res/drawable-xxhdpi/ic_select_all_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_select_all_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_select_all_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_select_all_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_select_off.webp b/app/src/main/res/drawable-xxhdpi/ic_select_off.webp similarity index 100% rename from res/drawable-xxhdpi/ic_select_off.webp rename to app/src/main/res/drawable-xxhdpi/ic_select_off.webp diff --git a/res/drawable-xxhdpi/ic_select_on.webp b/app/src/main/res/drawable-xxhdpi/ic_select_on.webp similarity index 100% rename from res/drawable-xxhdpi/ic_select_on.webp rename to app/src/main/res/drawable-xxhdpi/ic_select_on.webp diff --git a/res/drawable-xxhdpi/ic_share_black_18dp.webp b/app/src/main/res/drawable-xxhdpi/ic_share_black_18dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_share_black_18dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_share_black_18dp.webp diff --git a/res/drawable-xxhdpi/ic_share_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_share_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_share_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_share_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_signal_background_connection.webp b/app/src/main/res/drawable-xxhdpi/ic_signal_background_connection.webp similarity index 100% rename from res/drawable-xxhdpi/ic_signal_background_connection.webp rename to app/src/main/res/drawable-xxhdpi/ic_signal_background_connection.webp diff --git a/res/drawable-xxhdpi/ic_signal_backup.webp b/app/src/main/res/drawable-xxhdpi/ic_signal_backup.webp similarity index 100% rename from res/drawable-xxhdpi/ic_signal_backup.webp rename to app/src/main/res/drawable-xxhdpi/ic_signal_backup.webp diff --git a/res/drawable-xxhdpi/ic_signal_downloading.webp b/app/src/main/res/drawable-xxhdpi/ic_signal_downloading.webp similarity index 100% rename from res/drawable-xxhdpi/ic_signal_downloading.webp rename to app/src/main/res/drawable-xxhdpi/ic_signal_downloading.webp diff --git a/res/drawable-xxhdpi/ic_signal_grey_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_signal_grey_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_signal_grey_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_signal_grey_24dp.webp diff --git a/res/drawable-xxhdpi/ic_switch_camera_32.webp b/app/src/main/res/drawable-xxhdpi/ic_switch_camera_32.webp similarity index 100% rename from res/drawable-xxhdpi/ic_switch_camera_32.webp rename to app/src/main/res/drawable-xxhdpi/ic_switch_camera_32.webp diff --git a/res/drawable-xxhdpi/ic_text_32.webp b/app/src/main/res/drawable-xxhdpi/ic_text_32.webp similarity index 100% rename from res/drawable-xxhdpi/ic_text_32.webp rename to app/src/main/res/drawable-xxhdpi/ic_text_32.webp diff --git a/res/drawable-xxhdpi/ic_trash_filled_32.webp b/app/src/main/res/drawable-xxhdpi/ic_trash_filled_32.webp similarity index 100% rename from res/drawable-xxhdpi/ic_trash_filled_32.webp rename to app/src/main/res/drawable-xxhdpi/ic_trash_filled_32.webp diff --git a/res/drawable-xxhdpi/ic_unarchive_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_unarchive_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_unarchive_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_unarchive_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_unarchive_white_36dp.webp b/app/src/main/res/drawable-xxhdpi/ic_unarchive_white_36dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_unarchive_white_36dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_unarchive_white_36dp.webp diff --git a/res/drawable-xxhdpi/ic_undo_32.webp b/app/src/main/res/drawable-xxhdpi/ic_undo_32.webp similarity index 100% rename from res/drawable-xxhdpi/ic_undo_32.webp rename to app/src/main/res/drawable-xxhdpi/ic_undo_32.webp diff --git a/res/drawable-xxhdpi/ic_unidentified_delivery.webp b/app/src/main/res/drawable-xxhdpi/ic_unidentified_delivery.webp similarity index 100% rename from res/drawable-xxhdpi/ic_unidentified_delivery.webp rename to app/src/main/res/drawable-xxhdpi/ic_unidentified_delivery.webp diff --git a/res/drawable-xxhdpi/ic_unlocked_white_18dp.webp b/app/src/main/res/drawable-xxhdpi/ic_unlocked_white_18dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_unlocked_white_18dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_unlocked_white_18dp.webp diff --git a/res/drawable-xxhdpi/ic_unlocked_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_unlocked_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_unlocked_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_unlocked_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_video_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_video_dark.webp similarity index 100% rename from res/drawable-xxhdpi/ic_video_dark.webp rename to app/src/main/res/drawable-xxhdpi/ic_video_dark.webp diff --git a/res/drawable-xxhdpi/ic_video_light.webp b/app/src/main/res/drawable-xxhdpi/ic_video_light.webp similarity index 100% rename from res/drawable-xxhdpi/ic_video_light.webp rename to app/src/main/res/drawable-xxhdpi/ic_video_light.webp diff --git a/res/drawable-xxhdpi/ic_view_infinite_32.png b/app/src/main/res/drawable-xxhdpi/ic_view_infinite_32.png similarity index 100% rename from res/drawable-xxhdpi/ic_view_infinite_32.png rename to app/src/main/res/drawable-xxhdpi/ic_view_infinite_32.png diff --git a/res/drawable-xxhdpi/ic_view_once_32.png b/app/src/main/res/drawable-xxhdpi/ic_view_once_32.png similarity index 100% rename from res/drawable-xxhdpi/ic_view_once_32.png rename to app/src/main/res/drawable-xxhdpi/ic_view_once_32.png diff --git a/res/drawable-xxhdpi/ic_visibility_grey600_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_visibility_grey600_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_visibility_grey600_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_visibility_grey600_24dp.webp diff --git a/res/drawable-xxhdpi/ic_visibility_off_grey600_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_visibility_off_grey600_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_visibility_off_grey600_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_visibility_off_grey600_24dp.webp diff --git a/res/drawable-xxhdpi/ic_visibility_off_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_visibility_off_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_visibility_off_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_visibility_off_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_visibility_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_visibility_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_visibility_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_visibility_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_volume_off_grey600_18dp.webp b/app/src/main/res/drawable-xxhdpi/ic_volume_off_grey600_18dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_volume_off_grey600_18dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_volume_off_grey600_18dp.webp diff --git a/res/drawable-xxhdpi/ic_volume_off_white_18dp.webp b/app/src/main/res/drawable-xxhdpi/ic_volume_off_white_18dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_volume_off_white_18dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_volume_off_white_18dp.webp diff --git a/res/drawable-xxhdpi/ic_volume_up_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_volume_up_dark.webp similarity index 100% rename from res/drawable-xxhdpi/ic_volume_up_dark.webp rename to app/src/main/res/drawable-xxhdpi/ic_volume_up_dark.webp diff --git a/res/drawable-xxhdpi/ic_volume_up_light.webp b/app/src/main/res/drawable-xxhdpi/ic_volume_up_light.webp similarity index 100% rename from res/drawable-xxhdpi/ic_volume_up_light.webp rename to app/src/main/res/drawable-xxhdpi/ic_volume_up_light.webp diff --git a/res/drawable-xxhdpi/ic_volume_up_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_volume_up_white_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/ic_volume_up_white_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_volume_up_white_24dp.webp diff --git a/res/drawable-xxhdpi/ic_warning_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_warning_dark.webp similarity index 100% rename from res/drawable-xxhdpi/ic_warning_dark.webp rename to app/src/main/res/drawable-xxhdpi/ic_warning_dark.webp diff --git a/res/drawable-xxhdpi/ic_warning_light.webp b/app/src/main/res/drawable-xxhdpi/ic_warning_light.webp similarity index 100% rename from res/drawable-xxhdpi/ic_warning_light.webp rename to app/src/main/res/drawable-xxhdpi/ic_warning_light.webp diff --git a/res/drawable-xxhdpi/ic_x_28.webp b/app/src/main/res/drawable-xxhdpi/ic_x_28.webp similarity index 100% rename from res/drawable-xxhdpi/ic_x_28.webp rename to app/src/main/res/drawable-xxhdpi/ic_x_28.webp diff --git a/res/drawable-xxhdpi/icon_cached.webp b/app/src/main/res/drawable-xxhdpi/icon_cached.webp similarity index 100% rename from res/drawable-xxhdpi/icon_cached.webp rename to app/src/main/res/drawable-xxhdpi/icon_cached.webp diff --git a/res/drawable-xxhdpi/icon_dialog.webp b/app/src/main/res/drawable-xxhdpi/icon_dialog.webp similarity index 100% rename from res/drawable-xxhdpi/icon_dialog.webp rename to app/src/main/res/drawable-xxhdpi/icon_dialog.webp diff --git a/res/drawable-xxhdpi/icon_notification.webp b/app/src/main/res/drawable-xxhdpi/icon_notification.webp similarity index 100% rename from res/drawable-xxhdpi/icon_notification.webp rename to app/src/main/res/drawable-xxhdpi/icon_notification.webp diff --git a/res/drawable-xxhdpi/icon_transparent.webp b/app/src/main/res/drawable-xxhdpi/icon_transparent.webp similarity index 100% rename from res/drawable-xxhdpi/icon_transparent.webp rename to app/src/main/res/drawable-xxhdpi/icon_transparent.webp diff --git a/res/drawable-xxhdpi/inbox_zero.webp b/app/src/main/res/drawable-xxhdpi/inbox_zero.webp similarity index 100% rename from res/drawable-xxhdpi/inbox_zero.webp rename to app/src/main/res/drawable-xxhdpi/inbox_zero.webp diff --git a/res/drawable-xxhdpi/lockscreen_watermark_dark.webp b/app/src/main/res/drawable-xxhdpi/lockscreen_watermark_dark.webp similarity index 100% rename from res/drawable-xxhdpi/lockscreen_watermark_dark.webp rename to app/src/main/res/drawable-xxhdpi/lockscreen_watermark_dark.webp diff --git a/res/drawable-xxhdpi/lockscreen_watermark_light.webp b/app/src/main/res/drawable-xxhdpi/lockscreen_watermark_light.webp similarity index 100% rename from res/drawable-xxhdpi/lockscreen_watermark_light.webp rename to app/src/main/res/drawable-xxhdpi/lockscreen_watermark_light.webp diff --git a/res/drawable-xxhdpi/love_heart.webp b/app/src/main/res/drawable-xxhdpi/love_heart.webp similarity index 100% rename from res/drawable-xxhdpi/love_heart.webp rename to app/src/main/res/drawable-xxhdpi/love_heart.webp diff --git a/res/drawable-xxhdpi/marker_shadow.webp b/app/src/main/res/drawable-xxhdpi/marker_shadow.webp similarity index 100% rename from res/drawable-xxhdpi/marker_shadow.webp rename to app/src/main/res/drawable-xxhdpi/marker_shadow.webp diff --git a/res/drawable-xxhdpi/message_24dp.webp b/app/src/main/res/drawable-xxhdpi/message_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/message_24dp.webp rename to app/src/main/res/drawable-xxhdpi/message_24dp.webp diff --git a/res/drawable-xxhdpi/no_contacts.png b/app/src/main/res/drawable-xxhdpi/no_contacts.png similarity index 100% rename from res/drawable-xxhdpi/no_contacts.png rename to app/src/main/res/drawable-xxhdpi/no_contacts.png diff --git a/res/drawable-xxhdpi/phone_24dp.webp b/app/src/main/res/drawable-xxhdpi/phone_24dp.webp similarity index 100% rename from res/drawable-xxhdpi/phone_24dp.webp rename to app/src/main/res/drawable-xxhdpi/phone_24dp.webp diff --git a/res/drawable-xxhdpi/poweredby_giphy.webp b/app/src/main/res/drawable-xxhdpi/poweredby_giphy.webp similarity index 100% rename from res/drawable-xxhdpi/poweredby_giphy.webp rename to app/src/main/res/drawable-xxhdpi/poweredby_giphy.webp diff --git a/res/drawable-xxhdpi/profile_splash.webp b/app/src/main/res/drawable-xxhdpi/profile_splash.webp similarity index 100% rename from res/drawable-xxhdpi/profile_splash.webp rename to app/src/main/res/drawable-xxhdpi/profile_splash.webp diff --git a/res/drawable-xxhdpi/quick_camera_front.webp b/app/src/main/res/drawable-xxhdpi/quick_camera_front.webp similarity index 100% rename from res/drawable-xxhdpi/quick_camera_front.webp rename to app/src/main/res/drawable-xxhdpi/quick_camera_front.webp diff --git a/res/drawable-xxhdpi/quick_camera_rear.webp b/app/src/main/res/drawable-xxhdpi/quick_camera_rear.webp similarity index 100% rename from res/drawable-xxhdpi/quick_camera_rear.webp rename to app/src/main/res/drawable-xxhdpi/quick_camera_rear.webp diff --git a/res/drawable-xxhdpi/reaction_scrubber_angry_48.webp b/app/src/main/res/drawable-xxhdpi/reaction_scrubber_angry_48.webp similarity index 100% rename from res/drawable-xxhdpi/reaction_scrubber_angry_48.webp rename to app/src/main/res/drawable-xxhdpi/reaction_scrubber_angry_48.webp diff --git a/res/drawable-xxhdpi/reaction_scrubber_dislike_48.webp b/app/src/main/res/drawable-xxhdpi/reaction_scrubber_dislike_48.webp similarity index 100% rename from res/drawable-xxhdpi/reaction_scrubber_dislike_48.webp rename to app/src/main/res/drawable-xxhdpi/reaction_scrubber_dislike_48.webp diff --git a/res/drawable-xxhdpi/reaction_scrubber_haha_48.webp b/app/src/main/res/drawable-xxhdpi/reaction_scrubber_haha_48.webp similarity index 100% rename from res/drawable-xxhdpi/reaction_scrubber_haha_48.webp rename to app/src/main/res/drawable-xxhdpi/reaction_scrubber_haha_48.webp diff --git a/res/drawable-xxhdpi/reaction_scrubber_like_48.webp b/app/src/main/res/drawable-xxhdpi/reaction_scrubber_like_48.webp similarity index 100% rename from res/drawable-xxhdpi/reaction_scrubber_like_48.webp rename to app/src/main/res/drawable-xxhdpi/reaction_scrubber_like_48.webp diff --git a/res/drawable-xxhdpi/reaction_scrubber_love_48.webp b/app/src/main/res/drawable-xxhdpi/reaction_scrubber_love_48.webp similarity index 100% rename from res/drawable-xxhdpi/reaction_scrubber_love_48.webp rename to app/src/main/res/drawable-xxhdpi/reaction_scrubber_love_48.webp diff --git a/res/drawable-xxhdpi/reaction_scrubber_sad_48.webp b/app/src/main/res/drawable-xxhdpi/reaction_scrubber_sad_48.webp similarity index 100% rename from res/drawable-xxhdpi/reaction_scrubber_sad_48.webp rename to app/src/main/res/drawable-xxhdpi/reaction_scrubber_sad_48.webp diff --git a/res/drawable-xxhdpi/reaction_scrubber_wow_48.webp b/app/src/main/res/drawable-xxhdpi/reaction_scrubber_wow_48.webp similarity index 100% rename from res/drawable-xxhdpi/reaction_scrubber_wow_48.webp rename to app/src/main/res/drawable-xxhdpi/reaction_scrubber_wow_48.webp diff --git a/res/drawable-xxhdpi/splash_logo.webp b/app/src/main/res/drawable-xxhdpi/splash_logo.webp similarity index 100% rename from res/drawable-xxhdpi/splash_logo.webp rename to app/src/main/res/drawable-xxhdpi/splash_logo.webp diff --git a/res/drawable-xxhdpi/sticker_32.webp b/app/src/main/res/drawable-xxhdpi/sticker_32.webp similarity index 100% rename from res/drawable-xxhdpi/sticker_32.webp rename to app/src/main/res/drawable-xxhdpi/sticker_32.webp diff --git a/res/drawable-xxhdpi/video_splash.webp b/app/src/main/res/drawable-xxhdpi/video_splash.webp similarity index 100% rename from res/drawable-xxhdpi/video_splash.webp rename to app/src/main/res/drawable-xxhdpi/video_splash.webp diff --git a/res/drawable-xxhdpi/webrtc_video_mute_24.webp b/app/src/main/res/drawable-xxhdpi/webrtc_video_mute_24.webp similarity index 100% rename from res/drawable-xxhdpi/webrtc_video_mute_24.webp rename to app/src/main/res/drawable-xxhdpi/webrtc_video_mute_24.webp diff --git a/res/drawable-xxhdpi/welcome.webp b/app/src/main/res/drawable-xxhdpi/welcome.webp similarity index 100% rename from res/drawable-xxhdpi/welcome.webp rename to app/src/main/res/drawable-xxhdpi/welcome.webp diff --git a/res/drawable-xxxhdpi/baseline_account_circle_white_24.webp b/app/src/main/res/drawable-xxxhdpi/baseline_account_circle_white_24.webp similarity index 100% rename from res/drawable-xxxhdpi/baseline_account_circle_white_24.webp rename to app/src/main/res/drawable-xxxhdpi/baseline_account_circle_white_24.webp diff --git a/res/drawable-xxxhdpi/baseline_email_white_24.webp b/app/src/main/res/drawable-xxxhdpi/baseline_email_white_24.webp similarity index 100% rename from res/drawable-xxxhdpi/baseline_email_white_24.webp rename to app/src/main/res/drawable-xxxhdpi/baseline_email_white_24.webp diff --git a/res/drawable-xxxhdpi/clear_profile_avatar.webp b/app/src/main/res/drawable-xxxhdpi/clear_profile_avatar.webp similarity index 100% rename from res/drawable-xxxhdpi/clear_profile_avatar.webp rename to app/src/main/res/drawable-xxxhdpi/clear_profile_avatar.webp diff --git a/res/drawable-xxxhdpi/conversation_list_empty_state.webp b/app/src/main/res/drawable-xxxhdpi/conversation_list_empty_state.webp similarity index 100% rename from res/drawable-xxxhdpi/conversation_list_empty_state.webp rename to app/src/main/res/drawable-xxxhdpi/conversation_list_empty_state.webp diff --git a/res/drawable-xxxhdpi/empty_inbox_1.webp b/app/src/main/res/drawable-xxxhdpi/empty_inbox_1.webp similarity index 100% rename from res/drawable-xxxhdpi/empty_inbox_1.webp rename to app/src/main/res/drawable-xxxhdpi/empty_inbox_1.webp diff --git a/res/drawable-xxxhdpi/empty_inbox_2.webp b/app/src/main/res/drawable-xxxhdpi/empty_inbox_2.webp similarity index 100% rename from res/drawable-xxxhdpi/empty_inbox_2.webp rename to app/src/main/res/drawable-xxxhdpi/empty_inbox_2.webp diff --git a/res/drawable-xxxhdpi/empty_inbox_3.webp b/app/src/main/res/drawable-xxxhdpi/empty_inbox_3.webp similarity index 100% rename from res/drawable-xxxhdpi/empty_inbox_3.webp rename to app/src/main/res/drawable-xxxhdpi/empty_inbox_3.webp diff --git a/res/drawable-xxxhdpi/empty_inbox_4.webp b/app/src/main/res/drawable-xxxhdpi/empty_inbox_4.webp similarity index 100% rename from res/drawable-xxxhdpi/empty_inbox_4.webp rename to app/src/main/res/drawable-xxxhdpi/empty_inbox_4.webp diff --git a/res/drawable-xxxhdpi/empty_inbox_5.webp b/app/src/main/res/drawable-xxxhdpi/empty_inbox_5.webp similarity index 100% rename from res/drawable-xxxhdpi/empty_inbox_5.webp rename to app/src/main/res/drawable-xxxhdpi/empty_inbox_5.webp diff --git a/res/drawable-xxxhdpi/flash_auto_32.webp b/app/src/main/res/drawable-xxxhdpi/flash_auto_32.webp similarity index 100% rename from res/drawable-xxxhdpi/flash_auto_32.webp rename to app/src/main/res/drawable-xxxhdpi/flash_auto_32.webp diff --git a/res/drawable-xxxhdpi/flash_off_32.webp b/app/src/main/res/drawable-xxxhdpi/flash_off_32.webp similarity index 100% rename from res/drawable-xxxhdpi/flash_off_32.webp rename to app/src/main/res/drawable-xxxhdpi/flash_off_32.webp diff --git a/res/drawable-xxxhdpi/flash_on_32.webp b/app/src/main/res/drawable-xxxhdpi/flash_on_32.webp similarity index 100% rename from res/drawable-xxxhdpi/flash_on_32.webp rename to app/src/main/res/drawable-xxxhdpi/flash_on_32.webp diff --git a/res/drawable-xxxhdpi/ic_add_white_original_24dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_add_white_original_24dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_add_white_original_24dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_add_white_original_24dp.webp diff --git a/res/drawable-xxxhdpi/ic_archive_white_24dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_archive_white_24dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_archive_white_24dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_archive_white_24dp.webp diff --git a/res/drawable-xxxhdpi/ic_archive_white_36dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_archive_white_36dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_archive_white_36dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_archive_white_36dp.webp diff --git a/res/drawable-xxxhdpi/ic_arrow_forward_white_24dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_arrow_forward_white_24dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_arrow_forward_white_24dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_arrow_forward_white_24dp.webp diff --git a/res/drawable-xxxhdpi/ic_arrow_right.webp b/app/src/main/res/drawable-xxxhdpi/ic_arrow_right.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_arrow_right.webp rename to app/src/main/res/drawable-xxxhdpi/ic_arrow_right.webp diff --git a/res/drawable-xxxhdpi/ic_block_grey600_18dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_block_grey600_18dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_block_grey600_18dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_block_grey600_18dp.webp diff --git a/res/drawable-xxxhdpi/ic_block_white_18dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_block_white_18dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_block_white_18dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_block_white_18dp.webp diff --git a/res/drawable-xxxhdpi/ic_block_white_24dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_block_white_24dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_block_white_24dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_block_white_24dp.webp diff --git a/res/drawable-xxxhdpi/ic_bluetooth_white_24dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_bluetooth_white_24dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_bluetooth_white_24dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_bluetooth_white_24dp.webp diff --git a/res/drawable-xxxhdpi/ic_broken_link.webp b/app/src/main/res/drawable-xxxhdpi/ic_broken_link.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_broken_link.webp rename to app/src/main/res/drawable-xxxhdpi/ic_broken_link.webp diff --git a/res/drawable-xxxhdpi/ic_brush_highlight_32.webp b/app/src/main/res/drawable-xxxhdpi/ic_brush_highlight_32.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_brush_highlight_32.webp rename to app/src/main/res/drawable-xxxhdpi/ic_brush_highlight_32.webp diff --git a/res/drawable-xxxhdpi/ic_brush_marker_32.webp b/app/src/main/res/drawable-xxxhdpi/ic_brush_marker_32.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_brush_marker_32.webp rename to app/src/main/res/drawable-xxxhdpi/ic_brush_marker_32.webp diff --git a/res/drawable-xxxhdpi/ic_call_end_grey600_32dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_call_end_grey600_32dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_call_end_grey600_32dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_call_end_grey600_32dp.webp diff --git a/res/drawable-xxxhdpi/ic_call_end_white_48dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_call_end_white_48dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_call_end_white_48dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_call_end_white_48dp.webp diff --git a/res/drawable-xxxhdpi/ic_camera_alt_white_24dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_camera_alt_white_24dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_camera_alt_white_24dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_camera_alt_white_24dp.webp diff --git a/res/drawable-xxxhdpi/ic_camera_shutter.webp b/app/src/main/res/drawable-xxxhdpi/ic_camera_shutter.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_camera_shutter.webp rename to app/src/main/res/drawable-xxxhdpi/ic_camera_shutter.webp diff --git a/res/drawable-xxxhdpi/ic_camera_white_24dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_camera_white_24dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_camera_white_24dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_camera_white_24dp.webp diff --git a/res/drawable-xxxhdpi/ic_caption_28.webp b/app/src/main/res/drawable-xxxhdpi/ic_caption_28.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_caption_28.webp rename to app/src/main/res/drawable-xxxhdpi/ic_caption_28.webp diff --git a/res/drawable-xxxhdpi/ic_check_circle_32.webp b/app/src/main/res/drawable-xxxhdpi/ic_check_circle_32.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_check_circle_32.webp rename to app/src/main/res/drawable-xxxhdpi/ic_check_circle_32.webp diff --git a/res/drawable-xxxhdpi/ic_check_circle_white_18dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_check_circle_white_18dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_check_circle_white_18dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_check_circle_white_18dp.webp diff --git a/res/drawable-xxxhdpi/ic_check_white_24dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_check_white_24dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.webp diff --git a/res/drawable-xxxhdpi/ic_check_white_48dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_check_white_48dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_check_white_48dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_check_white_48dp.webp diff --git a/res/drawable-xxxhdpi/ic_circle_fill_white_48dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_circle_fill_white_48dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_circle_fill_white_48dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_circle_fill_white_48dp.webp diff --git a/res/drawable-xxxhdpi/ic_clear_white_24dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_clear_white_24dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_clear_white_24dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_clear_white_24dp.webp diff --git a/res/drawable-xxxhdpi/ic_close_grey600_32dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_close_grey600_32dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_close_grey600_32dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_close_grey600_32dp.webp diff --git a/res/drawable-xxxhdpi/ic_close_white_18dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_close_white_18dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_close_white_18dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_close_white_18dp.webp diff --git a/res/drawable-xxxhdpi/ic_close_white_24dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_close_white_24dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.webp diff --git a/res/drawable-xxxhdpi/ic_close_white_48dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_close_white_48dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_close_white_48dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_close_white_48dp.webp diff --git a/res/drawable-xxxhdpi/ic_contact_picture_large.webp b/app/src/main/res/drawable-xxxhdpi/ic_contact_picture_large.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_contact_picture_large.webp rename to app/src/main/res/drawable-xxxhdpi/ic_contact_picture_large.webp diff --git a/res/drawable-xxxhdpi/ic_contacts_white_48dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_contacts_white_48dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_contacts_white_48dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_contacts_white_48dp.webp diff --git a/res/drawable-xxxhdpi/ic_content_copy_white_24dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_content_copy_white_24dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_content_copy_white_24dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_content_copy_white_24dp.webp diff --git a/res/drawable-xxxhdpi/ic_create_album_outline_32.webp b/app/src/main/res/drawable-xxxhdpi/ic_create_album_outline_32.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_create_album_outline_32.webp rename to app/src/main/res/drawable-xxxhdpi/ic_create_album_outline_32.webp diff --git a/res/drawable-xxxhdpi/ic_crop_32.webp b/app/src/main/res/drawable-xxxhdpi/ic_crop_32.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_crop_32.webp rename to app/src/main/res/drawable-xxxhdpi/ic_crop_32.webp diff --git a/res/drawable-xxxhdpi/ic_crop_lock_32.webp b/app/src/main/res/drawable-xxxhdpi/ic_crop_lock_32.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_crop_lock_32.webp rename to app/src/main/res/drawable-xxxhdpi/ic_crop_lock_32.webp diff --git a/res/drawable-xxxhdpi/ic_crop_unlock_32.webp b/app/src/main/res/drawable-xxxhdpi/ic_crop_unlock_32.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_crop_unlock_32.webp rename to app/src/main/res/drawable-xxxhdpi/ic_crop_unlock_32.webp diff --git a/res/drawable-xxxhdpi/ic_delivery_status_delivered.webp b/app/src/main/res/drawable-xxxhdpi/ic_delivery_status_delivered.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_delivery_status_delivered.webp rename to app/src/main/res/drawable-xxxhdpi/ic_delivery_status_delivered.webp diff --git a/res/drawable-xxxhdpi/ic_delivery_status_read.webp b/app/src/main/res/drawable-xxxhdpi/ic_delivery_status_read.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_delivery_status_read.webp rename to app/src/main/res/drawable-xxxhdpi/ic_delivery_status_read.webp diff --git a/res/drawable-xxxhdpi/ic_delivery_status_sending.webp b/app/src/main/res/drawable-xxxhdpi/ic_delivery_status_sending.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_delivery_status_sending.webp rename to app/src/main/res/drawable-xxxhdpi/ic_delivery_status_sending.webp diff --git a/res/drawable-xxxhdpi/ic_delivery_status_sent.webp b/app/src/main/res/drawable-xxxhdpi/ic_delivery_status_sent.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_delivery_status_sent.webp rename to app/src/main/res/drawable-xxxhdpi/ic_delivery_status_sent.webp diff --git a/res/drawable-xxxhdpi/ic_devices_white.webp b/app/src/main/res/drawable-xxxhdpi/ic_devices_white.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_devices_white.webp rename to app/src/main/res/drawable-xxxhdpi/ic_devices_white.webp diff --git a/res/drawable-xxxhdpi/ic_document_large_dark.webp b/app/src/main/res/drawable-xxxhdpi/ic_document_large_dark.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_document_large_dark.webp rename to app/src/main/res/drawable-xxxhdpi/ic_document_large_dark.webp diff --git a/res/drawable-xxxhdpi/ic_document_large_light.webp b/app/src/main/res/drawable-xxxhdpi/ic_document_large_light.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_document_large_light.webp rename to app/src/main/res/drawable-xxxhdpi/ic_document_large_light.webp diff --git a/res/drawable-xxxhdpi/ic_document_small_dark.webp b/app/src/main/res/drawable-xxxhdpi/ic_document_small_dark.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_document_small_dark.webp rename to app/src/main/res/drawable-xxxhdpi/ic_document_small_dark.webp diff --git a/res/drawable-xxxhdpi/ic_document_small_light.webp b/app/src/main/res/drawable-xxxhdpi/ic_document_small_light.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_document_small_light.webp rename to app/src/main/res/drawable-xxxhdpi/ic_document_small_light.webp diff --git a/res/drawable-xxxhdpi/ic_download_32.png b/app/src/main/res/drawable-xxxhdpi/ic_download_32.png similarity index 100% rename from res/drawable-xxxhdpi/ic_download_32.png rename to app/src/main/res/drawable-xxxhdpi/ic_download_32.png diff --git a/res/drawable-xxxhdpi/ic_download_circle_fill_white_48dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_download_circle_fill_white_48dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_download_circle_fill_white_48dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_download_circle_fill_white_48dp.webp diff --git a/res/drawable-xxxhdpi/ic_emoji_32.webp b/app/src/main/res/drawable-xxxhdpi/ic_emoji_32.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_emoji_32.webp rename to app/src/main/res/drawable-xxxhdpi/ic_emoji_32.webp diff --git a/res/drawable-xxxhdpi/ic_error.webp b/app/src/main/res/drawable-xxxhdpi/ic_error.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_error.webp rename to app/src/main/res/drawable-xxxhdpi/ic_error.webp diff --git a/res/drawable-xxxhdpi/ic_face_white_24dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_face_white_24dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_face_white_24dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_face_white_24dp.webp diff --git a/res/drawable-xxxhdpi/ic_favorite_grey600_24dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_favorite_grey600_24dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_favorite_grey600_24dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_favorite_grey600_24dp.webp diff --git a/res/drawable-xxxhdpi/ic_fingerprint_white_48dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_fingerprint_white_48dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_fingerprint_white_48dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_fingerprint_white_48dp.webp diff --git a/res/drawable-xxxhdpi/ic_flip_32.webp b/app/src/main/res/drawable-xxxhdpi/ic_flip_32.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_flip_32.webp rename to app/src/main/res/drawable-xxxhdpi/ic_flip_32.webp diff --git a/res/drawable-xxxhdpi/ic_folder_white_48dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_folder_white_48dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_folder_white_48dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_folder_white_48dp.webp diff --git a/res/drawable-xxxhdpi/ic_gif_white_24dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_gif_white_24dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_gif_white_24dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_gif_white_24dp.webp diff --git a/res/drawable-xxxhdpi/ic_headset_white_24dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_headset_white_24dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_headset_white_24dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_headset_white_24dp.webp diff --git a/res/drawable-xxxhdpi/ic_image_white_24dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_image_white_24dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_image_white_24dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_image_white_24dp.webp diff --git a/res/drawable-xxxhdpi/ic_insert_drive_file_white_24dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_insert_drive_file_white_24dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_insert_drive_file_white_24dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_insert_drive_file_white_24dp.webp diff --git a/res/drawable-xxxhdpi/ic_keyboard_arrow_down_white_24dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_down_white_24dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_keyboard_arrow_down_white_24dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_down_white_24dp.webp diff --git a/res/drawable-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.webp diff --git a/res/drawable-xxxhdpi/ic_keyboard_arrow_up_white_36dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_up_white_36dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_keyboard_arrow_up_white_36dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_up_white_36dp.webp diff --git a/res/drawable-xxxhdpi/ic_launch_white_24dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_launch_white_24dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_launch_white_24dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_launch_white_24dp.webp diff --git a/res/drawable-xxxhdpi/ic_location_on_white_24dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_location_on_white_24dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_location_on_white_24dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_location_on_white_24dp.webp diff --git a/res/drawable-xxxhdpi/ic_lock_white_48dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_lock_white_48dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_lock_white_48dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_lock_white_48dp.webp diff --git a/res/drawable-xxxhdpi/ic_menu_lock_dark.webp b/app/src/main/res/drawable-xxxhdpi/ic_menu_lock_dark.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_menu_lock_dark.webp rename to app/src/main/res/drawable-xxxhdpi/ic_menu_lock_dark.webp diff --git a/res/drawable-xxxhdpi/ic_message_outline_24.webp b/app/src/main/res/drawable-xxxhdpi/ic_message_outline_24.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_message_outline_24.webp rename to app/src/main/res/drawable-xxxhdpi/ic_message_outline_24.webp diff --git a/res/drawable-xxxhdpi/ic_message_solid_24.webp b/app/src/main/res/drawable-xxxhdpi/ic_message_solid_24.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_message_solid_24.webp rename to app/src/main/res/drawable-xxxhdpi/ic_message_solid_24.webp diff --git a/res/drawable-xxxhdpi/ic_mic_off_white_24dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_mic_off_white_24dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_mic_off_white_24dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_mic_off_white_24dp.webp diff --git a/res/drawable-xxxhdpi/ic_note_to_self.webp b/app/src/main/res/drawable-xxxhdpi/ic_note_to_self.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_note_to_self.webp rename to app/src/main/res/drawable-xxxhdpi/ic_note_to_self.webp diff --git a/res/drawable-xxxhdpi/ic_pause_circle_fill_white_48dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_pause_circle_fill_white_48dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_pause_circle_fill_white_48dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_pause_circle_fill_white_48dp.webp diff --git a/res/drawable-xxxhdpi/ic_person_add_white_24dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_person_add_white_24dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_person_add_white_24dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_person_add_white_24dp.webp diff --git a/res/drawable-xxxhdpi/ic_person_white_24dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_person_white_24dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_person_white_24dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_person_white_24dp.webp diff --git a/res/drawable-xxxhdpi/ic_phone_grey600_32dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_phone_grey600_32dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_phone_grey600_32dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_phone_grey600_32dp.webp diff --git a/res/drawable-xxxhdpi/ic_photo_library_white_24dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_photo_library_white_24dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_photo_library_white_24dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_photo_library_white_24dp.webp diff --git a/res/drawable-xxxhdpi/ic_play_circle_fill_white_48dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_play_circle_fill_white_48dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_play_circle_fill_white_48dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_play_circle_fill_white_48dp.webp diff --git a/res/drawable-xxxhdpi/ic_profile_camera.webp b/app/src/main/res/drawable-xxxhdpi/ic_profile_camera.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_profile_camera.webp rename to app/src/main/res/drawable-xxxhdpi/ic_profile_camera.webp diff --git a/res/drawable-xxxhdpi/ic_reply_white_36dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_reply_white_36dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_reply_white_36dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_reply_white_36dp.webp diff --git a/res/drawable-xxxhdpi/ic_rotate_32.webp b/app/src/main/res/drawable-xxxhdpi/ic_rotate_32.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_rotate_32.webp rename to app/src/main/res/drawable-xxxhdpi/ic_rotate_32.webp diff --git a/res/drawable-xxxhdpi/ic_scroll_down.webp b/app/src/main/res/drawable-xxxhdpi/ic_scroll_down.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_scroll_down.webp rename to app/src/main/res/drawable-xxxhdpi/ic_scroll_down.webp diff --git a/res/drawable-xxxhdpi/ic_select_off.webp b/app/src/main/res/drawable-xxxhdpi/ic_select_off.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_select_off.webp rename to app/src/main/res/drawable-xxxhdpi/ic_select_off.webp diff --git a/res/drawable-xxxhdpi/ic_select_on.webp b/app/src/main/res/drawable-xxxhdpi/ic_select_on.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_select_on.webp rename to app/src/main/res/drawable-xxxhdpi/ic_select_on.webp diff --git a/res/drawable-xxxhdpi/ic_share_black_18dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_share_black_18dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_share_black_18dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_share_black_18dp.webp diff --git a/res/drawable-xxxhdpi/ic_share_white_24dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_share_white_24dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.webp diff --git a/res/drawable-xxxhdpi/ic_signal_background_connection.webp b/app/src/main/res/drawable-xxxhdpi/ic_signal_background_connection.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_signal_background_connection.webp rename to app/src/main/res/drawable-xxxhdpi/ic_signal_background_connection.webp diff --git a/res/drawable-xxxhdpi/ic_signal_backup.webp b/app/src/main/res/drawable-xxxhdpi/ic_signal_backup.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_signal_backup.webp rename to app/src/main/res/drawable-xxxhdpi/ic_signal_backup.webp diff --git a/res/drawable-xxxhdpi/ic_signal_downloading.webp b/app/src/main/res/drawable-xxxhdpi/ic_signal_downloading.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_signal_downloading.webp rename to app/src/main/res/drawable-xxxhdpi/ic_signal_downloading.webp diff --git a/res/drawable-xxxhdpi/ic_signal_grey_24dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_signal_grey_24dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_signal_grey_24dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_signal_grey_24dp.webp diff --git a/res/drawable-xxxhdpi/ic_switch_camera_32.webp b/app/src/main/res/drawable-xxxhdpi/ic_switch_camera_32.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_switch_camera_32.webp rename to app/src/main/res/drawable-xxxhdpi/ic_switch_camera_32.webp diff --git a/res/drawable-xxxhdpi/ic_text_32.webp b/app/src/main/res/drawable-xxxhdpi/ic_text_32.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_text_32.webp rename to app/src/main/res/drawable-xxxhdpi/ic_text_32.webp diff --git a/res/drawable-xxxhdpi/ic_trash_filled_32.webp b/app/src/main/res/drawable-xxxhdpi/ic_trash_filled_32.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_trash_filled_32.webp rename to app/src/main/res/drawable-xxxhdpi/ic_trash_filled_32.webp diff --git a/res/drawable-xxxhdpi/ic_unarchive_white_24dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_unarchive_white_24dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_unarchive_white_24dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_unarchive_white_24dp.webp diff --git a/res/drawable-xxxhdpi/ic_unarchive_white_36dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_unarchive_white_36dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_unarchive_white_36dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_unarchive_white_36dp.webp diff --git a/res/drawable-xxxhdpi/ic_undo_32.webp b/app/src/main/res/drawable-xxxhdpi/ic_undo_32.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_undo_32.webp rename to app/src/main/res/drawable-xxxhdpi/ic_undo_32.webp diff --git a/res/drawable-xxxhdpi/ic_unidentified_delivery.webp b/app/src/main/res/drawable-xxxhdpi/ic_unidentified_delivery.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_unidentified_delivery.webp rename to app/src/main/res/drawable-xxxhdpi/ic_unidentified_delivery.webp diff --git a/res/drawable-xxxhdpi/ic_unlocked_white_18dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_unlocked_white_18dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_unlocked_white_18dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_unlocked_white_18dp.webp diff --git a/res/drawable-xxxhdpi/ic_view_infinite_32.png b/app/src/main/res/drawable-xxxhdpi/ic_view_infinite_32.png similarity index 100% rename from res/drawable-xxxhdpi/ic_view_infinite_32.png rename to app/src/main/res/drawable-xxxhdpi/ic_view_infinite_32.png diff --git a/res/drawable-xxxhdpi/ic_view_once_32.png b/app/src/main/res/drawable-xxxhdpi/ic_view_once_32.png similarity index 100% rename from res/drawable-xxxhdpi/ic_view_once_32.png rename to app/src/main/res/drawable-xxxhdpi/ic_view_once_32.png diff --git a/res/drawable-xxxhdpi/ic_volume_off_grey600_18dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_volume_off_grey600_18dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_volume_off_grey600_18dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_volume_off_grey600_18dp.webp diff --git a/res/drawable-xxxhdpi/ic_volume_off_white_18dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_volume_off_white_18dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_volume_off_white_18dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_volume_off_white_18dp.webp diff --git a/res/drawable-xxxhdpi/ic_volume_up_white_24dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_volume_up_white_24dp.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_volume_up_white_24dp.webp rename to app/src/main/res/drawable-xxxhdpi/ic_volume_up_white_24dp.webp diff --git a/res/drawable-xxxhdpi/ic_x_28.webp b/app/src/main/res/drawable-xxxhdpi/ic_x_28.webp similarity index 100% rename from res/drawable-xxxhdpi/ic_x_28.webp rename to app/src/main/res/drawable-xxxhdpi/ic_x_28.webp diff --git a/res/drawable-xxxhdpi/icon_cached.webp b/app/src/main/res/drawable-xxxhdpi/icon_cached.webp similarity index 100% rename from res/drawable-xxxhdpi/icon_cached.webp rename to app/src/main/res/drawable-xxxhdpi/icon_cached.webp diff --git a/res/drawable-xxxhdpi/icon_notification.webp b/app/src/main/res/drawable-xxxhdpi/icon_notification.webp similarity index 100% rename from res/drawable-xxxhdpi/icon_notification.webp rename to app/src/main/res/drawable-xxxhdpi/icon_notification.webp diff --git a/res/drawable-xxxhdpi/icon_transparent.webp b/app/src/main/res/drawable-xxxhdpi/icon_transparent.webp similarity index 100% rename from res/drawable-xxxhdpi/icon_transparent.webp rename to app/src/main/res/drawable-xxxhdpi/icon_transparent.webp diff --git a/res/drawable-xxxhdpi/inbox_zero.webp b/app/src/main/res/drawable-xxxhdpi/inbox_zero.webp similarity index 100% rename from res/drawable-xxxhdpi/inbox_zero.webp rename to app/src/main/res/drawable-xxxhdpi/inbox_zero.webp diff --git a/res/drawable-xxxhdpi/love_heart.webp b/app/src/main/res/drawable-xxxhdpi/love_heart.webp similarity index 100% rename from res/drawable-xxxhdpi/love_heart.webp rename to app/src/main/res/drawable-xxxhdpi/love_heart.webp diff --git a/res/drawable-xxxhdpi/marker_shadow.webp b/app/src/main/res/drawable-xxxhdpi/marker_shadow.webp similarity index 100% rename from res/drawable-xxxhdpi/marker_shadow.webp rename to app/src/main/res/drawable-xxxhdpi/marker_shadow.webp diff --git a/res/drawable-xxxhdpi/message_24dp.webp b/app/src/main/res/drawable-xxxhdpi/message_24dp.webp similarity index 100% rename from res/drawable-xxxhdpi/message_24dp.webp rename to app/src/main/res/drawable-xxxhdpi/message_24dp.webp diff --git a/res/drawable-xxxhdpi/no_contacts.webp b/app/src/main/res/drawable-xxxhdpi/no_contacts.webp similarity index 100% rename from res/drawable-xxxhdpi/no_contacts.webp rename to app/src/main/res/drawable-xxxhdpi/no_contacts.webp diff --git a/res/drawable-xxxhdpi/phone_24dp.webp b/app/src/main/res/drawable-xxxhdpi/phone_24dp.webp similarity index 100% rename from res/drawable-xxxhdpi/phone_24dp.webp rename to app/src/main/res/drawable-xxxhdpi/phone_24dp.webp diff --git a/res/drawable-xxxhdpi/poweredby_giphy.webp b/app/src/main/res/drawable-xxxhdpi/poweredby_giphy.webp similarity index 100% rename from res/drawable-xxxhdpi/poweredby_giphy.webp rename to app/src/main/res/drawable-xxxhdpi/poweredby_giphy.webp diff --git a/res/drawable-xxxhdpi/profile_splash.webp b/app/src/main/res/drawable-xxxhdpi/profile_splash.webp similarity index 100% rename from res/drawable-xxxhdpi/profile_splash.webp rename to app/src/main/res/drawable-xxxhdpi/profile_splash.webp diff --git a/res/drawable-xxxhdpi/reaction_scrubber_angry_48.webp b/app/src/main/res/drawable-xxxhdpi/reaction_scrubber_angry_48.webp similarity index 100% rename from res/drawable-xxxhdpi/reaction_scrubber_angry_48.webp rename to app/src/main/res/drawable-xxxhdpi/reaction_scrubber_angry_48.webp diff --git a/res/drawable-xxxhdpi/reaction_scrubber_dislike_48.webp b/app/src/main/res/drawable-xxxhdpi/reaction_scrubber_dislike_48.webp similarity index 100% rename from res/drawable-xxxhdpi/reaction_scrubber_dislike_48.webp rename to app/src/main/res/drawable-xxxhdpi/reaction_scrubber_dislike_48.webp diff --git a/res/drawable-xxxhdpi/reaction_scrubber_haha_48.webp b/app/src/main/res/drawable-xxxhdpi/reaction_scrubber_haha_48.webp similarity index 100% rename from res/drawable-xxxhdpi/reaction_scrubber_haha_48.webp rename to app/src/main/res/drawable-xxxhdpi/reaction_scrubber_haha_48.webp diff --git a/res/drawable-xxxhdpi/reaction_scrubber_like_48.webp b/app/src/main/res/drawable-xxxhdpi/reaction_scrubber_like_48.webp similarity index 100% rename from res/drawable-xxxhdpi/reaction_scrubber_like_48.webp rename to app/src/main/res/drawable-xxxhdpi/reaction_scrubber_like_48.webp diff --git a/res/drawable-xxxhdpi/reaction_scrubber_love_48.webp b/app/src/main/res/drawable-xxxhdpi/reaction_scrubber_love_48.webp similarity index 100% rename from res/drawable-xxxhdpi/reaction_scrubber_love_48.webp rename to app/src/main/res/drawable-xxxhdpi/reaction_scrubber_love_48.webp diff --git a/res/drawable-xxxhdpi/reaction_scrubber_sad_48.webp b/app/src/main/res/drawable-xxxhdpi/reaction_scrubber_sad_48.webp similarity index 100% rename from res/drawable-xxxhdpi/reaction_scrubber_sad_48.webp rename to app/src/main/res/drawable-xxxhdpi/reaction_scrubber_sad_48.webp diff --git a/res/drawable-xxxhdpi/reaction_scrubber_wow_48.webp b/app/src/main/res/drawable-xxxhdpi/reaction_scrubber_wow_48.webp similarity index 100% rename from res/drawable-xxxhdpi/reaction_scrubber_wow_48.webp rename to app/src/main/res/drawable-xxxhdpi/reaction_scrubber_wow_48.webp diff --git a/res/drawable-xxxhdpi/sticker_32.webp b/app/src/main/res/drawable-xxxhdpi/sticker_32.webp similarity index 100% rename from res/drawable-xxxhdpi/sticker_32.webp rename to app/src/main/res/drawable-xxxhdpi/sticker_32.webp diff --git a/res/drawable-xxxhdpi/video_splash.webp b/app/src/main/res/drawable-xxxhdpi/video_splash.webp similarity index 100% rename from res/drawable-xxxhdpi/video_splash.webp rename to app/src/main/res/drawable-xxxhdpi/video_splash.webp diff --git a/res/drawable-xxxhdpi/webrtc_video_mute_24.webp b/app/src/main/res/drawable-xxxhdpi/webrtc_video_mute_24.webp similarity index 100% rename from res/drawable-xxxhdpi/webrtc_video_mute_24.webp rename to app/src/main/res/drawable-xxxhdpi/webrtc_video_mute_24.webp diff --git a/res/drawable-xxxhdpi/welcome.webp b/app/src/main/res/drawable-xxxhdpi/welcome.webp similarity index 100% rename from res/drawable-xxxhdpi/welcome.webp rename to app/src/main/res/drawable-xxxhdpi/welcome.webp diff --git a/res/drawable/archived_indicator_background.xml b/app/src/main/res/drawable/archived_indicator_background.xml similarity index 100% rename from res/drawable/archived_indicator_background.xml rename to app/src/main/res/drawable/archived_indicator_background.xml diff --git a/res/drawable/attachment_selector_shadow.xml b/app/src/main/res/drawable/attachment_selector_shadow.xml similarity index 100% rename from res/drawable/attachment_selector_shadow.xml rename to app/src/main/res/drawable/attachment_selector_shadow.xml diff --git a/res/drawable/avatar_gradient_dark.xml b/app/src/main/res/drawable/avatar_gradient_dark.xml similarity index 100% rename from res/drawable/avatar_gradient_dark.xml rename to app/src/main/res/drawable/avatar_gradient_dark.xml diff --git a/res/drawable/avatar_gradient_light.xml b/app/src/main/res/drawable/avatar_gradient_light.xml similarity index 100% rename from res/drawable/avatar_gradient_light.xml rename to app/src/main/res/drawable/avatar_gradient_light.xml diff --git a/res/drawable/background_pattern.png b/app/src/main/res/drawable/background_pattern.png similarity index 100% rename from res/drawable/background_pattern.png rename to app/src/main/res/drawable/background_pattern.png diff --git a/res/drawable/background_pattern_repeat.xml b/app/src/main/res/drawable/background_pattern_repeat.xml similarity index 100% rename from res/drawable/background_pattern_repeat.xml rename to app/src/main/res/drawable/background_pattern_repeat.xml diff --git a/res/drawable/camera_send_button_background.xml b/app/src/main/res/drawable/camera_send_button_background.xml similarity index 100% rename from res/drawable/camera_send_button_background.xml rename to app/src/main/res/drawable/camera_send_button_background.xml diff --git a/res/drawable/camera_video_recording_progress_record_bubble.xml b/app/src/main/res/drawable/camera_video_recording_progress_record_bubble.xml similarity index 100% rename from res/drawable/camera_video_recording_progress_record_bubble.xml rename to app/src/main/res/drawable/camera_video_recording_progress_record_bubble.xml diff --git a/res/drawable/camerax_flash_toggle.xml b/app/src/main/res/drawable/camerax_flash_toggle.xml similarity index 100% rename from res/drawable/camerax_flash_toggle.xml rename to app/src/main/res/drawable/camerax_flash_toggle.xml diff --git a/res/drawable/circle_alpha.xml b/app/src/main/res/drawable/circle_alpha.xml similarity index 100% rename from res/drawable/circle_alpha.xml rename to app/src/main/res/drawable/circle_alpha.xml diff --git a/res/drawable/circle_tintable.xml b/app/src/main/res/drawable/circle_tintable.xml similarity index 100% rename from res/drawable/circle_tintable.xml rename to app/src/main/res/drawable/circle_tintable.xml diff --git a/res/drawable/circle_touch_highlight_background.xml b/app/src/main/res/drawable/circle_touch_highlight_background.xml similarity index 100% rename from res/drawable/circle_touch_highlight_background.xml rename to app/src/main/res/drawable/circle_touch_highlight_background.xml diff --git a/res/drawable/circle_white.xml b/app/src/main/res/drawable/circle_white.xml similarity index 100% rename from res/drawable/circle_white.xml rename to app/src/main/res/drawable/circle_white.xml diff --git a/res/drawable/clickable_card_dark.xml b/app/src/main/res/drawable/clickable_card_dark.xml similarity index 100% rename from res/drawable/clickable_card_dark.xml rename to app/src/main/res/drawable/clickable_card_dark.xml diff --git a/res/drawable/clickable_card_light.xml b/app/src/main/res/drawable/clickable_card_light.xml similarity index 100% rename from res/drawable/clickable_card_light.xml rename to app/src/main/res/drawable/clickable_card_light.xml diff --git a/res/drawable/colorpickerpreference_pref_swatch.xml b/app/src/main/res/drawable/colorpickerpreference_pref_swatch.xml similarity index 100% rename from res/drawable/colorpickerpreference_pref_swatch.xml rename to app/src/main/res/drawable/colorpickerpreference_pref_swatch.xml diff --git a/res/drawable/compose_background_camera.xml b/app/src/main/res/drawable/compose_background_camera.xml similarity index 100% rename from res/drawable/compose_background_camera.xml rename to app/src/main/res/drawable/compose_background_camera.xml diff --git a/res/drawable/compose_background_dark.xml b/app/src/main/res/drawable/compose_background_dark.xml similarity index 100% rename from res/drawable/compose_background_dark.xml rename to app/src/main/res/drawable/compose_background_dark.xml diff --git a/res/drawable/compose_background_light.xml b/app/src/main/res/drawable/compose_background_light.xml similarity index 100% rename from res/drawable/compose_background_light.xml rename to app/src/main/res/drawable/compose_background_light.xml diff --git a/res/drawable/compose_divider_background.xml b/app/src/main/res/drawable/compose_divider_background.xml similarity index 100% rename from res/drawable/compose_divider_background.xml rename to app/src/main/res/drawable/compose_divider_background.xml diff --git a/res/drawable/contact_list_divider_dark.xml b/app/src/main/res/drawable/contact_list_divider_dark.xml similarity index 100% rename from res/drawable/contact_list_divider_dark.xml rename to app/src/main/res/drawable/contact_list_divider_dark.xml diff --git a/res/drawable/contact_list_divider_light.xml b/app/src/main/res/drawable/contact_list_divider_light.xml similarity index 100% rename from res/drawable/contact_list_divider_light.xml rename to app/src/main/res/drawable/contact_list_divider_light.xml diff --git a/res/drawable/contact_photo_background.xml b/app/src/main/res/drawable/contact_photo_background.xml similarity index 100% rename from res/drawable/contact_photo_background.xml rename to app/src/main/res/drawable/contact_photo_background.xml diff --git a/res/drawable/conversation_attachment_close_circle.xml b/app/src/main/res/drawable/conversation_attachment_close_circle.xml similarity index 100% rename from res/drawable/conversation_attachment_close_circle.xml rename to app/src/main/res/drawable/conversation_attachment_close_circle.xml diff --git a/res/drawable/conversation_attachment_edit.xml b/app/src/main/res/drawable/conversation_attachment_edit.xml similarity index 100% rename from res/drawable/conversation_attachment_edit.xml rename to app/src/main/res/drawable/conversation_attachment_edit.xml diff --git a/res/drawable/conversation_item_background.xml b/app/src/main/res/drawable/conversation_item_background.xml similarity index 100% rename from res/drawable/conversation_item_background.xml rename to app/src/main/res/drawable/conversation_item_background.xml diff --git a/res/drawable/conversation_item_background_animated.xml b/app/src/main/res/drawable/conversation_item_background_animated.xml similarity index 100% rename from res/drawable/conversation_item_background_animated.xml rename to app/src/main/res/drawable/conversation_item_background_animated.xml diff --git a/res/drawable/conversation_item_sent_indicator_text_shape.xml b/app/src/main/res/drawable/conversation_item_sent_indicator_text_shape.xml similarity index 100% rename from res/drawable/conversation_item_sent_indicator_text_shape.xml rename to app/src/main/res/drawable/conversation_item_sent_indicator_text_shape.xml diff --git a/res/drawable/conversation_item_sent_indicator_text_shape_dark.xml b/app/src/main/res/drawable/conversation_item_sent_indicator_text_shape_dark.xml similarity index 100% rename from res/drawable/conversation_item_sent_indicator_text_shape_dark.xml rename to app/src/main/res/drawable/conversation_item_sent_indicator_text_shape_dark.xml diff --git a/res/drawable/conversation_list_divider_shape.xml b/app/src/main/res/drawable/conversation_list_divider_shape.xml similarity index 100% rename from res/drawable/conversation_list_divider_shape.xml rename to app/src/main/res/drawable/conversation_list_divider_shape.xml diff --git a/res/drawable/conversation_list_divider_shape_dark.xml b/app/src/main/res/drawable/conversation_list_divider_shape_dark.xml similarity index 100% rename from res/drawable/conversation_list_divider_shape_dark.xml rename to app/src/main/res/drawable/conversation_list_divider_shape_dark.xml diff --git a/res/drawable/conversation_list_item_background.xml b/app/src/main/res/drawable/conversation_list_item_background.xml similarity index 100% rename from res/drawable/conversation_list_item_background.xml rename to app/src/main/res/drawable/conversation_list_item_background.xml diff --git a/res/drawable/conversation_list_item_background_dark.xml b/app/src/main/res/drawable/conversation_list_item_background_dark.xml similarity index 100% rename from res/drawable/conversation_list_item_background_dark.xml rename to app/src/main/res/drawable/conversation_list_item_background_dark.xml diff --git a/res/drawable/conversation_reaction_overlay_background_dark.xml b/app/src/main/res/drawable/conversation_reaction_overlay_background_dark.xml similarity index 100% rename from res/drawable/conversation_reaction_overlay_background_dark.xml rename to app/src/main/res/drawable/conversation_reaction_overlay_background_dark.xml diff --git a/res/drawable/cta_button_background.xml b/app/src/main/res/drawable/cta_button_background.xml similarity index 100% rename from res/drawable/cta_button_background.xml rename to app/src/main/res/drawable/cta_button_background.xml diff --git a/res/drawable/dialog_background.xml b/app/src/main/res/drawable/dialog_background.xml similarity index 100% rename from res/drawable/dialog_background.xml rename to app/src/main/res/drawable/dialog_background.xml diff --git a/res/drawable/dismiss_background.xml b/app/src/main/res/drawable/dismiss_background.xml similarity index 100% rename from res/drawable/dismiss_background.xml rename to app/src/main/res/drawable/dismiss_background.xml diff --git a/res/drawable/emoji_variation_selector_background_dark.xml b/app/src/main/res/drawable/emoji_variation_selector_background_dark.xml similarity index 100% rename from res/drawable/emoji_variation_selector_background_dark.xml rename to app/src/main/res/drawable/emoji_variation_selector_background_dark.xml diff --git a/res/drawable/emoji_variation_selector_background_light.xml b/app/src/main/res/drawable/emoji_variation_selector_background_light.xml similarity index 100% rename from res/drawable/emoji_variation_selector_background_light.xml rename to app/src/main/res/drawable/emoji_variation_selector_background_light.xml diff --git a/res/drawable/error_round.xml b/app/src/main/res/drawable/error_round.xml similarity index 100% rename from res/drawable/error_round.xml rename to app/src/main/res/drawable/error_round.xml diff --git a/res/drawable/ic_advanced_24.xml b/app/src/main/res/drawable/ic_advanced_24.xml similarity index 100% rename from res/drawable/ic_advanced_24.xml rename to app/src/main/res/drawable/ic_advanced_24.xml diff --git a/res/drawable/ic_appearance_outline_24.xml b/app/src/main/res/drawable/ic_appearance_outline_24.xml similarity index 100% rename from res/drawable/ic_appearance_outline_24.xml rename to app/src/main/res/drawable/ic_appearance_outline_24.xml diff --git a/res/drawable/ic_appearance_solid_24.xml b/app/src/main/res/drawable/ic_appearance_solid_24.xml similarity index 100% rename from res/drawable/ic_appearance_solid_24.xml rename to app/src/main/res/drawable/ic_appearance_solid_24.xml diff --git a/res/drawable/ic_archive_outline_24.xml b/app/src/main/res/drawable/ic_archive_outline_24.xml similarity index 100% rename from res/drawable/ic_archive_outline_24.xml rename to app/src/main/res/drawable/ic_archive_outline_24.xml diff --git a/res/drawable/ic_archive_outline_24dp.xml b/app/src/main/res/drawable/ic_archive_outline_24dp.xml similarity index 100% rename from res/drawable/ic_archive_outline_24dp.xml rename to app/src/main/res/drawable/ic_archive_outline_24dp.xml diff --git a/res/drawable/ic_archive_solid_24.xml b/app/src/main/res/drawable/ic_archive_solid_24.xml similarity index 100% rename from res/drawable/ic_archive_solid_24.xml rename to app/src/main/res/drawable/ic_archive_solid_24.xml diff --git a/res/drawable/ic_archive_solid_24dp.xml b/app/src/main/res/drawable/ic_archive_solid_24dp.xml similarity index 100% rename from res/drawable/ic_archive_solid_24dp.xml rename to app/src/main/res/drawable/ic_archive_solid_24dp.xml diff --git a/res/drawable/ic_arrow_down.xml b/app/src/main/res/drawable/ic_arrow_down.xml similarity index 100% rename from res/drawable/ic_arrow_down.xml rename to app/src/main/res/drawable/ic_arrow_down.xml diff --git a/res/drawable/ic_arrow_down_14.xml b/app/src/main/res/drawable/ic_arrow_down_14.xml similarity index 100% rename from res/drawable/ic_arrow_down_14.xml rename to app/src/main/res/drawable/ic_arrow_down_14.xml diff --git a/res/drawable/ic_arrow_down_circle_filled.xml b/app/src/main/res/drawable/ic_arrow_down_circle_filled.xml similarity index 100% rename from res/drawable/ic_arrow_down_circle_filled.xml rename to app/src/main/res/drawable/ic_arrow_down_circle_filled.xml diff --git a/res/drawable/ic_arrow_down_circle_outline_24.xml b/app/src/main/res/drawable/ic_arrow_down_circle_outline_24.xml similarity index 100% rename from res/drawable/ic_arrow_down_circle_outline_24.xml rename to app/src/main/res/drawable/ic_arrow_down_circle_outline_24.xml diff --git a/res/drawable/ic_arrow_left_24.xml b/app/src/main/res/drawable/ic_arrow_left_24.xml similarity index 100% rename from res/drawable/ic_arrow_left_24.xml rename to app/src/main/res/drawable/ic_arrow_left_24.xml diff --git a/res/drawable/ic_arrow_left_conversation_24.xml b/app/src/main/res/drawable/ic_arrow_left_conversation_24.xml similarity index 100% rename from res/drawable/ic_arrow_left_conversation_24.xml rename to app/src/main/res/drawable/ic_arrow_left_conversation_24.xml diff --git a/res/drawable/ic_bell_outline_24.xml b/app/src/main/res/drawable/ic_bell_outline_24.xml similarity index 100% rename from res/drawable/ic_bell_outline_24.xml rename to app/src/main/res/drawable/ic_bell_outline_24.xml diff --git a/res/drawable/ic_bell_solid_24.xml b/app/src/main/res/drawable/ic_bell_solid_24.xml similarity index 100% rename from res/drawable/ic_bell_solid_24.xml rename to app/src/main/res/drawable/ic_bell_solid_24.xml diff --git a/res/drawable/ic_camera_outline_24.xml b/app/src/main/res/drawable/ic_camera_outline_24.xml similarity index 100% rename from res/drawable/ic_camera_outline_24.xml rename to app/src/main/res/drawable/ic_camera_outline_24.xml diff --git a/res/drawable/ic_camera_solid_24.xml b/app/src/main/res/drawable/ic_camera_solid_24.xml similarity index 100% rename from res/drawable/ic_camera_solid_24.xml rename to app/src/main/res/drawable/ic_camera_solid_24.xml diff --git a/res/drawable/ic_camera_solid_white_24.xml b/app/src/main/res/drawable/ic_camera_solid_white_24.xml similarity index 100% rename from res/drawable/ic_camera_solid_white_24.xml rename to app/src/main/res/drawable/ic_camera_solid_white_24.xml diff --git a/res/drawable/ic_check_24.xml b/app/src/main/res/drawable/ic_check_24.xml similarity index 100% rename from res/drawable/ic_check_24.xml rename to app/src/main/res/drawable/ic_check_24.xml diff --git a/res/drawable/ic_check_circle_solid_20.xml b/app/src/main/res/drawable/ic_check_circle_solid_20.xml similarity index 100% rename from res/drawable/ic_check_circle_solid_20.xml rename to app/src/main/res/drawable/ic_check_circle_solid_20.xml diff --git a/res/drawable/ic_chevron_up.xml b/app/src/main/res/drawable/ic_chevron_up.xml similarity index 100% rename from res/drawable/ic_chevron_up.xml rename to app/src/main/res/drawable/ic_chevron_up.xml diff --git a/res/drawable/ic_compose_solid_24.xml b/app/src/main/res/drawable/ic_compose_solid_24.xml similarity index 100% rename from res/drawable/ic_compose_solid_24.xml rename to app/src/main/res/drawable/ic_compose_solid_24.xml diff --git a/res/drawable/ic_continue_24.xml b/app/src/main/res/drawable/ic_continue_24.xml similarity index 100% rename from res/drawable/ic_continue_24.xml rename to app/src/main/res/drawable/ic_continue_24.xml diff --git a/res/drawable/ic_copy_outline_24.xml b/app/src/main/res/drawable/ic_copy_outline_24.xml similarity index 100% rename from res/drawable/ic_copy_outline_24.xml rename to app/src/main/res/drawable/ic_copy_outline_24.xml diff --git a/res/drawable/ic_copy_solid_24.xml b/app/src/main/res/drawable/ic_copy_solid_24.xml similarity index 100% rename from res/drawable/ic_copy_solid_24.xml rename to app/src/main/res/drawable/ic_copy_solid_24.xml diff --git a/res/drawable/ic_dashboard_24.xml b/app/src/main/res/drawable/ic_dashboard_24.xml similarity index 100% rename from res/drawable/ic_dashboard_24.xml rename to app/src/main/res/drawable/ic_dashboard_24.xml diff --git a/res/drawable/ic_download_filled_white_24.xml b/app/src/main/res/drawable/ic_download_filled_white_24.xml similarity index 100% rename from res/drawable/ic_download_filled_white_24.xml rename to app/src/main/res/drawable/ic_download_filled_white_24.xml diff --git a/res/drawable/ic_download_outline_white_24.xml b/app/src/main/res/drawable/ic_download_outline_white_24.xml similarity index 100% rename from res/drawable/ic_download_outline_white_24.xml rename to app/src/main/res/drawable/ic_download_outline_white_24.xml diff --git a/res/drawable/ic_emoji_activity_dark_20.xml b/app/src/main/res/drawable/ic_emoji_activity_dark_20.xml similarity index 100% rename from res/drawable/ic_emoji_activity_dark_20.xml rename to app/src/main/res/drawable/ic_emoji_activity_dark_20.xml diff --git a/res/drawable/ic_emoji_activity_light_20.xml b/app/src/main/res/drawable/ic_emoji_activity_light_20.xml similarity index 100% rename from res/drawable/ic_emoji_activity_light_20.xml rename to app/src/main/res/drawable/ic_emoji_activity_light_20.xml diff --git a/res/drawable/ic_emoji_animal_dark_20.xml b/app/src/main/res/drawable/ic_emoji_animal_dark_20.xml similarity index 100% rename from res/drawable/ic_emoji_animal_dark_20.xml rename to app/src/main/res/drawable/ic_emoji_animal_dark_20.xml diff --git a/res/drawable/ic_emoji_animal_light_20.xml b/app/src/main/res/drawable/ic_emoji_animal_light_20.xml similarity index 100% rename from res/drawable/ic_emoji_animal_light_20.xml rename to app/src/main/res/drawable/ic_emoji_animal_light_20.xml diff --git a/res/drawable/ic_emoji_emoticon_dark_20.xml b/app/src/main/res/drawable/ic_emoji_emoticon_dark_20.xml similarity index 100% rename from res/drawable/ic_emoji_emoticon_dark_20.xml rename to app/src/main/res/drawable/ic_emoji_emoticon_dark_20.xml diff --git a/res/drawable/ic_emoji_emoticon_light_20.xml b/app/src/main/res/drawable/ic_emoji_emoticon_light_20.xml similarity index 100% rename from res/drawable/ic_emoji_emoticon_light_20.xml rename to app/src/main/res/drawable/ic_emoji_emoticon_light_20.xml diff --git a/res/drawable/ic_emoji_filled.xml b/app/src/main/res/drawable/ic_emoji_filled.xml similarity index 100% rename from res/drawable/ic_emoji_filled.xml rename to app/src/main/res/drawable/ic_emoji_filled.xml diff --git a/res/drawable/ic_emoji_flag_dark_20.xml b/app/src/main/res/drawable/ic_emoji_flag_dark_20.xml similarity index 100% rename from res/drawable/ic_emoji_flag_dark_20.xml rename to app/src/main/res/drawable/ic_emoji_flag_dark_20.xml diff --git a/res/drawable/ic_emoji_flag_light_20.xml b/app/src/main/res/drawable/ic_emoji_flag_light_20.xml similarity index 100% rename from res/drawable/ic_emoji_flag_light_20.xml rename to app/src/main/res/drawable/ic_emoji_flag_light_20.xml diff --git a/res/drawable/ic_emoji_food_dark_20.xml b/app/src/main/res/drawable/ic_emoji_food_dark_20.xml similarity index 100% rename from res/drawable/ic_emoji_food_dark_20.xml rename to app/src/main/res/drawable/ic_emoji_food_dark_20.xml diff --git a/res/drawable/ic_emoji_food_light_20.xml b/app/src/main/res/drawable/ic_emoji_food_light_20.xml similarity index 100% rename from res/drawable/ic_emoji_food_light_20.xml rename to app/src/main/res/drawable/ic_emoji_food_light_20.xml diff --git a/res/drawable/ic_emoji_object_dark_20.xml b/app/src/main/res/drawable/ic_emoji_object_dark_20.xml similarity index 100% rename from res/drawable/ic_emoji_object_dark_20.xml rename to app/src/main/res/drawable/ic_emoji_object_dark_20.xml diff --git a/res/drawable/ic_emoji_object_light_20.xml b/app/src/main/res/drawable/ic_emoji_object_light_20.xml similarity index 100% rename from res/drawable/ic_emoji_object_light_20.xml rename to app/src/main/res/drawable/ic_emoji_object_light_20.xml diff --git a/res/drawable/ic_emoji_outline.xml b/app/src/main/res/drawable/ic_emoji_outline.xml similarity index 100% rename from res/drawable/ic_emoji_outline.xml rename to app/src/main/res/drawable/ic_emoji_outline.xml diff --git a/res/drawable/ic_emoji_people_dark_20.xml b/app/src/main/res/drawable/ic_emoji_people_dark_20.xml similarity index 100% rename from res/drawable/ic_emoji_people_dark_20.xml rename to app/src/main/res/drawable/ic_emoji_people_dark_20.xml diff --git a/res/drawable/ic_emoji_people_light_20.xml b/app/src/main/res/drawable/ic_emoji_people_light_20.xml similarity index 100% rename from res/drawable/ic_emoji_people_light_20.xml rename to app/src/main/res/drawable/ic_emoji_people_light_20.xml diff --git a/res/drawable/ic_emoji_smiley_outline_24.xml b/app/src/main/res/drawable/ic_emoji_smiley_outline_24.xml similarity index 100% rename from res/drawable/ic_emoji_smiley_outline_24.xml rename to app/src/main/res/drawable/ic_emoji_smiley_outline_24.xml diff --git a/res/drawable/ic_emoji_smiley_solid_24.xml b/app/src/main/res/drawable/ic_emoji_smiley_solid_24.xml similarity index 100% rename from res/drawable/ic_emoji_smiley_solid_24.xml rename to app/src/main/res/drawable/ic_emoji_smiley_solid_24.xml diff --git a/res/drawable/ic_emoji_symbol_dark_20.xml b/app/src/main/res/drawable/ic_emoji_symbol_dark_20.xml similarity index 100% rename from res/drawable/ic_emoji_symbol_dark_20.xml rename to app/src/main/res/drawable/ic_emoji_symbol_dark_20.xml diff --git a/res/drawable/ic_emoji_symbol_light_20.xml b/app/src/main/res/drawable/ic_emoji_symbol_light_20.xml similarity index 100% rename from res/drawable/ic_emoji_symbol_light_20.xml rename to app/src/main/res/drawable/ic_emoji_symbol_light_20.xml diff --git a/res/drawable/ic_emoji_travel_dark_20.xml b/app/src/main/res/drawable/ic_emoji_travel_dark_20.xml similarity index 100% rename from res/drawable/ic_emoji_travel_dark_20.xml rename to app/src/main/res/drawable/ic_emoji_travel_dark_20.xml diff --git a/res/drawable/ic_emoji_travel_light_20.xml b/app/src/main/res/drawable/ic_emoji_travel_light_20.xml similarity index 100% rename from res/drawable/ic_emoji_travel_light_20.xml rename to app/src/main/res/drawable/ic_emoji_travel_light_20.xml diff --git a/res/drawable/ic_forward_outline_24.xml b/app/src/main/res/drawable/ic_forward_outline_24.xml similarity index 100% rename from res/drawable/ic_forward_outline_24.xml rename to app/src/main/res/drawable/ic_forward_outline_24.xml diff --git a/res/drawable/ic_forward_solid_24.xml b/app/src/main/res/drawable/ic_forward_solid_24.xml similarity index 100% rename from res/drawable/ic_forward_solid_24.xml rename to app/src/main/res/drawable/ic_forward_solid_24.xml diff --git a/res/drawable/ic_grid_outline_20.xml b/app/src/main/res/drawable/ic_grid_outline_20.xml similarity index 100% rename from res/drawable/ic_grid_outline_20.xml rename to app/src/main/res/drawable/ic_grid_outline_20.xml diff --git a/res/drawable/ic_grid_solid_20.xml b/app/src/main/res/drawable/ic_grid_solid_20.xml similarity index 100% rename from res/drawable/ic_grid_solid_20.xml rename to app/src/main/res/drawable/ic_grid_solid_20.xml diff --git a/res/drawable/ic_group_large.xml b/app/src/main/res/drawable/ic_group_large.xml similarity index 100% rename from res/drawable/ic_group_large.xml rename to app/src/main/res/drawable/ic_group_large.xml diff --git a/res/drawable/ic_group_outline_20.xml b/app/src/main/res/drawable/ic_group_outline_20.xml similarity index 100% rename from res/drawable/ic_group_outline_20.xml rename to app/src/main/res/drawable/ic_group_outline_20.xml diff --git a/res/drawable/ic_group_outline_24.xml b/app/src/main/res/drawable/ic_group_outline_24.xml similarity index 100% rename from res/drawable/ic_group_outline_24.xml rename to app/src/main/res/drawable/ic_group_outline_24.xml diff --git a/res/drawable/ic_group_outline_40.xml b/app/src/main/res/drawable/ic_group_outline_40.xml similarity index 100% rename from res/drawable/ic_group_outline_40.xml rename to app/src/main/res/drawable/ic_group_outline_40.xml diff --git a/res/drawable/ic_group_solid_24.xml b/app/src/main/res/drawable/ic_group_solid_24.xml similarity index 100% rename from res/drawable/ic_group_solid_24.xml rename to app/src/main/res/drawable/ic_group_solid_24.xml diff --git a/res/drawable/ic_group_solid_highlight_24.xml b/app/src/main/res/drawable/ic_group_solid_highlight_24.xml similarity index 100% rename from res/drawable/ic_group_solid_highlight_24.xml rename to app/src/main/res/drawable/ic_group_solid_highlight_24.xml diff --git a/res/drawable/ic_info_outline_message_details_24.xml b/app/src/main/res/drawable/ic_info_outline_message_details_24.xml similarity index 100% rename from res/drawable/ic_info_outline_message_details_24.xml rename to app/src/main/res/drawable/ic_info_outline_message_details_24.xml diff --git a/res/drawable/ic_info_solid_24.xml b/app/src/main/res/drawable/ic_info_solid_24.xml similarity index 100% rename from res/drawable/ic_info_solid_24.xml rename to app/src/main/res/drawable/ic_info_solid_24.xml diff --git a/res/drawable/ic_invite_28dp.xml b/app/src/main/res/drawable/ic_invite_28dp.xml similarity index 100% rename from res/drawable/ic_invite_28dp.xml rename to app/src/main/res/drawable/ic_invite_28dp.xml diff --git a/res/drawable/ic_invite_circle.xml b/app/src/main/res/drawable/ic_invite_circle.xml similarity index 100% rename from res/drawable/ic_invite_circle.xml rename to app/src/main/res/drawable/ic_invite_circle.xml diff --git a/res/drawable/ic_keyboard_outline_24.xml b/app/src/main/res/drawable/ic_keyboard_outline_24.xml similarity index 100% rename from res/drawable/ic_keyboard_outline_24.xml rename to app/src/main/res/drawable/ic_keyboard_outline_24.xml diff --git a/res/drawable/ic_keyboard_outline_contact_filter_24.xml b/app/src/main/res/drawable/ic_keyboard_outline_contact_filter_24.xml similarity index 100% rename from res/drawable/ic_keyboard_outline_contact_filter_24.xml rename to app/src/main/res/drawable/ic_keyboard_outline_contact_filter_24.xml diff --git a/res/drawable/ic_keyboard_solid_24.xml b/app/src/main/res/drawable/ic_keyboard_solid_24.xml similarity index 100% rename from res/drawable/ic_keyboard_solid_24.xml rename to app/src/main/res/drawable/ic_keyboard_solid_24.xml diff --git a/res/drawable/ic_keyboard_solid_contact_filter_24.xml b/app/src/main/res/drawable/ic_keyboard_solid_contact_filter_24.xml similarity index 100% rename from res/drawable/ic_keyboard_solid_contact_filter_24.xml rename to app/src/main/res/drawable/ic_keyboard_solid_contact_filter_24.xml diff --git a/res/drawable/ic_linked_devices_24.xml b/app/src/main/res/drawable/ic_linked_devices_24.xml similarity index 100% rename from res/drawable/ic_linked_devices_24.xml rename to app/src/main/res/drawable/ic_linked_devices_24.xml diff --git a/res/drawable/ic_list_outline_20.xml b/app/src/main/res/drawable/ic_list_outline_20.xml similarity index 100% rename from res/drawable/ic_list_outline_20.xml rename to app/src/main/res/drawable/ic_list_outline_20.xml diff --git a/res/drawable/ic_list_solid_20.xml b/app/src/main/res/drawable/ic_list_solid_20.xml similarity index 100% rename from res/drawable/ic_list_solid_20.xml rename to app/src/main/res/drawable/ic_list_solid_20.xml diff --git a/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml similarity index 100% rename from res/drawable/ic_lock.xml rename to app/src/main/res/drawable/ic_lock.xml diff --git a/res/drawable/ic_lock_outline_24.xml b/app/src/main/res/drawable/ic_lock_outline_24.xml similarity index 100% rename from res/drawable/ic_lock_outline_24.xml rename to app/src/main/res/drawable/ic_lock_outline_24.xml diff --git a/res/drawable/ic_lock_solid_24.xml b/app/src/main/res/drawable/ic_lock_solid_24.xml similarity index 100% rename from res/drawable/ic_lock_solid_24.xml rename to app/src/main/res/drawable/ic_lock_solid_24.xml diff --git a/res/drawable/ic_map_marker.xml b/app/src/main/res/drawable/ic_map_marker.xml similarity index 100% rename from res/drawable/ic_map_marker.xml rename to app/src/main/res/drawable/ic_map_marker.xml diff --git a/res/drawable/ic_message_outline_tinted_24.xml b/app/src/main/res/drawable/ic_message_outline_tinted_24.xml similarity index 100% rename from res/drawable/ic_message_outline_tinted_24.xml rename to app/src/main/res/drawable/ic_message_outline_tinted_24.xml diff --git a/res/drawable/ic_message_solid_tinted_24.xml b/app/src/main/res/drawable/ic_message_solid_tinted_24.xml similarity index 100% rename from res/drawable/ic_message_solid_tinted_24.xml rename to app/src/main/res/drawable/ic_message_solid_tinted_24.xml diff --git a/res/drawable/ic_mic_outline_24.xml b/app/src/main/res/drawable/ic_mic_outline_24.xml similarity index 100% rename from res/drawable/ic_mic_outline_24.xml rename to app/src/main/res/drawable/ic_mic_outline_24.xml diff --git a/res/drawable/ic_mic_solid_24.xml b/app/src/main/res/drawable/ic_mic_solid_24.xml similarity index 100% rename from res/drawable/ic_mic_solid_24.xml rename to app/src/main/res/drawable/ic_mic_solid_24.xml diff --git a/res/drawable/ic_more_vert_24.xml b/app/src/main/res/drawable/ic_more_vert_24.xml similarity index 100% rename from res/drawable/ic_more_vert_24.xml rename to app/src/main/res/drawable/ic_more_vert_24.xml diff --git a/res/drawable/ic_more_vert_conversation_24.xml b/app/src/main/res/drawable/ic_more_vert_conversation_24.xml similarity index 100% rename from res/drawable/ic_more_vert_conversation_24.xml rename to app/src/main/res/drawable/ic_more_vert_conversation_24.xml diff --git a/res/drawable/ic_number_pad_conversation_filter_24.xml b/app/src/main/res/drawable/ic_number_pad_conversation_filter_24.xml similarity index 100% rename from res/drawable/ic_number_pad_conversation_filter_24.xml rename to app/src/main/res/drawable/ic_number_pad_conversation_filter_24.xml diff --git a/res/drawable/ic_person_large.xml b/app/src/main/res/drawable/ic_person_large.xml similarity index 100% rename from res/drawable/ic_person_large.xml rename to app/src/main/res/drawable/ic_person_large.xml diff --git a/res/drawable/ic_phone_right_solid_24.xml b/app/src/main/res/drawable/ic_phone_right_solid_24.xml similarity index 100% rename from res/drawable/ic_phone_right_solid_24.xml rename to app/src/main/res/drawable/ic_phone_right_solid_24.xml diff --git a/res/drawable/ic_phone_right_unlock_solid_24.xml b/app/src/main/res/drawable/ic_phone_right_unlock_solid_24.xml similarity index 100% rename from res/drawable/ic_phone_right_unlock_solid_24.xml rename to app/src/main/res/drawable/ic_phone_right_unlock_solid_24.xml diff --git a/res/drawable/ic_photo_outline_24.xml b/app/src/main/res/drawable/ic_photo_outline_24.xml similarity index 100% rename from res/drawable/ic_photo_outline_24.xml rename to app/src/main/res/drawable/ic_photo_outline_24.xml diff --git a/res/drawable/ic_photo_solid_24.xml b/app/src/main/res/drawable/ic_photo_solid_24.xml similarity index 100% rename from res/drawable/ic_photo_solid_24.xml rename to app/src/main/res/drawable/ic_photo_solid_24.xml diff --git a/res/drawable/ic_play_outline_24.xml b/app/src/main/res/drawable/ic_play_outline_24.xml similarity index 100% rename from res/drawable/ic_play_outline_24.xml rename to app/src/main/res/drawable/ic_play_outline_24.xml diff --git a/res/drawable/ic_play_solid_24.xml b/app/src/main/res/drawable/ic_play_solid_24.xml similarity index 100% rename from res/drawable/ic_play_solid_24.xml rename to app/src/main/res/drawable/ic_play_solid_24.xml diff --git a/res/drawable/ic_plus_24.xml b/app/src/main/res/drawable/ic_plus_24.xml similarity index 100% rename from res/drawable/ic_plus_24.xml rename to app/src/main/res/drawable/ic_plus_24.xml diff --git a/res/drawable/ic_profile_outline_20.xml b/app/src/main/res/drawable/ic_profile_outline_20.xml similarity index 100% rename from res/drawable/ic_profile_outline_20.xml rename to app/src/main/res/drawable/ic_profile_outline_20.xml diff --git a/res/drawable/ic_profile_outline_40.xml b/app/src/main/res/drawable/ic_profile_outline_40.xml similarity index 100% rename from res/drawable/ic_profile_outline_40.xml rename to app/src/main/res/drawable/ic_profile_outline_40.xml diff --git a/res/drawable/ic_recent_dark_20.xml b/app/src/main/res/drawable/ic_recent_dark_20.xml similarity index 100% rename from res/drawable/ic_recent_dark_20.xml rename to app/src/main/res/drawable/ic_recent_dark_20.xml diff --git a/res/drawable/ic_recent_light_20.xml b/app/src/main/res/drawable/ic_recent_light_20.xml similarity index 100% rename from res/drawable/ic_recent_light_20.xml rename to app/src/main/res/drawable/ic_recent_light_20.xml diff --git a/res/drawable/ic_reply_outline_24.xml b/app/src/main/res/drawable/ic_reply_outline_24.xml similarity index 100% rename from res/drawable/ic_reply_outline_24.xml rename to app/src/main/res/drawable/ic_reply_outline_24.xml diff --git a/res/drawable/ic_reply_solid_24.xml b/app/src/main/res/drawable/ic_reply_solid_24.xml similarity index 100% rename from res/drawable/ic_reply_solid_24.xml rename to app/src/main/res/drawable/ic_reply_solid_24.xml diff --git a/res/drawable/ic_safety_number_outline_24.xml b/app/src/main/res/drawable/ic_safety_number_outline_24.xml similarity index 100% rename from res/drawable/ic_safety_number_outline_24.xml rename to app/src/main/res/drawable/ic_safety_number_outline_24.xml diff --git a/res/drawable/ic_safety_number_solid_24.xml b/app/src/main/res/drawable/ic_safety_number_solid_24.xml similarity index 100% rename from res/drawable/ic_safety_number_solid_24.xml rename to app/src/main/res/drawable/ic_safety_number_solid_24.xml diff --git a/res/drawable/ic_save_24.xml b/app/src/main/res/drawable/ic_save_24.xml similarity index 100% rename from res/drawable/ic_save_24.xml rename to app/src/main/res/drawable/ic_save_24.xml diff --git a/res/drawable/ic_search_24.xml b/app/src/main/res/drawable/ic_search_24.xml similarity index 100% rename from res/drawable/ic_search_24.xml rename to app/src/main/res/drawable/ic_search_24.xml diff --git a/res/drawable/ic_search_conversation_24.xml b/app/src/main/res/drawable/ic_search_conversation_24.xml similarity index 100% rename from res/drawable/ic_search_conversation_24.xml rename to app/src/main/res/drawable/ic_search_conversation_24.xml diff --git a/res/drawable/ic_select_24.xml b/app/src/main/res/drawable/ic_select_24.xml similarity index 100% rename from res/drawable/ic_select_24.xml rename to app/src/main/res/drawable/ic_select_24.xml diff --git a/res/drawable/ic_send_lock_24.xml b/app/src/main/res/drawable/ic_send_lock_24.xml similarity index 100% rename from res/drawable/ic_send_lock_24.xml rename to app/src/main/res/drawable/ic_send_lock_24.xml diff --git a/res/drawable/ic_send_unlock_24.xml b/app/src/main/res/drawable/ic_send_unlock_24.xml similarity index 100% rename from res/drawable/ic_send_unlock_24.xml rename to app/src/main/res/drawable/ic_send_unlock_24.xml diff --git a/res/drawable/ic_share_outline_24.xml b/app/src/main/res/drawable/ic_share_outline_24.xml similarity index 100% rename from res/drawable/ic_share_outline_24.xml rename to app/src/main/res/drawable/ic_share_outline_24.xml diff --git a/res/drawable/ic_share_solid_24.xml b/app/src/main/res/drawable/ic_share_solid_24.xml similarity index 100% rename from res/drawable/ic_share_solid_24.xml rename to app/src/main/res/drawable/ic_share_solid_24.xml diff --git a/res/drawable/ic_sticker_outline_24.xml b/app/src/main/res/drawable/ic_sticker_outline_24.xml similarity index 100% rename from res/drawable/ic_sticker_outline_24.xml rename to app/src/main/res/drawable/ic_sticker_outline_24.xml diff --git a/res/drawable/ic_sticker_solid_24.xml b/app/src/main/res/drawable/ic_sticker_solid_24.xml similarity index 100% rename from res/drawable/ic_sticker_solid_24.xml rename to app/src/main/res/drawable/ic_sticker_solid_24.xml diff --git a/res/drawable/ic_sticker_splash_24.xml b/app/src/main/res/drawable/ic_sticker_splash_24.xml similarity index 100% rename from res/drawable/ic_sticker_splash_24.xml rename to app/src/main/res/drawable/ic_sticker_splash_24.xml diff --git a/res/drawable/ic_timer_00_12.xml b/app/src/main/res/drawable/ic_timer_00_12.xml similarity index 100% rename from res/drawable/ic_timer_00_12.xml rename to app/src/main/res/drawable/ic_timer_00_12.xml diff --git a/res/drawable/ic_timer_05_12.xml b/app/src/main/res/drawable/ic_timer_05_12.xml similarity index 100% rename from res/drawable/ic_timer_05_12.xml rename to app/src/main/res/drawable/ic_timer_05_12.xml diff --git a/res/drawable/ic_timer_10_12.xml b/app/src/main/res/drawable/ic_timer_10_12.xml similarity index 100% rename from res/drawable/ic_timer_10_12.xml rename to app/src/main/res/drawable/ic_timer_10_12.xml diff --git a/res/drawable/ic_timer_15_12.xml b/app/src/main/res/drawable/ic_timer_15_12.xml similarity index 100% rename from res/drawable/ic_timer_15_12.xml rename to app/src/main/res/drawable/ic_timer_15_12.xml diff --git a/res/drawable/ic_timer_20_12.xml b/app/src/main/res/drawable/ic_timer_20_12.xml similarity index 100% rename from res/drawable/ic_timer_20_12.xml rename to app/src/main/res/drawable/ic_timer_20_12.xml diff --git a/res/drawable/ic_timer_24.xml b/app/src/main/res/drawable/ic_timer_24.xml similarity index 100% rename from res/drawable/ic_timer_24.xml rename to app/src/main/res/drawable/ic_timer_24.xml diff --git a/res/drawable/ic_timer_25_12.xml b/app/src/main/res/drawable/ic_timer_25_12.xml similarity index 100% rename from res/drawable/ic_timer_25_12.xml rename to app/src/main/res/drawable/ic_timer_25_12.xml diff --git a/res/drawable/ic_timer_30_12.xml b/app/src/main/res/drawable/ic_timer_30_12.xml similarity index 100% rename from res/drawable/ic_timer_30_12.xml rename to app/src/main/res/drawable/ic_timer_30_12.xml diff --git a/res/drawable/ic_timer_35_12.xml b/app/src/main/res/drawable/ic_timer_35_12.xml similarity index 100% rename from res/drawable/ic_timer_35_12.xml rename to app/src/main/res/drawable/ic_timer_35_12.xml diff --git a/res/drawable/ic_timer_40_12.xml b/app/src/main/res/drawable/ic_timer_40_12.xml similarity index 100% rename from res/drawable/ic_timer_40_12.xml rename to app/src/main/res/drawable/ic_timer_40_12.xml diff --git a/res/drawable/ic_timer_45_12.xml b/app/src/main/res/drawable/ic_timer_45_12.xml similarity index 100% rename from res/drawable/ic_timer_45_12.xml rename to app/src/main/res/drawable/ic_timer_45_12.xml diff --git a/res/drawable/ic_timer_50_12.xml b/app/src/main/res/drawable/ic_timer_50_12.xml similarity index 100% rename from res/drawable/ic_timer_50_12.xml rename to app/src/main/res/drawable/ic_timer_50_12.xml diff --git a/res/drawable/ic_timer_55_12.xml b/app/src/main/res/drawable/ic_timer_55_12.xml similarity index 100% rename from res/drawable/ic_timer_55_12.xml rename to app/src/main/res/drawable/ic_timer_55_12.xml diff --git a/res/drawable/ic_timer_60_12.xml b/app/src/main/res/drawable/ic_timer_60_12.xml similarity index 100% rename from res/drawable/ic_timer_60_12.xml rename to app/src/main/res/drawable/ic_timer_60_12.xml diff --git a/res/drawable/ic_timer_conversation_24.xml b/app/src/main/res/drawable/ic_timer_conversation_24.xml similarity index 100% rename from res/drawable/ic_timer_conversation_24.xml rename to app/src/main/res/drawable/ic_timer_conversation_24.xml diff --git a/res/drawable/ic_timer_disabled_24.xml b/app/src/main/res/drawable/ic_timer_disabled_24.xml similarity index 100% rename from res/drawable/ic_timer_disabled_24.xml rename to app/src/main/res/drawable/ic_timer_disabled_24.xml diff --git a/res/drawable/ic_trash_outline_24.xml b/app/src/main/res/drawable/ic_trash_outline_24.xml similarity index 100% rename from res/drawable/ic_trash_outline_24.xml rename to app/src/main/res/drawable/ic_trash_outline_24.xml diff --git a/res/drawable/ic_trash_solid_24.xml b/app/src/main/res/drawable/ic_trash_solid_24.xml similarity index 100% rename from res/drawable/ic_trash_solid_24.xml rename to app/src/main/res/drawable/ic_trash_solid_24.xml diff --git a/res/drawable/ic_triangle_down.xml b/app/src/main/res/drawable/ic_triangle_down.xml similarity index 100% rename from res/drawable/ic_triangle_down.xml rename to app/src/main/res/drawable/ic_triangle_down.xml diff --git a/res/drawable/ic_triangle_left.xml b/app/src/main/res/drawable/ic_triangle_left.xml similarity index 100% rename from res/drawable/ic_triangle_left.xml rename to app/src/main/res/drawable/ic_triangle_left.xml diff --git a/res/drawable/ic_triangle_right.xml b/app/src/main/res/drawable/ic_triangle_right.xml similarity index 100% rename from res/drawable/ic_triangle_right.xml rename to app/src/main/res/drawable/ic_triangle_right.xml diff --git a/res/drawable/ic_triangle_up.xml b/app/src/main/res/drawable/ic_triangle_up.xml similarity index 100% rename from res/drawable/ic_triangle_up.xml rename to app/src/main/res/drawable/ic_triangle_up.xml diff --git a/res/drawable/ic_video_solid_24.xml b/app/src/main/res/drawable/ic_video_solid_24.xml similarity index 100% rename from res/drawable/ic_video_solid_24.xml rename to app/src/main/res/drawable/ic_video_solid_24.xml diff --git a/res/drawable/ic_video_solid_24_tinted.xml b/app/src/main/res/drawable/ic_video_solid_24_tinted.xml similarity index 100% rename from res/drawable/ic_video_solid_24_tinted.xml rename to app/src/main/res/drawable/ic_video_solid_24_tinted.xml diff --git a/res/drawable/ic_view_stream_24.xml b/app/src/main/res/drawable/ic_view_stream_24.xml similarity index 100% rename from res/drawable/ic_view_stream_24.xml rename to app/src/main/res/drawable/ic_view_stream_24.xml diff --git a/res/drawable/ic_x.xml b/app/src/main/res/drawable/ic_x.xml similarity index 100% rename from res/drawable/ic_x.xml rename to app/src/main/res/drawable/ic_x.xml diff --git a/res/drawable/ic_x_20.xml b/app/src/main/res/drawable/ic_x_20.xml similarity index 100% rename from res/drawable/ic_x_20.xml rename to app/src/main/res/drawable/ic_x_20.xml diff --git a/res/drawable/ic_x_conversation.xml b/app/src/main/res/drawable/ic_x_conversation.xml similarity index 100% rename from res/drawable/ic_x_conversation.xml rename to app/src/main/res/drawable/ic_x_conversation.xml diff --git a/res/drawable/ic_x_conversation_20.xml b/app/src/main/res/drawable/ic_x_conversation_20.xml similarity index 100% rename from res/drawable/ic_x_conversation_20.xml rename to app/src/main/res/drawable/ic_x_conversation_20.xml diff --git a/res/drawable/ic_x_conversation_filter_24.xml b/app/src/main/res/drawable/ic_x_conversation_filter_24.xml similarity index 100% rename from res/drawable/ic_x_conversation_filter_24.xml rename to app/src/main/res/drawable/ic_x_conversation_filter_24.xml diff --git a/res/drawable/ic_x_tinted.xml b/app/src/main/res/drawable/ic_x_tinted.xml similarity index 100% rename from res/drawable/ic_x_tinted.xml rename to app/src/main/res/drawable/ic_x_tinted.xml diff --git a/res/drawable/image_preview_shade.xml b/app/src/main/res/drawable/image_preview_shade.xml similarity index 100% rename from res/drawable/image_preview_shade.xml rename to app/src/main/res/drawable/image_preview_shade.xml diff --git a/res/drawable/image_shade.xml b/app/src/main/res/drawable/image_shade.xml similarity index 100% rename from res/drawable/image_shade.xml rename to app/src/main/res/drawable/image_shade.xml diff --git a/res/drawable/import_export_item_background_dark.xml b/app/src/main/res/drawable/import_export_item_background_dark.xml similarity index 100% rename from res/drawable/import_export_item_background_dark.xml rename to app/src/main/res/drawable/import_export_item_background_dark.xml diff --git a/res/drawable/import_export_item_background_light.xml b/app/src/main/res/drawable/import_export_item_background_light.xml similarity index 100% rename from res/drawable/import_export_item_background_light.xml rename to app/src/main/res/drawable/import_export_item_background_light.xml diff --git a/res/drawable/info_round.xml b/app/src/main/res/drawable/info_round.xml similarity index 100% rename from res/drawable/info_round.xml rename to app/src/main/res/drawable/info_round.xml diff --git a/res/drawable/insights_cta_button_background.xml b/app/src/main/res/drawable/insights_cta_button_background.xml similarity index 100% rename from res/drawable/insights_cta_button_background.xml rename to app/src/main/res/drawable/insights_cta_button_background.xml diff --git a/res/drawable/insights_modal_background.xml b/app/src/main/res/drawable/insights_modal_background.xml similarity index 100% rename from res/drawable/insights_modal_background.xml rename to app/src/main/res/drawable/insights_modal_background.xml diff --git a/res/drawable/insights_modal_background_dark.xml b/app/src/main/res/drawable/insights_modal_background_dark.xml similarity index 100% rename from res/drawable/insights_modal_background_dark.xml rename to app/src/main/res/drawable/insights_modal_background_dark.xml diff --git a/res/drawable/invite_edit_text_background_dark.xml b/app/src/main/res/drawable/invite_edit_text_background_dark.xml similarity index 100% rename from res/drawable/invite_edit_text_background_dark.xml rename to app/src/main/res/drawable/invite_edit_text_background_dark.xml diff --git a/res/drawable/invite_edit_text_background_light.xml b/app/src/main/res/drawable/invite_edit_text_background_light.xml similarity index 100% rename from res/drawable/invite_edit_text_background_light.xml rename to app/src/main/res/drawable/invite_edit_text_background_light.xml diff --git a/res/drawable/labeled_edit_text_background_active.xml b/app/src/main/res/drawable/labeled_edit_text_background_active.xml similarity index 100% rename from res/drawable/labeled_edit_text_background_active.xml rename to app/src/main/res/drawable/labeled_edit_text_background_active.xml diff --git a/res/drawable/labeled_edit_text_background_inactive.xml b/app/src/main/res/drawable/labeled_edit_text_background_inactive.xml similarity index 100% rename from res/drawable/labeled_edit_text_background_inactive.xml rename to app/src/main/res/drawable/labeled_edit_text_background_inactive.xml diff --git a/res/drawable/media_camera_button_background.xml b/app/src/main/res/drawable/media_camera_button_background.xml similarity index 100% rename from res/drawable/media_camera_button_background.xml rename to app/src/main/res/drawable/media_camera_button_background.xml diff --git a/res/drawable/media_continue_button_background.xml b/app/src/main/res/drawable/media_continue_button_background.xml similarity index 100% rename from res/drawable/media_continue_button_background.xml rename to app/src/main/res/drawable/media_continue_button_background.xml diff --git a/res/drawable/media_count_button_background.xml b/app/src/main/res/drawable/media_count_button_background.xml similarity index 100% rename from res/drawable/media_count_button_background.xml rename to app/src/main/res/drawable/media_count_button_background.xml diff --git a/res/drawable/media_count_number_background.xml b/app/src/main/res/drawable/media_count_number_background.xml similarity index 100% rename from res/drawable/media_count_number_background.xml rename to app/src/main/res/drawable/media_count_number_background.xml diff --git a/res/drawable/media_keyboard_selected_background_dark.xml b/app/src/main/res/drawable/media_keyboard_selected_background_dark.xml similarity index 100% rename from res/drawable/media_keyboard_selected_background_dark.xml rename to app/src/main/res/drawable/media_keyboard_selected_background_dark.xml diff --git a/res/drawable/media_keyboard_selected_background_light.xml b/app/src/main/res/drawable/media_keyboard_selected_background_light.xml similarity index 100% rename from res/drawable/media_keyboard_selected_background_light.xml rename to app/src/main/res/drawable/media_keyboard_selected_background_light.xml diff --git a/res/drawable/media_overview_size_pill_background.xml b/app/src/main/res/drawable/media_overview_size_pill_background.xml similarity index 100% rename from res/drawable/media_overview_size_pill_background.xml rename to app/src/main/res/drawable/media_overview_size_pill_background.xml diff --git a/res/drawable/mediapicker_item_border_dark.xml b/app/src/main/res/drawable/mediapicker_item_border_dark.xml similarity index 100% rename from res/drawable/mediapicker_item_border_dark.xml rename to app/src/main/res/drawable/mediapicker_item_border_dark.xml diff --git a/res/drawable/mediapicker_item_border_light.xml b/app/src/main/res/drawable/mediapicker_item_border_light.xml similarity index 100% rename from res/drawable/mediapicker_item_border_light.xml rename to app/src/main/res/drawable/mediapicker_item_border_light.xml diff --git a/res/drawable/mediarail_button_background.xml b/app/src/main/res/drawable/mediarail_button_background.xml similarity index 100% rename from res/drawable/mediarail_button_background.xml rename to app/src/main/res/drawable/mediarail_button_background.xml diff --git a/res/drawable/mediarail_media_outline.xml b/app/src/main/res/drawable/mediarail_media_outline.xml similarity index 100% rename from res/drawable/mediarail_media_outline.xml rename to app/src/main/res/drawable/mediarail_media_outline.xml diff --git a/res/drawable/message_bubble_background.xml b/app/src/main/res/drawable/message_bubble_background.xml similarity index 100% rename from res/drawable/message_bubble_background.xml rename to app/src/main/res/drawable/message_bubble_background.xml diff --git a/res/drawable/message_bubble_background_received_alone.xml b/app/src/main/res/drawable/message_bubble_background_received_alone.xml similarity index 100% rename from res/drawable/message_bubble_background_received_alone.xml rename to app/src/main/res/drawable/message_bubble_background_received_alone.xml diff --git a/res/drawable/message_bubble_background_received_end.xml b/app/src/main/res/drawable/message_bubble_background_received_end.xml similarity index 100% rename from res/drawable/message_bubble_background_received_end.xml rename to app/src/main/res/drawable/message_bubble_background_received_end.xml diff --git a/res/drawable/message_bubble_background_received_middle.xml b/app/src/main/res/drawable/message_bubble_background_received_middle.xml similarity index 100% rename from res/drawable/message_bubble_background_received_middle.xml rename to app/src/main/res/drawable/message_bubble_background_received_middle.xml diff --git a/res/drawable/message_bubble_background_received_start.xml b/app/src/main/res/drawable/message_bubble_background_received_start.xml similarity index 100% rename from res/drawable/message_bubble_background_received_start.xml rename to app/src/main/res/drawable/message_bubble_background_received_start.xml diff --git a/res/drawable/message_bubble_background_sent_alone.xml b/app/src/main/res/drawable/message_bubble_background_sent_alone.xml similarity index 100% rename from res/drawable/message_bubble_background_sent_alone.xml rename to app/src/main/res/drawable/message_bubble_background_sent_alone.xml diff --git a/res/drawable/message_bubble_background_sent_end.xml b/app/src/main/res/drawable/message_bubble_background_sent_end.xml similarity index 100% rename from res/drawable/message_bubble_background_sent_end.xml rename to app/src/main/res/drawable/message_bubble_background_sent_end.xml diff --git a/res/drawable/message_bubble_background_sent_middle.xml b/app/src/main/res/drawable/message_bubble_background_sent_middle.xml similarity index 100% rename from res/drawable/message_bubble_background_sent_middle.xml rename to app/src/main/res/drawable/message_bubble_background_sent_middle.xml diff --git a/res/drawable/message_bubble_background_sent_start.xml b/app/src/main/res/drawable/message_bubble_background_sent_start.xml similarity index 100% rename from res/drawable/message_bubble_background_sent_start.xml rename to app/src/main/res/drawable/message_bubble_background_sent_start.xml diff --git a/res/drawable/message_request_button_background_dark.xml b/app/src/main/res/drawable/message_request_button_background_dark.xml similarity index 100% rename from res/drawable/message_request_button_background_dark.xml rename to app/src/main/res/drawable/message_request_button_background_dark.xml diff --git a/res/drawable/message_request_button_background_light.xml b/app/src/main/res/drawable/message_request_button_background_light.xml similarity index 100% rename from res/drawable/message_request_button_background_light.xml rename to app/src/main/res/drawable/message_request_button_background_light.xml diff --git a/res/drawable/pause_icon.xml b/app/src/main/res/drawable/pause_icon.xml similarity index 100% rename from res/drawable/pause_icon.xml rename to app/src/main/res/drawable/pause_icon.xml diff --git a/res/drawable/permission_rationale_dialog_corners.xml b/app/src/main/res/drawable/permission_rationale_dialog_corners.xml similarity index 100% rename from res/drawable/permission_rationale_dialog_corners.xml rename to app/src/main/res/drawable/permission_rationale_dialog_corners.xml diff --git a/res/drawable/pill.xml b/app/src/main/res/drawable/pill.xml similarity index 100% rename from res/drawable/pill.xml rename to app/src/main/res/drawable/pill.xml diff --git a/res/drawable/play_icon.xml b/app/src/main/res/drawable/play_icon.xml similarity index 100% rename from res/drawable/play_icon.xml rename to app/src/main/res/drawable/play_icon.xml diff --git a/res/drawable/preference_divider_dark.xml b/app/src/main/res/drawable/preference_divider_dark.xml similarity index 100% rename from res/drawable/preference_divider_dark.xml rename to app/src/main/res/drawable/preference_divider_dark.xml diff --git a/res/drawable/preference_divider_light.xml b/app/src/main/res/drawable/preference_divider_light.xml similarity index 100% rename from res/drawable/preference_divider_light.xml rename to app/src/main/res/drawable/preference_divider_light.xml diff --git a/res/drawable/progress_button_state.xml b/app/src/main/res/drawable/progress_button_state.xml similarity index 100% rename from res/drawable/progress_button_state.xml rename to app/src/main/res/drawable/progress_button_state.xml diff --git a/res/drawable/progress_button_state_grey.xml b/app/src/main/res/drawable/progress_button_state_grey.xml similarity index 100% rename from res/drawable/progress_button_state_grey.xml rename to app/src/main/res/drawable/progress_button_state_grey.xml diff --git a/res/drawable/progress_button_state_red.xml b/app/src/main/res/drawable/progress_button_state_red.xml similarity index 100% rename from res/drawable/progress_button_state_red.xml rename to app/src/main/res/drawable/progress_button_state_red.xml diff --git a/res/drawable/qr_code_background.xml b/app/src/main/res/drawable/qr_code_background.xml similarity index 100% rename from res/drawable/qr_code_background.xml rename to app/src/main/res/drawable/qr_code_background.xml diff --git a/res/drawable/reactions_bottom_sheet_dialog_fragment_emoji_item_selected_dark.xml b/app/src/main/res/drawable/reactions_bottom_sheet_dialog_fragment_emoji_item_selected_dark.xml similarity index 100% rename from res/drawable/reactions_bottom_sheet_dialog_fragment_emoji_item_selected_dark.xml rename to app/src/main/res/drawable/reactions_bottom_sheet_dialog_fragment_emoji_item_selected_dark.xml diff --git a/res/drawable/reactions_bottom_sheet_dialog_fragment_emoji_item_selected_light.xml b/app/src/main/res/drawable/reactions_bottom_sheet_dialog_fragment_emoji_item_selected_light.xml similarity index 100% rename from res/drawable/reactions_bottom_sheet_dialog_fragment_emoji_item_selected_light.xml rename to app/src/main/res/drawable/reactions_bottom_sheet_dialog_fragment_emoji_item_selected_light.xml diff --git a/res/drawable/reactions_old_background_dark.xml b/app/src/main/res/drawable/reactions_old_background_dark.xml similarity index 100% rename from res/drawable/reactions_old_background_dark.xml rename to app/src/main/res/drawable/reactions_old_background_dark.xml diff --git a/res/drawable/reactions_recv_background_dark.xml b/app/src/main/res/drawable/reactions_recv_background_dark.xml similarity index 100% rename from res/drawable/reactions_recv_background_dark.xml rename to app/src/main/res/drawable/reactions_recv_background_dark.xml diff --git a/res/drawable/reactions_recv_background_light.xml b/app/src/main/res/drawable/reactions_recv_background_light.xml similarity index 100% rename from res/drawable/reactions_recv_background_light.xml rename to app/src/main/res/drawable/reactions_recv_background_light.xml diff --git a/res/drawable/reactions_send_background_dark.xml b/app/src/main/res/drawable/reactions_send_background_dark.xml similarity index 100% rename from res/drawable/reactions_send_background_dark.xml rename to app/src/main/res/drawable/reactions_send_background_dark.xml diff --git a/res/drawable/reactions_send_background_light.xml b/app/src/main/res/drawable/reactions_send_background_light.xml similarity index 100% rename from res/drawable/reactions_send_background_light.xml rename to app/src/main/res/drawable/reactions_send_background_light.xml diff --git a/res/drawable/read_receipt_vector.xml b/app/src/main/res/drawable/read_receipt_vector.xml similarity index 100% rename from res/drawable/read_receipt_vector.xml rename to app/src/main/res/drawable/read_receipt_vector.xml diff --git a/res/drawable/recipient_preference_scrim_bottom.xml b/app/src/main/res/drawable/recipient_preference_scrim_bottom.xml similarity index 100% rename from res/drawable/recipient_preference_scrim_bottom.xml rename to app/src/main/res/drawable/recipient_preference_scrim_bottom.xml diff --git a/res/drawable/recipient_preference_scrim_top.xml b/app/src/main/res/drawable/recipient_preference_scrim_top.xml similarity index 100% rename from res/drawable/recipient_preference_scrim_top.xml rename to app/src/main/res/drawable/recipient_preference_scrim_top.xml diff --git a/res/drawable/recycler_view_fast_scroller_bubble.xml b/app/src/main/res/drawable/recycler_view_fast_scroller_bubble.xml similarity index 100% rename from res/drawable/recycler_view_fast_scroller_bubble.xml rename to app/src/main/res/drawable/recycler_view_fast_scroller_bubble.xml diff --git a/res/drawable/recycler_view_fast_scroller_handle.xml b/app/src/main/res/drawable/recycler_view_fast_scroller_handle.xml similarity index 100% rename from res/drawable/recycler_view_fast_scroller_handle.xml rename to app/src/main/res/drawable/recycler_view_fast_scroller_handle.xml diff --git a/res/drawable/reminder_background_error.xml b/app/src/main/res/drawable/reminder_background_error.xml similarity index 100% rename from res/drawable/reminder_background_error.xml rename to app/src/main/res/drawable/reminder_background_error.xml diff --git a/res/drawable/reminder_background_normal.xml b/app/src/main/res/drawable/reminder_background_normal.xml similarity index 100% rename from res/drawable/reminder_background_normal.xml rename to app/src/main/res/drawable/reminder_background_normal.xml diff --git a/res/drawable/reminder_progress_ring.xml b/app/src/main/res/drawable/reminder_progress_ring.xml similarity index 100% rename from res/drawable/reminder_progress_ring.xml rename to app/src/main/res/drawable/reminder_progress_ring.xml diff --git a/res/drawable/remove_button_state.xml b/app/src/main/res/drawable/remove_button_state.xml similarity index 100% rename from res/drawable/remove_button_state.xml rename to app/src/main/res/drawable/remove_button_state.xml diff --git a/res/drawable/rounded_rectangle_dark.xml b/app/src/main/res/drawable/rounded_rectangle_dark.xml similarity index 100% rename from res/drawable/rounded_rectangle_dark.xml rename to app/src/main/res/drawable/rounded_rectangle_dark.xml diff --git a/res/drawable/rounded_rectangle_white.xml b/app/src/main/res/drawable/rounded_rectangle_white.xml similarity index 100% rename from res/drawable/rounded_rectangle_white.xml rename to app/src/main/res/drawable/rounded_rectangle_white.xml diff --git a/res/drawable/search_toolbar_shadow.xml b/app/src/main/res/drawable/search_toolbar_shadow.xml similarity index 100% rename from res/drawable/search_toolbar_shadow.xml rename to app/src/main/res/drawable/search_toolbar_shadow.xml diff --git a/res/drawable/sticker_button_dark.xml b/app/src/main/res/drawable/sticker_button_dark.xml similarity index 100% rename from res/drawable/sticker_button_dark.xml rename to app/src/main/res/drawable/sticker_button_dark.xml diff --git a/res/drawable/sticker_button_light.xml b/app/src/main/res/drawable/sticker_button_light.xml similarity index 100% rename from res/drawable/sticker_button_light.xml rename to app/src/main/res/drawable/sticker_button_light.xml diff --git a/res/drawable/sticker_management_empty_background.xml b/app/src/main/res/drawable/sticker_management_empty_background.xml similarity index 100% rename from res/drawable/sticker_management_empty_background.xml rename to app/src/main/res/drawable/sticker_management_empty_background.xml diff --git a/res/drawable/sticker_missing_background_dark.xml b/app/src/main/res/drawable/sticker_missing_background_dark.xml similarity index 100% rename from res/drawable/sticker_missing_background_dark.xml rename to app/src/main/res/drawable/sticker_missing_background_dark.xml diff --git a/res/drawable/sticker_missing_background_light.xml b/app/src/main/res/drawable/sticker_missing_background_light.xml similarity index 100% rename from res/drawable/sticker_missing_background_light.xml rename to app/src/main/res/drawable/sticker_missing_background_light.xml diff --git a/res/drawable/sticky_date_header_background_dark.xml b/app/src/main/res/drawable/sticky_date_header_background_dark.xml similarity index 100% rename from res/drawable/sticky_date_header_background_dark.xml rename to app/src/main/res/drawable/sticky_date_header_background_dark.xml diff --git a/res/drawable/sticky_date_header_background_light.xml b/app/src/main/res/drawable/sticky_date_header_background_light.xml similarity index 100% rename from res/drawable/sticky_date_header_background_light.xml rename to app/src/main/res/drawable/sticky_date_header_background_light.xml diff --git a/res/drawable/storage_legend_audio.xml b/app/src/main/res/drawable/storage_legend_audio.xml similarity index 100% rename from res/drawable/storage_legend_audio.xml rename to app/src/main/res/drawable/storage_legend_audio.xml diff --git a/res/drawable/storage_legend_files.xml b/app/src/main/res/drawable/storage_legend_files.xml similarity index 100% rename from res/drawable/storage_legend_files.xml rename to app/src/main/res/drawable/storage_legend_files.xml diff --git a/res/drawable/storage_legend_photos.xml b/app/src/main/res/drawable/storage_legend_photos.xml similarity index 100% rename from res/drawable/storage_legend_photos.xml rename to app/src/main/res/drawable/storage_legend_photos.xml diff --git a/res/drawable/storage_legend_videos.xml b/app/src/main/res/drawable/storage_legend_videos.xml similarity index 100% rename from res/drawable/storage_legend_videos.xml rename to app/src/main/res/drawable/storage_legend_videos.xml diff --git a/res/drawable/toolbar_shadow.xml b/app/src/main/res/drawable/toolbar_shadow.xml similarity index 100% rename from res/drawable/toolbar_shadow.xml rename to app/src/main/res/drawable/toolbar_shadow.xml diff --git a/res/drawable/tooltip_background.xml b/app/src/main/res/drawable/tooltip_background.xml similarity index 100% rename from res/drawable/tooltip_background.xml rename to app/src/main/res/drawable/tooltip_background.xml diff --git a/res/drawable/touch_highlight_background.xml b/app/src/main/res/drawable/touch_highlight_background.xml similarity index 100% rename from res/drawable/touch_highlight_background.xml rename to app/src/main/res/drawable/touch_highlight_background.xml diff --git a/res/drawable/transfer_controls_background.xml b/app/src/main/res/drawable/transfer_controls_background.xml similarity index 100% rename from res/drawable/transfer_controls_background.xml rename to app/src/main/res/drawable/transfer_controls_background.xml diff --git a/res/drawable/triangle_bottom_right_corner.xml b/app/src/main/res/drawable/triangle_bottom_right_corner.xml similarity index 100% rename from res/drawable/triangle_bottom_right_corner.xml rename to app/src/main/res/drawable/triangle_bottom_right_corner.xml diff --git a/res/drawable/triangle_right.xml b/app/src/main/res/drawable/triangle_right.xml similarity index 100% rename from res/drawable/triangle_right.xml rename to app/src/main/res/drawable/triangle_right.xml diff --git a/res/drawable/unread_count_background_dark.xml b/app/src/main/res/drawable/unread_count_background_dark.xml similarity index 100% rename from res/drawable/unread_count_background_dark.xml rename to app/src/main/res/drawable/unread_count_background_dark.xml diff --git a/res/drawable/unread_count_background_light.xml b/app/src/main/res/drawable/unread_count_background_light.xml similarity index 100% rename from res/drawable/unread_count_background_light.xml rename to app/src/main/res/drawable/unread_count_background_light.xml diff --git a/res/drawable/webrtc_bluetooth_button.xml b/app/src/main/res/drawable/webrtc_bluetooth_button.xml similarity index 100% rename from res/drawable/webrtc_bluetooth_button.xml rename to app/src/main/res/drawable/webrtc_bluetooth_button.xml diff --git a/res/drawable/webrtc_camera_flip_button.xml b/app/src/main/res/drawable/webrtc_camera_flip_button.xml similarity index 100% rename from res/drawable/webrtc_camera_flip_button.xml rename to app/src/main/res/drawable/webrtc_camera_flip_button.xml diff --git a/res/drawable/webrtc_camera_front_button.xml b/app/src/main/res/drawable/webrtc_camera_front_button.xml similarity index 100% rename from res/drawable/webrtc_camera_front_button.xml rename to app/src/main/res/drawable/webrtc_camera_front_button.xml diff --git a/res/drawable/webrtc_camera_rear_button.xml b/app/src/main/res/drawable/webrtc_camera_rear_button.xml similarity index 100% rename from res/drawable/webrtc_camera_rear_button.xml rename to app/src/main/res/drawable/webrtc_camera_rear_button.xml diff --git a/res/drawable/webrtc_control_background.xml b/app/src/main/res/drawable/webrtc_control_background.xml similarity index 100% rename from res/drawable/webrtc_control_background.xml rename to app/src/main/res/drawable/webrtc_control_background.xml diff --git a/res/drawable/webrtc_mute_button.xml b/app/src/main/res/drawable/webrtc_mute_button.xml similarity index 100% rename from res/drawable/webrtc_mute_button.xml rename to app/src/main/res/drawable/webrtc_mute_button.xml diff --git a/res/drawable/webrtc_speaker_button.xml b/app/src/main/res/drawable/webrtc_speaker_button.xml similarity index 100% rename from res/drawable/webrtc_speaker_button.xml rename to app/src/main/res/drawable/webrtc_speaker_button.xml diff --git a/res/drawable/webrtc_video_mute_button.xml b/app/src/main/res/drawable/webrtc_video_mute_button.xml similarity index 100% rename from res/drawable/webrtc_video_mute_button.xml rename to app/src/main/res/drawable/webrtc_video_mute_button.xml diff --git a/res/layout/activity_contact_name_edit.xml b/app/src/main/res/layout/activity_contact_name_edit.xml similarity index 100% rename from res/layout/activity_contact_name_edit.xml rename to app/src/main/res/layout/activity_contact_name_edit.xml diff --git a/res/layout/activity_contact_share_edit.xml b/app/src/main/res/layout/activity_contact_share_edit.xml similarity index 100% rename from res/layout/activity_contact_share_edit.xml rename to app/src/main/res/layout/activity_contact_share_edit.xml diff --git a/res/layout/activity_map_bottom_sheet_view.xml b/app/src/main/res/layout/activity_map_bottom_sheet_view.xml similarity index 100% rename from res/layout/activity_map_bottom_sheet_view.xml rename to app/src/main/res/layout/activity_map_bottom_sheet_view.xml diff --git a/res/layout/activity_place_picker.xml b/app/src/main/res/layout/activity_place_picker.xml similarity index 100% rename from res/layout/activity_place_picker.xml rename to app/src/main/res/layout/activity_place_picker.xml diff --git a/res/layout/activity_registration_navigation.xml b/app/src/main/res/layout/activity_registration_navigation.xml similarity index 100% rename from res/layout/activity_registration_navigation.xml rename to app/src/main/res/layout/activity_registration_navigation.xml diff --git a/res/layout/activity_shared_contact_details.xml b/app/src/main/res/layout/activity_shared_contact_details.xml similarity index 100% rename from res/layout/activity_shared_contact_details.xml rename to app/src/main/res/layout/activity_shared_contact_details.xml diff --git a/res/layout/album_thumbnail_2.xml b/app/src/main/res/layout/album_thumbnail_2.xml similarity index 100% rename from res/layout/album_thumbnail_2.xml rename to app/src/main/res/layout/album_thumbnail_2.xml diff --git a/res/layout/album_thumbnail_3.xml b/app/src/main/res/layout/album_thumbnail_3.xml similarity index 100% rename from res/layout/album_thumbnail_3.xml rename to app/src/main/res/layout/album_thumbnail_3.xml diff --git a/res/layout/album_thumbnail_4.xml b/app/src/main/res/layout/album_thumbnail_4.xml similarity index 100% rename from res/layout/album_thumbnail_4.xml rename to app/src/main/res/layout/album_thumbnail_4.xml diff --git a/res/layout/album_thumbnail_5.xml b/app/src/main/res/layout/album_thumbnail_5.xml similarity index 100% rename from res/layout/album_thumbnail_5.xml rename to app/src/main/res/layout/album_thumbnail_5.xml diff --git a/res/layout/album_thumbnail_many.xml b/app/src/main/res/layout/album_thumbnail_many.xml similarity index 100% rename from res/layout/album_thumbnail_many.xml rename to app/src/main/res/layout/album_thumbnail_many.xml diff --git a/res/layout/album_thumbnail_view.xml b/app/src/main/res/layout/album_thumbnail_view.xml similarity index 100% rename from res/layout/album_thumbnail_view.xml rename to app/src/main/res/layout/album_thumbnail_view.xml diff --git a/res/layout/alert_view.xml b/app/src/main/res/layout/alert_view.xml similarity index 100% rename from res/layout/alert_view.xml rename to app/src/main/res/layout/alert_view.xml diff --git a/res/layout/application_migration_activity.xml b/app/src/main/res/layout/application_migration_activity.xml similarity index 100% rename from res/layout/application_migration_activity.xml rename to app/src/main/res/layout/application_migration_activity.xml diff --git a/res/layout/attachment_type_selector.xml b/app/src/main/res/layout/attachment_type_selector.xml similarity index 100% rename from res/layout/attachment_type_selector.xml rename to app/src/main/res/layout/attachment_type_selector.xml diff --git a/res/layout/audio_view.xml b/app/src/main/res/layout/audio_view.xml similarity index 100% rename from res/layout/audio_view.xml rename to app/src/main/res/layout/audio_view.xml diff --git a/res/layout/audio_view_circle.xml b/app/src/main/res/layout/audio_view_circle.xml similarity index 100% rename from res/layout/audio_view_circle.xml rename to app/src/main/res/layout/audio_view_circle.xml diff --git a/res/layout/audio_view_small.xml b/app/src/main/res/layout/audio_view_small.xml similarity index 100% rename from res/layout/audio_view_small.xml rename to app/src/main/res/layout/audio_view_small.xml diff --git a/res/layout/backup_enable_dialog.xml b/app/src/main/res/layout/backup_enable_dialog.xml similarity index 100% rename from res/layout/backup_enable_dialog.xml rename to app/src/main/res/layout/backup_enable_dialog.xml diff --git a/res/layout/blocked_contact_list_item.xml b/app/src/main/res/layout/blocked_contact_list_item.xml similarity index 100% rename from res/layout/blocked_contact_list_item.xml rename to app/src/main/res/layout/blocked_contact_list_item.xml diff --git a/res/layout/blocked_contacts_fragment.xml b/app/src/main/res/layout/blocked_contacts_fragment.xml similarity index 100% rename from res/layout/blocked_contacts_fragment.xml rename to app/src/main/res/layout/blocked_contacts_fragment.xml diff --git a/res/layout/camera_contact_contact_item.xml b/app/src/main/res/layout/camera_contact_contact_item.xml similarity index 100% rename from res/layout/camera_contact_contact_item.xml rename to app/src/main/res/layout/camera_contact_contact_item.xml diff --git a/res/layout/camera_contact_header_item.xml b/app/src/main/res/layout/camera_contact_header_item.xml similarity index 100% rename from res/layout/camera_contact_header_item.xml rename to app/src/main/res/layout/camera_contact_header_item.xml diff --git a/res/layout/camera_contact_invite_item.xml b/app/src/main/res/layout/camera_contact_invite_item.xml similarity index 100% rename from res/layout/camera_contact_invite_item.xml rename to app/src/main/res/layout/camera_contact_invite_item.xml diff --git a/res/layout/camera_contact_selection_fragment.xml b/app/src/main/res/layout/camera_contact_selection_fragment.xml similarity index 100% rename from res/layout/camera_contact_selection_fragment.xml rename to app/src/main/res/layout/camera_contact_selection_fragment.xml diff --git a/res/layout/camera_contact_selection_item.xml b/app/src/main/res/layout/camera_contact_selection_item.xml similarity index 100% rename from res/layout/camera_contact_selection_item.xml rename to app/src/main/res/layout/camera_contact_selection_item.xml diff --git a/res/layout/camera_controls_landscape.xml b/app/src/main/res/layout/camera_controls_landscape.xml similarity index 100% rename from res/layout/camera_controls_landscape.xml rename to app/src/main/res/layout/camera_controls_landscape.xml diff --git a/res/layout/camera_controls_portrait.xml b/app/src/main/res/layout/camera_controls_portrait.xml similarity index 100% rename from res/layout/camera_controls_portrait.xml rename to app/src/main/res/layout/camera_controls_portrait.xml diff --git a/res/layout/camera_fragment.xml b/app/src/main/res/layout/camera_fragment.xml similarity index 100% rename from res/layout/camera_fragment.xml rename to app/src/main/res/layout/camera_fragment.xml diff --git a/res/layout/camerax_fragment.xml b/app/src/main/res/layout/camerax_fragment.xml similarity index 100% rename from res/layout/camerax_fragment.xml rename to app/src/main/res/layout/camerax_fragment.xml diff --git a/res/layout/change_passphrase_activity.xml b/app/src/main/res/layout/change_passphrase_activity.xml similarity index 100% rename from res/layout/change_passphrase_activity.xml rename to app/src/main/res/layout/change_passphrase_activity.xml diff --git a/res/layout/color_fragment.xml b/app/src/main/res/layout/color_fragment.xml similarity index 100% rename from res/layout/color_fragment.xml rename to app/src/main/res/layout/color_fragment.xml diff --git a/res/layout/contact_filter_toolbar.xml b/app/src/main/res/layout/contact_filter_toolbar.xml similarity index 100% rename from res/layout/contact_filter_toolbar.xml rename to app/src/main/res/layout/contact_filter_toolbar.xml diff --git a/res/layout/contact_selection_activity.xml b/app/src/main/res/layout/contact_selection_activity.xml similarity index 100% rename from res/layout/contact_selection_activity.xml rename to app/src/main/res/layout/contact_selection_activity.xml diff --git a/res/layout/contact_selection_invite_action_item.xml b/app/src/main/res/layout/contact_selection_invite_action_item.xml similarity index 100% rename from res/layout/contact_selection_invite_action_item.xml rename to app/src/main/res/layout/contact_selection_invite_action_item.xml diff --git a/res/layout/contact_selection_list_divider.xml b/app/src/main/res/layout/contact_selection_list_divider.xml similarity index 100% rename from res/layout/contact_selection_list_divider.xml rename to app/src/main/res/layout/contact_selection_list_divider.xml diff --git a/res/layout/contact_selection_list_fragment.xml b/app/src/main/res/layout/contact_selection_list_fragment.xml similarity index 100% rename from res/layout/contact_selection_list_fragment.xml rename to app/src/main/res/layout/contact_selection_list_fragment.xml diff --git a/res/layout/contact_selection_list_item.xml b/app/src/main/res/layout/contact_selection_list_item.xml similarity index 100% rename from res/layout/contact_selection_list_item.xml rename to app/src/main/res/layout/contact_selection_list_item.xml diff --git a/res/layout/contact_selection_recyclerview_header.xml b/app/src/main/res/layout/contact_selection_recyclerview_header.xml similarity index 100% rename from res/layout/contact_selection_recyclerview_header.xml rename to app/src/main/res/layout/contact_selection_recyclerview_header.xml diff --git a/res/layout/conversation_activity.xml b/app/src/main/res/layout/conversation_activity.xml similarity index 100% rename from res/layout/conversation_activity.xml rename to app/src/main/res/layout/conversation_activity.xml diff --git a/res/layout/conversation_activity_attachment_editor_stub.xml b/app/src/main/res/layout/conversation_activity_attachment_editor_stub.xml similarity index 100% rename from res/layout/conversation_activity_attachment_editor_stub.xml rename to app/src/main/res/layout/conversation_activity_attachment_editor_stub.xml diff --git a/res/layout/conversation_activity_emojidrawer_stub.xml b/app/src/main/res/layout/conversation_activity_emojidrawer_stub.xml similarity index 100% rename from res/layout/conversation_activity_emojidrawer_stub.xml rename to app/src/main/res/layout/conversation_activity_emojidrawer_stub.xml diff --git a/res/layout/conversation_activity_group_share_profile_stub.xml b/app/src/main/res/layout/conversation_activity_group_share_profile_stub.xml similarity index 100% rename from res/layout/conversation_activity_group_share_profile_stub.xml rename to app/src/main/res/layout/conversation_activity_group_share_profile_stub.xml diff --git a/res/layout/conversation_activity_reminderview_stub.xml b/app/src/main/res/layout/conversation_activity_reminderview_stub.xml similarity index 100% rename from res/layout/conversation_activity_reminderview_stub.xml rename to app/src/main/res/layout/conversation_activity_reminderview_stub.xml diff --git a/res/layout/conversation_activity_unverified_banner_stub.xml b/app/src/main/res/layout/conversation_activity_unverified_banner_stub.xml similarity index 100% rename from res/layout/conversation_activity_unverified_banner_stub.xml rename to app/src/main/res/layout/conversation_activity_unverified_banner_stub.xml diff --git a/res/layout/conversation_fragment.xml b/app/src/main/res/layout/conversation_fragment.xml similarity index 100% rename from res/layout/conversation_fragment.xml rename to app/src/main/res/layout/conversation_fragment.xml diff --git a/res/layout/conversation_input_panel.xml b/app/src/main/res/layout/conversation_input_panel.xml similarity index 100% rename from res/layout/conversation_input_panel.xml rename to app/src/main/res/layout/conversation_input_panel.xml diff --git a/res/layout/conversation_item_footer.xml b/app/src/main/res/layout/conversation_item_footer.xml similarity index 100% rename from res/layout/conversation_item_footer.xml rename to app/src/main/res/layout/conversation_item_footer.xml diff --git a/res/layout/conversation_item_header.xml b/app/src/main/res/layout/conversation_item_header.xml similarity index 100% rename from res/layout/conversation_item_header.xml rename to app/src/main/res/layout/conversation_item_header.xml diff --git a/res/layout/conversation_item_last_seen.xml b/app/src/main/res/layout/conversation_item_last_seen.xml similarity index 100% rename from res/layout/conversation_item_last_seen.xml rename to app/src/main/res/layout/conversation_item_last_seen.xml diff --git a/res/layout/conversation_item_received.xml b/app/src/main/res/layout/conversation_item_received.xml similarity index 100% rename from res/layout/conversation_item_received.xml rename to app/src/main/res/layout/conversation_item_received.xml diff --git a/res/layout/conversation_item_received_audio.xml b/app/src/main/res/layout/conversation_item_received_audio.xml similarity index 100% rename from res/layout/conversation_item_received_audio.xml rename to app/src/main/res/layout/conversation_item_received_audio.xml diff --git a/res/layout/conversation_item_received_document.xml b/app/src/main/res/layout/conversation_item_received_document.xml similarity index 100% rename from res/layout/conversation_item_received_document.xml rename to app/src/main/res/layout/conversation_item_received_document.xml diff --git a/res/layout/conversation_item_received_link_preview.xml b/app/src/main/res/layout/conversation_item_received_link_preview.xml similarity index 100% rename from res/layout/conversation_item_received_link_preview.xml rename to app/src/main/res/layout/conversation_item_received_link_preview.xml diff --git a/res/layout/conversation_item_received_revealable.xml b/app/src/main/res/layout/conversation_item_received_revealable.xml similarity index 100% rename from res/layout/conversation_item_received_revealable.xml rename to app/src/main/res/layout/conversation_item_received_revealable.xml diff --git a/res/layout/conversation_item_received_shared_contact.xml b/app/src/main/res/layout/conversation_item_received_shared_contact.xml similarity index 100% rename from res/layout/conversation_item_received_shared_contact.xml rename to app/src/main/res/layout/conversation_item_received_shared_contact.xml diff --git a/res/layout/conversation_item_received_sticker.xml b/app/src/main/res/layout/conversation_item_received_sticker.xml similarity index 100% rename from res/layout/conversation_item_received_sticker.xml rename to app/src/main/res/layout/conversation_item_received_sticker.xml diff --git a/res/layout/conversation_item_received_thumbnail.xml b/app/src/main/res/layout/conversation_item_received_thumbnail.xml similarity index 100% rename from res/layout/conversation_item_received_thumbnail.xml rename to app/src/main/res/layout/conversation_item_received_thumbnail.xml diff --git a/res/layout/conversation_item_sent.xml b/app/src/main/res/layout/conversation_item_sent.xml similarity index 100% rename from res/layout/conversation_item_sent.xml rename to app/src/main/res/layout/conversation_item_sent.xml diff --git a/res/layout/conversation_item_sent_audio.xml b/app/src/main/res/layout/conversation_item_sent_audio.xml similarity index 100% rename from res/layout/conversation_item_sent_audio.xml rename to app/src/main/res/layout/conversation_item_sent_audio.xml diff --git a/res/layout/conversation_item_sent_document.xml b/app/src/main/res/layout/conversation_item_sent_document.xml similarity index 100% rename from res/layout/conversation_item_sent_document.xml rename to app/src/main/res/layout/conversation_item_sent_document.xml diff --git a/res/layout/conversation_item_sent_link_preview.xml b/app/src/main/res/layout/conversation_item_sent_link_preview.xml similarity index 100% rename from res/layout/conversation_item_sent_link_preview.xml rename to app/src/main/res/layout/conversation_item_sent_link_preview.xml diff --git a/res/layout/conversation_item_sent_revealable.xml b/app/src/main/res/layout/conversation_item_sent_revealable.xml similarity index 100% rename from res/layout/conversation_item_sent_revealable.xml rename to app/src/main/res/layout/conversation_item_sent_revealable.xml diff --git a/res/layout/conversation_item_sent_shared_contact.xml b/app/src/main/res/layout/conversation_item_sent_shared_contact.xml similarity index 100% rename from res/layout/conversation_item_sent_shared_contact.xml rename to app/src/main/res/layout/conversation_item_sent_shared_contact.xml diff --git a/res/layout/conversation_item_sent_sticker.xml b/app/src/main/res/layout/conversation_item_sent_sticker.xml similarity index 100% rename from res/layout/conversation_item_sent_sticker.xml rename to app/src/main/res/layout/conversation_item_sent_sticker.xml diff --git a/res/layout/conversation_item_sent_thumbnail.xml b/app/src/main/res/layout/conversation_item_sent_thumbnail.xml similarity index 100% rename from res/layout/conversation_item_sent_thumbnail.xml rename to app/src/main/res/layout/conversation_item_sent_thumbnail.xml diff --git a/res/layout/conversation_item_thumbnail.xml b/app/src/main/res/layout/conversation_item_thumbnail.xml similarity index 100% rename from res/layout/conversation_item_thumbnail.xml rename to app/src/main/res/layout/conversation_item_thumbnail.xml diff --git a/res/layout/conversation_item_update.xml b/app/src/main/res/layout/conversation_item_update.xml similarity index 100% rename from res/layout/conversation_item_update.xml rename to app/src/main/res/layout/conversation_item_update.xml diff --git a/res/layout/conversation_list_fragment.xml b/app/src/main/res/layout/conversation_list_fragment.xml similarity index 100% rename from res/layout/conversation_list_fragment.xml rename to app/src/main/res/layout/conversation_list_fragment.xml diff --git a/res/layout/conversation_list_item_action.xml b/app/src/main/res/layout/conversation_list_item_action.xml similarity index 100% rename from res/layout/conversation_list_item_action.xml rename to app/src/main/res/layout/conversation_list_item_action.xml diff --git a/res/layout/conversation_list_item_inbox_zero.xml b/app/src/main/res/layout/conversation_list_item_inbox_zero.xml similarity index 100% rename from res/layout/conversation_list_item_inbox_zero.xml rename to app/src/main/res/layout/conversation_list_item_inbox_zero.xml diff --git a/res/layout/conversation_list_item_view.xml b/app/src/main/res/layout/conversation_list_item_view.xml similarity index 100% rename from res/layout/conversation_list_item_view.xml rename to app/src/main/res/layout/conversation_list_item_view.xml diff --git a/res/layout/conversation_reaction_long_press_toolbar.xml b/app/src/main/res/layout/conversation_reaction_long_press_toolbar.xml similarity index 100% rename from res/layout/conversation_reaction_long_press_toolbar.xml rename to app/src/main/res/layout/conversation_reaction_long_press_toolbar.xml diff --git a/res/layout/conversation_reaction_scrubber.xml b/app/src/main/res/layout/conversation_reaction_scrubber.xml similarity index 100% rename from res/layout/conversation_reaction_scrubber.xml rename to app/src/main/res/layout/conversation_reaction_scrubber.xml diff --git a/res/layout/conversation_search_nav.xml b/app/src/main/res/layout/conversation_search_nav.xml similarity index 100% rename from res/layout/conversation_search_nav.xml rename to app/src/main/res/layout/conversation_search_nav.xml diff --git a/res/layout/conversation_title_view.xml b/app/src/main/res/layout/conversation_title_view.xml similarity index 100% rename from res/layout/conversation_title_view.xml rename to app/src/main/res/layout/conversation_title_view.xml diff --git a/res/layout/conversation_typing_view.xml b/app/src/main/res/layout/conversation_typing_view.xml similarity index 100% rename from res/layout/conversation_typing_view.xml rename to app/src/main/res/layout/conversation_typing_view.xml diff --git a/res/layout/country_code_text.xml b/app/src/main/res/layout/country_code_text.xml similarity index 100% rename from res/layout/country_code_text.xml rename to app/src/main/res/layout/country_code_text.xml diff --git a/res/layout/country_list_item.xml b/app/src/main/res/layout/country_list_item.xml similarity index 100% rename from res/layout/country_list_item.xml rename to app/src/main/res/layout/country_list_item.xml diff --git a/res/layout/country_selection_fragment.xml b/app/src/main/res/layout/country_selection_fragment.xml similarity index 100% rename from res/layout/country_selection_fragment.xml rename to app/src/main/res/layout/country_selection_fragment.xml diff --git a/res/layout/create_passphrase_activity.xml b/app/src/main/res/layout/create_passphrase_activity.xml similarity index 100% rename from res/layout/create_passphrase_activity.xml rename to app/src/main/res/layout/create_passphrase_activity.xml diff --git a/res/layout/custom_default_preference_dialog.xml b/app/src/main/res/layout/custom_default_preference_dialog.xml similarity index 100% rename from res/layout/custom_default_preference_dialog.xml rename to app/src/main/res/layout/custom_default_preference_dialog.xml diff --git a/res/layout/database_migration_activity.xml b/app/src/main/res/layout/database_migration_activity.xml similarity index 100% rename from res/layout/database_migration_activity.xml rename to app/src/main/res/layout/database_migration_activity.xml diff --git a/res/layout/delivery_status_view.xml b/app/src/main/res/layout/delivery_status_view.xml similarity index 100% rename from res/layout/delivery_status_view.xml rename to app/src/main/res/layout/delivery_status_view.xml diff --git a/res/layout/device_add_fragment.xml b/app/src/main/res/layout/device_add_fragment.xml similarity index 100% rename from res/layout/device_add_fragment.xml rename to app/src/main/res/layout/device_add_fragment.xml diff --git a/res/layout/device_link_fragment.xml b/app/src/main/res/layout/device_link_fragment.xml similarity index 100% rename from res/layout/device_link_fragment.xml rename to app/src/main/res/layout/device_link_fragment.xml diff --git a/res/layout/device_list_fragment.xml b/app/src/main/res/layout/device_list_fragment.xml similarity index 100% rename from res/layout/device_list_fragment.xml rename to app/src/main/res/layout/device_list_fragment.xml diff --git a/res/layout/device_list_item_view.xml b/app/src/main/res/layout/device_list_item_view.xml similarity index 100% rename from res/layout/device_list_item_view.xml rename to app/src/main/res/layout/device_list_item_view.xml diff --git a/res/layout/document_view.xml b/app/src/main/res/layout/document_view.xml similarity index 100% rename from res/layout/document_view.xml rename to app/src/main/res/layout/document_view.xml diff --git a/res/layout/emoji_display_item.xml b/app/src/main/res/layout/emoji_display_item.xml similarity index 100% rename from res/layout/emoji_display_item.xml rename to app/src/main/res/layout/emoji_display_item.xml diff --git a/res/layout/emoji_grid_layout.xml b/app/src/main/res/layout/emoji_grid_layout.xml similarity index 100% rename from res/layout/emoji_grid_layout.xml rename to app/src/main/res/layout/emoji_grid_layout.xml diff --git a/res/layout/emoji_keyboard_icon_dark.xml b/app/src/main/res/layout/emoji_keyboard_icon_dark.xml similarity index 100% rename from res/layout/emoji_keyboard_icon_dark.xml rename to app/src/main/res/layout/emoji_keyboard_icon_dark.xml diff --git a/res/layout/emoji_keyboard_icon_dark_selected.xml b/app/src/main/res/layout/emoji_keyboard_icon_dark_selected.xml similarity index 100% rename from res/layout/emoji_keyboard_icon_dark_selected.xml rename to app/src/main/res/layout/emoji_keyboard_icon_dark_selected.xml diff --git a/res/layout/emoji_keyboard_icon_light.xml b/app/src/main/res/layout/emoji_keyboard_icon_light.xml similarity index 100% rename from res/layout/emoji_keyboard_icon_light.xml rename to app/src/main/res/layout/emoji_keyboard_icon_light.xml diff --git a/res/layout/emoji_keyboard_icon_light_selected.xml b/app/src/main/res/layout/emoji_keyboard_icon_light_selected.xml similarity index 100% rename from res/layout/emoji_keyboard_icon_light_selected.xml rename to app/src/main/res/layout/emoji_keyboard_icon_light_selected.xml diff --git a/res/layout/emoji_variation_selector.xml b/app/src/main/res/layout/emoji_variation_selector.xml similarity index 100% rename from res/layout/emoji_variation_selector.xml rename to app/src/main/res/layout/emoji_variation_selector.xml diff --git a/res/layout/emoji_variation_selector_item.xml b/app/src/main/res/layout/emoji_variation_selector_item.xml similarity index 100% rename from res/layout/emoji_variation_selector_item.xml rename to app/src/main/res/layout/emoji_variation_selector_item.xml diff --git a/res/layout/enter_backup_passphrase_dialog.xml b/app/src/main/res/layout/enter_backup_passphrase_dialog.xml similarity index 100% rename from res/layout/enter_backup_passphrase_dialog.xml rename to app/src/main/res/layout/enter_backup_passphrase_dialog.xml diff --git a/res/layout/experience_upgrade_activity.xml b/app/src/main/res/layout/experience_upgrade_activity.xml similarity index 100% rename from res/layout/experience_upgrade_activity.xml rename to app/src/main/res/layout/experience_upgrade_activity.xml diff --git a/res/layout/experience_upgrade_link_previews_fragment.xml b/app/src/main/res/layout/experience_upgrade_link_previews_fragment.xml similarity index 100% rename from res/layout/experience_upgrade_link_previews_fragment.xml rename to app/src/main/res/layout/experience_upgrade_link_previews_fragment.xml diff --git a/res/layout/experience_upgrade_preference_fragment.xml b/app/src/main/res/layout/experience_upgrade_preference_fragment.xml similarity index 100% rename from res/layout/experience_upgrade_preference_fragment.xml rename to app/src/main/res/layout/experience_upgrade_preference_fragment.xml diff --git a/res/layout/experience_upgrade_stickers_fragment.xml b/app/src/main/res/layout/experience_upgrade_stickers_fragment.xml similarity index 100% rename from res/layout/experience_upgrade_stickers_fragment.xml rename to app/src/main/res/layout/experience_upgrade_stickers_fragment.xml diff --git a/res/layout/experience_upgrade_typing_indicators_fragment.xml b/app/src/main/res/layout/experience_upgrade_typing_indicators_fragment.xml similarity index 100% rename from res/layout/experience_upgrade_typing_indicators_fragment.xml rename to app/src/main/res/layout/experience_upgrade_typing_indicators_fragment.xml diff --git a/res/layout/expiration_dialog.xml b/app/src/main/res/layout/expiration_dialog.xml similarity index 100% rename from res/layout/expiration_dialog.xml rename to app/src/main/res/layout/expiration_dialog.xml diff --git a/res/layout/expiration_timer_badge.xml b/app/src/main/res/layout/expiration_timer_badge.xml similarity index 100% rename from res/layout/expiration_timer_badge.xml rename to app/src/main/res/layout/expiration_timer_badge.xml diff --git a/res/layout/fragment_registration_blank.xml b/app/src/main/res/layout/fragment_registration_blank.xml similarity index 100% rename from res/layout/fragment_registration_blank.xml rename to app/src/main/res/layout/fragment_registration_blank.xml diff --git a/res/layout/fragment_registration_captcha.xml b/app/src/main/res/layout/fragment_registration_captcha.xml similarity index 100% rename from res/layout/fragment_registration_captcha.xml rename to app/src/main/res/layout/fragment_registration_captcha.xml diff --git a/res/layout/fragment_registration_country_picker.xml b/app/src/main/res/layout/fragment_registration_country_picker.xml similarity index 100% rename from res/layout/fragment_registration_country_picker.xml rename to app/src/main/res/layout/fragment_registration_country_picker.xml diff --git a/res/layout/fragment_registration_enter_code.xml b/app/src/main/res/layout/fragment_registration_enter_code.xml similarity index 100% rename from res/layout/fragment_registration_enter_code.xml rename to app/src/main/res/layout/fragment_registration_enter_code.xml diff --git a/res/layout/fragment_registration_enter_phone_number.xml b/app/src/main/res/layout/fragment_registration_enter_phone_number.xml similarity index 100% rename from res/layout/fragment_registration_enter_phone_number.xml rename to app/src/main/res/layout/fragment_registration_enter_phone_number.xml diff --git a/res/layout/fragment_registration_lock.xml b/app/src/main/res/layout/fragment_registration_lock.xml similarity index 100% rename from res/layout/fragment_registration_lock.xml rename to app/src/main/res/layout/fragment_registration_lock.xml diff --git a/res/layout/fragment_registration_restore_backup.xml b/app/src/main/res/layout/fragment_registration_restore_backup.xml similarity index 100% rename from res/layout/fragment_registration_restore_backup.xml rename to app/src/main/res/layout/fragment_registration_restore_backup.xml diff --git a/res/layout/fragment_registration_welcome.xml b/app/src/main/res/layout/fragment_registration_welcome.xml similarity index 100% rename from res/layout/fragment_registration_welcome.xml rename to app/src/main/res/layout/fragment_registration_welcome.xml diff --git a/res/layout/fragment_registration_welcome_rereg.xml b/app/src/main/res/layout/fragment_registration_welcome_rereg.xml similarity index 100% rename from res/layout/fragment_registration_welcome_rereg.xml rename to app/src/main/res/layout/fragment_registration_welcome_rereg.xml diff --git a/res/layout/fragment_submit_log.xml b/app/src/main/res/layout/fragment_submit_log.xml similarity index 100% rename from res/layout/fragment_submit_log.xml rename to app/src/main/res/layout/fragment_submit_log.xml diff --git a/res/layout/giphy_activity.xml b/app/src/main/res/layout/giphy_activity.xml similarity index 100% rename from res/layout/giphy_activity.xml rename to app/src/main/res/layout/giphy_activity.xml diff --git a/res/layout/giphy_activity_toolbar.xml b/app/src/main/res/layout/giphy_activity_toolbar.xml similarity index 100% rename from res/layout/giphy_activity_toolbar.xml rename to app/src/main/res/layout/giphy_activity_toolbar.xml diff --git a/res/layout/giphy_fragment.xml b/app/src/main/res/layout/giphy_fragment.xml similarity index 100% rename from res/layout/giphy_fragment.xml rename to app/src/main/res/layout/giphy_fragment.xml diff --git a/res/layout/giphy_thumbnail.xml b/app/src/main/res/layout/giphy_thumbnail.xml similarity index 100% rename from res/layout/giphy_thumbnail.xml rename to app/src/main/res/layout/giphy_thumbnail.xml diff --git a/res/layout/group_create_activity.xml b/app/src/main/res/layout/group_create_activity.xml similarity index 100% rename from res/layout/group_create_activity.xml rename to app/src/main/res/layout/group_create_activity.xml diff --git a/res/layout/image_editor_fragment.xml b/app/src/main/res/layout/image_editor_fragment.xml similarity index 100% rename from res/layout/image_editor_fragment.xml rename to app/src/main/res/layout/image_editor_fragment.xml diff --git a/res/layout/image_editor_hud.xml b/app/src/main/res/layout/image_editor_hud.xml similarity index 100% rename from res/layout/image_editor_hud.xml rename to app/src/main/res/layout/image_editor_hud.xml diff --git a/res/layout/insights_dashboard.xml b/app/src/main/res/layout/insights_dashboard.xml similarity index 100% rename from res/layout/insights_dashboard.xml rename to app/src/main/res/layout/insights_dashboard.xml diff --git a/res/layout/insights_dashboard_adapter_item.xml b/app/src/main/res/layout/insights_dashboard_adapter_item.xml similarity index 100% rename from res/layout/insights_dashboard_adapter_item.xml rename to app/src/main/res/layout/insights_dashboard_adapter_item.xml diff --git a/res/layout/insights_modal.xml b/app/src/main/res/layout/insights_modal.xml similarity index 100% rename from res/layout/insights_modal.xml rename to app/src/main/res/layout/insights_modal.xml diff --git a/res/layout/invite_activity.xml b/app/src/main/res/layout/invite_activity.xml similarity index 100% rename from res/layout/invite_activity.xml rename to app/src/main/res/layout/invite_activity.xml diff --git a/res/layout/item_color.xml b/app/src/main/res/layout/item_color.xml similarity index 100% rename from res/layout/item_color.xml rename to app/src/main/res/layout/item_color.xml diff --git a/res/layout/item_editable_contact.xml b/app/src/main/res/layout/item_editable_contact.xml similarity index 100% rename from res/layout/item_editable_contact.xml rename to app/src/main/res/layout/item_editable_contact.xml diff --git a/res/layout/item_log_preview.xml b/app/src/main/res/layout/item_log_preview.xml similarity index 100% rename from res/layout/item_log_preview.xml rename to app/src/main/res/layout/item_log_preview.xml diff --git a/res/layout/item_selectable_contact_field.xml b/app/src/main/res/layout/item_selectable_contact_field.xml similarity index 100% rename from res/layout/item_selectable_contact_field.xml rename to app/src/main/res/layout/item_selectable_contact_field.xml diff --git a/res/layout/labeled_edit_text.xml b/app/src/main/res/layout/labeled_edit_text.xml similarity index 100% rename from res/layout/labeled_edit_text.xml rename to app/src/main/res/layout/labeled_edit_text.xml diff --git a/res/layout/labeled_edit_text_default.xml b/app/src/main/res/layout/labeled_edit_text_default.xml similarity index 100% rename from res/layout/labeled_edit_text_default.xml rename to app/src/main/res/layout/labeled_edit_text_default.xml diff --git a/res/layout/led_color_preference_widget.xml b/app/src/main/res/layout/led_color_preference_widget.xml similarity index 100% rename from res/layout/led_color_preference_widget.xml rename to app/src/main/res/layout/led_color_preference_widget.xml diff --git a/res/layout/link_preview.xml b/app/src/main/res/layout/link_preview.xml similarity index 100% rename from res/layout/link_preview.xml rename to app/src/main/res/layout/link_preview.xml diff --git a/res/layout/load_more_header.xml b/app/src/main/res/layout/load_more_header.xml similarity index 100% rename from res/layout/load_more_header.xml rename to app/src/main/res/layout/load_more_header.xml diff --git a/res/layout/log_submit_activity.xml b/app/src/main/res/layout/log_submit_activity.xml similarity index 100% rename from res/layout/log_submit_activity.xml rename to app/src/main/res/layout/log_submit_activity.xml diff --git a/res/layout/longmessage_activity.xml b/app/src/main/res/layout/longmessage_activity.xml similarity index 100% rename from res/layout/longmessage_activity.xml rename to app/src/main/res/layout/longmessage_activity.xml diff --git a/res/layout/longmessage_bubble_received.xml b/app/src/main/res/layout/longmessage_bubble_received.xml similarity index 100% rename from res/layout/longmessage_bubble_received.xml rename to app/src/main/res/layout/longmessage_bubble_received.xml diff --git a/res/layout/longmessage_bubble_sent.xml b/app/src/main/res/layout/longmessage_bubble_sent.xml similarity index 100% rename from res/layout/longmessage_bubble_sent.xml rename to app/src/main/res/layout/longmessage_bubble_sent.xml diff --git a/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml similarity index 100% rename from res/layout/main_activity.xml rename to app/src/main/res/layout/main_activity.xml diff --git a/res/layout/media_keyboard.xml b/app/src/main/res/layout/media_keyboard.xml similarity index 100% rename from res/layout/media_keyboard.xml rename to app/src/main/res/layout/media_keyboard.xml diff --git a/res/layout/media_keyboard_bottom_tab_item.xml b/app/src/main/res/layout/media_keyboard_bottom_tab_item.xml similarity index 100% rename from res/layout/media_keyboard_bottom_tab_item.xml rename to app/src/main/res/layout/media_keyboard_bottom_tab_item.xml diff --git a/res/layout/media_overview_activity.xml b/app/src/main/res/layout/media_overview_activity.xml similarity index 100% rename from res/layout/media_overview_activity.xml rename to app/src/main/res/layout/media_overview_activity.xml diff --git a/res/layout/media_overview_detail_item_audio.xml b/app/src/main/res/layout/media_overview_detail_item_audio.xml similarity index 100% rename from res/layout/media_overview_detail_item_audio.xml rename to app/src/main/res/layout/media_overview_detail_item_audio.xml diff --git a/res/layout/media_overview_detail_item_document.xml b/app/src/main/res/layout/media_overview_detail_item_document.xml similarity index 100% rename from res/layout/media_overview_detail_item_document.xml rename to app/src/main/res/layout/media_overview_detail_item_document.xml diff --git a/res/layout/media_overview_detail_item_media.xml b/app/src/main/res/layout/media_overview_detail_item_media.xml similarity index 100% rename from res/layout/media_overview_detail_item_media.xml rename to app/src/main/res/layout/media_overview_detail_item_media.xml diff --git a/res/layout/media_overview_detail_text.xml b/app/src/main/res/layout/media_overview_detail_text.xml similarity index 100% rename from res/layout/media_overview_detail_text.xml rename to app/src/main/res/layout/media_overview_detail_text.xml diff --git a/res/layout/media_overview_gallery_item.xml b/app/src/main/res/layout/media_overview_gallery_item.xml similarity index 100% rename from res/layout/media_overview_gallery_item.xml rename to app/src/main/res/layout/media_overview_gallery_item.xml diff --git a/res/layout/media_overview_item_header.xml b/app/src/main/res/layout/media_overview_item_header.xml similarity index 100% rename from res/layout/media_overview_item_header.xml rename to app/src/main/res/layout/media_overview_item_header.xml diff --git a/res/layout/media_overview_page_fragment.xml b/app/src/main/res/layout/media_overview_page_fragment.xml similarity index 100% rename from res/layout/media_overview_page_fragment.xml rename to app/src/main/res/layout/media_overview_page_fragment.xml diff --git a/res/layout/media_overview_selected_overlay.xml b/app/src/main/res/layout/media_overview_selected_overlay.xml similarity index 100% rename from res/layout/media_overview_selected_overlay.xml rename to app/src/main/res/layout/media_overview_selected_overlay.xml diff --git a/res/layout/media_preview_activity.xml b/app/src/main/res/layout/media_preview_activity.xml similarity index 100% rename from res/layout/media_preview_activity.xml rename to app/src/main/res/layout/media_preview_activity.xml diff --git a/res/layout/media_preview_exoplayer_layout.xml b/app/src/main/res/layout/media_preview_exoplayer_layout.xml similarity index 100% rename from res/layout/media_preview_exoplayer_layout.xml rename to app/src/main/res/layout/media_preview_exoplayer_layout.xml diff --git a/res/layout/media_preview_image_fragment.xml b/app/src/main/res/layout/media_preview_image_fragment.xml similarity index 100% rename from res/layout/media_preview_image_fragment.xml rename to app/src/main/res/layout/media_preview_image_fragment.xml diff --git a/res/layout/media_preview_video_fragment.xml b/app/src/main/res/layout/media_preview_video_fragment.xml similarity index 100% rename from res/layout/media_preview_video_fragment.xml rename to app/src/main/res/layout/media_preview_video_fragment.xml diff --git a/res/layout/media_view.xml b/app/src/main/res/layout/media_view.xml similarity index 100% rename from res/layout/media_view.xml rename to app/src/main/res/layout/media_view.xml diff --git a/res/layout/media_view_edit_button.xml b/app/src/main/res/layout/media_view_edit_button.xml similarity index 100% rename from res/layout/media_view_edit_button.xml rename to app/src/main/res/layout/media_view_edit_button.xml diff --git a/res/layout/media_view_remove_button.xml b/app/src/main/res/layout/media_view_remove_button.xml similarity index 100% rename from res/layout/media_view_remove_button.xml rename to app/src/main/res/layout/media_view_remove_button.xml diff --git a/res/layout/media_view_video.xml b/app/src/main/res/layout/media_view_video.xml similarity index 100% rename from res/layout/media_view_video.xml rename to app/src/main/res/layout/media_view_video.xml diff --git a/res/layout/mediapicker_folder_fragment.xml b/app/src/main/res/layout/mediapicker_folder_fragment.xml similarity index 100% rename from res/layout/mediapicker_folder_fragment.xml rename to app/src/main/res/layout/mediapicker_folder_fragment.xml diff --git a/res/layout/mediapicker_folder_item.xml b/app/src/main/res/layout/mediapicker_folder_item.xml similarity index 100% rename from res/layout/mediapicker_folder_item.xml rename to app/src/main/res/layout/mediapicker_folder_item.xml diff --git a/res/layout/mediapicker_item_fragment.xml b/app/src/main/res/layout/mediapicker_item_fragment.xml similarity index 100% rename from res/layout/mediapicker_item_fragment.xml rename to app/src/main/res/layout/mediapicker_item_fragment.xml diff --git a/res/layout/mediapicker_media_item.xml b/app/src/main/res/layout/mediapicker_media_item.xml similarity index 100% rename from res/layout/mediapicker_media_item.xml rename to app/src/main/res/layout/mediapicker_media_item.xml diff --git a/res/layout/mediarail_button_item.xml b/app/src/main/res/layout/mediarail_button_item.xml similarity index 100% rename from res/layout/mediarail_button_item.xml rename to app/src/main/res/layout/mediarail_button_item.xml diff --git a/res/layout/mediarail_media_item.xml b/app/src/main/res/layout/mediarail_media_item.xml similarity index 100% rename from res/layout/mediarail_media_item.xml rename to app/src/main/res/layout/mediarail_media_item.xml diff --git a/res/layout/mediasend_activity.xml b/app/src/main/res/layout/mediasend_activity.xml similarity index 100% rename from res/layout/mediasend_activity.xml rename to app/src/main/res/layout/mediasend_activity.xml diff --git a/res/layout/mediasend_count_button.xml b/app/src/main/res/layout/mediasend_count_button.xml similarity index 100% rename from res/layout/mediasend_count_button.xml rename to app/src/main/res/layout/mediasend_count_button.xml diff --git a/res/layout/mediasend_fragment.xml b/app/src/main/res/layout/mediasend_fragment.xml similarity index 100% rename from res/layout/mediasend_fragment.xml rename to app/src/main/res/layout/mediasend_fragment.xml diff --git a/res/layout/mediasend_image_fragment.xml b/app/src/main/res/layout/mediasend_image_fragment.xml similarity index 100% rename from res/layout/mediasend_image_fragment.xml rename to app/src/main/res/layout/mediasend_image_fragment.xml diff --git a/res/layout/mediasend_video_fragment.xml b/app/src/main/res/layout/mediasend_video_fragment.xml similarity index 100% rename from res/layout/mediasend_video_fragment.xml rename to app/src/main/res/layout/mediasend_video_fragment.xml diff --git a/res/layout/message_details_activity.xml b/app/src/main/res/layout/message_details_activity.xml similarity index 100% rename from res/layout/message_details_activity.xml rename to app/src/main/res/layout/message_details_activity.xml diff --git a/res/layout/message_details_header.xml b/app/src/main/res/layout/message_details_header.xml similarity index 100% rename from res/layout/message_details_header.xml rename to app/src/main/res/layout/message_details_header.xml diff --git a/res/layout/message_recipient_list_item.xml b/app/src/main/res/layout/message_recipient_list_item.xml similarity index 100% rename from res/layout/message_recipient_list_item.xml rename to app/src/main/res/layout/message_recipient_list_item.xml diff --git a/res/layout/message_request_fragment.xml b/app/src/main/res/layout/message_request_fragment.xml similarity index 100% rename from res/layout/message_request_fragment.xml rename to app/src/main/res/layout/message_request_fragment.xml diff --git a/res/layout/microphone_recorder_view.xml b/app/src/main/res/layout/microphone_recorder_view.xml similarity index 100% rename from res/layout/microphone_recorder_view.xml rename to app/src/main/res/layout/microphone_recorder_view.xml diff --git a/res/layout/null_recyclerview_header.xml b/app/src/main/res/layout/null_recyclerview_header.xml similarity index 100% rename from res/layout/null_recyclerview_header.xml rename to app/src/main/res/layout/null_recyclerview_header.xml diff --git a/res/layout/permissions_rationale_dialog.xml b/app/src/main/res/layout/permissions_rationale_dialog.xml similarity index 100% rename from res/layout/permissions_rationale_dialog.xml rename to app/src/main/res/layout/permissions_rationale_dialog.xml diff --git a/res/layout/phone_text.xml b/app/src/main/res/layout/phone_text.xml similarity index 100% rename from res/layout/phone_text.xml rename to app/src/main/res/layout/phone_text.xml diff --git a/res/layout/preference_divider.xml b/app/src/main/res/layout/preference_divider.xml similarity index 100% rename from res/layout/preference_divider.xml rename to app/src/main/res/layout/preference_divider.xml diff --git a/res/layout/preference_right_summary_widget.xml b/app/src/main/res/layout/preference_right_summary_widget.xml similarity index 100% rename from res/layout/preference_right_summary_widget.xml rename to app/src/main/res/layout/preference_right_summary_widget.xml diff --git a/res/layout/preference_storage_category.xml b/app/src/main/res/layout/preference_storage_category.xml similarity index 100% rename from res/layout/preference_storage_category.xml rename to app/src/main/res/layout/preference_storage_category.xml diff --git a/res/layout/preference_widget_color_swatch.xml b/app/src/main/res/layout/preference_widget_color_swatch.xml similarity index 100% rename from res/layout/preference_widget_color_swatch.xml rename to app/src/main/res/layout/preference_widget_color_swatch.xml diff --git a/res/layout/preference_widget_progress.xml b/app/src/main/res/layout/preference_widget_progress.xml similarity index 100% rename from res/layout/preference_widget_progress.xml rename to app/src/main/res/layout/preference_widget_progress.xml diff --git a/res/layout/profile_create_activity.xml b/app/src/main/res/layout/profile_create_activity.xml similarity index 100% rename from res/layout/profile_create_activity.xml rename to app/src/main/res/layout/profile_create_activity.xml diff --git a/res/layout/profile_edit_activity_v2.xml b/app/src/main/res/layout/profile_edit_activity_v2.xml similarity index 100% rename from res/layout/profile_edit_activity_v2.xml rename to app/src/main/res/layout/profile_edit_activity_v2.xml diff --git a/res/layout/profile_edit_name_fragment.xml b/app/src/main/res/layout/profile_edit_name_fragment.xml similarity index 100% rename from res/layout/profile_edit_name_fragment.xml rename to app/src/main/res/layout/profile_edit_name_fragment.xml diff --git a/res/layout/profile_edit_overview_fragment.xml b/app/src/main/res/layout/profile_edit_overview_fragment.xml similarity index 100% rename from res/layout/profile_edit_overview_fragment.xml rename to app/src/main/res/layout/profile_edit_overview_fragment.xml diff --git a/res/layout/profile_group_share_view.xml b/app/src/main/res/layout/profile_group_share_view.xml similarity index 100% rename from res/layout/profile_group_share_view.xml rename to app/src/main/res/layout/profile_group_share_view.xml diff --git a/res/layout/profile_name_text.xml b/app/src/main/res/layout/profile_name_text.xml similarity index 100% rename from res/layout/profile_name_text.xml rename to app/src/main/res/layout/profile_name_text.xml diff --git a/res/layout/profile_preference_view.xml b/app/src/main/res/layout/profile_preference_view.xml similarity index 100% rename from res/layout/profile_preference_view.xml rename to app/src/main/res/layout/profile_preference_view.xml diff --git a/res/layout/progress_dialog.xml b/app/src/main/res/layout/progress_dialog.xml similarity index 100% rename from res/layout/progress_dialog.xml rename to app/src/main/res/layout/progress_dialog.xml diff --git a/res/layout/prompt_apn_activity.xml b/app/src/main/res/layout/prompt_apn_activity.xml similarity index 100% rename from res/layout/prompt_apn_activity.xml rename to app/src/main/res/layout/prompt_apn_activity.xml diff --git a/res/layout/prompt_passphrase_activity.xml b/app/src/main/res/layout/prompt_passphrase_activity.xml similarity index 100% rename from res/layout/prompt_passphrase_activity.xml rename to app/src/main/res/layout/prompt_passphrase_activity.xml diff --git a/res/layout/push_recipients_panel.xml b/app/src/main/res/layout/push_recipients_panel.xml similarity index 100% rename from res/layout/push_recipients_panel.xml rename to app/src/main/res/layout/push_recipients_panel.xml diff --git a/res/layout/quote_view.xml b/app/src/main/res/layout/quote_view.xml similarity index 100% rename from res/layout/quote_view.xml rename to app/src/main/res/layout/quote_view.xml diff --git a/res/layout/reactions_bottom_sheet_dialog_fragment.xml b/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment.xml similarity index 100% rename from res/layout/reactions_bottom_sheet_dialog_fragment.xml rename to app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment.xml diff --git a/res/layout/reactions_bottom_sheet_dialog_fragment_emoji_item.xml b/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_emoji_item.xml similarity index 100% rename from res/layout/reactions_bottom_sheet_dialog_fragment_emoji_item.xml rename to app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_emoji_item.xml diff --git a/res/layout/reactions_bottom_sheet_dialog_fragment_recipient_item.xml b/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_recipient_item.xml similarity index 100% rename from res/layout/reactions_bottom_sheet_dialog_fragment_recipient_item.xml rename to app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_recipient_item.xml diff --git a/res/layout/recent_photo_view.xml b/app/src/main/res/layout/recent_photo_view.xml similarity index 100% rename from res/layout/recent_photo_view.xml rename to app/src/main/res/layout/recent_photo_view.xml diff --git a/res/layout/recent_photo_view_item.xml b/app/src/main/res/layout/recent_photo_view_item.xml similarity index 100% rename from res/layout/recent_photo_view_item.xml rename to app/src/main/res/layout/recent_photo_view_item.xml diff --git a/res/layout/recipient_filter_item.xml b/app/src/main/res/layout/recipient_filter_item.xml similarity index 100% rename from res/layout/recipient_filter_item.xml rename to app/src/main/res/layout/recipient_filter_item.xml diff --git a/res/layout/recipient_preference_activity.xml b/app/src/main/res/layout/recipient_preference_activity.xml similarity index 100% rename from res/layout/recipient_preference_activity.xml rename to app/src/main/res/layout/recipient_preference_activity.xml diff --git a/res/layout/recipient_preference_contact_widget.xml b/app/src/main/res/layout/recipient_preference_contact_widget.xml similarity index 100% rename from res/layout/recipient_preference_contact_widget.xml rename to app/src/main/res/layout/recipient_preference_contact_widget.xml diff --git a/res/layout/recipient_preference_photo_rail.xml b/app/src/main/res/layout/recipient_preference_photo_rail.xml similarity index 100% rename from res/layout/recipient_preference_photo_rail.xml rename to app/src/main/res/layout/recipient_preference_photo_rail.xml diff --git a/res/layout/recipient_preference_photo_rail_item.xml b/app/src/main/res/layout/recipient_preference_photo_rail_item.xml similarity index 100% rename from res/layout/recipient_preference_photo_rail_item.xml rename to app/src/main/res/layout/recipient_preference_photo_rail_item.xml diff --git a/res/layout/recording_layout.xml b/app/src/main/res/layout/recording_layout.xml similarity index 100% rename from res/layout/recording_layout.xml rename to app/src/main/res/layout/recording_layout.xml diff --git a/res/layout/recycler_view_fast_scroller.xml b/app/src/main/res/layout/recycler_view_fast_scroller.xml similarity index 100% rename from res/layout/recycler_view_fast_scroller.xml rename to app/src/main/res/layout/recycler_view_fast_scroller.xml diff --git a/res/layout/registration_lock_dialog_view.xml b/app/src/main/res/layout/registration_lock_dialog_view.xml similarity index 100% rename from res/layout/registration_lock_dialog_view.xml rename to app/src/main/res/layout/registration_lock_dialog_view.xml diff --git a/res/layout/registration_lock_reminder_view.xml b/app/src/main/res/layout/registration_lock_reminder_view.xml similarity index 100% rename from res/layout/registration_lock_reminder_view.xml rename to app/src/main/res/layout/registration_lock_reminder_view.xml diff --git a/res/layout/registration_unlock_dialog_view.xml b/app/src/main/res/layout/registration_unlock_dialog_view.xml similarity index 100% rename from res/layout/registration_unlock_dialog_view.xml rename to app/src/main/res/layout/registration_unlock_dialog_view.xml diff --git a/res/layout/reminder_action_button.xml b/app/src/main/res/layout/reminder_action_button.xml similarity index 100% rename from res/layout/reminder_action_button.xml rename to app/src/main/res/layout/reminder_action_button.xml diff --git a/res/layout/reminder_header.xml b/app/src/main/res/layout/reminder_header.xml similarity index 100% rename from res/layout/reminder_header.xml rename to app/src/main/res/layout/reminder_header.xml diff --git a/res/layout/reminder_progress.xml b/app/src/main/res/layout/reminder_progress.xml similarity index 100% rename from res/layout/reminder_progress.xml rename to app/src/main/res/layout/reminder_progress.xml diff --git a/res/layout/revealable_message_view.xml b/app/src/main/res/layout/revealable_message_view.xml similarity index 100% rename from res/layout/revealable_message_view.xml rename to app/src/main/res/layout/revealable_message_view.xml diff --git a/res/layout/scribble_fragment_emojidrawer_stub.xml b/app/src/main/res/layout/scribble_fragment_emojidrawer_stub.xml similarity index 100% rename from res/layout/scribble_fragment_emojidrawer_stub.xml rename to app/src/main/res/layout/scribble_fragment_emojidrawer_stub.xml diff --git a/res/layout/scribble_select_new_sticker_activity.xml b/app/src/main/res/layout/scribble_select_new_sticker_activity.xml similarity index 100% rename from res/layout/scribble_select_new_sticker_activity.xml rename to app/src/main/res/layout/scribble_select_new_sticker_activity.xml diff --git a/res/layout/scribble_sticker_item.xml b/app/src/main/res/layout/scribble_sticker_item.xml similarity index 100% rename from res/layout/scribble_sticker_item.xml rename to app/src/main/res/layout/scribble_sticker_item.xml diff --git a/res/layout/search_result_list_divider.xml b/app/src/main/res/layout/search_result_list_divider.xml similarity index 100% rename from res/layout/search_result_list_divider.xml rename to app/src/main/res/layout/search_result_list_divider.xml diff --git a/res/layout/search_toolbar.xml b/app/src/main/res/layout/search_toolbar.xml similarity index 100% rename from res/layout/search_toolbar.xml rename to app/src/main/res/layout/search_toolbar.xml diff --git a/res/layout/selected_recipient_list_item.xml b/app/src/main/res/layout/selected_recipient_list_item.xml similarity index 100% rename from res/layout/selected_recipient_list_item.xml rename to app/src/main/res/layout/selected_recipient_list_item.xml diff --git a/res/layout/share_activity.xml b/app/src/main/res/layout/share_activity.xml similarity index 100% rename from res/layout/share_activity.xml rename to app/src/main/res/layout/share_activity.xml diff --git a/res/layout/share_intent_list.xml b/app/src/main/res/layout/share_intent_list.xml similarity index 100% rename from res/layout/share_intent_list.xml rename to app/src/main/res/layout/share_intent_list.xml diff --git a/res/layout/share_intent_row.xml b/app/src/main/res/layout/share_intent_row.xml similarity index 100% rename from res/layout/share_intent_row.xml rename to app/src/main/res/layout/share_intent_row.xml diff --git a/res/layout/shared_contact_view.xml b/app/src/main/res/layout/shared_contact_view.xml similarity index 100% rename from res/layout/shared_contact_view.xml rename to app/src/main/res/layout/shared_contact_view.xml diff --git a/res/layout/signal_map_view.xml b/app/src/main/res/layout/signal_map_view.xml similarity index 100% rename from res/layout/signal_map_view.xml rename to app/src/main/res/layout/signal_map_view.xml diff --git a/res/layout/sticker_keyboard_icon_dark.xml b/app/src/main/res/layout/sticker_keyboard_icon_dark.xml similarity index 100% rename from res/layout/sticker_keyboard_icon_dark.xml rename to app/src/main/res/layout/sticker_keyboard_icon_dark.xml diff --git a/res/layout/sticker_keyboard_icon_dark_selected.xml b/app/src/main/res/layout/sticker_keyboard_icon_dark_selected.xml similarity index 100% rename from res/layout/sticker_keyboard_icon_dark_selected.xml rename to app/src/main/res/layout/sticker_keyboard_icon_dark_selected.xml diff --git a/res/layout/sticker_keyboard_icon_light.xml b/app/src/main/res/layout/sticker_keyboard_icon_light.xml similarity index 100% rename from res/layout/sticker_keyboard_icon_light.xml rename to app/src/main/res/layout/sticker_keyboard_icon_light.xml diff --git a/res/layout/sticker_keyboard_icon_light_selected.xml b/app/src/main/res/layout/sticker_keyboard_icon_light_selected.xml similarity index 100% rename from res/layout/sticker_keyboard_icon_light_selected.xml rename to app/src/main/res/layout/sticker_keyboard_icon_light_selected.xml diff --git a/res/layout/sticker_keyboard_page.xml b/app/src/main/res/layout/sticker_keyboard_page.xml similarity index 100% rename from res/layout/sticker_keyboard_page.xml rename to app/src/main/res/layout/sticker_keyboard_page.xml diff --git a/res/layout/sticker_keyboard_page_list_item.xml b/app/src/main/res/layout/sticker_keyboard_page_list_item.xml similarity index 100% rename from res/layout/sticker_keyboard_page_list_item.xml rename to app/src/main/res/layout/sticker_keyboard_page_list_item.xml diff --git a/res/layout/sticker_management_activity.xml b/app/src/main/res/layout/sticker_management_activity.xml similarity index 100% rename from res/layout/sticker_management_activity.xml rename to app/src/main/res/layout/sticker_management_activity.xml diff --git a/res/layout/sticker_management_empty_item.xml b/app/src/main/res/layout/sticker_management_empty_item.xml similarity index 100% rename from res/layout/sticker_management_empty_item.xml rename to app/src/main/res/layout/sticker_management_empty_item.xml diff --git a/res/layout/sticker_management_header_item.xml b/app/src/main/res/layout/sticker_management_header_item.xml similarity index 100% rename from res/layout/sticker_management_header_item.xml rename to app/src/main/res/layout/sticker_management_header_item.xml diff --git a/res/layout/sticker_management_sticker_item.xml b/app/src/main/res/layout/sticker_management_sticker_item.xml similarity index 100% rename from res/layout/sticker_management_sticker_item.xml rename to app/src/main/res/layout/sticker_management_sticker_item.xml diff --git a/res/layout/sticker_preview_activity.xml b/app/src/main/res/layout/sticker_preview_activity.xml similarity index 100% rename from res/layout/sticker_preview_activity.xml rename to app/src/main/res/layout/sticker_preview_activity.xml diff --git a/res/layout/sticker_preview_list_item.xml b/app/src/main/res/layout/sticker_preview_list_item.xml similarity index 100% rename from res/layout/sticker_preview_list_item.xml rename to app/src/main/res/layout/sticker_preview_list_item.xml diff --git a/res/layout/sticker_preview_popup.xml b/app/src/main/res/layout/sticker_preview_popup.xml similarity index 100% rename from res/layout/sticker_preview_popup.xml rename to app/src/main/res/layout/sticker_preview_popup.xml diff --git a/res/layout/sticker_suggestion_list_item.xml b/app/src/main/res/layout/sticker_suggestion_list_item.xml similarity index 100% rename from res/layout/sticker_suggestion_list_item.xml rename to app/src/main/res/layout/sticker_suggestion_list_item.xml diff --git a/res/layout/sticker_view.xml b/app/src/main/res/layout/sticker_view.xml similarity index 100% rename from res/layout/sticker_view.xml rename to app/src/main/res/layout/sticker_view.xml diff --git a/res/layout/switch_compat_preference.xml b/app/src/main/res/layout/switch_compat_preference.xml similarity index 100% rename from res/layout/switch_compat_preference.xml rename to app/src/main/res/layout/switch_compat_preference.xml diff --git a/res/layout/thumbnail_view.xml b/app/src/main/res/layout/thumbnail_view.xml similarity index 100% rename from res/layout/thumbnail_view.xml rename to app/src/main/res/layout/thumbnail_view.xml diff --git a/res/layout/tooltip.xml b/app/src/main/res/layout/tooltip.xml similarity index 100% rename from res/layout/tooltip.xml rename to app/src/main/res/layout/tooltip.xml diff --git a/res/layout/transfer_controls_stub.xml b/app/src/main/res/layout/transfer_controls_stub.xml similarity index 100% rename from res/layout/transfer_controls_stub.xml rename to app/src/main/res/layout/transfer_controls_stub.xml diff --git a/res/layout/transfer_controls_view.xml b/app/src/main/res/layout/transfer_controls_view.xml similarity index 100% rename from res/layout/transfer_controls_view.xml rename to app/src/main/res/layout/transfer_controls_view.xml diff --git a/res/layout/transport_selection_list_item.xml b/app/src/main/res/layout/transport_selection_list_item.xml similarity index 100% rename from res/layout/transport_selection_list_item.xml rename to app/src/main/res/layout/transport_selection_list_item.xml diff --git a/res/layout/typing_indicator_view.xml b/app/src/main/res/layout/typing_indicator_view.xml similarity index 100% rename from res/layout/typing_indicator_view.xml rename to app/src/main/res/layout/typing_indicator_view.xml diff --git a/res/layout/unidentified_delivery_learn_more.xml b/app/src/main/res/layout/unidentified_delivery_learn_more.xml similarity index 100% rename from res/layout/unidentified_delivery_learn_more.xml rename to app/src/main/res/layout/unidentified_delivery_learn_more.xml diff --git a/res/layout/unknown_sender_view.xml b/app/src/main/res/layout/unknown_sender_view.xml similarity index 100% rename from res/layout/unknown_sender_view.xml rename to app/src/main/res/layout/unknown_sender_view.xml diff --git a/res/layout/unverified_banner_view.xml b/app/src/main/res/layout/unverified_banner_view.xml similarity index 100% rename from res/layout/unverified_banner_view.xml rename to app/src/main/res/layout/unverified_banner_view.xml diff --git a/res/layout/username_edit_fragment.xml b/app/src/main/res/layout/username_edit_fragment.xml similarity index 100% rename from res/layout/username_edit_fragment.xml rename to app/src/main/res/layout/username_edit_fragment.xml diff --git a/res/layout/verification_code_view.xml b/app/src/main/res/layout/verification_code_view.xml similarity index 100% rename from res/layout/verification_code_view.xml rename to app/src/main/res/layout/verification_code_view.xml diff --git a/res/layout/verification_pin_keyboard_view.xml b/app/src/main/res/layout/verification_pin_keyboard_view.xml similarity index 100% rename from res/layout/verification_pin_keyboard_view.xml rename to app/src/main/res/layout/verification_pin_keyboard_view.xml diff --git a/res/layout/verify_display_fragment.xml b/app/src/main/res/layout/verify_display_fragment.xml similarity index 100% rename from res/layout/verify_display_fragment.xml rename to app/src/main/res/layout/verify_display_fragment.xml diff --git a/res/layout/verify_scan_fragment.xml b/app/src/main/res/layout/verify_scan_fragment.xml similarity index 100% rename from res/layout/verify_scan_fragment.xml rename to app/src/main/res/layout/verify_scan_fragment.xml diff --git a/res/layout/video_player.xml b/app/src/main/res/layout/video_player.xml similarity index 100% rename from res/layout/video_player.xml rename to app/src/main/res/layout/video_player.xml diff --git a/res/layout/view_once_message_activity.xml b/app/src/main/res/layout/view_once_message_activity.xml similarity index 100% rename from res/layout/view_once_message_activity.xml rename to app/src/main/res/layout/view_once_message_activity.xml diff --git a/res/layout/webrtc_answer_decline_button.xml b/app/src/main/res/layout/webrtc_answer_decline_button.xml similarity index 100% rename from res/layout/webrtc_answer_decline_button.xml rename to app/src/main/res/layout/webrtc_answer_decline_button.xml diff --git a/res/layout/webrtc_answer_decline_button_accessible.xml b/app/src/main/res/layout/webrtc_answer_decline_button_accessible.xml similarity index 100% rename from res/layout/webrtc_answer_decline_button_accessible.xml rename to app/src/main/res/layout/webrtc_answer_decline_button_accessible.xml diff --git a/res/layout/webrtc_call_activity.xml b/app/src/main/res/layout/webrtc_call_activity.xml similarity index 100% rename from res/layout/webrtc_call_activity.xml rename to app/src/main/res/layout/webrtc_call_activity.xml diff --git a/res/layout/webrtc_call_controls.xml b/app/src/main/res/layout/webrtc_call_controls.xml similarity index 100% rename from res/layout/webrtc_call_controls.xml rename to app/src/main/res/layout/webrtc_call_controls.xml diff --git a/res/layout/webrtc_call_screen.xml b/app/src/main/res/layout/webrtc_call_screen.xml similarity index 100% rename from res/layout/webrtc_call_screen.xml rename to app/src/main/res/layout/webrtc_call_screen.xml diff --git a/res/layout/zooming_image_view.xml b/app/src/main/res/layout/zooming_image_view.xml similarity index 100% rename from res/layout/zooming_image_view.xml rename to app/src/main/res/layout/zooming_image_view.xml diff --git a/res/menu/camera_contacts.xml b/app/src/main/res/menu/camera_contacts.xml similarity index 100% rename from res/menu/camera_contacts.xml rename to app/src/main/res/menu/camera_contacts.xml diff --git a/res/menu/conversation.xml b/app/src/main/res/menu/conversation.xml similarity index 100% rename from res/menu/conversation.xml rename to app/src/main/res/menu/conversation.xml diff --git a/res/menu/conversation_add_to_contacts.xml b/app/src/main/res/menu/conversation_add_to_contacts.xml similarity index 100% rename from res/menu/conversation_add_to_contacts.xml rename to app/src/main/res/menu/conversation_add_to_contacts.xml diff --git a/res/menu/conversation_callable_insecure.xml b/app/src/main/res/menu/conversation_callable_insecure.xml similarity index 100% rename from res/menu/conversation_callable_insecure.xml rename to app/src/main/res/menu/conversation_callable_insecure.xml diff --git a/res/menu/conversation_callable_secure.xml b/app/src/main/res/menu/conversation_callable_secure.xml similarity index 100% rename from res/menu/conversation_callable_secure.xml rename to app/src/main/res/menu/conversation_callable_secure.xml diff --git a/res/menu/conversation_context.xml b/app/src/main/res/menu/conversation_context.xml similarity index 100% rename from res/menu/conversation_context.xml rename to app/src/main/res/menu/conversation_context.xml diff --git a/res/menu/conversation_expiring_off.xml b/app/src/main/res/menu/conversation_expiring_off.xml similarity index 100% rename from res/menu/conversation_expiring_off.xml rename to app/src/main/res/menu/conversation_expiring_off.xml diff --git a/res/menu/conversation_expiring_on.xml b/app/src/main/res/menu/conversation_expiring_on.xml similarity index 100% rename from res/menu/conversation_expiring_on.xml rename to app/src/main/res/menu/conversation_expiring_on.xml diff --git a/res/menu/conversation_group_options.xml b/app/src/main/res/menu/conversation_group_options.xml similarity index 100% rename from res/menu/conversation_group_options.xml rename to app/src/main/res/menu/conversation_group_options.xml diff --git a/res/menu/conversation_insecure.xml b/app/src/main/res/menu/conversation_insecure.xml similarity index 100% rename from res/menu/conversation_insecure.xml rename to app/src/main/res/menu/conversation_insecure.xml diff --git a/res/menu/conversation_list_batch.xml b/app/src/main/res/menu/conversation_list_batch.xml similarity index 100% rename from res/menu/conversation_list_batch.xml rename to app/src/main/res/menu/conversation_list_batch.xml diff --git a/res/menu/conversation_list_batch_archive.xml b/app/src/main/res/menu/conversation_list_batch_archive.xml similarity index 100% rename from res/menu/conversation_list_batch_archive.xml rename to app/src/main/res/menu/conversation_list_batch_archive.xml diff --git a/res/menu/conversation_list_batch_unarchive.xml b/app/src/main/res/menu/conversation_list_batch_unarchive.xml similarity index 100% rename from res/menu/conversation_list_batch_unarchive.xml rename to app/src/main/res/menu/conversation_list_batch_unarchive.xml diff --git a/res/menu/conversation_list_search.xml b/app/src/main/res/menu/conversation_list_search.xml similarity index 100% rename from res/menu/conversation_list_search.xml rename to app/src/main/res/menu/conversation_list_search.xml diff --git a/res/menu/conversation_mms_group_options.xml b/app/src/main/res/menu/conversation_mms_group_options.xml similarity index 100% rename from res/menu/conversation_mms_group_options.xml rename to app/src/main/res/menu/conversation_mms_group_options.xml diff --git a/res/menu/conversation_muted.xml b/app/src/main/res/menu/conversation_muted.xml similarity index 100% rename from res/menu/conversation_muted.xml rename to app/src/main/res/menu/conversation_muted.xml diff --git a/res/menu/conversation_popup.xml b/app/src/main/res/menu/conversation_popup.xml similarity index 100% rename from res/menu/conversation_popup.xml rename to app/src/main/res/menu/conversation_popup.xml diff --git a/res/menu/conversation_push_group_options.xml b/app/src/main/res/menu/conversation_push_group_options.xml similarity index 100% rename from res/menu/conversation_push_group_options.xml rename to app/src/main/res/menu/conversation_push_group_options.xml diff --git a/res/menu/conversation_reactions_long_press_menu.xml b/app/src/main/res/menu/conversation_reactions_long_press_menu.xml similarity index 100% rename from res/menu/conversation_reactions_long_press_menu.xml rename to app/src/main/res/menu/conversation_reactions_long_press_menu.xml diff --git a/res/menu/conversation_secure.xml b/app/src/main/res/menu/conversation_secure.xml similarity index 100% rename from res/menu/conversation_secure.xml rename to app/src/main/res/menu/conversation_secure.xml diff --git a/res/menu/conversation_unmuted.xml b/app/src/main/res/menu/conversation_unmuted.xml similarity index 100% rename from res/menu/conversation_unmuted.xml rename to app/src/main/res/menu/conversation_unmuted.xml diff --git a/res/menu/group_create.xml b/app/src/main/res/menu/group_create.xml similarity index 100% rename from res/menu/group_create.xml rename to app/src/main/res/menu/group_create.xml diff --git a/res/menu/log_submit.xml b/app/src/main/res/menu/log_submit.xml similarity index 100% rename from res/menu/log_submit.xml rename to app/src/main/res/menu/log_submit.xml diff --git a/res/menu/media_overview_context.xml b/app/src/main/res/menu/media_overview_context.xml similarity index 100% rename from res/menu/media_overview_context.xml rename to app/src/main/res/menu/media_overview_context.xml diff --git a/res/menu/media_preview.xml b/app/src/main/res/menu/media_preview.xml similarity index 100% rename from res/menu/media_preview.xml rename to app/src/main/res/menu/media_preview.xml diff --git a/res/menu/mediapicker_default.xml b/app/src/main/res/menu/mediapicker_default.xml similarity index 100% rename from res/menu/mediapicker_default.xml rename to app/src/main/res/menu/mediapicker_default.xml diff --git a/res/menu/new_conversation_activity.xml b/app/src/main/res/menu/new_conversation_activity.xml similarity index 100% rename from res/menu/new_conversation_activity.xml rename to app/src/main/res/menu/new_conversation_activity.xml diff --git a/res/menu/text_secure_normal.xml b/app/src/main/res/menu/text_secure_normal.xml similarity index 100% rename from res/menu/text_secure_normal.xml rename to app/src/main/res/menu/text_secure_normal.xml diff --git a/res/menu/verify_display_fragment_context_menu.xml b/app/src/main/res/menu/verify_display_fragment_context_menu.xml similarity index 100% rename from res/menu/verify_display_fragment_context_menu.xml rename to app/src/main/res/menu/verify_display_fragment_context_menu.xml diff --git a/res/menu/verify_identity.xml b/app/src/main/res/menu/verify_identity.xml similarity index 100% rename from res/menu/verify_identity.xml rename to app/src/main/res/menu/verify_identity.xml diff --git a/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from res/mipmap-anydpi-v26/ic_launcher.xml rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/res/mipmap-hdpi/ic_group_shortcut.webp b/app/src/main/res/mipmap-hdpi/ic_group_shortcut.webp similarity index 100% rename from res/mipmap-hdpi/ic_group_shortcut.webp rename to app/src/main/res/mipmap-hdpi/ic_group_shortcut.webp diff --git a/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from res/mipmap-hdpi/ic_launcher.png rename to app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/res/mipmap-hdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp similarity index 100% rename from res/mipmap-hdpi/ic_launcher_foreground.webp rename to app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp diff --git a/res/mipmap-hdpi/ic_person_shortcut.webp b/app/src/main/res/mipmap-hdpi/ic_person_shortcut.webp similarity index 100% rename from res/mipmap-hdpi/ic_person_shortcut.webp rename to app/src/main/res/mipmap-hdpi/ic_person_shortcut.webp diff --git a/res/mipmap-mdpi/ic_group_shortcut.webp b/app/src/main/res/mipmap-mdpi/ic_group_shortcut.webp similarity index 100% rename from res/mipmap-mdpi/ic_group_shortcut.webp rename to app/src/main/res/mipmap-mdpi/ic_group_shortcut.webp diff --git a/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from res/mipmap-mdpi/ic_launcher.png rename to app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/res/mipmap-mdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp similarity index 100% rename from res/mipmap-mdpi/ic_launcher_foreground.webp rename to app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp diff --git a/res/mipmap-mdpi/ic_person_shortcut.webp b/app/src/main/res/mipmap-mdpi/ic_person_shortcut.webp similarity index 100% rename from res/mipmap-mdpi/ic_person_shortcut.webp rename to app/src/main/res/mipmap-mdpi/ic_person_shortcut.webp diff --git a/res/mipmap-xhdpi/ic_group_shortcut.webp b/app/src/main/res/mipmap-xhdpi/ic_group_shortcut.webp similarity index 100% rename from res/mipmap-xhdpi/ic_group_shortcut.webp rename to app/src/main/res/mipmap-xhdpi/ic_group_shortcut.webp diff --git a/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from res/mipmap-xhdpi/ic_launcher.png rename to app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/res/mipmap-xhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp similarity index 100% rename from res/mipmap-xhdpi/ic_launcher_foreground.webp rename to app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp diff --git a/res/mipmap-xhdpi/ic_person_shortcut.webp b/app/src/main/res/mipmap-xhdpi/ic_person_shortcut.webp similarity index 100% rename from res/mipmap-xhdpi/ic_person_shortcut.webp rename to app/src/main/res/mipmap-xhdpi/ic_person_shortcut.webp diff --git a/res/mipmap-xxhdpi/ic_group_shortcut.webp b/app/src/main/res/mipmap-xxhdpi/ic_group_shortcut.webp similarity index 100% rename from res/mipmap-xxhdpi/ic_group_shortcut.webp rename to app/src/main/res/mipmap-xxhdpi/ic_group_shortcut.webp diff --git a/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from res/mipmap-xxhdpi/ic_launcher.png rename to app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp similarity index 100% rename from res/mipmap-xxhdpi/ic_launcher_foreground.webp rename to app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp diff --git a/res/mipmap-xxhdpi/ic_person_shortcut.webp b/app/src/main/res/mipmap-xxhdpi/ic_person_shortcut.webp similarity index 100% rename from res/mipmap-xxhdpi/ic_person_shortcut.webp rename to app/src/main/res/mipmap-xxhdpi/ic_person_shortcut.webp diff --git a/res/mipmap-xxxhdpi/ic_group_shortcut.webp b/app/src/main/res/mipmap-xxxhdpi/ic_group_shortcut.webp similarity index 100% rename from res/mipmap-xxxhdpi/ic_group_shortcut.webp rename to app/src/main/res/mipmap-xxxhdpi/ic_group_shortcut.webp diff --git a/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from res/mipmap-xxxhdpi/ic_launcher.png rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp similarity index 100% rename from res/mipmap-xxxhdpi/ic_launcher_foreground.webp rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp diff --git a/res/mipmap-xxxhdpi/ic_person_shortcut.webp b/app/src/main/res/mipmap-xxxhdpi/ic_person_shortcut.webp similarity index 100% rename from res/mipmap-xxxhdpi/ic_person_shortcut.webp rename to app/src/main/res/mipmap-xxxhdpi/ic_person_shortcut.webp diff --git a/res/navigation/profile_edit.xml b/app/src/main/res/navigation/profile_edit.xml similarity index 100% rename from res/navigation/profile_edit.xml rename to app/src/main/res/navigation/profile_edit.xml diff --git a/res/navigation/registration.xml b/app/src/main/res/navigation/registration.xml similarity index 100% rename from res/navigation/registration.xml rename to app/src/main/res/navigation/registration.xml diff --git a/res/raw/censorship_fronting.store b/app/src/main/res/raw/censorship_fronting.store similarity index 100% rename from res/raw/censorship_fronting.store rename to app/src/main/res/raw/censorship_fronting.store diff --git a/res/raw/ias.store b/app/src/main/res/raw/ias.store similarity index 100% rename from res/raw/ias.store rename to app/src/main/res/raw/ias.store diff --git a/res/raw/lottie_insights_100.json b/app/src/main/res/raw/lottie_insights_100.json similarity index 100% rename from res/raw/lottie_insights_100.json rename to app/src/main/res/raw/lottie_insights_100.json diff --git a/res/raw/lottie_play_pause.json b/app/src/main/res/raw/lottie_play_pause.json similarity index 100% rename from res/raw/lottie_play_pause.json rename to app/src/main/res/raw/lottie_play_pause.json diff --git a/res/raw/lottie_stickers_splash.json b/app/src/main/res/raw/lottie_stickers_splash.json similarity index 100% rename from res/raw/lottie_stickers_splash.json rename to app/src/main/res/raw/lottie_stickers_splash.json diff --git a/res/raw/redphone_busy.mp3 b/app/src/main/res/raw/redphone_busy.mp3 similarity index 100% rename from res/raw/redphone_busy.mp3 rename to app/src/main/res/raw/redphone_busy.mp3 diff --git a/res/raw/redphone_outring.mp3 b/app/src/main/res/raw/redphone_outring.mp3 similarity index 100% rename from res/raw/redphone_outring.mp3 rename to app/src/main/res/raw/redphone_outring.mp3 diff --git a/res/raw/webrtc_completed.mp3 b/app/src/main/res/raw/webrtc_completed.mp3 similarity index 100% rename from res/raw/webrtc_completed.mp3 rename to app/src/main/res/raw/webrtc_completed.mp3 diff --git a/res/raw/webrtc_disconnected.mp3 b/app/src/main/res/raw/webrtc_disconnected.mp3 similarity index 100% rename from res/raw/webrtc_disconnected.mp3 rename to app/src/main/res/raw/webrtc_disconnected.mp3 diff --git a/res/raw/whisper.store b/app/src/main/res/raw/whisper.store similarity index 100% rename from res/raw/whisper.store rename to app/src/main/res/raw/whisper.store diff --git a/res/transition/fragment_shared.xml b/app/src/main/res/transition/fragment_shared.xml similarity index 100% rename from res/transition/fragment_shared.xml rename to app/src/main/res/transition/fragment_shared.xml diff --git a/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml similarity index 100% rename from res/values-ar/strings.xml rename to app/src/main/res/values-ar/strings.xml diff --git a/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml similarity index 100% rename from res/values-az/strings.xml rename to app/src/main/res/values-az/strings.xml diff --git a/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml similarity index 100% rename from res/values-bg/strings.xml rename to app/src/main/res/values-bg/strings.xml diff --git a/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml similarity index 100% rename from res/values-bn/strings.xml rename to app/src/main/res/values-bn/strings.xml diff --git a/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml similarity index 100% rename from res/values-bs/strings.xml rename to app/src/main/res/values-bs/strings.xml diff --git a/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml similarity index 100% rename from res/values-ca/strings.xml rename to app/src/main/res/values-ca/strings.xml diff --git a/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml similarity index 100% rename from res/values-cs/strings.xml rename to app/src/main/res/values-cs/strings.xml diff --git a/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml similarity index 100% rename from res/values-cy/strings.xml rename to app/src/main/res/values-cy/strings.xml diff --git a/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml similarity index 100% rename from res/values-da/strings.xml rename to app/src/main/res/values-da/strings.xml diff --git a/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml similarity index 100% rename from res/values-de/strings.xml rename to app/src/main/res/values-de/strings.xml diff --git a/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml similarity index 100% rename from res/values-el/strings.xml rename to app/src/main/res/values-el/strings.xml diff --git a/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml similarity index 100% rename from res/values-eo/strings.xml rename to app/src/main/res/values-eo/strings.xml diff --git a/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml similarity index 100% rename from res/values-es/strings.xml rename to app/src/main/res/values-es/strings.xml diff --git a/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml similarity index 100% rename from res/values-et/strings.xml rename to app/src/main/res/values-et/strings.xml diff --git a/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml similarity index 100% rename from res/values-eu/strings.xml rename to app/src/main/res/values-eu/strings.xml diff --git a/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml similarity index 100% rename from res/values-fa/strings.xml rename to app/src/main/res/values-fa/strings.xml diff --git a/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml similarity index 100% rename from res/values-fi/strings.xml rename to app/src/main/res/values-fi/strings.xml diff --git a/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml similarity index 100% rename from res/values-fr/strings.xml rename to app/src/main/res/values-fr/strings.xml diff --git a/res/values-ga/strings.xml b/app/src/main/res/values-ga/strings.xml similarity index 100% rename from res/values-ga/strings.xml rename to app/src/main/res/values-ga/strings.xml diff --git a/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml similarity index 100% rename from res/values-gl/strings.xml rename to app/src/main/res/values-gl/strings.xml diff --git a/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml similarity index 100% rename from res/values-hi/strings.xml rename to app/src/main/res/values-hi/strings.xml diff --git a/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml similarity index 100% rename from res/values-hr/strings.xml rename to app/src/main/res/values-hr/strings.xml diff --git a/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml similarity index 100% rename from res/values-hu/strings.xml rename to app/src/main/res/values-hu/strings.xml diff --git a/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml similarity index 100% rename from res/values-in/strings.xml rename to app/src/main/res/values-in/strings.xml diff --git a/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml similarity index 100% rename from res/values-it/strings.xml rename to app/src/main/res/values-it/strings.xml diff --git a/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml similarity index 100% rename from res/values-iw/strings.xml rename to app/src/main/res/values-iw/strings.xml diff --git a/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml similarity index 100% rename from res/values-ja/strings.xml rename to app/src/main/res/values-ja/strings.xml diff --git a/res/values-km/strings.xml b/app/src/main/res/values-km/strings.xml similarity index 100% rename from res/values-km/strings.xml rename to app/src/main/res/values-km/strings.xml diff --git a/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml similarity index 100% rename from res/values-ko/strings.xml rename to app/src/main/res/values-ko/strings.xml diff --git a/res/values-ku/strings.xml b/app/src/main/res/values-ku/strings.xml similarity index 100% rename from res/values-ku/strings.xml rename to app/src/main/res/values-ku/strings.xml diff --git a/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml similarity index 100% rename from res/values-land/dimens.xml rename to app/src/main/res/values-land/dimens.xml diff --git a/res/values-lg/strings.xml b/app/src/main/res/values-lg/strings.xml similarity index 100% rename from res/values-lg/strings.xml rename to app/src/main/res/values-lg/strings.xml diff --git a/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml similarity index 100% rename from res/values-lt/strings.xml rename to app/src/main/res/values-lt/strings.xml diff --git a/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml similarity index 100% rename from res/values-lv/strings.xml rename to app/src/main/res/values-lv/strings.xml diff --git a/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml similarity index 100% rename from res/values-mk/strings.xml rename to app/src/main/res/values-mk/strings.xml diff --git a/res/values-mr/strings.xml b/app/src/main/res/values-mr/strings.xml similarity index 100% rename from res/values-mr/strings.xml rename to app/src/main/res/values-mr/strings.xml diff --git a/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml similarity index 100% rename from res/values-ms/strings.xml rename to app/src/main/res/values-ms/strings.xml diff --git a/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml similarity index 100% rename from res/values-my/strings.xml rename to app/src/main/res/values-my/strings.xml diff --git a/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml similarity index 100% rename from res/values-nb/strings.xml rename to app/src/main/res/values-nb/strings.xml diff --git a/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml similarity index 100% rename from res/values-nl/strings.xml rename to app/src/main/res/values-nl/strings.xml diff --git a/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml similarity index 100% rename from res/values-nn/strings.xml rename to app/src/main/res/values-nn/strings.xml diff --git a/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml similarity index 100% rename from res/values-pa/strings.xml rename to app/src/main/res/values-pa/strings.xml diff --git a/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml similarity index 100% rename from res/values-pl/strings.xml rename to app/src/main/res/values-pl/strings.xml diff --git a/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from res/values-pt-rBR/strings.xml rename to app/src/main/res/values-pt-rBR/strings.xml diff --git a/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml similarity index 100% rename from res/values-pt/strings.xml rename to app/src/main/res/values-pt/strings.xml diff --git a/res/values-qu-rEC/strings.xml b/app/src/main/res/values-qu-rEC/strings.xml similarity index 100% rename from res/values-qu-rEC/strings.xml rename to app/src/main/res/values-qu-rEC/strings.xml diff --git a/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml similarity index 100% rename from res/values-ro/strings.xml rename to app/src/main/res/values-ro/strings.xml diff --git a/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml similarity index 100% rename from res/values-ru/strings.xml rename to app/src/main/res/values-ru/strings.xml diff --git a/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml similarity index 100% rename from res/values-sk/strings.xml rename to app/src/main/res/values-sk/strings.xml diff --git a/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml similarity index 100% rename from res/values-sl/strings.xml rename to app/src/main/res/values-sl/strings.xml diff --git a/res/values-small/dimens.xml b/app/src/main/res/values-small/dimens.xml similarity index 100% rename from res/values-small/dimens.xml rename to app/src/main/res/values-small/dimens.xml diff --git a/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml similarity index 100% rename from res/values-sq/strings.xml rename to app/src/main/res/values-sq/strings.xml diff --git a/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml similarity index 100% rename from res/values-sr/strings.xml rename to app/src/main/res/values-sr/strings.xml diff --git a/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml similarity index 100% rename from res/values-sv/strings.xml rename to app/src/main/res/values-sv/strings.xml diff --git a/res/values-sw/strings.xml b/app/src/main/res/values-sw/strings.xml similarity index 100% rename from res/values-sw/strings.xml rename to app/src/main/res/values-sw/strings.xml diff --git a/res/values-sw360dp/dimens.xml b/app/src/main/res/values-sw360dp/dimens.xml similarity index 100% rename from res/values-sw360dp/dimens.xml rename to app/src/main/res/values-sw360dp/dimens.xml diff --git a/res/values-sw360dp/registration_dimens.xml b/app/src/main/res/values-sw360dp/registration_dimens.xml similarity index 100% rename from res/values-sw360dp/registration_dimens.xml rename to app/src/main/res/values-sw360dp/registration_dimens.xml diff --git a/res/values-sw400dp/dimens.xml b/app/src/main/res/values-sw400dp/dimens.xml similarity index 100% rename from res/values-sw400dp/dimens.xml rename to app/src/main/res/values-sw400dp/dimens.xml diff --git a/res/values-sw480dp/dimens.xml b/app/src/main/res/values-sw480dp/dimens.xml similarity index 100% rename from res/values-sw480dp/dimens.xml rename to app/src/main/res/values-sw480dp/dimens.xml diff --git a/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml similarity index 100% rename from res/values-ta/strings.xml rename to app/src/main/res/values-ta/strings.xml diff --git a/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml similarity index 100% rename from res/values-te/strings.xml rename to app/src/main/res/values-te/strings.xml diff --git a/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml similarity index 100% rename from res/values-th/strings.xml rename to app/src/main/res/values-th/strings.xml diff --git a/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml similarity index 100% rename from res/values-tr/strings.xml rename to app/src/main/res/values-tr/strings.xml diff --git a/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml similarity index 100% rename from res/values-uk/strings.xml rename to app/src/main/res/values-uk/strings.xml diff --git a/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml similarity index 100% rename from res/values-ur/strings.xml rename to app/src/main/res/values-ur/strings.xml diff --git a/res/values-v11/styles.xml b/app/src/main/res/values-v11/styles.xml similarity index 100% rename from res/values-v11/styles.xml rename to app/src/main/res/values-v11/styles.xml diff --git a/res/values-v19/colors.xml b/app/src/main/res/values-v19/colors.xml similarity index 100% rename from res/values-v19/colors.xml rename to app/src/main/res/values-v19/colors.xml diff --git a/res/values-v19/themes.xml b/app/src/main/res/values-v19/themes.xml similarity index 100% rename from res/values-v19/themes.xml rename to app/src/main/res/values-v19/themes.xml diff --git a/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml similarity index 100% rename from res/values-v21/themes.xml rename to app/src/main/res/values-v21/themes.xml diff --git a/res/values-v23/themes.xml b/app/src/main/res/values-v23/themes.xml similarity index 100% rename from res/values-v23/themes.xml rename to app/src/main/res/values-v23/themes.xml diff --git a/res/values-v26/values.xml b/app/src/main/res/values-v26/values.xml similarity index 100% rename from res/values-v26/values.xml rename to app/src/main/res/values-v26/values.xml diff --git a/res/values-v27/themes.xml b/app/src/main/res/values-v27/themes.xml similarity index 100% rename from res/values-v27/themes.xml rename to app/src/main/res/values-v27/themes.xml diff --git a/res/values-v9/styles.xml b/app/src/main/res/values-v9/styles.xml similarity index 100% rename from res/values-v9/styles.xml rename to app/src/main/res/values-v9/styles.xml diff --git a/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml similarity index 100% rename from res/values-vi/strings.xml rename to app/src/main/res/values-vi/strings.xml diff --git a/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from res/values-zh-rCN/strings.xml rename to app/src/main/res/values-zh-rCN/strings.xml diff --git a/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from res/values-zh-rTW/strings.xml rename to app/src/main/res/values-zh-rTW/strings.xml diff --git a/res/values/arrays.xml b/app/src/main/res/values/arrays.xml similarity index 100% rename from res/values/arrays.xml rename to app/src/main/res/values/arrays.xml diff --git a/res/values/attrs.xml b/app/src/main/res/values/attrs.xml similarity index 100% rename from res/values/attrs.xml rename to app/src/main/res/values/attrs.xml diff --git a/res/values/colors.xml b/app/src/main/res/values/colors.xml similarity index 100% rename from res/values/colors.xml rename to app/src/main/res/values/colors.xml diff --git a/res/values/conversation_colors.xml b/app/src/main/res/values/conversation_colors.xml similarity index 100% rename from res/values/conversation_colors.xml rename to app/src/main/res/values/conversation_colors.xml diff --git a/res/values/core_colors.xml b/app/src/main/res/values/core_colors.xml similarity index 100% rename from res/values/core_colors.xml rename to app/src/main/res/values/core_colors.xml diff --git a/res/values/crop_area_renderer.xml b/app/src/main/res/values/crop_area_renderer.xml similarity index 100% rename from res/values/crop_area_renderer.xml rename to app/src/main/res/values/crop_area_renderer.xml diff --git a/res/values/dimens.xml b/app/src/main/res/values/dimens.xml similarity index 100% rename from res/values/dimens.xml rename to app/src/main/res/values/dimens.xml diff --git a/res/values/emoji.xml b/app/src/main/res/values/emoji.xml similarity index 100% rename from res/values/emoji.xml rename to app/src/main/res/values/emoji.xml diff --git a/res/values/firebase_messaging.xml b/app/src/main/res/values/firebase_messaging.xml similarity index 100% rename from res/values/firebase_messaging.xml rename to app/src/main/res/values/firebase_messaging.xml diff --git a/res/values/ids.xml b/app/src/main/res/values/ids.xml similarity index 100% rename from res/values/ids.xml rename to app/src/main/res/values/ids.xml diff --git a/res/values/integers.xml b/app/src/main/res/values/integers.xml similarity index 100% rename from res/values/integers.xml rename to app/src/main/res/values/integers.xml diff --git a/res/values/material_colors.xml b/app/src/main/res/values/material_colors.xml similarity index 100% rename from res/values/material_colors.xml rename to app/src/main/res/values/material_colors.xml diff --git a/res/values/registration_dimens.xml b/app/src/main/res/values/registration_dimens.xml similarity index 100% rename from res/values/registration_dimens.xml rename to app/src/main/res/values/registration_dimens.xml diff --git a/res/values/registration_styles.xml b/app/src/main/res/values/registration_styles.xml similarity index 100% rename from res/values/registration_styles.xml rename to app/src/main/res/values/registration_styles.xml diff --git a/res/values/strings.xml b/app/src/main/res/values/strings.xml similarity index 100% rename from res/values/strings.xml rename to app/src/main/res/values/strings.xml diff --git a/res/values/styles.xml b/app/src/main/res/values/styles.xml similarity index 100% rename from res/values/styles.xml rename to app/src/main/res/values/styles.xml diff --git a/res/values/text_styles.xml b/app/src/main/res/values/text_styles.xml similarity index 100% rename from res/values/text_styles.xml rename to app/src/main/res/values/text_styles.xml diff --git a/res/values/themes.xml b/app/src/main/res/values/themes.xml similarity index 100% rename from res/values/themes.xml rename to app/src/main/res/values/themes.xml diff --git a/res/values/values.xml b/app/src/main/res/values/values.xml similarity index 100% rename from res/values/values.xml rename to app/src/main/res/values/values.xml diff --git a/res/values/vector_paths.xml b/app/src/main/res/values/vector_paths.xml similarity index 100% rename from res/values/vector_paths.xml rename to app/src/main/res/values/vector_paths.xml diff --git a/res/xml-mcc202-mnc1/mms_config.xml b/app/src/main/res/xml-mcc202-mnc1/mms_config.xml similarity index 100% rename from res/xml-mcc202-mnc1/mms_config.xml rename to app/src/main/res/xml-mcc202-mnc1/mms_config.xml diff --git a/res/xml-mcc202-mnc5/mms_config.xml b/app/src/main/res/xml-mcc202-mnc5/mms_config.xml similarity index 100% rename from res/xml-mcc202-mnc5/mms_config.xml rename to app/src/main/res/xml-mcc202-mnc5/mms_config.xml diff --git a/res/xml-mcc204-mnc16/mms_config.xml b/app/src/main/res/xml-mcc204-mnc16/mms_config.xml similarity index 100% rename from res/xml-mcc204-mnc16/mms_config.xml rename to app/src/main/res/xml-mcc204-mnc16/mms_config.xml diff --git a/res/xml-mcc204-mnc20/mms_config.xml b/app/src/main/res/xml-mcc204-mnc20/mms_config.xml similarity index 100% rename from res/xml-mcc204-mnc20/mms_config.xml rename to app/src/main/res/xml-mcc204-mnc20/mms_config.xml diff --git a/res/xml-mcc208-mnc1/mms_config.xml b/app/src/main/res/xml-mcc208-mnc1/mms_config.xml similarity index 100% rename from res/xml-mcc208-mnc1/mms_config.xml rename to app/src/main/res/xml-mcc208-mnc1/mms_config.xml diff --git a/res/xml-mcc208-mnc10/mms_config.xml b/app/src/main/res/xml-mcc208-mnc10/mms_config.xml similarity index 100% rename from res/xml-mcc208-mnc10/mms_config.xml rename to app/src/main/res/xml-mcc208-mnc10/mms_config.xml diff --git a/res/xml-mcc208-mnc15/mms_config.xml b/app/src/main/res/xml-mcc208-mnc15/mms_config.xml similarity index 100% rename from res/xml-mcc208-mnc15/mms_config.xml rename to app/src/main/res/xml-mcc208-mnc15/mms_config.xml diff --git a/res/xml-mcc208-mnc20/mms_config.xml b/app/src/main/res/xml-mcc208-mnc20/mms_config.xml similarity index 100% rename from res/xml-mcc208-mnc20/mms_config.xml rename to app/src/main/res/xml-mcc208-mnc20/mms_config.xml diff --git a/res/xml-mcc208-mnc26/mms_config.xml b/app/src/main/res/xml-mcc208-mnc26/mms_config.xml similarity index 100% rename from res/xml-mcc208-mnc26/mms_config.xml rename to app/src/main/res/xml-mcc208-mnc26/mms_config.xml diff --git a/res/xml-mcc214-mnc1/mms_config.xml b/app/src/main/res/xml-mcc214-mnc1/mms_config.xml similarity index 100% rename from res/xml-mcc214-mnc1/mms_config.xml rename to app/src/main/res/xml-mcc214-mnc1/mms_config.xml diff --git a/res/xml-mcc214-mnc17/mms_config.xml b/app/src/main/res/xml-mcc214-mnc17/mms_config.xml similarity index 100% rename from res/xml-mcc214-mnc17/mms_config.xml rename to app/src/main/res/xml-mcc214-mnc17/mms_config.xml diff --git a/res/xml-mcc214-mnc21/mms_config.xml b/app/src/main/res/xml-mcc214-mnc21/mms_config.xml similarity index 100% rename from res/xml-mcc214-mnc21/mms_config.xml rename to app/src/main/res/xml-mcc214-mnc21/mms_config.xml diff --git a/res/xml-mcc214-mnc3/mms_config.xml b/app/src/main/res/xml-mcc214-mnc3/mms_config.xml similarity index 100% rename from res/xml-mcc214-mnc3/mms_config.xml rename to app/src/main/res/xml-mcc214-mnc3/mms_config.xml diff --git a/res/xml-mcc214-mnc6/mms_config.xml b/app/src/main/res/xml-mcc214-mnc6/mms_config.xml similarity index 100% rename from res/xml-mcc214-mnc6/mms_config.xml rename to app/src/main/res/xml-mcc214-mnc6/mms_config.xml diff --git a/res/xml-mcc214-mnc7/mms_config.xml b/app/src/main/res/xml-mcc214-mnc7/mms_config.xml similarity index 100% rename from res/xml-mcc214-mnc7/mms_config.xml rename to app/src/main/res/xml-mcc214-mnc7/mms_config.xml diff --git a/res/xml-mcc216-mnc30/mms_config.xml b/app/src/main/res/xml-mcc216-mnc30/mms_config.xml similarity index 100% rename from res/xml-mcc216-mnc30/mms_config.xml rename to app/src/main/res/xml-mcc216-mnc30/mms_config.xml diff --git a/res/xml-mcc216-mnc70/mms_config.xml b/app/src/main/res/xml-mcc216-mnc70/mms_config.xml similarity index 100% rename from res/xml-mcc216-mnc70/mms_config.xml rename to app/src/main/res/xml-mcc216-mnc70/mms_config.xml diff --git a/res/xml-mcc218-mnc5/mms_config.xml b/app/src/main/res/xml-mcc218-mnc5/mms_config.xml similarity index 100% rename from res/xml-mcc218-mnc5/mms_config.xml rename to app/src/main/res/xml-mcc218-mnc5/mms_config.xml diff --git a/res/xml-mcc219-mnc1/mms_config.xml b/app/src/main/res/xml-mcc219-mnc1/mms_config.xml similarity index 100% rename from res/xml-mcc219-mnc1/mms_config.xml rename to app/src/main/res/xml-mcc219-mnc1/mms_config.xml diff --git a/res/xml-mcc220-mnc4/mms_config.xml b/app/src/main/res/xml-mcc220-mnc4/mms_config.xml similarity index 100% rename from res/xml-mcc220-mnc4/mms_config.xml rename to app/src/main/res/xml-mcc220-mnc4/mms_config.xml diff --git a/res/xml-mcc222-mnc1/mms_config.xml b/app/src/main/res/xml-mcc222-mnc1/mms_config.xml similarity index 100% rename from res/xml-mcc222-mnc1/mms_config.xml rename to app/src/main/res/xml-mcc222-mnc1/mms_config.xml diff --git a/res/xml-mcc222-mnc10/mms_config.xml b/app/src/main/res/xml-mcc222-mnc10/mms_config.xml similarity index 100% rename from res/xml-mcc222-mnc10/mms_config.xml rename to app/src/main/res/xml-mcc222-mnc10/mms_config.xml diff --git a/res/xml-mcc222-mnc8/mms_config.xml b/app/src/main/res/xml-mcc222-mnc8/mms_config.xml similarity index 100% rename from res/xml-mcc222-mnc8/mms_config.xml rename to app/src/main/res/xml-mcc222-mnc8/mms_config.xml diff --git a/res/xml-mcc226-mnc1/mms_config.xml b/app/src/main/res/xml-mcc226-mnc1/mms_config.xml similarity index 100% rename from res/xml-mcc226-mnc1/mms_config.xml rename to app/src/main/res/xml-mcc226-mnc1/mms_config.xml diff --git a/res/xml-mcc226-mnc10/mms_config.xml b/app/src/main/res/xml-mcc226-mnc10/mms_config.xml similarity index 100% rename from res/xml-mcc226-mnc10/mms_config.xml rename to app/src/main/res/xml-mcc226-mnc10/mms_config.xml diff --git a/res/xml-mcc226-mnc3/mms_config.xml b/app/src/main/res/xml-mcc226-mnc3/mms_config.xml similarity index 100% rename from res/xml-mcc226-mnc3/mms_config.xml rename to app/src/main/res/xml-mcc226-mnc3/mms_config.xml diff --git a/res/xml-mcc226-mnc6/mms_config.xml b/app/src/main/res/xml-mcc226-mnc6/mms_config.xml similarity index 100% rename from res/xml-mcc226-mnc6/mms_config.xml rename to app/src/main/res/xml-mcc226-mnc6/mms_config.xml diff --git a/res/xml-mcc228-mnc1/mms_config.xml b/app/src/main/res/xml-mcc228-mnc1/mms_config.xml similarity index 100% rename from res/xml-mcc228-mnc1/mms_config.xml rename to app/src/main/res/xml-mcc228-mnc1/mms_config.xml diff --git a/res/xml-mcc230-mnc1/mms_config.xml b/app/src/main/res/xml-mcc230-mnc1/mms_config.xml similarity index 100% rename from res/xml-mcc230-mnc1/mms_config.xml rename to app/src/main/res/xml-mcc230-mnc1/mms_config.xml diff --git a/res/xml-mcc230-mnc3/mms_config.xml b/app/src/main/res/xml-mcc230-mnc3/mms_config.xml similarity index 100% rename from res/xml-mcc230-mnc3/mms_config.xml rename to app/src/main/res/xml-mcc230-mnc3/mms_config.xml diff --git a/res/xml-mcc230-mnc99/mms_config.xml b/app/src/main/res/xml-mcc230-mnc99/mms_config.xml similarity index 100% rename from res/xml-mcc230-mnc99/mms_config.xml rename to app/src/main/res/xml-mcc230-mnc99/mms_config.xml diff --git a/res/xml-mcc231-mnc2/mms_config.xml b/app/src/main/res/xml-mcc231-mnc2/mms_config.xml similarity index 100% rename from res/xml-mcc231-mnc2/mms_config.xml rename to app/src/main/res/xml-mcc231-mnc2/mms_config.xml diff --git a/res/xml-mcc232-mnc1/mms_config.xml b/app/src/main/res/xml-mcc232-mnc1/mms_config.xml similarity index 100% rename from res/xml-mcc232-mnc1/mms_config.xml rename to app/src/main/res/xml-mcc232-mnc1/mms_config.xml diff --git a/res/xml-mcc232-mnc3/mms_config.xml b/app/src/main/res/xml-mcc232-mnc3/mms_config.xml similarity index 100% rename from res/xml-mcc232-mnc3/mms_config.xml rename to app/src/main/res/xml-mcc232-mnc3/mms_config.xml diff --git a/res/xml-mcc232-mnc7/mms_config.xml b/app/src/main/res/xml-mcc232-mnc7/mms_config.xml similarity index 100% rename from res/xml-mcc232-mnc7/mms_config.xml rename to app/src/main/res/xml-mcc232-mnc7/mms_config.xml diff --git a/res/xml-mcc234-mnc15/mms_config.xml b/app/src/main/res/xml-mcc234-mnc15/mms_config.xml similarity index 100% rename from res/xml-mcc234-mnc15/mms_config.xml rename to app/src/main/res/xml-mcc234-mnc15/mms_config.xml diff --git a/res/xml-mcc234-mnc3/mms_config.xml b/app/src/main/res/xml-mcc234-mnc3/mms_config.xml similarity index 100% rename from res/xml-mcc234-mnc3/mms_config.xml rename to app/src/main/res/xml-mcc234-mnc3/mms_config.xml diff --git a/res/xml-mcc238-mnc2/mms_config.xml b/app/src/main/res/xml-mcc238-mnc2/mms_config.xml similarity index 100% rename from res/xml-mcc238-mnc2/mms_config.xml rename to app/src/main/res/xml-mcc238-mnc2/mms_config.xml diff --git a/res/xml-mcc238-mnc77/mms_config.xml b/app/src/main/res/xml-mcc238-mnc77/mms_config.xml similarity index 100% rename from res/xml-mcc238-mnc77/mms_config.xml rename to app/src/main/res/xml-mcc238-mnc77/mms_config.xml diff --git a/res/xml-mcc240-mnc1/mms_config.xml b/app/src/main/res/xml-mcc240-mnc1/mms_config.xml similarity index 100% rename from res/xml-mcc240-mnc1/mms_config.xml rename to app/src/main/res/xml-mcc240-mnc1/mms_config.xml diff --git a/res/xml-mcc240-mnc24/mms_config.xml b/app/src/main/res/xml-mcc240-mnc24/mms_config.xml similarity index 100% rename from res/xml-mcc240-mnc24/mms_config.xml rename to app/src/main/res/xml-mcc240-mnc24/mms_config.xml diff --git a/res/xml-mcc240-mnc4/mms_config.xml b/app/src/main/res/xml-mcc240-mnc4/mms_config.xml similarity index 100% rename from res/xml-mcc240-mnc4/mms_config.xml rename to app/src/main/res/xml-mcc240-mnc4/mms_config.xml diff --git a/res/xml-mcc240-mnc8/mms_config.xml b/app/src/main/res/xml-mcc240-mnc8/mms_config.xml similarity index 100% rename from res/xml-mcc240-mnc8/mms_config.xml rename to app/src/main/res/xml-mcc240-mnc8/mms_config.xml diff --git a/res/xml-mcc242-mnc1/mms_config.xml b/app/src/main/res/xml-mcc242-mnc1/mms_config.xml similarity index 100% rename from res/xml-mcc242-mnc1/mms_config.xml rename to app/src/main/res/xml-mcc242-mnc1/mms_config.xml diff --git a/res/xml-mcc242-mnc2/mms_config.xml b/app/src/main/res/xml-mcc242-mnc2/mms_config.xml similarity index 100% rename from res/xml-mcc242-mnc2/mms_config.xml rename to app/src/main/res/xml-mcc242-mnc2/mms_config.xml diff --git a/res/xml-mcc242-mnc5/mms_config.xml b/app/src/main/res/xml-mcc242-mnc5/mms_config.xml similarity index 100% rename from res/xml-mcc242-mnc5/mms_config.xml rename to app/src/main/res/xml-mcc242-mnc5/mms_config.xml diff --git a/res/xml-mcc244-mnc91/mms_config.xml b/app/src/main/res/xml-mcc244-mnc91/mms_config.xml similarity index 100% rename from res/xml-mcc244-mnc91/mms_config.xml rename to app/src/main/res/xml-mcc244-mnc91/mms_config.xml diff --git a/res/xml-mcc255-mnc1/mms_config.xml b/app/src/main/res/xml-mcc255-mnc1/mms_config.xml similarity index 100% rename from res/xml-mcc255-mnc1/mms_config.xml rename to app/src/main/res/xml-mcc255-mnc1/mms_config.xml diff --git a/res/xml-mcc260-mnc1/mms_config.xml b/app/src/main/res/xml-mcc260-mnc1/mms_config.xml similarity index 100% rename from res/xml-mcc260-mnc1/mms_config.xml rename to app/src/main/res/xml-mcc260-mnc1/mms_config.xml diff --git a/res/xml-mcc260-mnc2/mms_config.xml b/app/src/main/res/xml-mcc260-mnc2/mms_config.xml similarity index 100% rename from res/xml-mcc260-mnc2/mms_config.xml rename to app/src/main/res/xml-mcc260-mnc2/mms_config.xml diff --git a/res/xml-mcc260-mnc3/mms_config.xml b/app/src/main/res/xml-mcc260-mnc3/mms_config.xml similarity index 100% rename from res/xml-mcc260-mnc3/mms_config.xml rename to app/src/main/res/xml-mcc260-mnc3/mms_config.xml diff --git a/res/xml-mcc260-mnc5/mms_config.xml b/app/src/main/res/xml-mcc260-mnc5/mms_config.xml similarity index 100% rename from res/xml-mcc260-mnc5/mms_config.xml rename to app/src/main/res/xml-mcc260-mnc5/mms_config.xml diff --git a/res/xml-mcc260-mnc6/mms_config.xml b/app/src/main/res/xml-mcc260-mnc6/mms_config.xml similarity index 100% rename from res/xml-mcc260-mnc6/mms_config.xml rename to app/src/main/res/xml-mcc260-mnc6/mms_config.xml diff --git a/res/xml-mcc262-mnc1/mms_config.xml b/app/src/main/res/xml-mcc262-mnc1/mms_config.xml similarity index 100% rename from res/xml-mcc262-mnc1/mms_config.xml rename to app/src/main/res/xml-mcc262-mnc1/mms_config.xml diff --git a/res/xml-mcc262-mnc2/mms_config.xml b/app/src/main/res/xml-mcc262-mnc2/mms_config.xml similarity index 100% rename from res/xml-mcc262-mnc2/mms_config.xml rename to app/src/main/res/xml-mcc262-mnc2/mms_config.xml diff --git a/res/xml-mcc262-mnc4/mms_config.xml b/app/src/main/res/xml-mcc262-mnc4/mms_config.xml similarity index 100% rename from res/xml-mcc262-mnc4/mms_config.xml rename to app/src/main/res/xml-mcc262-mnc4/mms_config.xml diff --git a/res/xml-mcc262-mnc7/mms_config.xml b/app/src/main/res/xml-mcc262-mnc7/mms_config.xml similarity index 100% rename from res/xml-mcc262-mnc7/mms_config.xml rename to app/src/main/res/xml-mcc262-mnc7/mms_config.xml diff --git a/res/xml-mcc262-mnc9/mms_config.xml b/app/src/main/res/xml-mcc262-mnc9/mms_config.xml similarity index 100% rename from res/xml-mcc262-mnc9/mms_config.xml rename to app/src/main/res/xml-mcc262-mnc9/mms_config.xml diff --git a/res/xml-mcc268-mnc1/mms_config.xml b/app/src/main/res/xml-mcc268-mnc1/mms_config.xml similarity index 100% rename from res/xml-mcc268-mnc1/mms_config.xml rename to app/src/main/res/xml-mcc268-mnc1/mms_config.xml diff --git a/res/xml-mcc272-mnc1/mms_config.xml b/app/src/main/res/xml-mcc272-mnc1/mms_config.xml similarity index 100% rename from res/xml-mcc272-mnc1/mms_config.xml rename to app/src/main/res/xml-mcc272-mnc1/mms_config.xml diff --git a/res/xml-mcc274-mnc2/mms_config.xml b/app/src/main/res/xml-mcc274-mnc2/mms_config.xml similarity index 100% rename from res/xml-mcc274-mnc2/mms_config.xml rename to app/src/main/res/xml-mcc274-mnc2/mms_config.xml diff --git a/res/xml-mcc274-mnc3/mms_config.xml b/app/src/main/res/xml-mcc274-mnc3/mms_config.xml similarity index 100% rename from res/xml-mcc274-mnc3/mms_config.xml rename to app/src/main/res/xml-mcc274-mnc3/mms_config.xml diff --git a/res/xml-mcc276-mnc2/mms_config.xml b/app/src/main/res/xml-mcc276-mnc2/mms_config.xml similarity index 100% rename from res/xml-mcc276-mnc2/mms_config.xml rename to app/src/main/res/xml-mcc276-mnc2/mms_config.xml diff --git a/res/xml-mcc278-mnc1/mms_config.xml b/app/src/main/res/xml-mcc278-mnc1/mms_config.xml similarity index 100% rename from res/xml-mcc278-mnc1/mms_config.xml rename to app/src/main/res/xml-mcc278-mnc1/mms_config.xml diff --git a/res/xml-mcc284-mnc1/mms_config.xml b/app/src/main/res/xml-mcc284-mnc1/mms_config.xml similarity index 100% rename from res/xml-mcc284-mnc1/mms_config.xml rename to app/src/main/res/xml-mcc284-mnc1/mms_config.xml diff --git a/res/xml-mcc286-mnc1/mms_config.xml b/app/src/main/res/xml-mcc286-mnc1/mms_config.xml similarity index 100% rename from res/xml-mcc286-mnc1/mms_config.xml rename to app/src/main/res/xml-mcc286-mnc1/mms_config.xml diff --git a/res/xml-mcc286-mnc2/mms_config.xml b/app/src/main/res/xml-mcc286-mnc2/mms_config.xml similarity index 100% rename from res/xml-mcc286-mnc2/mms_config.xml rename to app/src/main/res/xml-mcc286-mnc2/mms_config.xml diff --git a/res/xml-mcc286-mnc3/mms_config.xml b/app/src/main/res/xml-mcc286-mnc3/mms_config.xml similarity index 100% rename from res/xml-mcc286-mnc3/mms_config.xml rename to app/src/main/res/xml-mcc286-mnc3/mms_config.xml diff --git a/res/xml-mcc293-mnc40/mms_config.xml b/app/src/main/res/xml-mcc293-mnc40/mms_config.xml similarity index 100% rename from res/xml-mcc293-mnc40/mms_config.xml rename to app/src/main/res/xml-mcc293-mnc40/mms_config.xml diff --git a/res/xml-mcc294-mnc1/mms_config.xml b/app/src/main/res/xml-mcc294-mnc1/mms_config.xml similarity index 100% rename from res/xml-mcc294-mnc1/mms_config.xml rename to app/src/main/res/xml-mcc294-mnc1/mms_config.xml diff --git a/res/xml-mcc294-mnc2/mms_config.xml b/app/src/main/res/xml-mcc294-mnc2/mms_config.xml similarity index 100% rename from res/xml-mcc294-mnc2/mms_config.xml rename to app/src/main/res/xml-mcc294-mnc2/mms_config.xml diff --git a/res/xml-mcc294-mnc3/mms_config.xml b/app/src/main/res/xml-mcc294-mnc3/mms_config.xml similarity index 100% rename from res/xml-mcc294-mnc3/mms_config.xml rename to app/src/main/res/xml-mcc294-mnc3/mms_config.xml diff --git a/res/xml-mcc297-mnc2/mms_config.xml b/app/src/main/res/xml-mcc297-mnc2/mms_config.xml similarity index 100% rename from res/xml-mcc297-mnc2/mms_config.xml rename to app/src/main/res/xml-mcc297-mnc2/mms_config.xml diff --git a/res/xml-mcc302-mnc220/mms_config.xml b/app/src/main/res/xml-mcc302-mnc220/mms_config.xml similarity index 100% rename from res/xml-mcc302-mnc220/mms_config.xml rename to app/src/main/res/xml-mcc302-mnc220/mms_config.xml diff --git a/res/xml-mcc302-mnc221/mms_config.xml b/app/src/main/res/xml-mcc302-mnc221/mms_config.xml similarity index 100% rename from res/xml-mcc302-mnc221/mms_config.xml rename to app/src/main/res/xml-mcc302-mnc221/mms_config.xml diff --git a/res/xml-mcc302-mnc270/mms_config.xml b/app/src/main/res/xml-mcc302-mnc270/mms_config.xml similarity index 100% rename from res/xml-mcc302-mnc270/mms_config.xml rename to app/src/main/res/xml-mcc302-mnc270/mms_config.xml diff --git a/res/xml-mcc302-mnc290/mms_config.xml b/app/src/main/res/xml-mcc302-mnc290/mms_config.xml similarity index 100% rename from res/xml-mcc302-mnc290/mms_config.xml rename to app/src/main/res/xml-mcc302-mnc290/mms_config.xml diff --git a/res/xml-mcc302-mnc320/mms_config.xml b/app/src/main/res/xml-mcc302-mnc320/mms_config.xml similarity index 100% rename from res/xml-mcc302-mnc320/mms_config.xml rename to app/src/main/res/xml-mcc302-mnc320/mms_config.xml diff --git a/res/xml-mcc302-mnc370/mms_config.xml b/app/src/main/res/xml-mcc302-mnc370/mms_config.xml similarity index 100% rename from res/xml-mcc302-mnc370/mms_config.xml rename to app/src/main/res/xml-mcc302-mnc370/mms_config.xml diff --git a/res/xml-mcc302-mnc490/mms_config.xml b/app/src/main/res/xml-mcc302-mnc490/mms_config.xml similarity index 100% rename from res/xml-mcc302-mnc490/mms_config.xml rename to app/src/main/res/xml-mcc302-mnc490/mms_config.xml diff --git a/res/xml-mcc302-mnc500/mms_config.xml b/app/src/main/res/xml-mcc302-mnc500/mms_config.xml similarity index 100% rename from res/xml-mcc302-mnc500/mms_config.xml rename to app/src/main/res/xml-mcc302-mnc500/mms_config.xml diff --git a/res/xml-mcc302-mnc510/mms_config.xml b/app/src/main/res/xml-mcc302-mnc510/mms_config.xml similarity index 100% rename from res/xml-mcc302-mnc510/mms_config.xml rename to app/src/main/res/xml-mcc302-mnc510/mms_config.xml diff --git a/res/xml-mcc302-mnc520/mms_config.xml b/app/src/main/res/xml-mcc302-mnc520/mms_config.xml similarity index 100% rename from res/xml-mcc302-mnc520/mms_config.xml rename to app/src/main/res/xml-mcc302-mnc520/mms_config.xml diff --git a/res/xml-mcc302-mnc610/mms_config.xml b/app/src/main/res/xml-mcc302-mnc610/mms_config.xml similarity index 100% rename from res/xml-mcc302-mnc610/mms_config.xml rename to app/src/main/res/xml-mcc302-mnc610/mms_config.xml diff --git a/res/xml-mcc302-mnc660/mms_config.xml b/app/src/main/res/xml-mcc302-mnc660/mms_config.xml similarity index 100% rename from res/xml-mcc302-mnc660/mms_config.xml rename to app/src/main/res/xml-mcc302-mnc660/mms_config.xml diff --git a/res/xml-mcc302-mnc720/mms_config.xml b/app/src/main/res/xml-mcc302-mnc720/mms_config.xml similarity index 100% rename from res/xml-mcc302-mnc720/mms_config.xml rename to app/src/main/res/xml-mcc302-mnc720/mms_config.xml diff --git a/res/xml-mcc302-mnc780/mms_config.xml b/app/src/main/res/xml-mcc302-mnc780/mms_config.xml similarity index 100% rename from res/xml-mcc302-mnc780/mms_config.xml rename to app/src/main/res/xml-mcc302-mnc780/mms_config.xml diff --git a/res/xml-mcc310-mnc10/mms_config.xml b/app/src/main/res/xml-mcc310-mnc10/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc10/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc10/mms_config.xml diff --git a/res/xml-mcc310-mnc12/mms_config.xml b/app/src/main/res/xml-mcc310-mnc12/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc12/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc12/mms_config.xml diff --git a/res/xml-mcc310-mnc120/mms_config.xml b/app/src/main/res/xml-mcc310-mnc120/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc120/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc120/mms_config.xml diff --git a/res/xml-mcc310-mnc13/mms_config.xml b/app/src/main/res/xml-mcc310-mnc13/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc13/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc13/mms_config.xml diff --git a/res/xml-mcc310-mnc130/mms_config.xml b/app/src/main/res/xml-mcc310-mnc130/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc130/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc130/mms_config.xml diff --git a/res/xml-mcc310-mnc150/mms_config.xml b/app/src/main/res/xml-mcc310-mnc150/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc150/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc150/mms_config.xml diff --git a/res/xml-mcc310-mnc160/mms_config.xml b/app/src/main/res/xml-mcc310-mnc160/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc160/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc160/mms_config.xml diff --git a/res/xml-mcc310-mnc170/mms_config.xml b/app/src/main/res/xml-mcc310-mnc170/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc170/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc170/mms_config.xml diff --git a/res/xml-mcc310-mnc26/mms_config.xml b/app/src/main/res/xml-mcc310-mnc26/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc26/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc26/mms_config.xml diff --git a/res/xml-mcc310-mnc260/mms_config.xml b/app/src/main/res/xml-mcc310-mnc260/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc260/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc260/mms_config.xml diff --git a/res/xml-mcc310-mnc360/mms_config.xml b/app/src/main/res/xml-mcc310-mnc360/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc360/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc360/mms_config.xml diff --git a/res/xml-mcc310-mnc380/mms_config.xml b/app/src/main/res/xml-mcc310-mnc380/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc380/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc380/mms_config.xml diff --git a/res/xml-mcc310-mnc4/mms_config.xml b/app/src/main/res/xml-mcc310-mnc4/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc4/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc4/mms_config.xml diff --git a/res/xml-mcc310-mnc40/mms_config.xml b/app/src/main/res/xml-mcc310-mnc40/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc40/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc40/mms_config.xml diff --git a/res/xml-mcc310-mnc410/mms_config.xml b/app/src/main/res/xml-mcc310-mnc410/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc410/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc410/mms_config.xml diff --git a/res/xml-mcc310-mnc420/mms_config.xml b/app/src/main/res/xml-mcc310-mnc420/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc420/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc420/mms_config.xml diff --git a/res/xml-mcc310-mnc450/mms_config.xml b/app/src/main/res/xml-mcc310-mnc450/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc450/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc450/mms_config.xml diff --git a/res/xml-mcc310-mnc470/mms_config.xml b/app/src/main/res/xml-mcc310-mnc470/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc470/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc470/mms_config.xml diff --git a/res/xml-mcc310-mnc490/mms_config.xml b/app/src/main/res/xml-mcc310-mnc490/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc490/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc490/mms_config.xml diff --git a/res/xml-mcc310-mnc5/mms_config.xml b/app/src/main/res/xml-mcc310-mnc5/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc5/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc5/mms_config.xml diff --git a/res/xml-mcc310-mnc560/mms_config.xml b/app/src/main/res/xml-mcc310-mnc560/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc560/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc560/mms_config.xml diff --git a/res/xml-mcc310-mnc580/mms_config.xml b/app/src/main/res/xml-mcc310-mnc580/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc580/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc580/mms_config.xml diff --git a/res/xml-mcc310-mnc590/mms_config.xml b/app/src/main/res/xml-mcc310-mnc590/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc590/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc590/mms_config.xml diff --git a/res/xml-mcc310-mnc600/mms_config.xml b/app/src/main/res/xml-mcc310-mnc600/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc600/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc600/mms_config.xml diff --git a/res/xml-mcc310-mnc680/mms_config.xml b/app/src/main/res/xml-mcc310-mnc680/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc680/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc680/mms_config.xml diff --git a/res/xml-mcc310-mnc70/mms_config.xml b/app/src/main/res/xml-mcc310-mnc70/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc70/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc70/mms_config.xml diff --git a/res/xml-mcc310-mnc750/mms_config.xml b/app/src/main/res/xml-mcc310-mnc750/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc750/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc750/mms_config.xml diff --git a/res/xml-mcc310-mnc770/mms_config.xml b/app/src/main/res/xml-mcc310-mnc770/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc770/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc770/mms_config.xml diff --git a/res/xml-mcc310-mnc890/mms_config.xml b/app/src/main/res/xml-mcc310-mnc890/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc890/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc890/mms_config.xml diff --git a/res/xml-mcc310-mnc90/mms_config.xml b/app/src/main/res/xml-mcc310-mnc90/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc90/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc90/mms_config.xml diff --git a/res/xml-mcc310-mnc910/mms_config.xml b/app/src/main/res/xml-mcc310-mnc910/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc910/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc910/mms_config.xml diff --git a/res/xml-mcc310-mnc920/mms_config.xml b/app/src/main/res/xml-mcc310-mnc920/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc920/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc920/mms_config.xml diff --git a/res/xml-mcc310-mnc980/mms_config.xml b/app/src/main/res/xml-mcc310-mnc980/mms_config.xml similarity index 100% rename from res/xml-mcc310-mnc980/mms_config.xml rename to app/src/main/res/xml-mcc310-mnc980/mms_config.xml diff --git a/res/xml-mcc311-mnc100/mms_config.xml b/app/src/main/res/xml-mcc311-mnc100/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc100/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc100/mms_config.xml diff --git a/res/xml-mcc311-mnc110/mms_config.xml b/app/src/main/res/xml-mcc311-mnc110/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc110/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc110/mms_config.xml diff --git a/res/xml-mcc311-mnc12/mms_config.xml b/app/src/main/res/xml-mcc311-mnc12/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc12/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc12/mms_config.xml diff --git a/res/xml-mcc311-mnc180/mms_config.xml b/app/src/main/res/xml-mcc311-mnc180/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc180/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc180/mms_config.xml diff --git a/res/xml-mcc311-mnc220/mms_config.xml b/app/src/main/res/xml-mcc311-mnc220/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc220/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc220/mms_config.xml diff --git a/res/xml-mcc311-mnc221/mms_config.xml b/app/src/main/res/xml-mcc311-mnc221/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc221/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc221/mms_config.xml diff --git a/res/xml-mcc311-mnc222/mms_config.xml b/app/src/main/res/xml-mcc311-mnc222/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc222/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc222/mms_config.xml diff --git a/res/xml-mcc311-mnc223/mms_config.xml b/app/src/main/res/xml-mcc311-mnc223/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc223/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc223/mms_config.xml diff --git a/res/xml-mcc311-mnc224/mms_config.xml b/app/src/main/res/xml-mcc311-mnc224/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc224/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc224/mms_config.xml diff --git a/res/xml-mcc311-mnc225/mms_config.xml b/app/src/main/res/xml-mcc311-mnc225/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc225/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc225/mms_config.xml diff --git a/res/xml-mcc311-mnc226/mms_config.xml b/app/src/main/res/xml-mcc311-mnc226/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc226/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc226/mms_config.xml diff --git a/res/xml-mcc311-mnc227/mms_config.xml b/app/src/main/res/xml-mcc311-mnc227/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc227/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc227/mms_config.xml diff --git a/res/xml-mcc311-mnc228/mms_config.xml b/app/src/main/res/xml-mcc311-mnc228/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc228/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc228/mms_config.xml diff --git a/res/xml-mcc311-mnc229/mms_config.xml b/app/src/main/res/xml-mcc311-mnc229/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc229/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc229/mms_config.xml diff --git a/res/xml-mcc311-mnc230/mms_config.xml b/app/src/main/res/xml-mcc311-mnc230/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc230/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc230/mms_config.xml diff --git a/res/xml-mcc311-mnc270/mms_config.xml b/app/src/main/res/xml-mcc311-mnc270/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc270/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc270/mms_config.xml diff --git a/res/xml-mcc311-mnc271/mms_config.xml b/app/src/main/res/xml-mcc311-mnc271/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc271/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc271/mms_config.xml diff --git a/res/xml-mcc311-mnc272/mms_config.xml b/app/src/main/res/xml-mcc311-mnc272/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc272/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc272/mms_config.xml diff --git a/res/xml-mcc311-mnc273/mms_config.xml b/app/src/main/res/xml-mcc311-mnc273/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc273/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc273/mms_config.xml diff --git a/res/xml-mcc311-mnc274/mms_config.xml b/app/src/main/res/xml-mcc311-mnc274/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc274/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc274/mms_config.xml diff --git a/res/xml-mcc311-mnc275/mms_config.xml b/app/src/main/res/xml-mcc311-mnc275/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc275/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc275/mms_config.xml diff --git a/res/xml-mcc311-mnc276/mms_config.xml b/app/src/main/res/xml-mcc311-mnc276/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc276/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc276/mms_config.xml diff --git a/res/xml-mcc311-mnc277/mms_config.xml b/app/src/main/res/xml-mcc311-mnc277/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc277/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc277/mms_config.xml diff --git a/res/xml-mcc311-mnc278/mms_config.xml b/app/src/main/res/xml-mcc311-mnc278/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc278/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc278/mms_config.xml diff --git a/res/xml-mcc311-mnc279/mms_config.xml b/app/src/main/res/xml-mcc311-mnc279/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc279/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc279/mms_config.xml diff --git a/res/xml-mcc311-mnc280/mms_config.xml b/app/src/main/res/xml-mcc311-mnc280/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc280/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc280/mms_config.xml diff --git a/res/xml-mcc311-mnc281/mms_config.xml b/app/src/main/res/xml-mcc311-mnc281/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc281/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc281/mms_config.xml diff --git a/res/xml-mcc311-mnc282/mms_config.xml b/app/src/main/res/xml-mcc311-mnc282/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc282/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc282/mms_config.xml diff --git a/res/xml-mcc311-mnc283/mms_config.xml b/app/src/main/res/xml-mcc311-mnc283/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc283/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc283/mms_config.xml diff --git a/res/xml-mcc311-mnc284/mms_config.xml b/app/src/main/res/xml-mcc311-mnc284/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc284/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc284/mms_config.xml diff --git a/res/xml-mcc311-mnc285/mms_config.xml b/app/src/main/res/xml-mcc311-mnc285/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc285/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc285/mms_config.xml diff --git a/res/xml-mcc311-mnc286/mms_config.xml b/app/src/main/res/xml-mcc311-mnc286/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc286/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc286/mms_config.xml diff --git a/res/xml-mcc311-mnc287/mms_config.xml b/app/src/main/res/xml-mcc311-mnc287/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc287/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc287/mms_config.xml diff --git a/res/xml-mcc311-mnc288/mms_config.xml b/app/src/main/res/xml-mcc311-mnc288/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc288/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc288/mms_config.xml diff --git a/res/xml-mcc311-mnc289/mms_config.xml b/app/src/main/res/xml-mcc311-mnc289/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc289/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc289/mms_config.xml diff --git a/res/xml-mcc311-mnc340/mms_config.xml b/app/src/main/res/xml-mcc311-mnc340/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc340/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc340/mms_config.xml diff --git a/res/xml-mcc311-mnc370/mms_config.xml b/app/src/main/res/xml-mcc311-mnc370/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc370/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc370/mms_config.xml diff --git a/res/xml-mcc311-mnc390/mms_config.xml b/app/src/main/res/xml-mcc311-mnc390/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc390/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc390/mms_config.xml diff --git a/res/xml-mcc311-mnc410/mms_config.xml b/app/src/main/res/xml-mcc311-mnc410/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc410/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc410/mms_config.xml diff --git a/res/xml-mcc311-mnc430/mms_config.xml b/app/src/main/res/xml-mcc311-mnc430/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc430/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc430/mms_config.xml diff --git a/res/xml-mcc311-mnc440/mms_config.xml b/app/src/main/res/xml-mcc311-mnc440/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc440/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc440/mms_config.xml diff --git a/res/xml-mcc311-mnc480/mms_config.xml b/app/src/main/res/xml-mcc311-mnc480/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc480/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc480/mms_config.xml diff --git a/res/xml-mcc311-mnc481/mms_config.xml b/app/src/main/res/xml-mcc311-mnc481/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc481/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc481/mms_config.xml diff --git a/res/xml-mcc311-mnc482/mms_config.xml b/app/src/main/res/xml-mcc311-mnc482/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc482/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc482/mms_config.xml diff --git a/res/xml-mcc311-mnc483/mms_config.xml b/app/src/main/res/xml-mcc311-mnc483/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc483/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc483/mms_config.xml diff --git a/res/xml-mcc311-mnc484/mms_config.xml b/app/src/main/res/xml-mcc311-mnc484/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc484/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc484/mms_config.xml diff --git a/res/xml-mcc311-mnc485/mms_config.xml b/app/src/main/res/xml-mcc311-mnc485/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc485/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc485/mms_config.xml diff --git a/res/xml-mcc311-mnc486/mms_config.xml b/app/src/main/res/xml-mcc311-mnc486/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc486/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc486/mms_config.xml diff --git a/res/xml-mcc311-mnc487/mms_config.xml b/app/src/main/res/xml-mcc311-mnc487/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc487/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc487/mms_config.xml diff --git a/res/xml-mcc311-mnc488/mms_config.xml b/app/src/main/res/xml-mcc311-mnc488/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc488/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc488/mms_config.xml diff --git a/res/xml-mcc311-mnc489/mms_config.xml b/app/src/main/res/xml-mcc311-mnc489/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc489/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc489/mms_config.xml diff --git a/res/xml-mcc311-mnc490/mms_config.xml b/app/src/main/res/xml-mcc311-mnc490/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc490/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc490/mms_config.xml diff --git a/res/xml-mcc311-mnc580/mms_config.xml b/app/src/main/res/xml-mcc311-mnc580/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc580/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc580/mms_config.xml diff --git a/res/xml-mcc311-mnc581/mms_config.xml b/app/src/main/res/xml-mcc311-mnc581/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc581/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc581/mms_config.xml diff --git a/res/xml-mcc311-mnc582/mms_config.xml b/app/src/main/res/xml-mcc311-mnc582/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc582/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc582/mms_config.xml diff --git a/res/xml-mcc311-mnc583/mms_config.xml b/app/src/main/res/xml-mcc311-mnc583/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc583/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc583/mms_config.xml diff --git a/res/xml-mcc311-mnc584/mms_config.xml b/app/src/main/res/xml-mcc311-mnc584/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc584/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc584/mms_config.xml diff --git a/res/xml-mcc311-mnc585/mms_config.xml b/app/src/main/res/xml-mcc311-mnc585/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc585/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc585/mms_config.xml diff --git a/res/xml-mcc311-mnc586/mms_config.xml b/app/src/main/res/xml-mcc311-mnc586/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc586/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc586/mms_config.xml diff --git a/res/xml-mcc311-mnc587/mms_config.xml b/app/src/main/res/xml-mcc311-mnc587/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc587/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc587/mms_config.xml diff --git a/res/xml-mcc311-mnc588/mms_config.xml b/app/src/main/res/xml-mcc311-mnc588/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc588/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc588/mms_config.xml diff --git a/res/xml-mcc311-mnc589/mms_config.xml b/app/src/main/res/xml-mcc311-mnc589/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc589/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc589/mms_config.xml diff --git a/res/xml-mcc311-mnc590/mms_config.xml b/app/src/main/res/xml-mcc311-mnc590/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc590/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc590/mms_config.xml diff --git a/res/xml-mcc311-mnc70/mms_config.xml b/app/src/main/res/xml-mcc311-mnc70/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc70/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc70/mms_config.xml diff --git a/res/xml-mcc311-mnc870/mms_config.xml b/app/src/main/res/xml-mcc311-mnc870/mms_config.xml similarity index 100% rename from res/xml-mcc311-mnc870/mms_config.xml rename to app/src/main/res/xml-mcc311-mnc870/mms_config.xml diff --git a/res/xml-mcc312-mnc160/mms_config.xml b/app/src/main/res/xml-mcc312-mnc160/mms_config.xml similarity index 100% rename from res/xml-mcc312-mnc160/mms_config.xml rename to app/src/main/res/xml-mcc312-mnc160/mms_config.xml diff --git a/res/xml-mcc312-mnc420/mms_config.xml b/app/src/main/res/xml-mcc312-mnc420/mms_config.xml similarity index 100% rename from res/xml-mcc312-mnc420/mms_config.xml rename to app/src/main/res/xml-mcc312-mnc420/mms_config.xml diff --git a/res/xml-mcc312-mnc530/mms_config.xml b/app/src/main/res/xml-mcc312-mnc530/mms_config.xml similarity index 100% rename from res/xml-mcc312-mnc530/mms_config.xml rename to app/src/main/res/xml-mcc312-mnc530/mms_config.xml diff --git a/res/xml-mcc334-mnc2/mms_config.xml b/app/src/main/res/xml-mcc334-mnc2/mms_config.xml similarity index 100% rename from res/xml-mcc334-mnc2/mms_config.xml rename to app/src/main/res/xml-mcc334-mnc2/mms_config.xml diff --git a/res/xml-mcc334-mnc20/mms_config.xml b/app/src/main/res/xml-mcc334-mnc20/mms_config.xml similarity index 100% rename from res/xml-mcc334-mnc20/mms_config.xml rename to app/src/main/res/xml-mcc334-mnc20/mms_config.xml diff --git a/res/xml-mcc418-mnc20/mms_config.xml b/app/src/main/res/xml-mcc418-mnc20/mms_config.xml similarity index 100% rename from res/xml-mcc418-mnc20/mms_config.xml rename to app/src/main/res/xml-mcc418-mnc20/mms_config.xml diff --git a/res/xml-mcc418-mnc30/mms_config.xml b/app/src/main/res/xml-mcc418-mnc30/mms_config.xml similarity index 100% rename from res/xml-mcc418-mnc30/mms_config.xml rename to app/src/main/res/xml-mcc418-mnc30/mms_config.xml diff --git a/res/xml-mcc418-mnc5/mms_config.xml b/app/src/main/res/xml-mcc418-mnc5/mms_config.xml similarity index 100% rename from res/xml-mcc418-mnc5/mms_config.xml rename to app/src/main/res/xml-mcc418-mnc5/mms_config.xml diff --git a/res/xml-mcc420-mnc4/mms_config.xml b/app/src/main/res/xml-mcc420-mnc4/mms_config.xml similarity index 100% rename from res/xml-mcc420-mnc4/mms_config.xml rename to app/src/main/res/xml-mcc420-mnc4/mms_config.xml diff --git a/res/xml-mcc426-mnc2/mms_config.xml b/app/src/main/res/xml-mcc426-mnc2/mms_config.xml similarity index 100% rename from res/xml-mcc426-mnc2/mms_config.xml rename to app/src/main/res/xml-mcc426-mnc2/mms_config.xml diff --git a/res/xml-mcc427-mnc2/mms_config.xml b/app/src/main/res/xml-mcc427-mnc2/mms_config.xml similarity index 100% rename from res/xml-mcc427-mnc2/mms_config.xml rename to app/src/main/res/xml-mcc427-mnc2/mms_config.xml diff --git a/res/xml-mcc440-mnc20/mms_config.xml b/app/src/main/res/xml-mcc440-mnc20/mms_config.xml similarity index 100% rename from res/xml-mcc440-mnc20/mms_config.xml rename to app/src/main/res/xml-mcc440-mnc20/mms_config.xml diff --git a/res/xml-mcc450-mnc00/mms_config.xml b/app/src/main/res/xml-mcc450-mnc00/mms_config.xml similarity index 100% rename from res/xml-mcc450-mnc00/mms_config.xml rename to app/src/main/res/xml-mcc450-mnc00/mms_config.xml diff --git a/res/xml-mcc450-mnc2/mms_config.xml b/app/src/main/res/xml-mcc450-mnc2/mms_config.xml similarity index 100% rename from res/xml-mcc450-mnc2/mms_config.xml rename to app/src/main/res/xml-mcc450-mnc2/mms_config.xml diff --git a/res/xml-mcc450-mnc5/mms_config.xml b/app/src/main/res/xml-mcc450-mnc5/mms_config.xml similarity index 100% rename from res/xml-mcc450-mnc5/mms_config.xml rename to app/src/main/res/xml-mcc450-mnc5/mms_config.xml diff --git a/res/xml-mcc450-mnc6/mms_config.xml b/app/src/main/res/xml-mcc450-mnc6/mms_config.xml similarity index 100% rename from res/xml-mcc450-mnc6/mms_config.xml rename to app/src/main/res/xml-mcc450-mnc6/mms_config.xml diff --git a/res/xml-mcc450-mnc8/mms_config.xml b/app/src/main/res/xml-mcc450-mnc8/mms_config.xml similarity index 100% rename from res/xml-mcc450-mnc8/mms_config.xml rename to app/src/main/res/xml-mcc450-mnc8/mms_config.xml diff --git a/res/xml-mcc505-mnc1/mms_config.xml b/app/src/main/res/xml-mcc505-mnc1/mms_config.xml similarity index 100% rename from res/xml-mcc505-mnc1/mms_config.xml rename to app/src/main/res/xml-mcc505-mnc1/mms_config.xml diff --git a/res/xml-mcc505-mnc3/mms_config.xml b/app/src/main/res/xml-mcc505-mnc3/mms_config.xml similarity index 100% rename from res/xml-mcc505-mnc3/mms_config.xml rename to app/src/main/res/xml-mcc505-mnc3/mms_config.xml diff --git a/res/xml-mcc505-mnc7/mms_config.xml b/app/src/main/res/xml-mcc505-mnc7/mms_config.xml similarity index 100% rename from res/xml-mcc505-mnc7/mms_config.xml rename to app/src/main/res/xml-mcc505-mnc7/mms_config.xml diff --git a/res/xml-mcc530-mnc1/mms_config.xml b/app/src/main/res/xml-mcc530-mnc1/mms_config.xml similarity index 100% rename from res/xml-mcc530-mnc1/mms_config.xml rename to app/src/main/res/xml-mcc530-mnc1/mms_config.xml diff --git a/res/xml-mcc530-mnc5/mms_config.xml b/app/src/main/res/xml-mcc530-mnc5/mms_config.xml similarity index 100% rename from res/xml-mcc530-mnc5/mms_config.xml rename to app/src/main/res/xml-mcc530-mnc5/mms_config.xml diff --git a/res/xml-mcc602-mnc2/mms_config.xml b/app/src/main/res/xml-mcc602-mnc2/mms_config.xml similarity index 100% rename from res/xml-mcc602-mnc2/mms_config.xml rename to app/src/main/res/xml-mcc602-mnc2/mms_config.xml diff --git a/res/xml-mcc604-mnc00/mms_config.xml b/app/src/main/res/xml-mcc604-mnc00/mms_config.xml similarity index 100% rename from res/xml-mcc604-mnc00/mms_config.xml rename to app/src/main/res/xml-mcc604-mnc00/mms_config.xml diff --git a/res/xml-mcc604-mnc2/mms_config.xml b/app/src/main/res/xml-mcc604-mnc2/mms_config.xml similarity index 100% rename from res/xml-mcc604-mnc2/mms_config.xml rename to app/src/main/res/xml-mcc604-mnc2/mms_config.xml diff --git a/res/xml-mcc647-mnc10/mms_config.xml b/app/src/main/res/xml-mcc647-mnc10/mms_config.xml similarity index 100% rename from res/xml-mcc647-mnc10/mms_config.xml rename to app/src/main/res/xml-mcc647-mnc10/mms_config.xml diff --git a/res/xml-mcc655-mnc1/mms_config.xml b/app/src/main/res/xml-mcc655-mnc1/mms_config.xml similarity index 100% rename from res/xml-mcc655-mnc1/mms_config.xml rename to app/src/main/res/xml-mcc655-mnc1/mms_config.xml diff --git a/res/xml/authenticator.xml b/app/src/main/res/xml/authenticator.xml similarity index 100% rename from res/xml/authenticator.xml rename to app/src/main/res/xml/authenticator.xml diff --git a/res/xml/automotive_app_desc.xml b/app/src/main/res/xml/automotive_app_desc.xml similarity index 100% rename from res/xml/automotive_app_desc.xml rename to app/src/main/res/xml/automotive_app_desc.xml diff --git a/res/xml/contactsformat.xml b/app/src/main/res/xml/contactsformat.xml similarity index 100% rename from res/xml/contactsformat.xml rename to app/src/main/res/xml/contactsformat.xml diff --git a/res/xml/file_provider_paths.xml b/app/src/main/res/xml/file_provider_paths.xml similarity index 100% rename from res/xml/file_provider_paths.xml rename to app/src/main/res/xml/file_provider_paths.xml diff --git a/res/xml/mms_config.xml b/app/src/main/res/xml/mms_config.xml similarity index 100% rename from res/xml/mms_config.xml rename to app/src/main/res/xml/mms_config.xml diff --git a/res/xml/pin_keyboard.xml b/app/src/main/res/xml/pin_keyboard.xml similarity index 100% rename from res/xml/pin_keyboard.xml rename to app/src/main/res/xml/pin_keyboard.xml diff --git a/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml similarity index 100% rename from res/xml/preferences.xml rename to app/src/main/res/xml/preferences.xml diff --git a/res/xml/preferences_advanced.xml b/app/src/main/res/xml/preferences_advanced.xml similarity index 100% rename from res/xml/preferences_advanced.xml rename to app/src/main/res/xml/preferences_advanced.xml diff --git a/res/xml/preferences_app_protection.xml b/app/src/main/res/xml/preferences_app_protection.xml similarity index 100% rename from res/xml/preferences_app_protection.xml rename to app/src/main/res/xml/preferences_app_protection.xml diff --git a/res/xml/preferences_appearance.xml b/app/src/main/res/xml/preferences_appearance.xml similarity index 100% rename from res/xml/preferences_appearance.xml rename to app/src/main/res/xml/preferences_appearance.xml diff --git a/res/xml/preferences_chats.xml b/app/src/main/res/xml/preferences_chats.xml similarity index 100% rename from res/xml/preferences_chats.xml rename to app/src/main/res/xml/preferences_chats.xml diff --git a/res/xml/preferences_manual_mms.xml b/app/src/main/res/xml/preferences_manual_mms.xml similarity index 100% rename from res/xml/preferences_manual_mms.xml rename to app/src/main/res/xml/preferences_manual_mms.xml diff --git a/res/xml/preferences_notifications.xml b/app/src/main/res/xml/preferences_notifications.xml similarity index 100% rename from res/xml/preferences_notifications.xml rename to app/src/main/res/xml/preferences_notifications.xml diff --git a/res/xml/preferences_sms_mms.xml b/app/src/main/res/xml/preferences_sms_mms.xml similarity index 100% rename from res/xml/preferences_sms_mms.xml rename to app/src/main/res/xml/preferences_sms_mms.xml diff --git a/res/xml/preferences_storage.xml b/app/src/main/res/xml/preferences_storage.xml similarity index 100% rename from res/xml/preferences_storage.xml rename to app/src/main/res/xml/preferences_storage.xml diff --git a/res/xml/recipient_preferences.xml b/app/src/main/res/xml/recipient_preferences.xml similarity index 100% rename from res/xml/recipient_preferences.xml rename to app/src/main/res/xml/recipient_preferences.xml diff --git a/res/xml/syncadapter.xml b/app/src/main/res/xml/syncadapter.xml similarity index 100% rename from res/xml/syncadapter.xml rename to app/src/main/res/xml/syncadapter.xml diff --git a/staging/res/values/strings.xml b/app/src/staging/res/values/strings.xml similarity index 100% rename from staging/res/values/strings.xml rename to app/src/staging/res/values/strings.xml diff --git a/test/unitTest/java/org/thoughtcrime/securesms/BaseUnitTest.java b/app/src/test/java/org/thoughtcrime/securesms/BaseUnitTest.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/BaseUnitTest.java rename to app/src/test/java/org/thoughtcrime/securesms/BaseUnitTest.java diff --git a/test/unitTest/java/org/thoughtcrime/securesms/camera/OrderEnforcerTest.java b/app/src/test/java/org/thoughtcrime/securesms/camera/OrderEnforcerTest.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/camera/OrderEnforcerTest.java rename to app/src/test/java/org/thoughtcrime/securesms/camera/OrderEnforcerTest.java diff --git a/test/unitTest/java/org/thoughtcrime/securesms/contacts/sync/StorageSyncHelperTest.java b/app/src/test/java/org/thoughtcrime/securesms/contacts/sync/StorageSyncHelperTest.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/contacts/sync/StorageSyncHelperTest.java rename to app/src/test/java/org/thoughtcrime/securesms/contacts/sync/StorageSyncHelperTest.java diff --git a/test/unitTest/java/org/thoughtcrime/securesms/contactshare/ContactUtilTest_getPrettyPhoneNumber.java b/app/src/test/java/org/thoughtcrime/securesms/contactshare/ContactUtilTest_getPrettyPhoneNumber.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/contactshare/ContactUtilTest_getPrettyPhoneNumber.java rename to app/src/test/java/org/thoughtcrime/securesms/contactshare/ContactUtilTest_getPrettyPhoneNumber.java diff --git a/test/unitTest/java/org/thoughtcrime/securesms/conversation/ConversationAdapterTest.java b/app/src/test/java/org/thoughtcrime/securesms/conversation/ConversationAdapterTest.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/conversation/ConversationAdapterTest.java rename to app/src/test/java/org/thoughtcrime/securesms/conversation/ConversationAdapterTest.java diff --git a/test/unitTest/java/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapterTest.java b/app/src/test/java/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapterTest.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapterTest.java rename to app/src/test/java/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapterTest.java diff --git a/test/unitTest/java/org/thoughtcrime/securesms/database/SqlUtilTest.java b/app/src/test/java/org/thoughtcrime/securesms/database/SqlUtilTest.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/database/SqlUtilTest.java rename to app/src/test/java/org/thoughtcrime/securesms/database/SqlUtilTest.java diff --git a/test/unitTest/java/org/thoughtcrime/securesms/jobmanager/JobMigratorTest.java b/app/src/test/java/org/thoughtcrime/securesms/jobmanager/JobMigratorTest.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/jobmanager/JobMigratorTest.java rename to app/src/test/java/org/thoughtcrime/securesms/jobmanager/JobMigratorTest.java diff --git a/test/unitTest/java/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializerTest.java b/app/src/test/java/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializerTest.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializerTest.java rename to app/src/test/java/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializerTest.java diff --git a/test/unitTest/java/org/thoughtcrime/securesms/jobmanager/migrations/RecipientIdFollowUpJobMigrationTest.java b/app/src/test/java/org/thoughtcrime/securesms/jobmanager/migrations/RecipientIdFollowUpJobMigrationTest.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/jobmanager/migrations/RecipientIdFollowUpJobMigrationTest.java rename to app/src/test/java/org/thoughtcrime/securesms/jobmanager/migrations/RecipientIdFollowUpJobMigrationTest.java diff --git a/test/unitTest/java/org/thoughtcrime/securesms/jobmanager/migrations/RecipientIdJobMigrationTest.java b/app/src/test/java/org/thoughtcrime/securesms/jobmanager/migrations/RecipientIdJobMigrationTest.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/jobmanager/migrations/RecipientIdJobMigrationTest.java rename to app/src/test/java/org/thoughtcrime/securesms/jobmanager/migrations/RecipientIdJobMigrationTest.java diff --git a/test/unitTest/java/org/thoughtcrime/securesms/jobs/FastJobStorageTest.java b/app/src/test/java/org/thoughtcrime/securesms/jobs/FastJobStorageTest.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/jobs/FastJobStorageTest.java rename to app/src/test/java/org/thoughtcrime/securesms/jobs/FastJobStorageTest.java diff --git a/test/unitTest/java/org/thoughtcrime/securesms/jobs/JobManagerFactoriesTest.java b/app/src/test/java/org/thoughtcrime/securesms/jobs/JobManagerFactoriesTest.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/jobs/JobManagerFactoriesTest.java rename to app/src/test/java/org/thoughtcrime/securesms/jobs/JobManagerFactoriesTest.java diff --git a/test/unitTest/java/org/thoughtcrime/securesms/l10n/LanguageResourcesTest.java b/app/src/test/java/org/thoughtcrime/securesms/l10n/LanguageResourcesTest.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/l10n/LanguageResourcesTest.java rename to app/src/test/java/org/thoughtcrime/securesms/l10n/LanguageResourcesTest.java diff --git a/test/unitTest/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtilTest.java b/app/src/test/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtilTest.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtilTest.java rename to app/src/test/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtilTest.java diff --git a/test/unitTest/java/org/thoughtcrime/securesms/logging/LogTest.java b/app/src/test/java/org/thoughtcrime/securesms/logging/LogTest.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/logging/LogTest.java rename to app/src/test/java/org/thoughtcrime/securesms/logging/LogTest.java diff --git a/test/unitTest/java/org/thoughtcrime/securesms/logsubmit/util/ScrubberTest.java b/app/src/test/java/org/thoughtcrime/securesms/logsubmit/util/ScrubberTest.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/logsubmit/util/ScrubberTest.java rename to app/src/test/java/org/thoughtcrime/securesms/logsubmit/util/ScrubberTest.java diff --git a/test/unitTest/java/org/thoughtcrime/securesms/phonenumbers/PhoneNumberFormatterTest.java b/app/src/test/java/org/thoughtcrime/securesms/phonenumbers/PhoneNumberFormatterTest.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/phonenumbers/PhoneNumberFormatterTest.java rename to app/src/test/java/org/thoughtcrime/securesms/phonenumbers/PhoneNumberFormatterTest.java diff --git a/test/unitTest/java/org/thoughtcrime/securesms/recipients/RecipientExporterTest.java b/app/src/test/java/org/thoughtcrime/securesms/recipients/RecipientExporterTest.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/recipients/RecipientExporterTest.java rename to app/src/test/java/org/thoughtcrime/securesms/recipients/RecipientExporterTest.java diff --git a/test/unitTest/java/org/thoughtcrime/securesms/registration/PushChallengeRequestTest.java b/app/src/test/java/org/thoughtcrime/securesms/registration/PushChallengeRequestTest.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/registration/PushChallengeRequestTest.java rename to app/src/test/java/org/thoughtcrime/securesms/registration/PushChallengeRequestTest.java diff --git a/test/unitTest/java/org/thoughtcrime/securesms/registration/viewmodel/LocalCodeRequestRateLimiterTest.java b/app/src/test/java/org/thoughtcrime/securesms/registration/viewmodel/LocalCodeRequestRateLimiterTest.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/registration/viewmodel/LocalCodeRequestRateLimiterTest.java rename to app/src/test/java/org/thoughtcrime/securesms/registration/viewmodel/LocalCodeRequestRateLimiterTest.java diff --git a/test/unitTest/java/org/thoughtcrime/securesms/service/VerificationCodeParserTest.java b/app/src/test/java/org/thoughtcrime/securesms/service/VerificationCodeParserTest.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/service/VerificationCodeParserTest.java rename to app/src/test/java/org/thoughtcrime/securesms/service/VerificationCodeParserTest.java diff --git a/test/unitTest/java/org/thoughtcrime/securesms/testutil/DirectExecutor.java b/app/src/test/java/org/thoughtcrime/securesms/testutil/DirectExecutor.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/testutil/DirectExecutor.java rename to app/src/test/java/org/thoughtcrime/securesms/testutil/DirectExecutor.java diff --git a/test/unitTest/java/org/thoughtcrime/securesms/util/DelimiterUtilTest.java b/app/src/test/java/org/thoughtcrime/securesms/util/DelimiterUtilTest.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/util/DelimiterUtilTest.java rename to app/src/test/java/org/thoughtcrime/securesms/util/DelimiterUtilTest.java diff --git a/test/unitTest/java/org/thoughtcrime/securesms/util/ListPartitionTest.java b/app/src/test/java/org/thoughtcrime/securesms/util/ListPartitionTest.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/util/ListPartitionTest.java rename to app/src/test/java/org/thoughtcrime/securesms/util/ListPartitionTest.java diff --git a/test/unitTest/java/org/thoughtcrime/securesms/util/PhoneNumberFormatterTest.java b/app/src/test/java/org/thoughtcrime/securesms/util/PhoneNumberFormatterTest.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/util/PhoneNumberFormatterTest.java rename to app/src/test/java/org/thoughtcrime/securesms/util/PhoneNumberFormatterTest.java diff --git a/test/unitTest/java/org/thoughtcrime/securesms/util/Rfc5724UriTest.java b/app/src/test/java/org/thoughtcrime/securesms/util/Rfc5724UriTest.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/util/Rfc5724UriTest.java rename to app/src/test/java/org/thoughtcrime/securesms/util/Rfc5724UriTest.java diff --git a/test/unitTest/java/org/thoughtcrime/securesms/util/SearchUtilTest.java b/app/src/test/java/org/thoughtcrime/securesms/util/SearchUtilTest.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/util/SearchUtilTest.java rename to app/src/test/java/org/thoughtcrime/securesms/util/SearchUtilTest.java diff --git a/test/unitTest/java/org/thoughtcrime/securesms/util/ShortCodeUtilTest.java b/app/src/test/java/org/thoughtcrime/securesms/util/ShortCodeUtilTest.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/util/ShortCodeUtilTest.java rename to app/src/test/java/org/thoughtcrime/securesms/util/ShortCodeUtilTest.java diff --git a/test/unitTest/java/org/thoughtcrime/securesms/util/UsernameUtilTest.java b/app/src/test/java/org/thoughtcrime/securesms/util/UsernameUtilTest.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/util/UsernameUtilTest.java rename to app/src/test/java/org/thoughtcrime/securesms/util/UsernameUtilTest.java diff --git a/test/unitTest/java/org/thoughtcrime/securesms/util/UtilTest.java b/app/src/test/java/org/thoughtcrime/securesms/util/UtilTest.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/util/UtilTest.java rename to app/src/test/java/org/thoughtcrime/securesms/util/UtilTest.java diff --git a/test/unitTest/java/org/thoughtcrime/securesms/util/dynamiclanguage/LanguageStringTest.java b/app/src/test/java/org/thoughtcrime/securesms/util/dynamiclanguage/LanguageStringTest.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/util/dynamiclanguage/LanguageStringTest.java rename to app/src/test/java/org/thoughtcrime/securesms/util/dynamiclanguage/LanguageStringTest.java diff --git a/test/unitTest/java/org/thoughtcrime/securesms/util/dynamiclanguage/LocaleParserTest.java b/app/src/test/java/org/thoughtcrime/securesms/util/dynamiclanguage/LocaleParserTest.java similarity index 100% rename from test/unitTest/java/org/thoughtcrime/securesms/util/dynamiclanguage/LocaleParserTest.java rename to app/src/test/java/org/thoughtcrime/securesms/util/dynamiclanguage/LocaleParserTest.java diff --git a/test/unitTest/resources/data/data_serialized.json b/app/src/test/resources/data/data_serialized.json similarity index 100% rename from test/unitTest/resources/data/data_serialized.json rename to app/src/test/resources/data/data_serialized.json diff --git a/website/AndroidManifest.xml b/app/src/website/AndroidManifest.xml similarity index 100% rename from website/AndroidManifest.xml rename to app/src/website/AndroidManifest.xml diff --git a/app/translations.gradle b/app/translations.gradle index fc49e8e1c..689b4d8ca 100644 --- a/app/translations.gradle +++ b/app/translations.gradle @@ -7,7 +7,7 @@ ext { } def allStringsResourceFiles(@ClosureParams(value = SimpleType.class, options = ['java.io.File']) Closure c) { - file('../res').eachFileRecurse(FileType.FILES) { f -> + file('src/main/res').eachFileRecurse(FileType.FILES) { f -> if (f.name == 'strings.xml') { c(f) } @@ -70,7 +70,7 @@ task excludeNonTranslatables { group 'Translate' description 'Remove strings that are marked "translatable"="false" or are ExtraTranslations.' doLast { - def englishFile = file('../res/values/strings.xml') + def englishFile = file('src/main/res/values/strings.xml') def english = new XmlParser().parse(englishFile) def nonTranslatable = english diff --git a/libsignal/service/build.gradle b/libsignal/service/build.gradle index a00ec3d55..dc4985244 100644 --- a/libsignal/service/build.gradle +++ b/libsignal/service/build.gradle @@ -65,10 +65,6 @@ protobuf { } } -sourceSets { - main.proto.srcDir 'protobuf' -} - def isReleaseBuild() { return version.contains("SNAPSHOT") == false } diff --git a/libsignal/service/protobuf/InternalSerialization.proto b/libsignal/service/src/main/proto/InternalSerialization.proto similarity index 100% rename from libsignal/service/protobuf/InternalSerialization.proto rename to libsignal/service/src/main/proto/InternalSerialization.proto diff --git a/libsignal/service/protobuf/KeyBackupService.proto b/libsignal/service/src/main/proto/KeyBackupService.proto similarity index 100% rename from libsignal/service/protobuf/KeyBackupService.proto rename to libsignal/service/src/main/proto/KeyBackupService.proto diff --git a/libsignal/service/protobuf/Provisioning.proto b/libsignal/service/src/main/proto/Provisioning.proto similarity index 100% rename from libsignal/service/protobuf/Provisioning.proto rename to libsignal/service/src/main/proto/Provisioning.proto diff --git a/libsignal/service/protobuf/SignalService.proto b/libsignal/service/src/main/proto/SignalService.proto similarity index 100% rename from libsignal/service/protobuf/SignalService.proto rename to libsignal/service/src/main/proto/SignalService.proto diff --git a/libsignal/service/protobuf/SignalStorage.proto b/libsignal/service/src/main/proto/SignalStorage.proto similarity index 100% rename from libsignal/service/protobuf/SignalStorage.proto rename to libsignal/service/src/main/proto/SignalStorage.proto diff --git a/libsignal/service/protobuf/StickerResources.proto b/libsignal/service/src/main/proto/StickerResources.proto similarity index 100% rename from libsignal/service/protobuf/StickerResources.proto rename to libsignal/service/src/main/proto/StickerResources.proto diff --git a/libsignal/service/protobuf/WebSocketResources.proto b/libsignal/service/src/main/proto/WebSocketResources.proto similarity index 100% rename from libsignal/service/protobuf/WebSocketResources.proto rename to libsignal/service/src/main/proto/WebSocketResources.proto