diff --git a/assets/fonts/Roboto-Light.ttf b/src/main/assets/fonts/Roboto-Light.ttf
similarity index 100%
rename from assets/fonts/Roboto-Light.ttf
rename to src/main/assets/fonts/Roboto-Light.ttf
diff --git a/assets/help/cs/help.html b/src/main/assets/help/cs/help.html
similarity index 100%
rename from assets/help/cs/help.html
rename to src/main/assets/help/cs/help.html
diff --git a/assets/help/de/help.html b/src/main/assets/help/de/help.html
similarity index 100%
rename from assets/help/de/help.html
rename to src/main/assets/help/de/help.html
diff --git a/assets/help/delta-what-optim.png b/src/main/assets/help/delta-what-optim.png
similarity index 100%
rename from assets/help/delta-what-optim.png
rename to src/main/assets/help/delta-what-optim.png
diff --git a/assets/help/en/help.html b/src/main/assets/help/en/help.html
similarity index 100%
rename from assets/help/en/help.html
rename to src/main/assets/help/en/help.html
diff --git a/assets/help/es/help.html b/src/main/assets/help/es/help.html
similarity index 100%
rename from assets/help/es/help.html
rename to src/main/assets/help/es/help.html
diff --git a/assets/help/fr/help.html b/src/main/assets/help/fr/help.html
similarity index 100%
rename from assets/help/fr/help.html
rename to src/main/assets/help/fr/help.html
diff --git a/assets/help/green-checkmark-screenshot.png b/src/main/assets/help/green-checkmark-screenshot.png
similarity index 100%
rename from assets/help/green-checkmark-screenshot.png
rename to src/main/assets/help/green-checkmark-screenshot.png
diff --git a/assets/help/green-checkmark.png b/src/main/assets/help/green-checkmark.png
similarity index 100%
rename from assets/help/green-checkmark.png
rename to src/main/assets/help/green-checkmark.png
diff --git a/assets/help/help.css b/src/main/assets/help/help.css
similarity index 100%
rename from assets/help/help.css
rename to src/main/assets/help/help.css
diff --git a/assets/help/id/help.html b/src/main/assets/help/id/help.html
similarity index 100%
rename from assets/help/id/help.html
rename to src/main/assets/help/id/help.html
diff --git a/assets/help/it/help.html b/src/main/assets/help/it/help.html
similarity index 100%
rename from assets/help/it/help.html
rename to src/main/assets/help/it/help.html
diff --git a/assets/help/lock-icon.png b/src/main/assets/help/lock-icon.png
similarity index 100%
rename from assets/help/lock-icon.png
rename to src/main/assets/help/lock-icon.png
diff --git a/assets/help/lock-screenshot.png b/src/main/assets/help/lock-screenshot.png
similarity index 100%
rename from assets/help/lock-screenshot.png
rename to src/main/assets/help/lock-screenshot.png
diff --git a/assets/help/nl/help.html b/src/main/assets/help/nl/help.html
similarity index 100%
rename from assets/help/nl/help.html
rename to src/main/assets/help/nl/help.html
diff --git a/assets/help/pl/help.html b/src/main/assets/help/pl/help.html
similarity index 100%
rename from assets/help/pl/help.html
rename to src/main/assets/help/pl/help.html
diff --git a/assets/help/pt/help.html b/src/main/assets/help/pt/help.html
similarity index 100%
rename from assets/help/pt/help.html
rename to src/main/assets/help/pt/help.html
diff --git a/assets/help/qr-icon.png b/src/main/assets/help/qr-icon.png
similarity index 100%
rename from assets/help/qr-icon.png
rename to src/main/assets/help/qr-icon.png
diff --git a/assets/help/ru/help.html b/src/main/assets/help/ru/help.html
similarity index 100%
rename from assets/help/ru/help.html
rename to src/main/assets/help/ru/help.html
diff --git a/assets/help/sk/help.html b/src/main/assets/help/sk/help.html
similarity index 100%
rename from assets/help/sk/help.html
rename to src/main/assets/help/sk/help.html
diff --git a/assets/help/sq/help.html b/src/main/assets/help/sq/help.html
similarity index 100%
rename from assets/help/sq/help.html
rename to src/main/assets/help/sq/help.html
diff --git a/assets/help/uk/help.html b/src/main/assets/help/uk/help.html
similarity index 100%
rename from assets/help/uk/help.html
rename to src/main/assets/help/uk/help.html
diff --git a/assets/help/zh_CN/help.html b/src/main/assets/help/zh_CN/help.html
similarity index 100%
rename from assets/help/zh_CN/help.html
rename to src/main/assets/help/zh_CN/help.html
diff --git a/assets/webxdc/maps.xdc b/src/main/assets/webxdc/maps.xdc
similarity index 100%
rename from assets/webxdc/maps.xdc
rename to src/main/assets/webxdc/maps.xdc
diff --git a/src/com/b44t/messenger/DcAccounts.java b/src/main/java/com/b44t/messenger/DcAccounts.java
similarity index 100%
rename from src/com/b44t/messenger/DcAccounts.java
rename to src/main/java/com/b44t/messenger/DcAccounts.java
diff --git a/src/com/b44t/messenger/DcBackupProvider.java b/src/main/java/com/b44t/messenger/DcBackupProvider.java
similarity index 100%
rename from src/com/b44t/messenger/DcBackupProvider.java
rename to src/main/java/com/b44t/messenger/DcBackupProvider.java
diff --git a/src/com/b44t/messenger/DcChat.java b/src/main/java/com/b44t/messenger/DcChat.java
similarity index 100%
rename from src/com/b44t/messenger/DcChat.java
rename to src/main/java/com/b44t/messenger/DcChat.java
diff --git a/src/com/b44t/messenger/DcChatlist.java b/src/main/java/com/b44t/messenger/DcChatlist.java
similarity index 100%
rename from src/com/b44t/messenger/DcChatlist.java
rename to src/main/java/com/b44t/messenger/DcChatlist.java
diff --git a/src/com/b44t/messenger/DcContact.java b/src/main/java/com/b44t/messenger/DcContact.java
similarity index 100%
rename from src/com/b44t/messenger/DcContact.java
rename to src/main/java/com/b44t/messenger/DcContact.java
diff --git a/src/com/b44t/messenger/DcContext.java b/src/main/java/com/b44t/messenger/DcContext.java
similarity index 100%
rename from src/com/b44t/messenger/DcContext.java
rename to src/main/java/com/b44t/messenger/DcContext.java
diff --git a/src/com/b44t/messenger/DcEvent.java b/src/main/java/com/b44t/messenger/DcEvent.java
similarity index 100%
rename from src/com/b44t/messenger/DcEvent.java
rename to src/main/java/com/b44t/messenger/DcEvent.java
diff --git a/src/com/b44t/messenger/DcEventEmitter.java b/src/main/java/com/b44t/messenger/DcEventEmitter.java
similarity index 100%
rename from src/com/b44t/messenger/DcEventEmitter.java
rename to src/main/java/com/b44t/messenger/DcEventEmitter.java
diff --git a/src/com/b44t/messenger/DcJsonrpcInstance.java b/src/main/java/com/b44t/messenger/DcJsonrpcInstance.java
similarity index 100%
rename from src/com/b44t/messenger/DcJsonrpcInstance.java
rename to src/main/java/com/b44t/messenger/DcJsonrpcInstance.java
diff --git a/src/com/b44t/messenger/DcLot.java b/src/main/java/com/b44t/messenger/DcLot.java
similarity index 100%
rename from src/com/b44t/messenger/DcLot.java
rename to src/main/java/com/b44t/messenger/DcLot.java
diff --git a/src/com/b44t/messenger/DcMediaGalleryElement.java b/src/main/java/com/b44t/messenger/DcMediaGalleryElement.java
similarity index 100%
rename from src/com/b44t/messenger/DcMediaGalleryElement.java
rename to src/main/java/com/b44t/messenger/DcMediaGalleryElement.java
diff --git a/src/com/b44t/messenger/DcMsg.java b/src/main/java/com/b44t/messenger/DcMsg.java
similarity index 100%
rename from src/com/b44t/messenger/DcMsg.java
rename to src/main/java/com/b44t/messenger/DcMsg.java
diff --git a/src/com/b44t/messenger/DcProvider.java b/src/main/java/com/b44t/messenger/DcProvider.java
similarity index 100%
rename from src/com/b44t/messenger/DcProvider.java
rename to src/main/java/com/b44t/messenger/DcProvider.java
diff --git a/src/com/b44t/messenger/rpc/HttpResponse.java b/src/main/java/com/b44t/messenger/rpc/HttpResponse.java
similarity index 100%
rename from src/com/b44t/messenger/rpc/HttpResponse.java
rename to src/main/java/com/b44t/messenger/rpc/HttpResponse.java
diff --git a/src/com/b44t/messenger/rpc/Reaction.java b/src/main/java/com/b44t/messenger/rpc/Reaction.java
similarity index 100%
rename from src/com/b44t/messenger/rpc/Reaction.java
rename to src/main/java/com/b44t/messenger/rpc/Reaction.java
diff --git a/src/com/b44t/messenger/rpc/Reactions.java b/src/main/java/com/b44t/messenger/rpc/Reactions.java
similarity index 100%
rename from src/com/b44t/messenger/rpc/Reactions.java
rename to src/main/java/com/b44t/messenger/rpc/Reactions.java
diff --git a/src/com/b44t/messenger/rpc/Rpc.java b/src/main/java/com/b44t/messenger/rpc/Rpc.java
similarity index 100%
rename from src/com/b44t/messenger/rpc/Rpc.java
rename to src/main/java/com/b44t/messenger/rpc/Rpc.java
diff --git a/src/com/b44t/messenger/rpc/RpcException.java b/src/main/java/com/b44t/messenger/rpc/RpcException.java
similarity index 100%
rename from src/com/b44t/messenger/rpc/RpcException.java
rename to src/main/java/com/b44t/messenger/rpc/RpcException.java
diff --git a/src/com/b44t/messenger/rpc/VcardContact.java b/src/main/java/com/b44t/messenger/rpc/VcardContact.java
similarity index 100%
rename from src/com/b44t/messenger/rpc/VcardContact.java
rename to src/main/java/com/b44t/messenger/rpc/VcardContact.java
diff --git a/src/com/b44t/messenger/util/concurrent/ListenableFuture.java b/src/main/java/com/b44t/messenger/util/concurrent/ListenableFuture.java
similarity index 100%
rename from src/com/b44t/messenger/util/concurrent/ListenableFuture.java
rename to src/main/java/com/b44t/messenger/util/concurrent/ListenableFuture.java
diff --git a/src/com/b44t/messenger/util/concurrent/SettableFuture.java b/src/main/java/com/b44t/messenger/util/concurrent/SettableFuture.java
similarity index 100%
rename from src/com/b44t/messenger/util/concurrent/SettableFuture.java
rename to src/main/java/com/b44t/messenger/util/concurrent/SettableFuture.java
diff --git a/src/org/thoughtcrime/securesms/ApplicationContext.java b/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ApplicationContext.java
rename to src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
diff --git a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
rename to src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
diff --git a/src/org/thoughtcrime/securesms/AttachContactActivity.java b/src/main/java/org/thoughtcrime/securesms/AttachContactActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/AttachContactActivity.java
rename to src/main/java/org/thoughtcrime/securesms/AttachContactActivity.java
diff --git a/src/org/thoughtcrime/securesms/BaseActionBarActivity.java b/src/main/java/org/thoughtcrime/securesms/BaseActionBarActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/BaseActionBarActivity.java
rename to src/main/java/org/thoughtcrime/securesms/BaseActionBarActivity.java
diff --git a/src/org/thoughtcrime/securesms/BaseActivity.java b/src/main/java/org/thoughtcrime/securesms/BaseActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/BaseActivity.java
rename to src/main/java/org/thoughtcrime/securesms/BaseActivity.java
diff --git a/src/org/thoughtcrime/securesms/BaseConversationItem.java b/src/main/java/org/thoughtcrime/securesms/BaseConversationItem.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/BaseConversationItem.java
rename to src/main/java/org/thoughtcrime/securesms/BaseConversationItem.java
diff --git a/src/org/thoughtcrime/securesms/BaseConversationListAdapter.java b/src/main/java/org/thoughtcrime/securesms/BaseConversationListAdapter.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/BaseConversationListAdapter.java
rename to src/main/java/org/thoughtcrime/securesms/BaseConversationListAdapter.java
diff --git a/src/org/thoughtcrime/securesms/BaseConversationListFragment.java b/src/main/java/org/thoughtcrime/securesms/BaseConversationListFragment.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/BaseConversationListFragment.java
rename to src/main/java/org/thoughtcrime/securesms/BaseConversationListFragment.java
diff --git a/src/org/thoughtcrime/securesms/BindableConversationItem.java b/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/BindableConversationItem.java
rename to src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java
diff --git a/src/org/thoughtcrime/securesms/BindableConversationListItem.java b/src/main/java/org/thoughtcrime/securesms/BindableConversationListItem.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/BindableConversationListItem.java
rename to src/main/java/org/thoughtcrime/securesms/BindableConversationListItem.java
diff --git a/src/org/thoughtcrime/securesms/BlockedContactsActivity.java b/src/main/java/org/thoughtcrime/securesms/BlockedContactsActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/BlockedContactsActivity.java
rename to src/main/java/org/thoughtcrime/securesms/BlockedContactsActivity.java
diff --git a/src/org/thoughtcrime/securesms/ConnectivityActivity.java b/src/main/java/org/thoughtcrime/securesms/ConnectivityActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ConnectivityActivity.java
rename to src/main/java/org/thoughtcrime/securesms/ConnectivityActivity.java
diff --git a/src/org/thoughtcrime/securesms/ContactMultiSelectionActivity.java b/src/main/java/org/thoughtcrime/securesms/ContactMultiSelectionActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ContactMultiSelectionActivity.java
rename to src/main/java/org/thoughtcrime/securesms/ContactMultiSelectionActivity.java
diff --git a/src/org/thoughtcrime/securesms/ContactSelectionActivity.java b/src/main/java/org/thoughtcrime/securesms/ContactSelectionActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ContactSelectionActivity.java
rename to src/main/java/org/thoughtcrime/securesms/ContactSelectionActivity.java
diff --git a/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java b/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ContactSelectionListFragment.java
rename to src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ConversationActivity.java
rename to src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
diff --git a/src/org/thoughtcrime/securesms/ConversationAdapter.java b/src/main/java/org/thoughtcrime/securesms/ConversationAdapter.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ConversationAdapter.java
rename to src/main/java/org/thoughtcrime/securesms/ConversationAdapter.java
diff --git a/src/org/thoughtcrime/securesms/ConversationFragment.java b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ConversationFragment.java
rename to src/main/java/org/thoughtcrime/securesms/ConversationFragment.java
diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/main/java/org/thoughtcrime/securesms/ConversationItem.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ConversationItem.java
rename to src/main/java/org/thoughtcrime/securesms/ConversationItem.java
diff --git a/src/org/thoughtcrime/securesms/ConversationItemSwipeCallback.java b/src/main/java/org/thoughtcrime/securesms/ConversationItemSwipeCallback.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ConversationItemSwipeCallback.java
rename to src/main/java/org/thoughtcrime/securesms/ConversationItemSwipeCallback.java
diff --git a/src/org/thoughtcrime/securesms/ConversationItemTouchListener.java b/src/main/java/org/thoughtcrime/securesms/ConversationItemTouchListener.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ConversationItemTouchListener.java
rename to src/main/java/org/thoughtcrime/securesms/ConversationItemTouchListener.java
diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ConversationListActivity.java
rename to src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java
diff --git a/src/org/thoughtcrime/securesms/ConversationListAdapter.java b/src/main/java/org/thoughtcrime/securesms/ConversationListAdapter.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ConversationListAdapter.java
rename to src/main/java/org/thoughtcrime/securesms/ConversationListAdapter.java
diff --git a/src/org/thoughtcrime/securesms/ConversationListArchiveActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationListArchiveActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ConversationListArchiveActivity.java
rename to src/main/java/org/thoughtcrime/securesms/ConversationListArchiveActivity.java
diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/main/java/org/thoughtcrime/securesms/ConversationListFragment.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ConversationListFragment.java
rename to src/main/java/org/thoughtcrime/securesms/ConversationListFragment.java
diff --git a/src/org/thoughtcrime/securesms/ConversationListItem.java b/src/main/java/org/thoughtcrime/securesms/ConversationListItem.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ConversationListItem.java
rename to src/main/java/org/thoughtcrime/securesms/ConversationListItem.java
diff --git a/src/org/thoughtcrime/securesms/ConversationListItemInboxZero.java b/src/main/java/org/thoughtcrime/securesms/ConversationListItemInboxZero.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ConversationListItemInboxZero.java
rename to src/main/java/org/thoughtcrime/securesms/ConversationListItemInboxZero.java
diff --git a/src/org/thoughtcrime/securesms/ConversationListRelayingActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationListRelayingActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ConversationListRelayingActivity.java
rename to src/main/java/org/thoughtcrime/securesms/ConversationListRelayingActivity.java
diff --git a/src/org/thoughtcrime/securesms/ConversationSwipeAnimationHelper.java b/src/main/java/org/thoughtcrime/securesms/ConversationSwipeAnimationHelper.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ConversationSwipeAnimationHelper.java
rename to src/main/java/org/thoughtcrime/securesms/ConversationSwipeAnimationHelper.java
diff --git a/src/org/thoughtcrime/securesms/ConversationTitleView.java b/src/main/java/org/thoughtcrime/securesms/ConversationTitleView.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ConversationTitleView.java
rename to src/main/java/org/thoughtcrime/securesms/ConversationTitleView.java
diff --git a/src/org/thoughtcrime/securesms/ConversationUpdateItem.java b/src/main/java/org/thoughtcrime/securesms/ConversationUpdateItem.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ConversationUpdateItem.java
rename to src/main/java/org/thoughtcrime/securesms/ConversationUpdateItem.java
diff --git a/src/org/thoughtcrime/securesms/ConversationVideochatItem.java b/src/main/java/org/thoughtcrime/securesms/ConversationVideochatItem.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ConversationVideochatItem.java
rename to src/main/java/org/thoughtcrime/securesms/ConversationVideochatItem.java
diff --git a/src/org/thoughtcrime/securesms/CreateProfileActivity.java b/src/main/java/org/thoughtcrime/securesms/CreateProfileActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/CreateProfileActivity.java
rename to src/main/java/org/thoughtcrime/securesms/CreateProfileActivity.java
diff --git a/src/org/thoughtcrime/securesms/DummyActivity.java b/src/main/java/org/thoughtcrime/securesms/DummyActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/DummyActivity.java
rename to src/main/java/org/thoughtcrime/securesms/DummyActivity.java
diff --git a/src/org/thoughtcrime/securesms/EphemeralMessagesDialog.java b/src/main/java/org/thoughtcrime/securesms/EphemeralMessagesDialog.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/EphemeralMessagesDialog.java
rename to src/main/java/org/thoughtcrime/securesms/EphemeralMessagesDialog.java
diff --git a/src/org/thoughtcrime/securesms/FullMsgActivity.java b/src/main/java/org/thoughtcrime/securesms/FullMsgActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/FullMsgActivity.java
rename to src/main/java/org/thoughtcrime/securesms/FullMsgActivity.java
diff --git a/src/org/thoughtcrime/securesms/GroupCreateActivity.java b/src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/GroupCreateActivity.java
rename to src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java
diff --git a/src/org/thoughtcrime/securesms/InstantOnboardingActivity.java b/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/InstantOnboardingActivity.java
rename to src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
diff --git a/src/org/thoughtcrime/securesms/LocalHelpActivity.java b/src/main/java/org/thoughtcrime/securesms/LocalHelpActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/LocalHelpActivity.java
rename to src/main/java/org/thoughtcrime/securesms/LocalHelpActivity.java
diff --git a/src/org/thoughtcrime/securesms/LogViewActivity.java b/src/main/java/org/thoughtcrime/securesms/LogViewActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/LogViewActivity.java
rename to src/main/java/org/thoughtcrime/securesms/LogViewActivity.java
diff --git a/src/org/thoughtcrime/securesms/LogViewFragment.java b/src/main/java/org/thoughtcrime/securesms/LogViewFragment.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/LogViewFragment.java
rename to src/main/java/org/thoughtcrime/securesms/LogViewFragment.java
diff --git a/src/org/thoughtcrime/securesms/MediaPreviewActivity.java b/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/MediaPreviewActivity.java
rename to src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
diff --git a/src/org/thoughtcrime/securesms/MessageSelectorFragment.java b/src/main/java/org/thoughtcrime/securesms/MessageSelectorFragment.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/MessageSelectorFragment.java
rename to src/main/java/org/thoughtcrime/securesms/MessageSelectorFragment.java
diff --git a/src/org/thoughtcrime/securesms/MuteDialog.java b/src/main/java/org/thoughtcrime/securesms/MuteDialog.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/MuteDialog.java
rename to src/main/java/org/thoughtcrime/securesms/MuteDialog.java
diff --git a/src/org/thoughtcrime/securesms/NewConversationActivity.java b/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/NewConversationActivity.java
rename to src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java
diff --git a/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java b/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java
rename to src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java
diff --git a/src/org/thoughtcrime/securesms/ProfileActivity.java b/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ProfileActivity.java
rename to src/main/java/org/thoughtcrime/securesms/ProfileActivity.java
diff --git a/src/org/thoughtcrime/securesms/ProfileDocumentsAdapter.java b/src/main/java/org/thoughtcrime/securesms/ProfileDocumentsAdapter.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ProfileDocumentsAdapter.java
rename to src/main/java/org/thoughtcrime/securesms/ProfileDocumentsAdapter.java
diff --git a/src/org/thoughtcrime/securesms/ProfileDocumentsFragment.java b/src/main/java/org/thoughtcrime/securesms/ProfileDocumentsFragment.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ProfileDocumentsFragment.java
rename to src/main/java/org/thoughtcrime/securesms/ProfileDocumentsFragment.java
diff --git a/src/org/thoughtcrime/securesms/ProfileGalleryAdapter.java b/src/main/java/org/thoughtcrime/securesms/ProfileGalleryAdapter.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ProfileGalleryAdapter.java
rename to src/main/java/org/thoughtcrime/securesms/ProfileGalleryAdapter.java
diff --git a/src/org/thoughtcrime/securesms/ProfileGalleryFragment.java b/src/main/java/org/thoughtcrime/securesms/ProfileGalleryFragment.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ProfileGalleryFragment.java
rename to src/main/java/org/thoughtcrime/securesms/ProfileGalleryFragment.java
diff --git a/src/org/thoughtcrime/securesms/ProfileSettingsAdapter.java b/src/main/java/org/thoughtcrime/securesms/ProfileSettingsAdapter.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ProfileSettingsAdapter.java
rename to src/main/java/org/thoughtcrime/securesms/ProfileSettingsAdapter.java
diff --git a/src/org/thoughtcrime/securesms/ProfileSettingsFragment.java b/src/main/java/org/thoughtcrime/securesms/ProfileSettingsFragment.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ProfileSettingsFragment.java
rename to src/main/java/org/thoughtcrime/securesms/ProfileSettingsFragment.java
diff --git a/src/org/thoughtcrime/securesms/ProfileSettingsItem.java b/src/main/java/org/thoughtcrime/securesms/ProfileSettingsItem.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ProfileSettingsItem.java
rename to src/main/java/org/thoughtcrime/securesms/ProfileSettingsItem.java
diff --git a/src/org/thoughtcrime/securesms/ProfileStatusItem.java b/src/main/java/org/thoughtcrime/securesms/ProfileStatusItem.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ProfileStatusItem.java
rename to src/main/java/org/thoughtcrime/securesms/ProfileStatusItem.java
diff --git a/src/org/thoughtcrime/securesms/RegistrationActivity.java b/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/RegistrationActivity.java
rename to src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java
diff --git a/src/org/thoughtcrime/securesms/ResolveMediaTask.java b/src/main/java/org/thoughtcrime/securesms/ResolveMediaTask.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ResolveMediaTask.java
rename to src/main/java/org/thoughtcrime/securesms/ResolveMediaTask.java
diff --git a/src/org/thoughtcrime/securesms/SetStartingPositionLinearLayoutManager.java b/src/main/java/org/thoughtcrime/securesms/SetStartingPositionLinearLayoutManager.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/SetStartingPositionLinearLayoutManager.java
rename to src/main/java/org/thoughtcrime/securesms/SetStartingPositionLinearLayoutManager.java
diff --git a/src/org/thoughtcrime/securesms/ShareActivity.java b/src/main/java/org/thoughtcrime/securesms/ShareActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ShareActivity.java
rename to src/main/java/org/thoughtcrime/securesms/ShareActivity.java
diff --git a/src/org/thoughtcrime/securesms/ShareLocationDialog.java b/src/main/java/org/thoughtcrime/securesms/ShareLocationDialog.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/ShareLocationDialog.java
rename to src/main/java/org/thoughtcrime/securesms/ShareLocationDialog.java
diff --git a/src/org/thoughtcrime/securesms/TransportOption.java b/src/main/java/org/thoughtcrime/securesms/TransportOption.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/TransportOption.java
rename to src/main/java/org/thoughtcrime/securesms/TransportOption.java
diff --git a/src/org/thoughtcrime/securesms/TransportOptions.java b/src/main/java/org/thoughtcrime/securesms/TransportOptions.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/TransportOptions.java
rename to src/main/java/org/thoughtcrime/securesms/TransportOptions.java
diff --git a/src/org/thoughtcrime/securesms/TransportOptionsAdapter.java b/src/main/java/org/thoughtcrime/securesms/TransportOptionsAdapter.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/TransportOptionsAdapter.java
rename to src/main/java/org/thoughtcrime/securesms/TransportOptionsAdapter.java
diff --git a/src/org/thoughtcrime/securesms/TransportOptionsPopup.java b/src/main/java/org/thoughtcrime/securesms/TransportOptionsPopup.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/TransportOptionsPopup.java
rename to src/main/java/org/thoughtcrime/securesms/TransportOptionsPopup.java
diff --git a/src/org/thoughtcrime/securesms/Unbindable.java b/src/main/java/org/thoughtcrime/securesms/Unbindable.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/Unbindable.java
rename to src/main/java/org/thoughtcrime/securesms/Unbindable.java
diff --git a/src/org/thoughtcrime/securesms/WebViewActivity.java b/src/main/java/org/thoughtcrime/securesms/WebViewActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/WebViewActivity.java
rename to src/main/java/org/thoughtcrime/securesms/WebViewActivity.java
diff --git a/src/org/thoughtcrime/securesms/WebxdcActivity.java b/src/main/java/org/thoughtcrime/securesms/WebxdcActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/WebxdcActivity.java
rename to src/main/java/org/thoughtcrime/securesms/WebxdcActivity.java
diff --git a/src/org/thoughtcrime/securesms/WelcomeActivity.java b/src/main/java/org/thoughtcrime/securesms/WelcomeActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/WelcomeActivity.java
rename to src/main/java/org/thoughtcrime/securesms/WelcomeActivity.java
diff --git a/src/org/thoughtcrime/securesms/accounts/AccountSelectionListAdapter.java b/src/main/java/org/thoughtcrime/securesms/accounts/AccountSelectionListAdapter.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/accounts/AccountSelectionListAdapter.java
rename to src/main/java/org/thoughtcrime/securesms/accounts/AccountSelectionListAdapter.java
diff --git a/src/org/thoughtcrime/securesms/accounts/AccountSelectionListFragment.java b/src/main/java/org/thoughtcrime/securesms/accounts/AccountSelectionListFragment.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/accounts/AccountSelectionListFragment.java
rename to src/main/java/org/thoughtcrime/securesms/accounts/AccountSelectionListFragment.java
diff --git a/src/org/thoughtcrime/securesms/accounts/AccountSelectionListItem.java b/src/main/java/org/thoughtcrime/securesms/accounts/AccountSelectionListItem.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/accounts/AccountSelectionListItem.java
rename to src/main/java/org/thoughtcrime/securesms/accounts/AccountSelectionListItem.java
diff --git a/src/org/thoughtcrime/securesms/animation/AnimationCompleteListener.java b/src/main/java/org/thoughtcrime/securesms/animation/AnimationCompleteListener.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/animation/AnimationCompleteListener.java
rename to src/main/java/org/thoughtcrime/securesms/animation/AnimationCompleteListener.java
diff --git a/src/org/thoughtcrime/securesms/attachments/Attachment.java b/src/main/java/org/thoughtcrime/securesms/attachments/Attachment.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/attachments/Attachment.java
rename to src/main/java/org/thoughtcrime/securesms/attachments/Attachment.java
diff --git a/src/org/thoughtcrime/securesms/attachments/DcAttachment.java b/src/main/java/org/thoughtcrime/securesms/attachments/DcAttachment.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/attachments/DcAttachment.java
rename to src/main/java/org/thoughtcrime/securesms/attachments/DcAttachment.java
diff --git a/src/org/thoughtcrime/securesms/attachments/UriAttachment.java b/src/main/java/org/thoughtcrime/securesms/attachments/UriAttachment.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/attachments/UriAttachment.java
rename to src/main/java/org/thoughtcrime/securesms/attachments/UriAttachment.java
diff --git a/src/org/thoughtcrime/securesms/audio/AudioCodec.java b/src/main/java/org/thoughtcrime/securesms/audio/AudioCodec.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/audio/AudioCodec.java
rename to src/main/java/org/thoughtcrime/securesms/audio/AudioCodec.java
diff --git a/src/org/thoughtcrime/securesms/audio/AudioRecorder.java b/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/audio/AudioRecorder.java
rename to src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java
diff --git a/src/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java b/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java
rename to src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java
diff --git a/src/org/thoughtcrime/securesms/components/AnimatingToggle.java b/src/main/java/org/thoughtcrime/securesms/components/AnimatingToggle.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/AnimatingToggle.java
rename to src/main/java/org/thoughtcrime/securesms/components/AnimatingToggle.java
diff --git a/src/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java b/src/main/java/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java
rename to src/main/java/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java
diff --git a/src/org/thoughtcrime/securesms/components/AudioView.java b/src/main/java/org/thoughtcrime/securesms/components/AudioView.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/AudioView.java
rename to src/main/java/org/thoughtcrime/securesms/components/AudioView.java
diff --git a/src/org/thoughtcrime/securesms/components/AvatarImageView.java b/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/AvatarImageView.java
rename to src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
diff --git a/src/org/thoughtcrime/securesms/components/AvatarSelector.java b/src/main/java/org/thoughtcrime/securesms/components/AvatarSelector.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/AvatarSelector.java
rename to src/main/java/org/thoughtcrime/securesms/components/AvatarSelector.java
diff --git a/src/org/thoughtcrime/securesms/components/AvatarView.java b/src/main/java/org/thoughtcrime/securesms/components/AvatarView.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/AvatarView.java
rename to src/main/java/org/thoughtcrime/securesms/components/AvatarView.java
diff --git a/src/org/thoughtcrime/securesms/components/BorderlessImageView.java b/src/main/java/org/thoughtcrime/securesms/components/BorderlessImageView.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/BorderlessImageView.java
rename to src/main/java/org/thoughtcrime/securesms/components/BorderlessImageView.java
diff --git a/src/org/thoughtcrime/securesms/components/CircleColorImageView.java b/src/main/java/org/thoughtcrime/securesms/components/CircleColorImageView.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/CircleColorImageView.java
rename to src/main/java/org/thoughtcrime/securesms/components/CircleColorImageView.java
diff --git a/src/org/thoughtcrime/securesms/components/ComposeText.java b/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/ComposeText.java
rename to src/main/java/org/thoughtcrime/securesms/components/ComposeText.java
diff --git a/src/org/thoughtcrime/securesms/components/ContactFilterToolbar.java b/src/main/java/org/thoughtcrime/securesms/components/ContactFilterToolbar.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/ContactFilterToolbar.java
rename to src/main/java/org/thoughtcrime/securesms/components/ContactFilterToolbar.java
diff --git a/src/org/thoughtcrime/securesms/components/ControllableViewPager.java b/src/main/java/org/thoughtcrime/securesms/components/ControllableViewPager.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/ControllableViewPager.java
rename to src/main/java/org/thoughtcrime/securesms/components/ControllableViewPager.java
diff --git a/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java b/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/ConversationItemFooter.java
rename to src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
diff --git a/src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java b/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java
rename to src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java
diff --git a/src/org/thoughtcrime/securesms/components/CornerMask.java b/src/main/java/org/thoughtcrime/securesms/components/CornerMask.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/CornerMask.java
rename to src/main/java/org/thoughtcrime/securesms/components/CornerMask.java
diff --git a/src/org/thoughtcrime/securesms/components/CustomDefaultPreference.java b/src/main/java/org/thoughtcrime/securesms/components/CustomDefaultPreference.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/CustomDefaultPreference.java
rename to src/main/java/org/thoughtcrime/securesms/components/CustomDefaultPreference.java
diff --git a/src/org/thoughtcrime/securesms/components/DeliveryStatusView.java b/src/main/java/org/thoughtcrime/securesms/components/DeliveryStatusView.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/DeliveryStatusView.java
rename to src/main/java/org/thoughtcrime/securesms/components/DeliveryStatusView.java
diff --git a/src/org/thoughtcrime/securesms/components/DocumentView.java b/src/main/java/org/thoughtcrime/securesms/components/DocumentView.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/DocumentView.java
rename to src/main/java/org/thoughtcrime/securesms/components/DocumentView.java
diff --git a/src/org/thoughtcrime/securesms/components/FromTextView.java b/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/FromTextView.java
rename to src/main/java/org/thoughtcrime/securesms/components/FromTextView.java
diff --git a/src/org/thoughtcrime/securesms/components/GlideDrawableListeningTarget.java b/src/main/java/org/thoughtcrime/securesms/components/GlideDrawableListeningTarget.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/GlideDrawableListeningTarget.java
rename to src/main/java/org/thoughtcrime/securesms/components/GlideDrawableListeningTarget.java
diff --git a/src/org/thoughtcrime/securesms/components/HidingLinearLayout.java b/src/main/java/org/thoughtcrime/securesms/components/HidingLinearLayout.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/HidingLinearLayout.java
rename to src/main/java/org/thoughtcrime/securesms/components/HidingLinearLayout.java
diff --git a/src/org/thoughtcrime/securesms/components/ImageDivet.java b/src/main/java/org/thoughtcrime/securesms/components/ImageDivet.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/ImageDivet.java
rename to src/main/java/org/thoughtcrime/securesms/components/ImageDivet.java
diff --git a/src/org/thoughtcrime/securesms/components/InputAwareLayout.java b/src/main/java/org/thoughtcrime/securesms/components/InputAwareLayout.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/InputAwareLayout.java
rename to src/main/java/org/thoughtcrime/securesms/components/InputAwareLayout.java
diff --git a/src/org/thoughtcrime/securesms/components/InputPanel.java b/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/InputPanel.java
rename to src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
diff --git a/src/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java b/src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java
rename to src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java
diff --git a/src/org/thoughtcrime/securesms/components/MediaView.java b/src/main/java/org/thoughtcrime/securesms/components/MediaView.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/MediaView.java
rename to src/main/java/org/thoughtcrime/securesms/components/MediaView.java
diff --git a/src/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java b/src/main/java/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java
rename to src/main/java/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java
diff --git a/src/org/thoughtcrime/securesms/components/QuoteView.java b/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/QuoteView.java
rename to src/main/java/org/thoughtcrime/securesms/components/QuoteView.java
diff --git a/src/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java b/src/main/java/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java
rename to src/main/java/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java
diff --git a/src/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java b/src/main/java/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java
rename to src/main/java/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java
diff --git a/src/org/thoughtcrime/securesms/components/RepeatableImageKey.java b/src/main/java/org/thoughtcrime/securesms/components/RepeatableImageKey.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/RepeatableImageKey.java
rename to src/main/java/org/thoughtcrime/securesms/components/RepeatableImageKey.java
diff --git a/src/org/thoughtcrime/securesms/components/ScaleStableImageView.java b/src/main/java/org/thoughtcrime/securesms/components/ScaleStableImageView.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/ScaleStableImageView.java
rename to src/main/java/org/thoughtcrime/securesms/components/ScaleStableImageView.java
diff --git a/src/org/thoughtcrime/securesms/components/SearchToolbar.java b/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/SearchToolbar.java
rename to src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java
diff --git a/src/org/thoughtcrime/securesms/components/SendButton.java b/src/main/java/org/thoughtcrime/securesms/components/SendButton.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/SendButton.java
rename to src/main/java/org/thoughtcrime/securesms/components/SendButton.java
diff --git a/src/org/thoughtcrime/securesms/components/ShapeScrim.java b/src/main/java/org/thoughtcrime/securesms/components/ShapeScrim.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/ShapeScrim.java
rename to src/main/java/org/thoughtcrime/securesms/components/ShapeScrim.java
diff --git a/src/org/thoughtcrime/securesms/components/SquareFrameLayout.java b/src/main/java/org/thoughtcrime/securesms/components/SquareFrameLayout.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/SquareFrameLayout.java
rename to src/main/java/org/thoughtcrime/securesms/components/SquareFrameLayout.java
diff --git a/src/org/thoughtcrime/securesms/components/SwitchPreferenceCompat.java b/src/main/java/org/thoughtcrime/securesms/components/SwitchPreferenceCompat.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/SwitchPreferenceCompat.java
rename to src/main/java/org/thoughtcrime/securesms/components/SwitchPreferenceCompat.java
diff --git a/src/org/thoughtcrime/securesms/components/ThumbnailView.java b/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/ThumbnailView.java
rename to src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java
diff --git a/src/org/thoughtcrime/securesms/components/VcardView.java b/src/main/java/org/thoughtcrime/securesms/components/VcardView.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/VcardView.java
rename to src/main/java/org/thoughtcrime/securesms/components/VcardView.java
diff --git a/src/org/thoughtcrime/securesms/components/WebxdcView.java b/src/main/java/org/thoughtcrime/securesms/components/WebxdcView.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/WebxdcView.java
rename to src/main/java/org/thoughtcrime/securesms/components/WebxdcView.java
diff --git a/src/org/thoughtcrime/securesms/components/ZoomingImageView.java b/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/ZoomingImageView.java
rename to src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java
diff --git a/src/org/thoughtcrime/securesms/components/emoji/AnimatingImageSpan.java b/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 src/main/java/org/thoughtcrime/securesms/components/emoji/AnimatingImageSpan.java
diff --git a/src/org/thoughtcrime/securesms/components/emoji/AsciiEmojiView.java b/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 src/main/java/org/thoughtcrime/securesms/components/emoji/AsciiEmojiView.java
diff --git a/src/org/thoughtcrime/securesms/components/emoji/CompositeEmojiPageModel.java b/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 src/main/java/org/thoughtcrime/securesms/components/emoji/CompositeEmojiPageModel.java
diff --git a/src/org/thoughtcrime/securesms/components/emoji/Emoji.java b/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 src/main/java/org/thoughtcrime/securesms/components/emoji/Emoji.java
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java b/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 src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiFilter.java b/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 src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiFilter.java
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiImageView.java b/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 src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiImageView.java
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java b/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 src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiPageModel.java b/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 src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageModel.java
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java b/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 src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiPageViewGridAdapter.java b/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 src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageViewGridAdapter.java
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiPages.java b/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 src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPages.java
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java b/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 src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiSpan.java b/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 src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiSpan.java
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiStrings.java b/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 src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiStrings.java
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java b/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 src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java b/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 src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java b/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 src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java
diff --git a/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java b/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 src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java
diff --git a/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboardBottomTabAdapter.java b/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 src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboardBottomTabAdapter.java
diff --git a/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboardProvider.java b/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 src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboardProvider.java
diff --git a/src/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java b/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 src/main/java/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java
diff --git a/src/org/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel.java b/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 src/main/java/org/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel.java
diff --git a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiDrawInfo.java b/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 src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiDrawInfo.java
diff --git a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java b/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 src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java
diff --git a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java b/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 src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java
diff --git a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiTree.java b/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 src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiTree.java
diff --git a/src/org/thoughtcrime/securesms/components/emoji/parsing/Fitzpatrick.java b/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 src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/Fitzpatrick.java
diff --git a/src/org/thoughtcrime/securesms/components/recyclerview/DeleteItemAnimator.java b/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 src/main/java/org/thoughtcrime/securesms/components/recyclerview/DeleteItemAnimator.java
diff --git a/src/org/thoughtcrime/securesms/components/registration/PulsingFloatingActionButton.java b/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 src/main/java/org/thoughtcrime/securesms/components/registration/PulsingFloatingActionButton.java
diff --git a/src/org/thoughtcrime/securesms/components/reminder/DozeReminder.java b/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 src/main/java/org/thoughtcrime/securesms/components/reminder/DozeReminder.java
diff --git a/src/org/thoughtcrime/securesms/components/subsampling/AttachmentBitmapDecoder.java b/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 src/main/java/org/thoughtcrime/securesms/components/subsampling/AttachmentBitmapDecoder.java
diff --git a/src/org/thoughtcrime/securesms/components/subsampling/AttachmentRegionDecoder.java b/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 src/main/java/org/thoughtcrime/securesms/components/subsampling/AttachmentRegionDecoder.java
diff --git a/src/org/thoughtcrime/securesms/components/viewpager/ExtendedOnPageChangedListener.java b/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 src/main/java/org/thoughtcrime/securesms/components/viewpager/ExtendedOnPageChangedListener.java
diff --git a/src/org/thoughtcrime/securesms/components/viewpager/HackyViewPager.java b/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 src/main/java/org/thoughtcrime/securesms/components/viewpager/HackyViewPager.java
diff --git a/src/org/thoughtcrime/securesms/connect/AccountManager.java b/src/main/java/org/thoughtcrime/securesms/connect/AccountManager.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/connect/AccountManager.java
rename to src/main/java/org/thoughtcrime/securesms/connect/AccountManager.java
diff --git a/src/org/thoughtcrime/securesms/connect/AttachmentsContentProvider.java b/src/main/java/org/thoughtcrime/securesms/connect/AttachmentsContentProvider.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/connect/AttachmentsContentProvider.java
rename to src/main/java/org/thoughtcrime/securesms/connect/AttachmentsContentProvider.java
diff --git a/src/org/thoughtcrime/securesms/connect/DcContactsLoader.java b/src/main/java/org/thoughtcrime/securesms/connect/DcContactsLoader.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/connect/DcContactsLoader.java
rename to src/main/java/org/thoughtcrime/securesms/connect/DcContactsLoader.java
diff --git a/src/org/thoughtcrime/securesms/connect/DcEventCenter.java b/src/main/java/org/thoughtcrime/securesms/connect/DcEventCenter.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/connect/DcEventCenter.java
rename to src/main/java/org/thoughtcrime/securesms/connect/DcEventCenter.java
diff --git a/src/org/thoughtcrime/securesms/connect/DcHelper.java b/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/connect/DcHelper.java
rename to src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java
diff --git a/src/org/thoughtcrime/securesms/connect/DirectShareUtil.java b/src/main/java/org/thoughtcrime/securesms/connect/DirectShareUtil.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/connect/DirectShareUtil.java
rename to src/main/java/org/thoughtcrime/securesms/connect/DirectShareUtil.java
diff --git a/src/org/thoughtcrime/securesms/connect/FetchWorker.java b/src/main/java/org/thoughtcrime/securesms/connect/FetchWorker.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/connect/FetchWorker.java
rename to src/main/java/org/thoughtcrime/securesms/connect/FetchWorker.java
diff --git a/src/org/thoughtcrime/securesms/connect/ForegroundDetector.java b/src/main/java/org/thoughtcrime/securesms/connect/ForegroundDetector.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/connect/ForegroundDetector.java
rename to src/main/java/org/thoughtcrime/securesms/connect/ForegroundDetector.java
diff --git a/src/org/thoughtcrime/securesms/connect/KeepAliveService.java b/src/main/java/org/thoughtcrime/securesms/connect/KeepAliveService.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/connect/KeepAliveService.java
rename to src/main/java/org/thoughtcrime/securesms/connect/KeepAliveService.java
diff --git a/src/org/thoughtcrime/securesms/connect/NetworkStateReceiver.java b/src/main/java/org/thoughtcrime/securesms/connect/NetworkStateReceiver.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/connect/NetworkStateReceiver.java
rename to src/main/java/org/thoughtcrime/securesms/connect/NetworkStateReceiver.java
diff --git a/src/org/thoughtcrime/securesms/contacts/ContactAccessor.java b/src/main/java/org/thoughtcrime/securesms/contacts/ContactAccessor.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/contacts/ContactAccessor.java
rename to src/main/java/org/thoughtcrime/securesms/contacts/ContactAccessor.java
diff --git a/src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java b/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java
rename to src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java
diff --git a/src/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java b/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java
rename to src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java
diff --git a/src/org/thoughtcrime/securesms/contacts/NewContactActivity.java b/src/main/java/org/thoughtcrime/securesms/contacts/NewContactActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/contacts/NewContactActivity.java
rename to src/main/java/org/thoughtcrime/securesms/contacts/NewContactActivity.java
diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/ContactPhoto.java b/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 src/main/java/org/thoughtcrime/securesms/contacts/avatars/ContactPhoto.java
diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/FallbackContactPhoto.java b/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 src/main/java/org/thoughtcrime/securesms/contacts/avatars/FallbackContactPhoto.java
diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java b/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 src/main/java/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java
diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/GroupRecordContactPhoto.java b/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 src/main/java/org/thoughtcrime/securesms/contacts/avatars/GroupRecordContactPhoto.java
diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/LocalFileContactPhoto.java b/src/main/java/org/thoughtcrime/securesms/contacts/avatars/LocalFileContactPhoto.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/contacts/avatars/LocalFileContactPhoto.java
rename to src/main/java/org/thoughtcrime/securesms/contacts/avatars/LocalFileContactPhoto.java
diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/MyProfileContactPhoto.java b/src/main/java/org/thoughtcrime/securesms/contacts/avatars/MyProfileContactPhoto.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/contacts/avatars/MyProfileContactPhoto.java
rename to src/main/java/org/thoughtcrime/securesms/contacts/avatars/MyProfileContactPhoto.java
diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java b/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 src/main/java/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java
diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java b/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 src/main/java/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java
diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/SystemContactPhoto.java b/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 src/main/java/org/thoughtcrime/securesms/contacts/avatars/SystemContactPhoto.java
diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/VcardContactPhoto.java b/src/main/java/org/thoughtcrime/securesms/contacts/avatars/VcardContactPhoto.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/contacts/avatars/VcardContactPhoto.java
rename to src/main/java/org/thoughtcrime/securesms/contacts/avatars/VcardContactPhoto.java
diff --git a/src/org/thoughtcrime/securesms/crypto/DatabaseSecret.java b/src/main/java/org/thoughtcrime/securesms/crypto/DatabaseSecret.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/crypto/DatabaseSecret.java
rename to src/main/java/org/thoughtcrime/securesms/crypto/DatabaseSecret.java
diff --git a/src/org/thoughtcrime/securesms/crypto/DatabaseSecretProvider.java b/src/main/java/org/thoughtcrime/securesms/crypto/DatabaseSecretProvider.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/crypto/DatabaseSecretProvider.java
rename to src/main/java/org/thoughtcrime/securesms/crypto/DatabaseSecretProvider.java
diff --git a/src/org/thoughtcrime/securesms/crypto/KeyStoreHelper.java b/src/main/java/org/thoughtcrime/securesms/crypto/KeyStoreHelper.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/crypto/KeyStoreHelper.java
rename to src/main/java/org/thoughtcrime/securesms/crypto/KeyStoreHelper.java
diff --git a/src/org/thoughtcrime/securesms/crypto/PRNGFixes.java b/src/main/java/org/thoughtcrime/securesms/crypto/PRNGFixes.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/crypto/PRNGFixes.java
rename to src/main/java/org/thoughtcrime/securesms/crypto/PRNGFixes.java
diff --git a/src/org/thoughtcrime/securesms/database/Address.java b/src/main/java/org/thoughtcrime/securesms/database/Address.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/database/Address.java
rename to src/main/java/org/thoughtcrime/securesms/database/Address.java
diff --git a/src/org/thoughtcrime/securesms/database/AttachmentDatabase.java b/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/database/AttachmentDatabase.java
rename to src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java
diff --git a/src/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapter.java b/src/main/java/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapter.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapter.java
rename to src/main/java/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapter.java
diff --git a/src/org/thoughtcrime/securesms/database/loaders/BucketedThreadMediaLoader.java b/src/main/java/org/thoughtcrime/securesms/database/loaders/BucketedThreadMediaLoader.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/database/loaders/BucketedThreadMediaLoader.java
rename to src/main/java/org/thoughtcrime/securesms/database/loaders/BucketedThreadMediaLoader.java
diff --git a/src/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java b/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 src/main/java/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java
diff --git a/src/org/thoughtcrime/securesms/database/loaders/RecentPhotosLoader.java b/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 src/main/java/org/thoughtcrime/securesms/database/loaders/RecentPhotosLoader.java
diff --git a/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java b/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 src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java
diff --git a/src/org/thoughtcrime/securesms/geolocation/DcLocation.java b/src/main/java/org/thoughtcrime/securesms/geolocation/DcLocation.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/geolocation/DcLocation.java
rename to src/main/java/org/thoughtcrime/securesms/geolocation/DcLocation.java
diff --git a/src/org/thoughtcrime/securesms/geolocation/DcLocationManager.java b/src/main/java/org/thoughtcrime/securesms/geolocation/DcLocationManager.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/geolocation/DcLocationManager.java
rename to src/main/java/org/thoughtcrime/securesms/geolocation/DcLocationManager.java
diff --git a/src/org/thoughtcrime/securesms/geolocation/LocationBackgroundService.java b/src/main/java/org/thoughtcrime/securesms/geolocation/LocationBackgroundService.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/geolocation/LocationBackgroundService.java
rename to src/main/java/org/thoughtcrime/securesms/geolocation/LocationBackgroundService.java
diff --git a/src/org/thoughtcrime/securesms/glide/ContactPhotoFetcher.java b/src/main/java/org/thoughtcrime/securesms/glide/ContactPhotoFetcher.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/glide/ContactPhotoFetcher.java
rename to src/main/java/org/thoughtcrime/securesms/glide/ContactPhotoFetcher.java
diff --git a/src/org/thoughtcrime/securesms/glide/ContactPhotoLoader.java b/src/main/java/org/thoughtcrime/securesms/glide/ContactPhotoLoader.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/glide/ContactPhotoLoader.java
rename to src/main/java/org/thoughtcrime/securesms/glide/ContactPhotoLoader.java
diff --git a/src/org/thoughtcrime/securesms/glide/lottie/LottieDecoder.java b/src/main/java/org/thoughtcrime/securesms/glide/lottie/LottieDecoder.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/glide/lottie/LottieDecoder.java
rename to src/main/java/org/thoughtcrime/securesms/glide/lottie/LottieDecoder.java
diff --git a/src/org/thoughtcrime/securesms/glide/lottie/LottieDrawableTranscoder.java b/src/main/java/org/thoughtcrime/securesms/glide/lottie/LottieDrawableTranscoder.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/glide/lottie/LottieDrawableTranscoder.java
rename to src/main/java/org/thoughtcrime/securesms/glide/lottie/LottieDrawableTranscoder.java
diff --git a/src/org/thoughtcrime/securesms/glide/svg/SvgDecoder.java b/src/main/java/org/thoughtcrime/securesms/glide/svg/SvgDecoder.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/glide/svg/SvgDecoder.java
rename to src/main/java/org/thoughtcrime/securesms/glide/svg/SvgDecoder.java
diff --git a/src/org/thoughtcrime/securesms/glide/svg/SvgDrawableTranscoder.java b/src/main/java/org/thoughtcrime/securesms/glide/svg/SvgDrawableTranscoder.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/glide/svg/SvgDrawableTranscoder.java
rename to src/main/java/org/thoughtcrime/securesms/glide/svg/SvgDrawableTranscoder.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/Bounds.java b/src/main/java/org/thoughtcrime/securesms/imageeditor/Bounds.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/imageeditor/Bounds.java
rename to src/main/java/org/thoughtcrime/securesms/imageeditor/Bounds.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/CanvasMatrix.java b/src/main/java/org/thoughtcrime/securesms/imageeditor/CanvasMatrix.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/imageeditor/CanvasMatrix.java
rename to src/main/java/org/thoughtcrime/securesms/imageeditor/CanvasMatrix.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/ColorableRenderer.java b/src/main/java/org/thoughtcrime/securesms/imageeditor/ColorableRenderer.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/imageeditor/ColorableRenderer.java
rename to src/main/java/org/thoughtcrime/securesms/imageeditor/ColorableRenderer.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/DrawingSession.java b/src/main/java/org/thoughtcrime/securesms/imageeditor/DrawingSession.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/imageeditor/DrawingSession.java
rename to src/main/java/org/thoughtcrime/securesms/imageeditor/DrawingSession.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/EditSession.java b/src/main/java/org/thoughtcrime/securesms/imageeditor/EditSession.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/imageeditor/EditSession.java
rename to src/main/java/org/thoughtcrime/securesms/imageeditor/EditSession.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/ElementDragEditSession.java b/src/main/java/org/thoughtcrime/securesms/imageeditor/ElementDragEditSession.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/imageeditor/ElementDragEditSession.java
rename to src/main/java/org/thoughtcrime/securesms/imageeditor/ElementDragEditSession.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/ElementEditSession.java b/src/main/java/org/thoughtcrime/securesms/imageeditor/ElementEditSession.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/imageeditor/ElementEditSession.java
rename to src/main/java/org/thoughtcrime/securesms/imageeditor/ElementEditSession.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/ElementScaleEditSession.java b/src/main/java/org/thoughtcrime/securesms/imageeditor/ElementScaleEditSession.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/imageeditor/ElementScaleEditSession.java
rename to src/main/java/org/thoughtcrime/securesms/imageeditor/ElementScaleEditSession.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/HiddenEditText.java b/src/main/java/org/thoughtcrime/securesms/imageeditor/HiddenEditText.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/imageeditor/HiddenEditText.java
rename to src/main/java/org/thoughtcrime/securesms/imageeditor/HiddenEditText.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/ImageEditorMediaConstraints.java b/src/main/java/org/thoughtcrime/securesms/imageeditor/ImageEditorMediaConstraints.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/imageeditor/ImageEditorMediaConstraints.java
rename to src/main/java/org/thoughtcrime/securesms/imageeditor/ImageEditorMediaConstraints.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/ImageEditorView.java b/src/main/java/org/thoughtcrime/securesms/imageeditor/ImageEditorView.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/imageeditor/ImageEditorView.java
rename to src/main/java/org/thoughtcrime/securesms/imageeditor/ImageEditorView.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/Renderer.java b/src/main/java/org/thoughtcrime/securesms/imageeditor/Renderer.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/imageeditor/Renderer.java
rename to src/main/java/org/thoughtcrime/securesms/imageeditor/Renderer.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/RendererContext.java b/src/main/java/org/thoughtcrime/securesms/imageeditor/RendererContext.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/imageeditor/RendererContext.java
rename to src/main/java/org/thoughtcrime/securesms/imageeditor/RendererContext.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/ThumbDragEditSession.java b/src/main/java/org/thoughtcrime/securesms/imageeditor/ThumbDragEditSession.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/imageeditor/ThumbDragEditSession.java
rename to src/main/java/org/thoughtcrime/securesms/imageeditor/ThumbDragEditSession.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/UndoRedoStackListener.java b/src/main/java/org/thoughtcrime/securesms/imageeditor/UndoRedoStackListener.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/imageeditor/UndoRedoStackListener.java
rename to src/main/java/org/thoughtcrime/securesms/imageeditor/UndoRedoStackListener.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/AlphaAnimation.java b/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 src/main/java/org/thoughtcrime/securesms/imageeditor/model/AlphaAnimation.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/AnimationMatrix.java b/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 src/main/java/org/thoughtcrime/securesms/imageeditor/model/AnimationMatrix.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/Bisect.java b/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 src/main/java/org/thoughtcrime/securesms/imageeditor/model/Bisect.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/CropThumbRenderer.java b/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 src/main/java/org/thoughtcrime/securesms/imageeditor/model/CropThumbRenderer.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/EditorElement.java b/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 src/main/java/org/thoughtcrime/securesms/imageeditor/model/EditorElement.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/EditorElementHierarchy.java b/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 src/main/java/org/thoughtcrime/securesms/imageeditor/model/EditorElementHierarchy.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/EditorFlags.java b/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 src/main/java/org/thoughtcrime/securesms/imageeditor/model/EditorFlags.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/EditorModel.java b/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 src/main/java/org/thoughtcrime/securesms/imageeditor/model/EditorModel.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/ElementStack.java b/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 src/main/java/org/thoughtcrime/securesms/imageeditor/model/ElementStack.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/InBoundsMemory.java b/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 src/main/java/org/thoughtcrime/securesms/imageeditor/model/InBoundsMemory.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/ParcelUtils.java b/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 src/main/java/org/thoughtcrime/securesms/imageeditor/model/ParcelUtils.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/ThumbRenderer.java b/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 src/main/java/org/thoughtcrime/securesms/imageeditor/model/ThumbRenderer.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/UndoRedoStacks.java b/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 src/main/java/org/thoughtcrime/securesms/imageeditor/model/UndoRedoStacks.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/renderers/AutomaticControlPointBezierLine.java b/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 src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/AutomaticControlPointBezierLine.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/renderers/BezierDrawingRenderer.java b/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 src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/BezierDrawingRenderer.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/renderers/CropAreaRenderer.java b/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 src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/CropAreaRenderer.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/renderers/InvalidateableRenderer.java b/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 src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/InvalidateableRenderer.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/renderers/InverseFillRenderer.java b/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 src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/InverseFillRenderer.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/renderers/MultiLineTextRenderer.java b/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 src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/MultiLineTextRenderer.java
diff --git a/src/org/thoughtcrime/securesms/imageeditor/renderers/OvalGuideRenderer.java b/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/OvalGuideRenderer.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/imageeditor/renderers/OvalGuideRenderer.java
rename to src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/OvalGuideRenderer.java
diff --git a/src/org/thoughtcrime/securesms/jobmanager/Job.java b/src/main/java/org/thoughtcrime/securesms/jobmanager/Job.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/jobmanager/Job.java
rename to src/main/java/org/thoughtcrime/securesms/jobmanager/Job.java
diff --git a/src/org/thoughtcrime/securesms/jobmanager/JobConsumer.java b/src/main/java/org/thoughtcrime/securesms/jobmanager/JobConsumer.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/jobmanager/JobConsumer.java
rename to src/main/java/org/thoughtcrime/securesms/jobmanager/JobConsumer.java
diff --git a/src/org/thoughtcrime/securesms/jobmanager/JobManager.java b/src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/jobmanager/JobManager.java
rename to src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java
diff --git a/src/org/thoughtcrime/securesms/jobmanager/JobParameters.java b/src/main/java/org/thoughtcrime/securesms/jobmanager/JobParameters.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/jobmanager/JobParameters.java
rename to src/main/java/org/thoughtcrime/securesms/jobmanager/JobParameters.java
diff --git a/src/org/thoughtcrime/securesms/jobmanager/JobQueue.java b/src/main/java/org/thoughtcrime/securesms/jobmanager/JobQueue.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/jobmanager/JobQueue.java
rename to src/main/java/org/thoughtcrime/securesms/jobmanager/JobQueue.java
diff --git a/src/org/thoughtcrime/securesms/jobmanager/requirements/Requirement.java b/src/main/java/org/thoughtcrime/securesms/jobmanager/requirements/Requirement.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/jobmanager/requirements/Requirement.java
rename to src/main/java/org/thoughtcrime/securesms/jobmanager/requirements/Requirement.java
diff --git a/src/org/thoughtcrime/securesms/messagerequests/MessageRequestsBottomView.java b/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsBottomView.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/messagerequests/MessageRequestsBottomView.java
rename to src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsBottomView.java
diff --git a/src/org/thoughtcrime/securesms/mms/AttachmentManager.java b/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/mms/AttachmentManager.java
rename to src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
diff --git a/src/org/thoughtcrime/securesms/mms/AudioSlide.java b/src/main/java/org/thoughtcrime/securesms/mms/AudioSlide.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/mms/AudioSlide.java
rename to src/main/java/org/thoughtcrime/securesms/mms/AudioSlide.java
diff --git a/src/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java b/src/main/java/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java
rename to src/main/java/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java
diff --git a/src/org/thoughtcrime/securesms/mms/DecryptableStreamUriLoader.java b/src/main/java/org/thoughtcrime/securesms/mms/DecryptableStreamUriLoader.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/mms/DecryptableStreamUriLoader.java
rename to src/main/java/org/thoughtcrime/securesms/mms/DecryptableStreamUriLoader.java
diff --git a/src/org/thoughtcrime/securesms/mms/DocumentSlide.java b/src/main/java/org/thoughtcrime/securesms/mms/DocumentSlide.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/mms/DocumentSlide.java
rename to src/main/java/org/thoughtcrime/securesms/mms/DocumentSlide.java
diff --git a/src/org/thoughtcrime/securesms/mms/GifSlide.java b/src/main/java/org/thoughtcrime/securesms/mms/GifSlide.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/mms/GifSlide.java
rename to src/main/java/org/thoughtcrime/securesms/mms/GifSlide.java
diff --git a/src/org/thoughtcrime/securesms/mms/ImageSlide.java b/src/main/java/org/thoughtcrime/securesms/mms/ImageSlide.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/mms/ImageSlide.java
rename to src/main/java/org/thoughtcrime/securesms/mms/ImageSlide.java
diff --git a/src/org/thoughtcrime/securesms/mms/MediaConstraints.java b/src/main/java/org/thoughtcrime/securesms/mms/MediaConstraints.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/mms/MediaConstraints.java
rename to src/main/java/org/thoughtcrime/securesms/mms/MediaConstraints.java
diff --git a/src/org/thoughtcrime/securesms/mms/PartAuthority.java b/src/main/java/org/thoughtcrime/securesms/mms/PartAuthority.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/mms/PartAuthority.java
rename to src/main/java/org/thoughtcrime/securesms/mms/PartAuthority.java
diff --git a/src/org/thoughtcrime/securesms/mms/QuoteModel.java b/src/main/java/org/thoughtcrime/securesms/mms/QuoteModel.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/mms/QuoteModel.java
rename to src/main/java/org/thoughtcrime/securesms/mms/QuoteModel.java
diff --git a/src/org/thoughtcrime/securesms/mms/SignalGlideModule.java b/src/main/java/org/thoughtcrime/securesms/mms/SignalGlideModule.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/mms/SignalGlideModule.java
rename to src/main/java/org/thoughtcrime/securesms/mms/SignalGlideModule.java
diff --git a/src/org/thoughtcrime/securesms/mms/Slide.java b/src/main/java/org/thoughtcrime/securesms/mms/Slide.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/mms/Slide.java
rename to src/main/java/org/thoughtcrime/securesms/mms/Slide.java
diff --git a/src/org/thoughtcrime/securesms/mms/SlideClickListener.java b/src/main/java/org/thoughtcrime/securesms/mms/SlideClickListener.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/mms/SlideClickListener.java
rename to src/main/java/org/thoughtcrime/securesms/mms/SlideClickListener.java
diff --git a/src/org/thoughtcrime/securesms/mms/SlideDeck.java b/src/main/java/org/thoughtcrime/securesms/mms/SlideDeck.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/mms/SlideDeck.java
rename to src/main/java/org/thoughtcrime/securesms/mms/SlideDeck.java
diff --git a/src/org/thoughtcrime/securesms/mms/StickerSlide.java b/src/main/java/org/thoughtcrime/securesms/mms/StickerSlide.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/mms/StickerSlide.java
rename to src/main/java/org/thoughtcrime/securesms/mms/StickerSlide.java
diff --git a/src/org/thoughtcrime/securesms/mms/VcardSlide.java b/src/main/java/org/thoughtcrime/securesms/mms/VcardSlide.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/mms/VcardSlide.java
rename to src/main/java/org/thoughtcrime/securesms/mms/VcardSlide.java
diff --git a/src/org/thoughtcrime/securesms/mms/VideoSlide.java b/src/main/java/org/thoughtcrime/securesms/mms/VideoSlide.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/mms/VideoSlide.java
rename to src/main/java/org/thoughtcrime/securesms/mms/VideoSlide.java
diff --git a/src/org/thoughtcrime/securesms/notifications/FcmReceiveService.java b/src/main/java/org/thoughtcrime/securesms/notifications/FcmReceiveService.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/notifications/FcmReceiveService.java
rename to src/main/java/org/thoughtcrime/securesms/notifications/FcmReceiveService.java
diff --git a/src/org/thoughtcrime/securesms/notifications/InChatSounds.java b/src/main/java/org/thoughtcrime/securesms/notifications/InChatSounds.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/notifications/InChatSounds.java
rename to src/main/java/org/thoughtcrime/securesms/notifications/InChatSounds.java
diff --git a/src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java b/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java
rename to src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java
diff --git a/src/org/thoughtcrime/securesms/notifications/NotificationCenter.java b/src/main/java/org/thoughtcrime/securesms/notifications/NotificationCenter.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/notifications/NotificationCenter.java
rename to src/main/java/org/thoughtcrime/securesms/notifications/NotificationCenter.java
diff --git a/src/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java b/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java
rename to src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java
diff --git a/src/org/thoughtcrime/securesms/permissions/Permissions.java b/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/permissions/Permissions.java
rename to src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java
diff --git a/src/org/thoughtcrime/securesms/permissions/PermissionsRequest.java b/src/main/java/org/thoughtcrime/securesms/permissions/PermissionsRequest.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/permissions/PermissionsRequest.java
rename to src/main/java/org/thoughtcrime/securesms/permissions/PermissionsRequest.java
diff --git a/src/org/thoughtcrime/securesms/permissions/RationaleDialog.java b/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/permissions/RationaleDialog.java
rename to src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.java
diff --git a/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java b/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
rename to src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
diff --git a/src/org/thoughtcrime/securesms/preferences/AppearancePreferenceFragment.java b/src/main/java/org/thoughtcrime/securesms/preferences/AppearancePreferenceFragment.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/preferences/AppearancePreferenceFragment.java
rename to src/main/java/org/thoughtcrime/securesms/preferences/AppearancePreferenceFragment.java
diff --git a/src/org/thoughtcrime/securesms/preferences/ChatBackgroundActivity.java b/src/main/java/org/thoughtcrime/securesms/preferences/ChatBackgroundActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/preferences/ChatBackgroundActivity.java
rename to src/main/java/org/thoughtcrime/securesms/preferences/ChatBackgroundActivity.java
diff --git a/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java b/src/main/java/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java
rename to src/main/java/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java
diff --git a/src/org/thoughtcrime/securesms/preferences/CorrectedPreferenceFragment.java b/src/main/java/org/thoughtcrime/securesms/preferences/CorrectedPreferenceFragment.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/preferences/CorrectedPreferenceFragment.java
rename to src/main/java/org/thoughtcrime/securesms/preferences/CorrectedPreferenceFragment.java
diff --git a/src/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java b/src/main/java/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java
rename to src/main/java/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java
diff --git a/src/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java b/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java
rename to src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java
diff --git a/src/org/thoughtcrime/securesms/preferences/PrivacyPreferenceFragment.java b/src/main/java/org/thoughtcrime/securesms/preferences/PrivacyPreferenceFragment.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/preferences/PrivacyPreferenceFragment.java
rename to src/main/java/org/thoughtcrime/securesms/preferences/PrivacyPreferenceFragment.java
diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/NotificationPrivacyPreference.java b/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 src/main/java/org/thoughtcrime/securesms/preferences/widgets/NotificationPrivacyPreference.java
diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java b/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 src/main/java/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java
diff --git a/src/org/thoughtcrime/securesms/profiles/AvatarHelper.java b/src/main/java/org/thoughtcrime/securesms/profiles/AvatarHelper.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/profiles/AvatarHelper.java
rename to src/main/java/org/thoughtcrime/securesms/profiles/AvatarHelper.java
diff --git a/src/org/thoughtcrime/securesms/profiles/ProfileMediaConstraints.java b/src/main/java/org/thoughtcrime/securesms/profiles/ProfileMediaConstraints.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/profiles/ProfileMediaConstraints.java
rename to src/main/java/org/thoughtcrime/securesms/profiles/ProfileMediaConstraints.java
diff --git a/src/org/thoughtcrime/securesms/providers/PersistentBlobProvider.java b/src/main/java/org/thoughtcrime/securesms/providers/PersistentBlobProvider.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/providers/PersistentBlobProvider.java
rename to src/main/java/org/thoughtcrime/securesms/providers/PersistentBlobProvider.java
diff --git a/src/org/thoughtcrime/securesms/providers/SingleUseBlobProvider.java b/src/main/java/org/thoughtcrime/securesms/providers/SingleUseBlobProvider.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/providers/SingleUseBlobProvider.java
rename to src/main/java/org/thoughtcrime/securesms/providers/SingleUseBlobProvider.java
diff --git a/src/org/thoughtcrime/securesms/qr/BackupProviderFragment.java b/src/main/java/org/thoughtcrime/securesms/qr/BackupProviderFragment.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/qr/BackupProviderFragment.java
rename to src/main/java/org/thoughtcrime/securesms/qr/BackupProviderFragment.java
diff --git a/src/org/thoughtcrime/securesms/qr/BackupReceiverFragment.java b/src/main/java/org/thoughtcrime/securesms/qr/BackupReceiverFragment.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/qr/BackupReceiverFragment.java
rename to src/main/java/org/thoughtcrime/securesms/qr/BackupReceiverFragment.java
diff --git a/src/org/thoughtcrime/securesms/qr/BackupTransferActivity.java b/src/main/java/org/thoughtcrime/securesms/qr/BackupTransferActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/qr/BackupTransferActivity.java
rename to src/main/java/org/thoughtcrime/securesms/qr/BackupTransferActivity.java
diff --git a/src/org/thoughtcrime/securesms/qr/QrActivity.java b/src/main/java/org/thoughtcrime/securesms/qr/QrActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/qr/QrActivity.java
rename to src/main/java/org/thoughtcrime/securesms/qr/QrActivity.java
diff --git a/src/org/thoughtcrime/securesms/qr/QrCodeHandler.java b/src/main/java/org/thoughtcrime/securesms/qr/QrCodeHandler.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/qr/QrCodeHandler.java
rename to src/main/java/org/thoughtcrime/securesms/qr/QrCodeHandler.java
diff --git a/src/org/thoughtcrime/securesms/qr/QrScanFragment.java b/src/main/java/org/thoughtcrime/securesms/qr/QrScanFragment.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/qr/QrScanFragment.java
rename to src/main/java/org/thoughtcrime/securesms/qr/QrScanFragment.java
diff --git a/src/org/thoughtcrime/securesms/qr/QrShowActivity.java b/src/main/java/org/thoughtcrime/securesms/qr/QrShowActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/qr/QrShowActivity.java
rename to src/main/java/org/thoughtcrime/securesms/qr/QrShowActivity.java
diff --git a/src/org/thoughtcrime/securesms/qr/QrShowFragment.java b/src/main/java/org/thoughtcrime/securesms/qr/QrShowFragment.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/qr/QrShowFragment.java
rename to src/main/java/org/thoughtcrime/securesms/qr/QrShowFragment.java
diff --git a/src/org/thoughtcrime/securesms/qr/RegistrationQrActivity.java b/src/main/java/org/thoughtcrime/securesms/qr/RegistrationQrActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/qr/RegistrationQrActivity.java
rename to src/main/java/org/thoughtcrime/securesms/qr/RegistrationQrActivity.java
diff --git a/src/org/thoughtcrime/securesms/reactions/AddReactionView.java b/src/main/java/org/thoughtcrime/securesms/reactions/AddReactionView.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/reactions/AddReactionView.java
rename to src/main/java/org/thoughtcrime/securesms/reactions/AddReactionView.java
diff --git a/src/org/thoughtcrime/securesms/reactions/ReactionRecipientItem.java b/src/main/java/org/thoughtcrime/securesms/reactions/ReactionRecipientItem.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/reactions/ReactionRecipientItem.java
rename to src/main/java/org/thoughtcrime/securesms/reactions/ReactionRecipientItem.java
diff --git a/src/org/thoughtcrime/securesms/reactions/ReactionRecipientsAdapter.java b/src/main/java/org/thoughtcrime/securesms/reactions/ReactionRecipientsAdapter.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/reactions/ReactionRecipientsAdapter.java
rename to src/main/java/org/thoughtcrime/securesms/reactions/ReactionRecipientsAdapter.java
diff --git a/src/org/thoughtcrime/securesms/reactions/ReactionsConversationView.java b/src/main/java/org/thoughtcrime/securesms/reactions/ReactionsConversationView.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/reactions/ReactionsConversationView.java
rename to src/main/java/org/thoughtcrime/securesms/reactions/ReactionsConversationView.java
diff --git a/src/org/thoughtcrime/securesms/reactions/ReactionsDetailsFragment.java b/src/main/java/org/thoughtcrime/securesms/reactions/ReactionsDetailsFragment.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/reactions/ReactionsDetailsFragment.java
rename to src/main/java/org/thoughtcrime/securesms/reactions/ReactionsDetailsFragment.java
diff --git a/src/org/thoughtcrime/securesms/recipients/Recipient.java b/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/recipients/Recipient.java
rename to src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
diff --git a/src/org/thoughtcrime/securesms/recipients/RecipientForeverObserver.java b/src/main/java/org/thoughtcrime/securesms/recipients/RecipientForeverObserver.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/recipients/RecipientForeverObserver.java
rename to src/main/java/org/thoughtcrime/securesms/recipients/RecipientForeverObserver.java
diff --git a/src/org/thoughtcrime/securesms/recipients/RecipientModifiedListener.java b/src/main/java/org/thoughtcrime/securesms/recipients/RecipientModifiedListener.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/recipients/RecipientModifiedListener.java
rename to src/main/java/org/thoughtcrime/securesms/recipients/RecipientModifiedListener.java
diff --git a/src/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java b/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java
rename to src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java
diff --git a/src/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java b/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java
rename to src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java
diff --git a/src/org/thoughtcrime/securesms/scribbles/ScribbleActivity.java b/src/main/java/org/thoughtcrime/securesms/scribbles/ScribbleActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/scribbles/ScribbleActivity.java
rename to src/main/java/org/thoughtcrime/securesms/scribbles/ScribbleActivity.java
diff --git a/src/org/thoughtcrime/securesms/scribbles/StickerLoader.java b/src/main/java/org/thoughtcrime/securesms/scribbles/StickerLoader.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/scribbles/StickerLoader.java
rename to src/main/java/org/thoughtcrime/securesms/scribbles/StickerLoader.java
diff --git a/src/org/thoughtcrime/securesms/scribbles/StickerSelectActivity.java b/src/main/java/org/thoughtcrime/securesms/scribbles/StickerSelectActivity.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/scribbles/StickerSelectActivity.java
rename to src/main/java/org/thoughtcrime/securesms/scribbles/StickerSelectActivity.java
diff --git a/src/org/thoughtcrime/securesms/scribbles/StickerSelectFragment.java b/src/main/java/org/thoughtcrime/securesms/scribbles/StickerSelectFragment.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/scribbles/StickerSelectFragment.java
rename to src/main/java/org/thoughtcrime/securesms/scribbles/StickerSelectFragment.java
diff --git a/src/org/thoughtcrime/securesms/scribbles/UriGlideRenderer.java b/src/main/java/org/thoughtcrime/securesms/scribbles/UriGlideRenderer.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/scribbles/UriGlideRenderer.java
rename to src/main/java/org/thoughtcrime/securesms/scribbles/UriGlideRenderer.java
diff --git a/src/org/thoughtcrime/securesms/scribbles/widget/ColorPaletteAdapter.java b/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 src/main/java/org/thoughtcrime/securesms/scribbles/widget/ColorPaletteAdapter.java
diff --git a/src/org/thoughtcrime/securesms/scribbles/widget/VerticalSlideColorPicker.java b/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 src/main/java/org/thoughtcrime/securesms/scribbles/widget/VerticalSlideColorPicker.java
diff --git a/src/org/thoughtcrime/securesms/search/SearchFragment.java b/src/main/java/org/thoughtcrime/securesms/search/SearchFragment.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/search/SearchFragment.java
rename to src/main/java/org/thoughtcrime/securesms/search/SearchFragment.java
diff --git a/src/org/thoughtcrime/securesms/search/SearchListAdapter.java b/src/main/java/org/thoughtcrime/securesms/search/SearchListAdapter.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/search/SearchListAdapter.java
rename to src/main/java/org/thoughtcrime/securesms/search/SearchListAdapter.java
diff --git a/src/org/thoughtcrime/securesms/search/SearchViewModel.java b/src/main/java/org/thoughtcrime/securesms/search/SearchViewModel.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/search/SearchViewModel.java
rename to src/main/java/org/thoughtcrime/securesms/search/SearchViewModel.java
diff --git a/src/org/thoughtcrime/securesms/search/model/SearchResult.java b/src/main/java/org/thoughtcrime/securesms/search/model/SearchResult.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/search/model/SearchResult.java
rename to src/main/java/org/thoughtcrime/securesms/search/model/SearchResult.java
diff --git a/src/org/thoughtcrime/securesms/service/BootReceiver.java b/src/main/java/org/thoughtcrime/securesms/service/BootReceiver.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/service/BootReceiver.java
rename to src/main/java/org/thoughtcrime/securesms/service/BootReceiver.java
diff --git a/src/org/thoughtcrime/securesms/service/GenericForegroundService.java b/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/service/GenericForegroundService.java
rename to src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java
diff --git a/src/org/thoughtcrime/securesms/service/IPCAddAccountsService.java b/src/main/java/org/thoughtcrime/securesms/service/IPCAddAccountsService.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/service/IPCAddAccountsService.java
rename to src/main/java/org/thoughtcrime/securesms/service/IPCAddAccountsService.java
diff --git a/src/org/thoughtcrime/securesms/service/NotificationController.java b/src/main/java/org/thoughtcrime/securesms/service/NotificationController.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/service/NotificationController.java
rename to src/main/java/org/thoughtcrime/securesms/service/NotificationController.java
diff --git a/src/org/thoughtcrime/securesms/service/PanicResponderListener.java b/src/main/java/org/thoughtcrime/securesms/service/PanicResponderListener.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/service/PanicResponderListener.java
rename to src/main/java/org/thoughtcrime/securesms/service/PanicResponderListener.java
diff --git a/src/org/thoughtcrime/securesms/util/AccessibilityUtil.java b/src/main/java/org/thoughtcrime/securesms/util/AccessibilityUtil.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/AccessibilityUtil.java
rename to src/main/java/org/thoughtcrime/securesms/util/AccessibilityUtil.java
diff --git a/src/org/thoughtcrime/securesms/util/AndroidSignalProtocolLogger.java b/src/main/java/org/thoughtcrime/securesms/util/AndroidSignalProtocolLogger.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/AndroidSignalProtocolLogger.java
rename to src/main/java/org/thoughtcrime/securesms/util/AndroidSignalProtocolLogger.java
diff --git a/src/org/thoughtcrime/securesms/util/AsyncLoader.java b/src/main/java/org/thoughtcrime/securesms/util/AsyncLoader.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/AsyncLoader.java
rename to src/main/java/org/thoughtcrime/securesms/util/AsyncLoader.java
diff --git a/src/org/thoughtcrime/securesms/util/BitmapDecodingException.java b/src/main/java/org/thoughtcrime/securesms/util/BitmapDecodingException.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/BitmapDecodingException.java
rename to src/main/java/org/thoughtcrime/securesms/util/BitmapDecodingException.java
diff --git a/src/org/thoughtcrime/securesms/util/BitmapUtil.java b/src/main/java/org/thoughtcrime/securesms/util/BitmapUtil.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/BitmapUtil.java
rename to src/main/java/org/thoughtcrime/securesms/util/BitmapUtil.java
diff --git a/src/org/thoughtcrime/securesms/util/BreakIteratorCompat.java b/src/main/java/org/thoughtcrime/securesms/util/BreakIteratorCompat.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/BreakIteratorCompat.java
rename to src/main/java/org/thoughtcrime/securesms/util/BreakIteratorCompat.java
diff --git a/src/org/thoughtcrime/securesms/util/Conversions.java b/src/main/java/org/thoughtcrime/securesms/util/Conversions.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/Conversions.java
rename to src/main/java/org/thoughtcrime/securesms/util/Conversions.java
diff --git a/src/org/thoughtcrime/securesms/util/DateUtils.java b/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/DateUtils.java
rename to src/main/java/org/thoughtcrime/securesms/util/DateUtils.java
diff --git a/src/org/thoughtcrime/securesms/util/Debouncer.java b/src/main/java/org/thoughtcrime/securesms/util/Debouncer.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/Debouncer.java
rename to src/main/java/org/thoughtcrime/securesms/util/Debouncer.java
diff --git a/src/org/thoughtcrime/securesms/util/DrawableUtil.java b/src/main/java/org/thoughtcrime/securesms/util/DrawableUtil.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/DrawableUtil.java
rename to src/main/java/org/thoughtcrime/securesms/util/DrawableUtil.java
diff --git a/src/org/thoughtcrime/securesms/util/DynamicLanguage.java b/src/main/java/org/thoughtcrime/securesms/util/DynamicLanguage.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/DynamicLanguage.java
rename to src/main/java/org/thoughtcrime/securesms/util/DynamicLanguage.java
diff --git a/src/org/thoughtcrime/securesms/util/DynamicNoActionBarTheme.java b/src/main/java/org/thoughtcrime/securesms/util/DynamicNoActionBarTheme.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/DynamicNoActionBarTheme.java
rename to src/main/java/org/thoughtcrime/securesms/util/DynamicNoActionBarTheme.java
diff --git a/src/org/thoughtcrime/securesms/util/DynamicTheme.java b/src/main/java/org/thoughtcrime/securesms/util/DynamicTheme.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/DynamicTheme.java
rename to src/main/java/org/thoughtcrime/securesms/util/DynamicTheme.java
diff --git a/src/org/thoughtcrime/securesms/util/FileProviderUtil.java b/src/main/java/org/thoughtcrime/securesms/util/FileProviderUtil.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/FileProviderUtil.java
rename to src/main/java/org/thoughtcrime/securesms/util/FileProviderUtil.java
diff --git a/src/org/thoughtcrime/securesms/util/FileUtils.java b/src/main/java/org/thoughtcrime/securesms/util/FileUtils.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/FileUtils.java
rename to src/main/java/org/thoughtcrime/securesms/util/FileUtils.java
diff --git a/src/org/thoughtcrime/securesms/util/FutureTaskListener.java b/src/main/java/org/thoughtcrime/securesms/util/FutureTaskListener.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/FutureTaskListener.java
rename to src/main/java/org/thoughtcrime/securesms/util/FutureTaskListener.java
diff --git a/src/org/thoughtcrime/securesms/util/Hash.java b/src/main/java/org/thoughtcrime/securesms/util/Hash.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/Hash.java
rename to src/main/java/org/thoughtcrime/securesms/util/Hash.java
diff --git a/src/org/thoughtcrime/securesms/util/Hex.java b/src/main/java/org/thoughtcrime/securesms/util/Hex.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/Hex.java
rename to src/main/java/org/thoughtcrime/securesms/util/Hex.java
diff --git a/src/org/thoughtcrime/securesms/util/IntentUtils.java b/src/main/java/org/thoughtcrime/securesms/util/IntentUtils.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/IntentUtils.java
rename to src/main/java/org/thoughtcrime/securesms/util/IntentUtils.java
diff --git a/src/org/thoughtcrime/securesms/util/JsonUtils.java b/src/main/java/org/thoughtcrime/securesms/util/JsonUtils.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/JsonUtils.java
rename to src/main/java/org/thoughtcrime/securesms/util/JsonUtils.java
diff --git a/src/org/thoughtcrime/securesms/util/LRUCache.java b/src/main/java/org/thoughtcrime/securesms/util/LRUCache.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/LRUCache.java
rename to src/main/java/org/thoughtcrime/securesms/util/LRUCache.java
diff --git a/src/org/thoughtcrime/securesms/util/ListenableFutureTask.java b/src/main/java/org/thoughtcrime/securesms/util/ListenableFutureTask.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/ListenableFutureTask.java
rename to src/main/java/org/thoughtcrime/securesms/util/ListenableFutureTask.java
diff --git a/src/org/thoughtcrime/securesms/util/LongClickCopySpan.java b/src/main/java/org/thoughtcrime/securesms/util/LongClickCopySpan.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/LongClickCopySpan.java
rename to src/main/java/org/thoughtcrime/securesms/util/LongClickCopySpan.java
diff --git a/src/org/thoughtcrime/securesms/util/LongClickMovementMethod.java b/src/main/java/org/thoughtcrime/securesms/util/LongClickMovementMethod.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/LongClickMovementMethod.java
rename to src/main/java/org/thoughtcrime/securesms/util/LongClickMovementMethod.java
diff --git a/src/org/thoughtcrime/securesms/util/MailtoUtil.java b/src/main/java/org/thoughtcrime/securesms/util/MailtoUtil.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/MailtoUtil.java
rename to src/main/java/org/thoughtcrime/securesms/util/MailtoUtil.java
diff --git a/src/org/thoughtcrime/securesms/util/MarkdownUtil.java b/src/main/java/org/thoughtcrime/securesms/util/MarkdownUtil.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/MarkdownUtil.java
rename to src/main/java/org/thoughtcrime/securesms/util/MarkdownUtil.java
diff --git a/src/org/thoughtcrime/securesms/util/MediaUtil.java b/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/MediaUtil.java
rename to src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java
diff --git a/src/org/thoughtcrime/securesms/util/Pair.java b/src/main/java/org/thoughtcrime/securesms/util/Pair.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/Pair.java
rename to src/main/java/org/thoughtcrime/securesms/util/Pair.java
diff --git a/src/org/thoughtcrime/securesms/util/ParcelUtil.java b/src/main/java/org/thoughtcrime/securesms/util/ParcelUtil.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/ParcelUtil.java
rename to src/main/java/org/thoughtcrime/securesms/util/ParcelUtil.java
diff --git a/src/org/thoughtcrime/securesms/util/Prefs.java b/src/main/java/org/thoughtcrime/securesms/util/Prefs.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/Prefs.java
rename to src/main/java/org/thoughtcrime/securesms/util/Prefs.java
diff --git a/src/org/thoughtcrime/securesms/util/RelayUtil.java b/src/main/java/org/thoughtcrime/securesms/util/RelayUtil.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/RelayUtil.java
rename to src/main/java/org/thoughtcrime/securesms/util/RelayUtil.java
diff --git a/src/org/thoughtcrime/securesms/util/ResUtil.java b/src/main/java/org/thoughtcrime/securesms/util/ResUtil.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/ResUtil.java
rename to src/main/java/org/thoughtcrime/securesms/util/ResUtil.java
diff --git a/src/org/thoughtcrime/securesms/util/SaveAttachmentTask.java b/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/SaveAttachmentTask.java
rename to src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java
diff --git a/src/org/thoughtcrime/securesms/util/ScreenLockUtil.java b/src/main/java/org/thoughtcrime/securesms/util/ScreenLockUtil.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/ScreenLockUtil.java
rename to src/main/java/org/thoughtcrime/securesms/util/ScreenLockUtil.java
diff --git a/src/org/thoughtcrime/securesms/util/SelectedContactsAdapter.java b/src/main/java/org/thoughtcrime/securesms/util/SelectedContactsAdapter.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/SelectedContactsAdapter.java
rename to src/main/java/org/thoughtcrime/securesms/util/SelectedContactsAdapter.java
diff --git a/src/org/thoughtcrime/securesms/util/SendRelayedMessageUtil.java b/src/main/java/org/thoughtcrime/securesms/util/SendRelayedMessageUtil.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/SendRelayedMessageUtil.java
rename to src/main/java/org/thoughtcrime/securesms/util/SendRelayedMessageUtil.java
diff --git a/src/org/thoughtcrime/securesms/util/ServiceUtil.java b/src/main/java/org/thoughtcrime/securesms/util/ServiceUtil.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/ServiceUtil.java
rename to src/main/java/org/thoughtcrime/securesms/util/ServiceUtil.java
diff --git a/src/org/thoughtcrime/securesms/util/SignalProtocolLogger.java b/src/main/java/org/thoughtcrime/securesms/util/SignalProtocolLogger.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/SignalProtocolLogger.java
rename to src/main/java/org/thoughtcrime/securesms/util/SignalProtocolLogger.java
diff --git a/src/org/thoughtcrime/securesms/util/SignalProtocolLoggerProvider.java b/src/main/java/org/thoughtcrime/securesms/util/SignalProtocolLoggerProvider.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/SignalProtocolLoggerProvider.java
rename to src/main/java/org/thoughtcrime/securesms/util/SignalProtocolLoggerProvider.java
diff --git a/src/org/thoughtcrime/securesms/util/SpanUtil.java b/src/main/java/org/thoughtcrime/securesms/util/SpanUtil.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/SpanUtil.java
rename to src/main/java/org/thoughtcrime/securesms/util/SpanUtil.java
diff --git a/src/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java b/src/main/java/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java
rename to src/main/java/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java
diff --git a/src/org/thoughtcrime/securesms/util/Stopwatch.java b/src/main/java/org/thoughtcrime/securesms/util/Stopwatch.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/Stopwatch.java
rename to src/main/java/org/thoughtcrime/securesms/util/Stopwatch.java
diff --git a/src/org/thoughtcrime/securesms/util/StorageUtil.java b/src/main/java/org/thoughtcrime/securesms/util/StorageUtil.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/StorageUtil.java
rename to src/main/java/org/thoughtcrime/securesms/util/StorageUtil.java
diff --git a/src/org/thoughtcrime/securesms/util/StreamUtil.java b/src/main/java/org/thoughtcrime/securesms/util/StreamUtil.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/StreamUtil.java
rename to src/main/java/org/thoughtcrime/securesms/util/StreamUtil.java
diff --git a/src/org/thoughtcrime/securesms/util/StringUtil.java b/src/main/java/org/thoughtcrime/securesms/util/StringUtil.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/StringUtil.java
rename to src/main/java/org/thoughtcrime/securesms/util/StringUtil.java
diff --git a/src/org/thoughtcrime/securesms/util/ThemeUtil.java b/src/main/java/org/thoughtcrime/securesms/util/ThemeUtil.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/ThemeUtil.java
rename to src/main/java/org/thoughtcrime/securesms/util/ThemeUtil.java
diff --git a/src/org/thoughtcrime/securesms/util/ThreadUtil.java b/src/main/java/org/thoughtcrime/securesms/util/ThreadUtil.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/ThreadUtil.java
rename to src/main/java/org/thoughtcrime/securesms/util/ThreadUtil.java
diff --git a/src/org/thoughtcrime/securesms/util/Util.java b/src/main/java/org/thoughtcrime/securesms/util/Util.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/Util.java
rename to src/main/java/org/thoughtcrime/securesms/util/Util.java
diff --git a/src/org/thoughtcrime/securesms/util/ViewUtil.java b/src/main/java/org/thoughtcrime/securesms/util/ViewUtil.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/ViewUtil.java
rename to src/main/java/org/thoughtcrime/securesms/util/ViewUtil.java
diff --git a/src/org/thoughtcrime/securesms/util/concurrent/AssertedSuccessListener.java b/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 src/main/java/org/thoughtcrime/securesms/util/concurrent/AssertedSuccessListener.java
diff --git a/src/org/thoughtcrime/securesms/util/guava/Absent.java b/src/main/java/org/thoughtcrime/securesms/util/guava/Absent.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/guava/Absent.java
rename to src/main/java/org/thoughtcrime/securesms/util/guava/Absent.java
diff --git a/src/org/thoughtcrime/securesms/util/guava/Function.java b/src/main/java/org/thoughtcrime/securesms/util/guava/Function.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/guava/Function.java
rename to src/main/java/org/thoughtcrime/securesms/util/guava/Function.java
diff --git a/src/org/thoughtcrime/securesms/util/guava/Optional.java b/src/main/java/org/thoughtcrime/securesms/util/guava/Optional.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/guava/Optional.java
rename to src/main/java/org/thoughtcrime/securesms/util/guava/Optional.java
diff --git a/src/org/thoughtcrime/securesms/util/guava/Preconditions.java b/src/main/java/org/thoughtcrime/securesms/util/guava/Preconditions.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/guava/Preconditions.java
rename to src/main/java/org/thoughtcrime/securesms/util/guava/Preconditions.java
diff --git a/src/org/thoughtcrime/securesms/util/guava/Present.java b/src/main/java/org/thoughtcrime/securesms/util/guava/Present.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/guava/Present.java
rename to src/main/java/org/thoughtcrime/securesms/util/guava/Present.java
diff --git a/src/org/thoughtcrime/securesms/util/guava/Supplier.java b/src/main/java/org/thoughtcrime/securesms/util/guava/Supplier.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/guava/Supplier.java
rename to src/main/java/org/thoughtcrime/securesms/util/guava/Supplier.java
diff --git a/src/org/thoughtcrime/securesms/util/spans/CenterAlignedRelativeSizeSpan.java b/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 src/main/java/org/thoughtcrime/securesms/util/spans/CenterAlignedRelativeSizeSpan.java
diff --git a/src/org/thoughtcrime/securesms/util/task/ProgressDialogAsyncTask.java b/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 src/main/java/org/thoughtcrime/securesms/util/task/ProgressDialogAsyncTask.java
diff --git a/src/org/thoughtcrime/securesms/util/task/SnackbarAsyncTask.java b/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 src/main/java/org/thoughtcrime/securesms/util/task/SnackbarAsyncTask.java
diff --git a/src/org/thoughtcrime/securesms/util/views/ConversationAdaptiveActionsToolbar.java b/src/main/java/org/thoughtcrime/securesms/util/views/ConversationAdaptiveActionsToolbar.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/views/ConversationAdaptiveActionsToolbar.java
rename to src/main/java/org/thoughtcrime/securesms/util/views/ConversationAdaptiveActionsToolbar.java
diff --git a/src/org/thoughtcrime/securesms/util/views/ProgressDialog.java b/src/main/java/org/thoughtcrime/securesms/util/views/ProgressDialog.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/util/views/ProgressDialog.java
rename to src/main/java/org/thoughtcrime/securesms/util/views/ProgressDialog.java
diff --git a/src/org/thoughtcrime/securesms/util/views/Stub.java b/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 src/main/java/org/thoughtcrime/securesms/util/views/Stub.java
diff --git a/src/org/thoughtcrime/securesms/video/VideoPlayer.java b/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/video/VideoPlayer.java
rename to src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java
diff --git a/src/org/thoughtcrime/securesms/video/exo/AttachmentDataSource.java b/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 src/main/java/org/thoughtcrime/securesms/video/exo/AttachmentDataSource.java
diff --git a/src/org/thoughtcrime/securesms/video/exo/AttachmentDataSourceFactory.java b/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 src/main/java/org/thoughtcrime/securesms/video/exo/AttachmentDataSourceFactory.java
diff --git a/src/org/thoughtcrime/securesms/video/recode/InputSurface.java b/src/main/java/org/thoughtcrime/securesms/video/recode/InputSurface.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/video/recode/InputSurface.java
rename to src/main/java/org/thoughtcrime/securesms/video/recode/InputSurface.java
diff --git a/src/org/thoughtcrime/securesms/video/recode/MP4Builder.java b/src/main/java/org/thoughtcrime/securesms/video/recode/MP4Builder.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/video/recode/MP4Builder.java
rename to src/main/java/org/thoughtcrime/securesms/video/recode/MP4Builder.java
diff --git a/src/org/thoughtcrime/securesms/video/recode/Mp4Movie.java b/src/main/java/org/thoughtcrime/securesms/video/recode/Mp4Movie.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/video/recode/Mp4Movie.java
rename to src/main/java/org/thoughtcrime/securesms/video/recode/Mp4Movie.java
diff --git a/src/org/thoughtcrime/securesms/video/recode/OutputSurface.java b/src/main/java/org/thoughtcrime/securesms/video/recode/OutputSurface.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/video/recode/OutputSurface.java
rename to src/main/java/org/thoughtcrime/securesms/video/recode/OutputSurface.java
diff --git a/src/org/thoughtcrime/securesms/video/recode/Sample.java b/src/main/java/org/thoughtcrime/securesms/video/recode/Sample.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/video/recode/Sample.java
rename to src/main/java/org/thoughtcrime/securesms/video/recode/Sample.java
diff --git a/src/org/thoughtcrime/securesms/video/recode/TextureRenderer.java b/src/main/java/org/thoughtcrime/securesms/video/recode/TextureRenderer.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/video/recode/TextureRenderer.java
rename to src/main/java/org/thoughtcrime/securesms/video/recode/TextureRenderer.java
diff --git a/src/org/thoughtcrime/securesms/video/recode/Track.java b/src/main/java/org/thoughtcrime/securesms/video/recode/Track.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/video/recode/Track.java
rename to src/main/java/org/thoughtcrime/securesms/video/recode/Track.java
diff --git a/src/org/thoughtcrime/securesms/video/recode/VideoRecoder.java b/src/main/java/org/thoughtcrime/securesms/video/recode/VideoRecoder.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/video/recode/VideoRecoder.java
rename to src/main/java/org/thoughtcrime/securesms/video/recode/VideoRecoder.java
diff --git a/src/org/thoughtcrime/securesms/videochat/VideochatUtil.java b/src/main/java/org/thoughtcrime/securesms/videochat/VideochatUtil.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/videochat/VideochatUtil.java
rename to src/main/java/org/thoughtcrime/securesms/videochat/VideochatUtil.java
diff --git a/res/anim/animation_toggle_in.xml b/src/main/res/anim/animation_toggle_in.xml
similarity index 100%
rename from res/anim/animation_toggle_in.xml
rename to src/main/res/anim/animation_toggle_in.xml
diff --git a/res/anim/animation_toggle_out.xml b/src/main/res/anim/animation_toggle_out.xml
similarity index 100%
rename from res/anim/animation_toggle_out.xml
rename to src/main/res/anim/animation_toggle_out.xml
diff --git a/res/anim/fade_scale_in.xml b/src/main/res/anim/fade_scale_in.xml
similarity index 100%
rename from res/anim/fade_scale_in.xml
rename to src/main/res/anim/fade_scale_in.xml
diff --git a/res/anim/fade_scale_out.xml b/src/main/res/anim/fade_scale_out.xml
similarity index 100%
rename from res/anim/fade_scale_out.xml
rename to src/main/res/anim/fade_scale_out.xml
diff --git a/res/anim/slide_from_right.xml b/src/main/res/anim/slide_from_right.xml
similarity index 100%
rename from res/anim/slide_from_right.xml
rename to src/main/res/anim/slide_from_right.xml
diff --git a/res/anim/slide_to_right.xml b/src/main/res/anim/slide_to_right.xml
similarity index 100%
rename from res/anim/slide_to_right.xml
rename to src/main/res/anim/slide_to_right.xml
diff --git a/res/animator/bottom_pause_to_play_animation.xml b/src/main/res/animator/bottom_pause_to_play_animation.xml
similarity index 100%
rename from res/animator/bottom_pause_to_play_animation.xml
rename to src/main/res/animator/bottom_pause_to_play_animation.xml
diff --git a/res/animator/bottom_play_to_pause_animation.xml b/src/main/res/animator/bottom_play_to_pause_animation.xml
similarity index 100%
rename from res/animator/bottom_play_to_pause_animation.xml
rename to src/main/res/animator/bottom_play_to_pause_animation.xml
diff --git a/res/animator/rotate_90_animation.xml b/src/main/res/animator/rotate_90_animation.xml
similarity index 100%
rename from res/animator/rotate_90_animation.xml
rename to src/main/res/animator/rotate_90_animation.xml
diff --git a/res/animator/rotate_minus_90_animation.xml b/src/main/res/animator/rotate_minus_90_animation.xml
similarity index 100%
rename from res/animator/rotate_minus_90_animation.xml
rename to src/main/res/animator/rotate_minus_90_animation.xml
diff --git a/res/animator/upper_pause_to_play_animation.xml b/src/main/res/animator/upper_pause_to_play_animation.xml
similarity index 100%
rename from res/animator/upper_pause_to_play_animation.xml
rename to src/main/res/animator/upper_pause_to_play_animation.xml
diff --git a/res/animator/upper_play_to_pause_animation.xml b/src/main/res/animator/upper_play_to_pause_animation.xml
similarity index 100%
rename from res/animator/upper_play_to_pause_animation.xml
rename to src/main/res/animator/upper_play_to_pause_animation.xml
diff --git a/res/color/text_color_dark_theme.xml b/src/main/res/color/text_color_dark_theme.xml
similarity index 100%
rename from res/color/text_color_dark_theme.xml
rename to src/main/res/color/text_color_dark_theme.xml
diff --git a/res/color/text_color_secondary_dark_theme.xml b/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 src/main/res/color/text_color_secondary_dark_theme.xml
diff --git a/res/drawable-hdpi-v11/icon_notification.png b/src/main/res/drawable-hdpi-v11/icon_notification.png
similarity index 100%
rename from res/drawable-hdpi-v11/icon_notification.png
rename to src/main/res/drawable-hdpi-v11/icon_notification.png
diff --git a/res/drawable-hdpi/check.png b/src/main/res/drawable-hdpi/check.png
similarity index 100%
rename from res/drawable-hdpi/check.png
rename to src/main/res/drawable-hdpi/check.png
diff --git a/res/drawable-hdpi/divet_lower_right_dark.png b/src/main/res/drawable-hdpi/divet_lower_right_dark.png
similarity index 100%
rename from res/drawable-hdpi/divet_lower_right_dark.png
rename to src/main/res/drawable-hdpi/divet_lower_right_dark.png
diff --git a/res/drawable-hdpi/divet_lower_right_light.png b/src/main/res/drawable-hdpi/divet_lower_right_light.png
similarity index 100%
rename from res/drawable-hdpi/divet_lower_right_light.png
rename to src/main/res/drawable-hdpi/divet_lower_right_light.png
diff --git a/res/drawable-hdpi/ic_account_box_dark.png b/src/main/res/drawable-hdpi/ic_account_box_dark.png
similarity index 100%
rename from res/drawable-hdpi/ic_account_box_dark.png
rename to src/main/res/drawable-hdpi/ic_account_box_dark.png
diff --git a/res/drawable-hdpi/ic_account_box_light.png b/src/main/res/drawable-hdpi/ic_account_box_light.png
similarity index 100%
rename from res/drawable-hdpi/ic_account_box_light.png
rename to src/main/res/drawable-hdpi/ic_account_box_light.png
diff --git a/res/drawable-hdpi/ic_add_white_24dp.png b/src/main/res/drawable-hdpi/ic_add_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_add_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_add_white_24dp.png
diff --git a/res/drawable-hdpi/ic_advanced_white_24dp.png b/src/main/res/drawable-hdpi/ic_advanced_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_advanced_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_advanced_white_24dp.png
diff --git a/res/drawable-hdpi/ic_archive_white_24dp.png b/src/main/res/drawable-hdpi/ic_archive_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_archive_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_archive_white_24dp.png
diff --git a/res/drawable-hdpi/ic_arrow_back_white_24dp.png b/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_arrow_back_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png
diff --git a/res/drawable-hdpi/ic_attach_grey600_24dp.png b/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 src/main/res/drawable-hdpi/ic_attach_grey600_24dp.png
diff --git a/res/drawable-hdpi/ic_attach_white_24dp.png b/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 src/main/res/drawable-hdpi/ic_attach_white_24dp.png
diff --git a/res/drawable-hdpi/ic_backspace_grey600_24dp.png b/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 src/main/res/drawable-hdpi/ic_backspace_grey600_24dp.png
diff --git a/res/drawable-hdpi/ic_blur_on_white_24.png b/src/main/res/drawable-hdpi/ic_blur_on_white_24.png
similarity index 100%
rename from res/drawable-hdpi/ic_blur_on_white_24.png
rename to src/main/res/drawable-hdpi/ic_blur_on_white_24.png
diff --git a/res/drawable-hdpi/ic_brightness_6_white_24dp.png b/src/main/res/drawable-hdpi/ic_brightness_6_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_brightness_6_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_brightness_6_white_24dp.png
diff --git a/res/drawable-hdpi/ic_brush_highlight_32.webp b/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 src/main/res/drawable-hdpi/ic_brush_highlight_32.webp
diff --git a/res/drawable-hdpi/ic_brush_marker_32.webp b/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 src/main/res/drawable-hdpi/ic_brush_marker_32.webp
diff --git a/res/drawable-hdpi/ic_camera_alt_white_24dp.png b/src/main/res/drawable-hdpi/ic_camera_alt_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_camera_alt_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_camera_alt_white_24dp.png
diff --git a/res/drawable-hdpi/ic_check_white_24dp.png b/src/main/res/drawable-hdpi/ic_check_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_check_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_check_white_24dp.png
diff --git a/res/drawable-hdpi/ic_circle_fill_white_48dp.png b/src/main/res/drawable-hdpi/ic_circle_fill_white_48dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_circle_fill_white_48dp.png
rename to src/main/res/drawable-hdpi/ic_circle_fill_white_48dp.png
diff --git a/res/drawable-hdpi/ic_clear_white_24dp.png b/src/main/res/drawable-hdpi/ic_clear_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_clear_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_clear_white_24dp.png
diff --git a/res/drawable-hdpi/ic_close_white_18dp.webp b/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 src/main/res/drawable-hdpi/ic_close_white_18dp.webp
diff --git a/res/drawable-hdpi/ic_close_white_24dp.png b/src/main/res/drawable-hdpi/ic_close_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_close_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_close_white_24dp.png
diff --git a/res/drawable-hdpi/ic_contact_picture.png b/src/main/res/drawable-hdpi/ic_contact_picture.png
similarity index 100%
rename from res/drawable-hdpi/ic_contact_picture.png
rename to src/main/res/drawable-hdpi/ic_contact_picture.png
diff --git a/res/drawable-hdpi/ic_content_copy_white_24dp.png b/src/main/res/drawable-hdpi/ic_content_copy_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_content_copy_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_content_copy_white_24dp.png
diff --git a/res/drawable-hdpi/ic_create_white_24dp.png b/src/main/res/drawable-hdpi/ic_create_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_create_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_create_white_24dp.png
diff --git a/res/drawable-hdpi/ic_crop_32.webp b/src/main/res/drawable-hdpi/ic_crop_32.webp
similarity index 100%
rename from res/drawable-hdpi/ic_crop_32.webp
rename to src/main/res/drawable-hdpi/ic_crop_32.webp
diff --git a/res/drawable-hdpi/ic_delete_white_24dp.png b/src/main/res/drawable-hdpi/ic_delete_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_delete_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_delete_white_24dp.png
diff --git a/res/drawable-hdpi/ic_delivery_status_read.png b/src/main/res/drawable-hdpi/ic_delivery_status_read.png
similarity index 100%
rename from res/drawable-hdpi/ic_delivery_status_read.png
rename to src/main/res/drawable-hdpi/ic_delivery_status_read.png
diff --git a/res/drawable-hdpi/ic_delivery_status_sending.png b/src/main/res/drawable-hdpi/ic_delivery_status_sending.png
similarity index 100%
rename from res/drawable-hdpi/ic_delivery_status_sending.png
rename to src/main/res/drawable-hdpi/ic_delivery_status_sending.png
diff --git a/res/drawable-hdpi/ic_delivery_status_sent.png b/src/main/res/drawable-hdpi/ic_delivery_status_sent.png
similarity index 100%
rename from res/drawable-hdpi/ic_delivery_status_sent.png
rename to src/main/res/drawable-hdpi/ic_delivery_status_sent.png
diff --git a/res/drawable-hdpi/ic_emoji_32.webp b/src/main/res/drawable-hdpi/ic_emoji_32.webp
similarity index 100%
rename from res/drawable-hdpi/ic_emoji_32.webp
rename to src/main/res/drawable-hdpi/ic_emoji_32.webp
diff --git a/res/drawable-hdpi/ic_flip_32.webp b/src/main/res/drawable-hdpi/ic_flip_32.webp
similarity index 100%
rename from res/drawable-hdpi/ic_flip_32.webp
rename to src/main/res/drawable-hdpi/ic_flip_32.webp
diff --git a/res/drawable-hdpi/ic_forum_white_24dp.png b/src/main/res/drawable-hdpi/ic_forum_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_forum_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_forum_white_24dp.png
diff --git a/res/drawable-hdpi/ic_forward_white_24dp.png b/src/main/res/drawable-hdpi/ic_forward_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_forward_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_forward_white_24dp.png
diff --git a/res/drawable-hdpi/ic_group_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_group_grey600_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_group_grey600_24dp.png
rename to src/main/res/drawable-hdpi/ic_group_grey600_24dp.png
diff --git a/res/drawable-hdpi/ic_group_white_24dp.png b/src/main/res/drawable-hdpi/ic_group_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_group_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_group_white_24dp.png
diff --git a/res/drawable-hdpi/ic_headset_white_24dp.png b/src/main/res/drawable-hdpi/ic_headset_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_headset_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_headset_white_24dp.png
diff --git a/res/drawable-hdpi/ic_help_white_24dp.png b/src/main/res/drawable-hdpi/ic_help_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_help_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_help_white_24dp.png
diff --git a/res/drawable-hdpi/ic_image_dark.png b/src/main/res/drawable-hdpi/ic_image_dark.png
similarity index 100%
rename from res/drawable-hdpi/ic_image_dark.png
rename to src/main/res/drawable-hdpi/ic_image_dark.png
diff --git a/res/drawable-hdpi/ic_image_light.png b/src/main/res/drawable-hdpi/ic_image_light.png
similarity index 100%
rename from res/drawable-hdpi/ic_image_light.png
rename to src/main/res/drawable-hdpi/ic_image_light.png
diff --git a/res/drawable-hdpi/ic_image_white_24dp.png b/src/main/res/drawable-hdpi/ic_image_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_image_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_image_white_24dp.png
diff --git a/res/drawable-hdpi/ic_info_outline_dark.png b/src/main/res/drawable-hdpi/ic_info_outline_dark.png
similarity index 100%
rename from res/drawable-hdpi/ic_info_outline_dark.png
rename to src/main/res/drawable-hdpi/ic_info_outline_dark.png
diff --git a/res/drawable-hdpi/ic_info_outline_light.png b/src/main/res/drawable-hdpi/ic_info_outline_light.png
similarity index 100%
rename from res/drawable-hdpi/ic_info_outline_light.png
rename to src/main/res/drawable-hdpi/ic_info_outline_light.png
diff --git a/res/drawable-hdpi/ic_info_outline_white_24dp.png b/src/main/res/drawable-hdpi/ic_info_outline_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_info_outline_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_info_outline_white_24dp.png
diff --git a/res/drawable-hdpi/ic_insert_drive_file_white_24dp.png b/src/main/res/drawable-hdpi/ic_insert_drive_file_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_insert_drive_file_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_insert_drive_file_white_24dp.png
diff --git a/res/drawable-hdpi/ic_keyboard_arrow_down_white_24dp.png b/src/main/res/drawable-hdpi/ic_keyboard_arrow_down_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_keyboard_arrow_down_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_keyboard_arrow_down_white_24dp.png
diff --git a/res/drawable-hdpi/ic_keyboard_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_keyboard_grey600_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_keyboard_grey600_24dp.png
rename to src/main/res/drawable-hdpi/ic_keyboard_grey600_24dp.png
diff --git a/res/drawable-hdpi/ic_keyboard_white_24dp.png b/src/main/res/drawable-hdpi/ic_keyboard_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_keyboard_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_keyboard_white_24dp.png
diff --git a/res/drawable-hdpi/ic_launch_white_24dp.png b/src/main/res/drawable-hdpi/ic_launch_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_launch_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_launch_white_24dp.png
diff --git a/res/drawable-hdpi/ic_local_dining_white_24dp.png b/src/main/res/drawable-hdpi/ic_local_dining_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_local_dining_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_local_dining_white_24dp.png
diff --git a/res/drawable-hdpi/ic_location_off_white_24.png b/src/main/res/drawable-hdpi/ic_location_off_white_24.png
similarity index 100%
rename from res/drawable-hdpi/ic_location_off_white_24.png
rename to src/main/res/drawable-hdpi/ic_location_off_white_24.png
diff --git a/res/drawable-hdpi/ic_location_on_white_24dp.png b/src/main/res/drawable-hdpi/ic_location_on_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_location_on_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_location_on_white_24dp.png
diff --git a/res/drawable-hdpi/ic_lock_white_18dp.png b/src/main/res/drawable-hdpi/ic_lock_white_18dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_lock_white_18dp.png
rename to src/main/res/drawable-hdpi/ic_lock_white_18dp.png
diff --git a/res/drawable-hdpi/ic_lock_white_24dp.png b/src/main/res/drawable-hdpi/ic_lock_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_lock_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_lock_white_24dp.png
diff --git a/res/drawable-hdpi/ic_mic_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_mic_grey600_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_mic_grey600_24dp.png
rename to src/main/res/drawable-hdpi/ic_mic_grey600_24dp.png
diff --git a/res/drawable-hdpi/ic_mic_white_24dp.png b/src/main/res/drawable-hdpi/ic_mic_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_mic_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_mic_white_24dp.png
diff --git a/res/drawable-hdpi/ic_mic_white_48dp.png b/src/main/res/drawable-hdpi/ic_mic_white_48dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_mic_white_48dp.png
rename to src/main/res/drawable-hdpi/ic_mic_white_48dp.png
diff --git a/res/drawable-hdpi/ic_mood_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_mood_grey600_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_mood_grey600_24dp.png
rename to src/main/res/drawable-hdpi/ic_mood_grey600_24dp.png
diff --git a/res/drawable-hdpi/ic_mood_white_24dp.png b/src/main/res/drawable-hdpi/ic_mood_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_mood_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_mood_white_24dp.png
diff --git a/res/drawable-hdpi/ic_movie_creation_dark.png b/src/main/res/drawable-hdpi/ic_movie_creation_dark.png
similarity index 100%
rename from res/drawable-hdpi/ic_movie_creation_dark.png
rename to src/main/res/drawable-hdpi/ic_movie_creation_dark.png
diff --git a/res/drawable-hdpi/ic_movie_creation_light.png b/src/main/res/drawable-hdpi/ic_movie_creation_light.png
similarity index 100%
rename from res/drawable-hdpi/ic_movie_creation_light.png
rename to src/main/res/drawable-hdpi/ic_movie_creation_light.png
diff --git a/res/drawable-hdpi/ic_notifications_white_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_notifications_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_notifications_white_24dp.png
diff --git a/res/drawable-hdpi/ic_pause_circle_fill_white_48dp.png b/src/main/res/drawable-hdpi/ic_pause_circle_fill_white_48dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_pause_circle_fill_white_48dp.png
rename to src/main/res/drawable-hdpi/ic_pause_circle_fill_white_48dp.png
diff --git a/res/drawable-hdpi/ic_person_white_24dp.png b/src/main/res/drawable-hdpi/ic_person_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_person_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_person_white_24dp.png
diff --git a/res/drawable-hdpi/ic_pets_white_24dp.png b/src/main/res/drawable-hdpi/ic_pets_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_pets_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_pets_white_24dp.png
diff --git a/res/drawable-hdpi/ic_photo_camera_dark.png b/src/main/res/drawable-hdpi/ic_photo_camera_dark.png
similarity index 100%
rename from res/drawable-hdpi/ic_photo_camera_dark.png
rename to src/main/res/drawable-hdpi/ic_photo_camera_dark.png
diff --git a/res/drawable-hdpi/ic_photo_camera_light.png b/src/main/res/drawable-hdpi/ic_photo_camera_light.png
similarity index 100%
rename from res/drawable-hdpi/ic_photo_camera_light.png
rename to src/main/res/drawable-hdpi/ic_photo_camera_light.png
diff --git a/res/drawable-hdpi/ic_pin_white.png b/src/main/res/drawable-hdpi/ic_pin_white.png
similarity index 100%
rename from res/drawable-hdpi/ic_pin_white.png
rename to src/main/res/drawable-hdpi/ic_pin_white.png
diff --git a/res/drawable-hdpi/ic_play_circle_fill_white_48dp.png b/src/main/res/drawable-hdpi/ic_play_circle_fill_white_48dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_play_circle_fill_white_48dp.png
rename to src/main/res/drawable-hdpi/ic_play_circle_fill_white_48dp.png
diff --git a/res/drawable-hdpi/ic_reply.png b/src/main/res/drawable-hdpi/ic_reply.png
similarity index 100%
rename from res/drawable-hdpi/ic_reply.png
rename to src/main/res/drawable-hdpi/ic_reply.png
diff --git a/res/drawable-hdpi/ic_reply_white_24dp.png b/src/main/res/drawable-hdpi/ic_reply_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_reply_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_reply_white_24dp.png
diff --git a/res/drawable-hdpi/ic_reply_white_36dp.png b/src/main/res/drawable-hdpi/ic_reply_white_36dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_reply_white_36dp.png
rename to src/main/res/drawable-hdpi/ic_reply_white_36dp.png
diff --git a/res/drawable-hdpi/ic_rotate_32.webp b/src/main/res/drawable-hdpi/ic_rotate_32.webp
similarity index 100%
rename from res/drawable-hdpi/ic_rotate_32.webp
rename to src/main/res/drawable-hdpi/ic_rotate_32.webp
diff --git a/res/drawable-hdpi/ic_send_push.png b/src/main/res/drawable-hdpi/ic_send_push.png
similarity index 100%
rename from res/drawable-hdpi/ic_send_push.png
rename to src/main/res/drawable-hdpi/ic_send_push.png
diff --git a/res/drawable-hdpi/ic_send_push_white_24dp.png b/src/main/res/drawable-hdpi/ic_send_push_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_send_push_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_send_push_white_24dp.png
diff --git a/res/drawable-hdpi/ic_send_sms_insecure.png b/src/main/res/drawable-hdpi/ic_send_sms_insecure.png
similarity index 100%
rename from res/drawable-hdpi/ic_send_sms_insecure.png
rename to src/main/res/drawable-hdpi/ic_send_sms_insecure.png
diff --git a/res/drawable-hdpi/ic_send_sms_insecure_dark.png b/src/main/res/drawable-hdpi/ic_send_sms_insecure_dark.png
similarity index 100%
rename from res/drawable-hdpi/ic_send_sms_insecure_dark.png
rename to src/main/res/drawable-hdpi/ic_send_sms_insecure_dark.png
diff --git a/res/drawable-hdpi/ic_send_sms_white_24dp.png b/src/main/res/drawable-hdpi/ic_send_sms_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_send_sms_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_send_sms_white_24dp.png
diff --git a/res/drawable-hdpi/ic_swap_vert_white_24dp.png b/src/main/res/drawable-hdpi/ic_swap_vert_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_swap_vert_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_swap_vert_white_24dp.png
diff --git a/res/drawable-hdpi/ic_tag_faces_white_24dp.png b/src/main/res/drawable-hdpi/ic_tag_faces_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_tag_faces_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_tag_faces_white_24dp.png
diff --git a/res/drawable-hdpi/ic_text_32.webp b/src/main/res/drawable-hdpi/ic_text_32.webp
similarity index 100%
rename from res/drawable-hdpi/ic_text_32.webp
rename to src/main/res/drawable-hdpi/ic_text_32.webp
diff --git a/res/drawable-hdpi/ic_trash_filled_32.webp b/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 src/main/res/drawable-hdpi/ic_trash_filled_32.webp
diff --git a/res/drawable-hdpi/ic_unarchive_white_24dp.png b/src/main/res/drawable-hdpi/ic_unarchive_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_unarchive_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_unarchive_white_24dp.png
diff --git a/res/drawable-hdpi/ic_undo_32.webp b/src/main/res/drawable-hdpi/ic_undo_32.webp
similarity index 100%
rename from res/drawable-hdpi/ic_undo_32.webp
rename to src/main/res/drawable-hdpi/ic_undo_32.webp
diff --git a/res/drawable-hdpi/ic_unlocked_white_24dp.png b/src/main/res/drawable-hdpi/ic_unlocked_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_unlocked_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_unlocked_white_24dp.png
diff --git a/res/drawable-hdpi/ic_unpin_white.png b/src/main/res/drawable-hdpi/ic_unpin_white.png
similarity index 100%
rename from res/drawable-hdpi/ic_unpin_white.png
rename to src/main/res/drawable-hdpi/ic_unpin_white.png
diff --git a/res/drawable-hdpi/ic_volume_off_grey600_18dp.png b/src/main/res/drawable-hdpi/ic_volume_off_grey600_18dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_volume_off_grey600_18dp.png
rename to src/main/res/drawable-hdpi/ic_volume_off_grey600_18dp.png
diff --git a/res/drawable-hdpi/ic_volume_off_white_18dp.png b/src/main/res/drawable-hdpi/ic_volume_off_white_18dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_volume_off_white_18dp.png
rename to src/main/res/drawable-hdpi/ic_volume_off_white_18dp.png
diff --git a/res/drawable-hdpi/ic_volume_up_dark.png b/src/main/res/drawable-hdpi/ic_volume_up_dark.png
similarity index 100%
rename from res/drawable-hdpi/ic_volume_up_dark.png
rename to src/main/res/drawable-hdpi/ic_volume_up_dark.png
diff --git a/res/drawable-hdpi/ic_volume_up_light.png b/src/main/res/drawable-hdpi/ic_volume_up_light.png
similarity index 100%
rename from res/drawable-hdpi/ic_volume_up_light.png
rename to src/main/res/drawable-hdpi/ic_volume_up_light.png
diff --git a/res/drawable-hdpi/ic_warning_dark.png b/src/main/res/drawable-hdpi/ic_warning_dark.png
similarity index 100%
rename from res/drawable-hdpi/ic_warning_dark.png
rename to src/main/res/drawable-hdpi/ic_warning_dark.png
diff --git a/res/drawable-hdpi/ic_warning_light.png b/src/main/res/drawable-hdpi/ic_warning_light.png
similarity index 100%
rename from res/drawable-hdpi/ic_warning_light.png
rename to src/main/res/drawable-hdpi/ic_warning_light.png
diff --git a/res/drawable-hdpi/ic_wb_sunny_white_24dp.png b/src/main/res/drawable-hdpi/ic_wb_sunny_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_wb_sunny_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_wb_sunny_white_24dp.png
diff --git a/res/drawable-hdpi/ic_work_white_24dp.png b/src/main/res/drawable-hdpi/ic_work_white_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_work_white_24dp.png
rename to src/main/res/drawable-hdpi/ic_work_white_24dp.png
diff --git a/res/drawable-hdpi/msg_encr_out.png b/src/main/res/drawable-hdpi/msg_encr_out.png
similarity index 100%
rename from res/drawable-hdpi/msg_encr_out.png
rename to src/main/res/drawable-hdpi/msg_encr_out.png
diff --git a/res/drawable-hdpi/notification_permanent.png b/src/main/res/drawable-hdpi/notification_permanent.png
similarity index 100%
rename from res/drawable-hdpi/notification_permanent.png
rename to src/main/res/drawable-hdpi/notification_permanent.png
diff --git a/res/drawable-hdpi/notify_panel_notification_icon_bg.png b/src/main/res/drawable-hdpi/notify_panel_notification_icon_bg.png
similarity index 100%
rename from res/drawable-hdpi/notify_panel_notification_icon_bg.png
rename to src/main/res/drawable-hdpi/notify_panel_notification_icon_bg.png
diff --git a/res/drawable-hdpi/quick_camera_dark.png b/src/main/res/drawable-hdpi/quick_camera_dark.png
similarity index 100%
rename from res/drawable-hdpi/quick_camera_dark.png
rename to src/main/res/drawable-hdpi/quick_camera_dark.png
diff --git a/res/drawable-hdpi/quick_camera_exit_fullscreen.png b/src/main/res/drawable-hdpi/quick_camera_exit_fullscreen.png
similarity index 100%
rename from res/drawable-hdpi/quick_camera_exit_fullscreen.png
rename to src/main/res/drawable-hdpi/quick_camera_exit_fullscreen.png
diff --git a/res/drawable-hdpi/quick_camera_front.png b/src/main/res/drawable-hdpi/quick_camera_front.png
similarity index 100%
rename from res/drawable-hdpi/quick_camera_front.png
rename to src/main/res/drawable-hdpi/quick_camera_front.png
diff --git a/res/drawable-hdpi/quick_camera_fullscreen.png b/src/main/res/drawable-hdpi/quick_camera_fullscreen.png
similarity index 100%
rename from res/drawable-hdpi/quick_camera_fullscreen.png
rename to src/main/res/drawable-hdpi/quick_camera_fullscreen.png
diff --git a/res/drawable-hdpi/quick_camera_hide.png b/src/main/res/drawable-hdpi/quick_camera_hide.png
similarity index 100%
rename from res/drawable-hdpi/quick_camera_hide.png
rename to src/main/res/drawable-hdpi/quick_camera_hide.png
diff --git a/res/drawable-hdpi/quick_camera_light.png b/src/main/res/drawable-hdpi/quick_camera_light.png
similarity index 100%
rename from res/drawable-hdpi/quick_camera_light.png
rename to src/main/res/drawable-hdpi/quick_camera_light.png
diff --git a/res/drawable-hdpi/quick_camera_rear.png b/src/main/res/drawable-hdpi/quick_camera_rear.png
similarity index 100%
rename from res/drawable-hdpi/quick_camera_rear.png
rename to src/main/res/drawable-hdpi/quick_camera_rear.png
diff --git a/res/drawable-hdpi/quick_shutter_button.png b/src/main/res/drawable-hdpi/quick_shutter_button.png
similarity index 100%
rename from res/drawable-hdpi/quick_shutter_button.png
rename to src/main/res/drawable-hdpi/quick_shutter_button.png
diff --git a/res/drawable-land-night/background_hd.jpg b/src/main/res/drawable-land-night/background_hd.jpg
similarity index 100%
rename from res/drawable-land-night/background_hd.jpg
rename to src/main/res/drawable-land-night/background_hd.jpg
diff --git a/res/drawable-land/background_hd.jpg b/src/main/res/drawable-land/background_hd.jpg
similarity index 100%
rename from res/drawable-land/background_hd.jpg
rename to src/main/res/drawable-land/background_hd.jpg
diff --git a/res/drawable-ldrtl-hdpi/ic_arrow_back_white_24dp.png b/src/main/res/drawable-ldrtl-hdpi/ic_arrow_back_white_24dp.png
similarity index 100%
rename from res/drawable-ldrtl-hdpi/ic_arrow_back_white_24dp.png
rename to src/main/res/drawable-ldrtl-hdpi/ic_arrow_back_white_24dp.png
diff --git a/res/drawable-ldrtl-mdpi/ic_arrow_back_white_24dp.png b/src/main/res/drawable-ldrtl-mdpi/ic_arrow_back_white_24dp.png
similarity index 100%
rename from res/drawable-ldrtl-mdpi/ic_arrow_back_white_24dp.png
rename to src/main/res/drawable-ldrtl-mdpi/ic_arrow_back_white_24dp.png
diff --git a/res/drawable-ldrtl-xhdpi/ic_arrow_back_white_24dp.png b/src/main/res/drawable-ldrtl-xhdpi/ic_arrow_back_white_24dp.png
similarity index 100%
rename from res/drawable-ldrtl-xhdpi/ic_arrow_back_white_24dp.png
rename to src/main/res/drawable-ldrtl-xhdpi/ic_arrow_back_white_24dp.png
diff --git a/res/drawable-ldrtl-xxhdpi/ic_arrow_back_white_24dp.png b/src/main/res/drawable-ldrtl-xxhdpi/ic_arrow_back_white_24dp.png
similarity index 100%
rename from res/drawable-ldrtl-xxhdpi/ic_arrow_back_white_24dp.png
rename to src/main/res/drawable-ldrtl-xxhdpi/ic_arrow_back_white_24dp.png
diff --git a/res/drawable-ldrtl-xxxhdpi/ic_arrow_back_white_24dp.png b/src/main/res/drawable-ldrtl-xxxhdpi/ic_arrow_back_white_24dp.png
similarity index 100%
rename from res/drawable-ldrtl-xxxhdpi/ic_arrow_back_white_24dp.png
rename to src/main/res/drawable-ldrtl-xxxhdpi/ic_arrow_back_white_24dp.png
diff --git a/res/drawable-ldrtl/message_bubble_background_received_alone.xml b/src/main/res/drawable-ldrtl/message_bubble_background_received_alone.xml
similarity index 100%
rename from res/drawable-ldrtl/message_bubble_background_received_alone.xml
rename to src/main/res/drawable-ldrtl/message_bubble_background_received_alone.xml
diff --git a/res/drawable-ldrtl/message_bubble_background_sent_alone.xml b/src/main/res/drawable-ldrtl/message_bubble_background_sent_alone.xml
similarity index 100%
rename from res/drawable-ldrtl/message_bubble_background_sent_alone.xml
rename to src/main/res/drawable-ldrtl/message_bubble_background_sent_alone.xml
diff --git a/res/drawable-mdpi-v11/icon_notification.png b/src/main/res/drawable-mdpi-v11/icon_notification.png
similarity index 100%
rename from res/drawable-mdpi-v11/icon_notification.png
rename to src/main/res/drawable-mdpi-v11/icon_notification.png
diff --git a/res/drawable-mdpi-v9/icon_notification.png b/src/main/res/drawable-mdpi-v9/icon_notification.png
similarity index 100%
rename from res/drawable-mdpi-v9/icon_notification.png
rename to src/main/res/drawable-mdpi-v9/icon_notification.png
diff --git a/res/drawable-mdpi/check.png b/src/main/res/drawable-mdpi/check.png
similarity index 100%
rename from res/drawable-mdpi/check.png
rename to src/main/res/drawable-mdpi/check.png
diff --git a/res/drawable-mdpi/divet_lower_right_dark.png b/src/main/res/drawable-mdpi/divet_lower_right_dark.png
similarity index 100%
rename from res/drawable-mdpi/divet_lower_right_dark.png
rename to src/main/res/drawable-mdpi/divet_lower_right_dark.png
diff --git a/res/drawable-mdpi/divet_lower_right_light.png b/src/main/res/drawable-mdpi/divet_lower_right_light.png
similarity index 100%
rename from res/drawable-mdpi/divet_lower_right_light.png
rename to src/main/res/drawable-mdpi/divet_lower_right_light.png
diff --git a/res/drawable-mdpi/ic_account_box_dark.png b/src/main/res/drawable-mdpi/ic_account_box_dark.png
similarity index 100%
rename from res/drawable-mdpi/ic_account_box_dark.png
rename to src/main/res/drawable-mdpi/ic_account_box_dark.png
diff --git a/res/drawable-mdpi/ic_account_box_light.png b/src/main/res/drawable-mdpi/ic_account_box_light.png
similarity index 100%
rename from res/drawable-mdpi/ic_account_box_light.png
rename to src/main/res/drawable-mdpi/ic_account_box_light.png
diff --git a/res/drawable-mdpi/ic_add_white_24dp.png b/src/main/res/drawable-mdpi/ic_add_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_add_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_add_white_24dp.png
diff --git a/res/drawable-mdpi/ic_advanced_white_24dp.png b/src/main/res/drawable-mdpi/ic_advanced_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_advanced_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_advanced_white_24dp.png
diff --git a/res/drawable-mdpi/ic_archive_white_24dp.png b/src/main/res/drawable-mdpi/ic_archive_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_archive_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_archive_white_24dp.png
diff --git a/res/drawable-mdpi/ic_arrow_back_white_24dp.png b/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_arrow_back_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png
diff --git a/res/drawable-mdpi/ic_attach_grey600_24dp.png b/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 src/main/res/drawable-mdpi/ic_attach_grey600_24dp.png
diff --git a/res/drawable-mdpi/ic_attach_white_24dp.png b/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 src/main/res/drawable-mdpi/ic_attach_white_24dp.png
diff --git a/res/drawable-mdpi/ic_backspace_grey600_24dp.png b/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 src/main/res/drawable-mdpi/ic_backspace_grey600_24dp.png
diff --git a/res/drawable-mdpi/ic_blur_on_white_24.png b/src/main/res/drawable-mdpi/ic_blur_on_white_24.png
similarity index 100%
rename from res/drawable-mdpi/ic_blur_on_white_24.png
rename to src/main/res/drawable-mdpi/ic_blur_on_white_24.png
diff --git a/res/drawable-mdpi/ic_brightness_6_white_24dp.png b/src/main/res/drawable-mdpi/ic_brightness_6_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_brightness_6_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_brightness_6_white_24dp.png
diff --git a/res/drawable-mdpi/ic_brush_highlight_32.webp b/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 src/main/res/drawable-mdpi/ic_brush_highlight_32.webp
diff --git a/res/drawable-mdpi/ic_brush_marker_32.webp b/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 src/main/res/drawable-mdpi/ic_brush_marker_32.webp
diff --git a/res/drawable-mdpi/ic_camera_alt_white_24dp.png b/src/main/res/drawable-mdpi/ic_camera_alt_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_camera_alt_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_camera_alt_white_24dp.png
diff --git a/res/drawable-mdpi/ic_check_white_24dp.png b/src/main/res/drawable-mdpi/ic_check_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_check_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_check_white_24dp.png
diff --git a/res/drawable-mdpi/ic_circle_fill_white_48dp.png b/src/main/res/drawable-mdpi/ic_circle_fill_white_48dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_circle_fill_white_48dp.png
rename to src/main/res/drawable-mdpi/ic_circle_fill_white_48dp.png
diff --git a/res/drawable-mdpi/ic_clear_white_24dp.png b/src/main/res/drawable-mdpi/ic_clear_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_clear_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_clear_white_24dp.png
diff --git a/res/drawable-mdpi/ic_close_white_18dp.webp b/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 src/main/res/drawable-mdpi/ic_close_white_18dp.webp
diff --git a/res/drawable-mdpi/ic_close_white_24dp.png b/src/main/res/drawable-mdpi/ic_close_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_close_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_close_white_24dp.png
diff --git a/res/drawable-mdpi/ic_contact_picture.png b/src/main/res/drawable-mdpi/ic_contact_picture.png
similarity index 100%
rename from res/drawable-mdpi/ic_contact_picture.png
rename to src/main/res/drawable-mdpi/ic_contact_picture.png
diff --git a/res/drawable-mdpi/ic_content_copy_white_24dp.png b/src/main/res/drawable-mdpi/ic_content_copy_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_content_copy_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_content_copy_white_24dp.png
diff --git a/res/drawable-mdpi/ic_create_white_24dp.png b/src/main/res/drawable-mdpi/ic_create_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_create_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_create_white_24dp.png
diff --git a/res/drawable-mdpi/ic_crop_32.webp b/src/main/res/drawable-mdpi/ic_crop_32.webp
similarity index 100%
rename from res/drawable-mdpi/ic_crop_32.webp
rename to src/main/res/drawable-mdpi/ic_crop_32.webp
diff --git a/res/drawable-mdpi/ic_delete_white_24dp.png b/src/main/res/drawable-mdpi/ic_delete_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_delete_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_delete_white_24dp.png
diff --git a/res/drawable-mdpi/ic_delivery_status_read.png b/src/main/res/drawable-mdpi/ic_delivery_status_read.png
similarity index 100%
rename from res/drawable-mdpi/ic_delivery_status_read.png
rename to src/main/res/drawable-mdpi/ic_delivery_status_read.png
diff --git a/res/drawable-mdpi/ic_delivery_status_sending.png b/src/main/res/drawable-mdpi/ic_delivery_status_sending.png
similarity index 100%
rename from res/drawable-mdpi/ic_delivery_status_sending.png
rename to src/main/res/drawable-mdpi/ic_delivery_status_sending.png
diff --git a/res/drawable-mdpi/ic_delivery_status_sent.png b/src/main/res/drawable-mdpi/ic_delivery_status_sent.png
similarity index 100%
rename from res/drawable-mdpi/ic_delivery_status_sent.png
rename to src/main/res/drawable-mdpi/ic_delivery_status_sent.png
diff --git a/res/drawable-mdpi/ic_emoji_32.webp b/src/main/res/drawable-mdpi/ic_emoji_32.webp
similarity index 100%
rename from res/drawable-mdpi/ic_emoji_32.webp
rename to src/main/res/drawable-mdpi/ic_emoji_32.webp
diff --git a/res/drawable-mdpi/ic_flip_32.png b/src/main/res/drawable-mdpi/ic_flip_32.png
similarity index 100%
rename from res/drawable-mdpi/ic_flip_32.png
rename to src/main/res/drawable-mdpi/ic_flip_32.png
diff --git a/res/drawable-mdpi/ic_forum_white_24dp.png b/src/main/res/drawable-mdpi/ic_forum_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_forum_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_forum_white_24dp.png
diff --git a/res/drawable-mdpi/ic_forward_white_24dp.png b/src/main/res/drawable-mdpi/ic_forward_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_forward_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_forward_white_24dp.png
diff --git a/res/drawable-mdpi/ic_group_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_group_grey600_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_group_grey600_24dp.png
rename to src/main/res/drawable-mdpi/ic_group_grey600_24dp.png
diff --git a/res/drawable-mdpi/ic_group_white_24dp.png b/src/main/res/drawable-mdpi/ic_group_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_group_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_group_white_24dp.png
diff --git a/res/drawable-mdpi/ic_headset_white_24dp.png b/src/main/res/drawable-mdpi/ic_headset_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_headset_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_headset_white_24dp.png
diff --git a/res/drawable-mdpi/ic_help_white_24dp.png b/src/main/res/drawable-mdpi/ic_help_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_help_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_help_white_24dp.png
diff --git a/res/drawable-mdpi/ic_image_dark.png b/src/main/res/drawable-mdpi/ic_image_dark.png
similarity index 100%
rename from res/drawable-mdpi/ic_image_dark.png
rename to src/main/res/drawable-mdpi/ic_image_dark.png
diff --git a/res/drawable-mdpi/ic_image_light.png b/src/main/res/drawable-mdpi/ic_image_light.png
similarity index 100%
rename from res/drawable-mdpi/ic_image_light.png
rename to src/main/res/drawable-mdpi/ic_image_light.png
diff --git a/res/drawable-mdpi/ic_image_white_24dp.png b/src/main/res/drawable-mdpi/ic_image_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_image_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_image_white_24dp.png
diff --git a/res/drawable-mdpi/ic_info_outline_dark.png b/src/main/res/drawable-mdpi/ic_info_outline_dark.png
similarity index 100%
rename from res/drawable-mdpi/ic_info_outline_dark.png
rename to src/main/res/drawable-mdpi/ic_info_outline_dark.png
diff --git a/res/drawable-mdpi/ic_info_outline_light.png b/src/main/res/drawable-mdpi/ic_info_outline_light.png
similarity index 100%
rename from res/drawable-mdpi/ic_info_outline_light.png
rename to src/main/res/drawable-mdpi/ic_info_outline_light.png
diff --git a/res/drawable-mdpi/ic_info_outline_white_24dp.png b/src/main/res/drawable-mdpi/ic_info_outline_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_info_outline_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_info_outline_white_24dp.png
diff --git a/res/drawable-mdpi/ic_insert_drive_file_white_24dp.png b/src/main/res/drawable-mdpi/ic_insert_drive_file_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_insert_drive_file_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_insert_drive_file_white_24dp.png
diff --git a/res/drawable-mdpi/ic_keyboard_arrow_down_white_24dp.png b/src/main/res/drawable-mdpi/ic_keyboard_arrow_down_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_keyboard_arrow_down_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_keyboard_arrow_down_white_24dp.png
diff --git a/res/drawable-mdpi/ic_keyboard_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_keyboard_grey600_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_keyboard_grey600_24dp.png
rename to src/main/res/drawable-mdpi/ic_keyboard_grey600_24dp.png
diff --git a/res/drawable-mdpi/ic_keyboard_white_24dp.png b/src/main/res/drawable-mdpi/ic_keyboard_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_keyboard_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_keyboard_white_24dp.png
diff --git a/res/drawable-mdpi/ic_launch_white_24dp.png b/src/main/res/drawable-mdpi/ic_launch_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_launch_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_launch_white_24dp.png
diff --git a/res/drawable-mdpi/ic_local_dining_white_24dp.png b/src/main/res/drawable-mdpi/ic_local_dining_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_local_dining_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_local_dining_white_24dp.png
diff --git a/res/drawable-mdpi/ic_location_on_white_24dp.png b/src/main/res/drawable-mdpi/ic_location_on_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_location_on_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_location_on_white_24dp.png
diff --git a/res/drawable-mdpi/ic_lock_white_18dp.png b/src/main/res/drawable-mdpi/ic_lock_white_18dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_lock_white_18dp.png
rename to src/main/res/drawable-mdpi/ic_lock_white_18dp.png
diff --git a/res/drawable-mdpi/ic_lock_white_24dp.png b/src/main/res/drawable-mdpi/ic_lock_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_lock_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_lock_white_24dp.png
diff --git a/res/drawable-mdpi/ic_mic_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_mic_grey600_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_mic_grey600_24dp.png
rename to src/main/res/drawable-mdpi/ic_mic_grey600_24dp.png
diff --git a/res/drawable-mdpi/ic_mic_white_24dp.png b/src/main/res/drawable-mdpi/ic_mic_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_mic_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_mic_white_24dp.png
diff --git a/res/drawable-mdpi/ic_mic_white_48dp.png b/src/main/res/drawable-mdpi/ic_mic_white_48dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_mic_white_48dp.png
rename to src/main/res/drawable-mdpi/ic_mic_white_48dp.png
diff --git a/res/drawable-mdpi/ic_mood_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_mood_grey600_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_mood_grey600_24dp.png
rename to src/main/res/drawable-mdpi/ic_mood_grey600_24dp.png
diff --git a/res/drawable-mdpi/ic_mood_white_24dp.png b/src/main/res/drawable-mdpi/ic_mood_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_mood_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_mood_white_24dp.png
diff --git a/res/drawable-mdpi/ic_movie_creation_dark.png b/src/main/res/drawable-mdpi/ic_movie_creation_dark.png
similarity index 100%
rename from res/drawable-mdpi/ic_movie_creation_dark.png
rename to src/main/res/drawable-mdpi/ic_movie_creation_dark.png
diff --git a/res/drawable-mdpi/ic_movie_creation_light.png b/src/main/res/drawable-mdpi/ic_movie_creation_light.png
similarity index 100%
rename from res/drawable-mdpi/ic_movie_creation_light.png
rename to src/main/res/drawable-mdpi/ic_movie_creation_light.png
diff --git a/res/drawable-mdpi/ic_notifications_white_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_notifications_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_notifications_white_24dp.png
diff --git a/res/drawable-mdpi/ic_pause_circle_fill_white_48dp.png b/src/main/res/drawable-mdpi/ic_pause_circle_fill_white_48dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_pause_circle_fill_white_48dp.png
rename to src/main/res/drawable-mdpi/ic_pause_circle_fill_white_48dp.png
diff --git a/res/drawable-mdpi/ic_person_white_24dp.png b/src/main/res/drawable-mdpi/ic_person_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_person_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_person_white_24dp.png
diff --git a/res/drawable-mdpi/ic_pets_white_24dp.png b/src/main/res/drawable-mdpi/ic_pets_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_pets_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_pets_white_24dp.png
diff --git a/res/drawable-mdpi/ic_photo_camera_dark.png b/src/main/res/drawable-mdpi/ic_photo_camera_dark.png
similarity index 100%
rename from res/drawable-mdpi/ic_photo_camera_dark.png
rename to src/main/res/drawable-mdpi/ic_photo_camera_dark.png
diff --git a/res/drawable-mdpi/ic_photo_camera_light.png b/src/main/res/drawable-mdpi/ic_photo_camera_light.png
similarity index 100%
rename from res/drawable-mdpi/ic_photo_camera_light.png
rename to src/main/res/drawable-mdpi/ic_photo_camera_light.png
diff --git a/res/drawable-mdpi/ic_pin_white.png b/src/main/res/drawable-mdpi/ic_pin_white.png
similarity index 100%
rename from res/drawable-mdpi/ic_pin_white.png
rename to src/main/res/drawable-mdpi/ic_pin_white.png
diff --git a/res/drawable-mdpi/ic_play_circle_fill_white_48dp.png b/src/main/res/drawable-mdpi/ic_play_circle_fill_white_48dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_play_circle_fill_white_48dp.png
rename to src/main/res/drawable-mdpi/ic_play_circle_fill_white_48dp.png
diff --git a/res/drawable-mdpi/ic_reply.png b/src/main/res/drawable-mdpi/ic_reply.png
similarity index 100%
rename from res/drawable-mdpi/ic_reply.png
rename to src/main/res/drawable-mdpi/ic_reply.png
diff --git a/res/drawable-mdpi/ic_reply_white_24dp.png b/src/main/res/drawable-mdpi/ic_reply_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_reply_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_reply_white_24dp.png
diff --git a/res/drawable-mdpi/ic_reply_white_36dp.png b/src/main/res/drawable-mdpi/ic_reply_white_36dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_reply_white_36dp.png
rename to src/main/res/drawable-mdpi/ic_reply_white_36dp.png
diff --git a/res/drawable-mdpi/ic_rotate_32.webp b/src/main/res/drawable-mdpi/ic_rotate_32.webp
similarity index 100%
rename from res/drawable-mdpi/ic_rotate_32.webp
rename to src/main/res/drawable-mdpi/ic_rotate_32.webp
diff --git a/res/drawable-mdpi/ic_send_push.png b/src/main/res/drawable-mdpi/ic_send_push.png
similarity index 100%
rename from res/drawable-mdpi/ic_send_push.png
rename to src/main/res/drawable-mdpi/ic_send_push.png
diff --git a/res/drawable-mdpi/ic_send_push_white_24dp.png b/src/main/res/drawable-mdpi/ic_send_push_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_send_push_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_send_push_white_24dp.png
diff --git a/res/drawable-mdpi/ic_send_sms_insecure.png b/src/main/res/drawable-mdpi/ic_send_sms_insecure.png
similarity index 100%
rename from res/drawable-mdpi/ic_send_sms_insecure.png
rename to src/main/res/drawable-mdpi/ic_send_sms_insecure.png
diff --git a/res/drawable-mdpi/ic_send_sms_insecure_dark.png b/src/main/res/drawable-mdpi/ic_send_sms_insecure_dark.png
similarity index 100%
rename from res/drawable-mdpi/ic_send_sms_insecure_dark.png
rename to src/main/res/drawable-mdpi/ic_send_sms_insecure_dark.png
diff --git a/res/drawable-mdpi/ic_send_sms_white_24dp.png b/src/main/res/drawable-mdpi/ic_send_sms_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_send_sms_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_send_sms_white_24dp.png
diff --git a/res/drawable-mdpi/ic_swap_vert_white_24dp.png b/src/main/res/drawable-mdpi/ic_swap_vert_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_swap_vert_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_swap_vert_white_24dp.png
diff --git a/res/drawable-mdpi/ic_tag_faces_white_24dp.png b/src/main/res/drawable-mdpi/ic_tag_faces_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_tag_faces_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_tag_faces_white_24dp.png
diff --git a/res/drawable-mdpi/ic_text_32.webp b/src/main/res/drawable-mdpi/ic_text_32.webp
similarity index 100%
rename from res/drawable-mdpi/ic_text_32.webp
rename to src/main/res/drawable-mdpi/ic_text_32.webp
diff --git a/res/drawable-mdpi/ic_trash_filled_32.webp b/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 src/main/res/drawable-mdpi/ic_trash_filled_32.webp
diff --git a/res/drawable-mdpi/ic_unarchive_white_24dp.png b/src/main/res/drawable-mdpi/ic_unarchive_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_unarchive_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_unarchive_white_24dp.png
diff --git a/res/drawable-mdpi/ic_undo_32.webp b/src/main/res/drawable-mdpi/ic_undo_32.webp
similarity index 100%
rename from res/drawable-mdpi/ic_undo_32.webp
rename to src/main/res/drawable-mdpi/ic_undo_32.webp
diff --git a/res/drawable-mdpi/ic_unlocked_white_24dp.png b/src/main/res/drawable-mdpi/ic_unlocked_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_unlocked_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_unlocked_white_24dp.png
diff --git a/res/drawable-mdpi/ic_unpin_white.png b/src/main/res/drawable-mdpi/ic_unpin_white.png
similarity index 100%
rename from res/drawable-mdpi/ic_unpin_white.png
rename to src/main/res/drawable-mdpi/ic_unpin_white.png
diff --git a/res/drawable-mdpi/ic_volume_off_grey600_18dp.png b/src/main/res/drawable-mdpi/ic_volume_off_grey600_18dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_volume_off_grey600_18dp.png
rename to src/main/res/drawable-mdpi/ic_volume_off_grey600_18dp.png
diff --git a/res/drawable-mdpi/ic_volume_off_white_18dp.png b/src/main/res/drawable-mdpi/ic_volume_off_white_18dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_volume_off_white_18dp.png
rename to src/main/res/drawable-mdpi/ic_volume_off_white_18dp.png
diff --git a/res/drawable-mdpi/ic_volume_up_dark.png b/src/main/res/drawable-mdpi/ic_volume_up_dark.png
similarity index 100%
rename from res/drawable-mdpi/ic_volume_up_dark.png
rename to src/main/res/drawable-mdpi/ic_volume_up_dark.png
diff --git a/res/drawable-mdpi/ic_volume_up_light.png b/src/main/res/drawable-mdpi/ic_volume_up_light.png
similarity index 100%
rename from res/drawable-mdpi/ic_volume_up_light.png
rename to src/main/res/drawable-mdpi/ic_volume_up_light.png
diff --git a/res/drawable-mdpi/ic_warning_dark.png b/src/main/res/drawable-mdpi/ic_warning_dark.png
similarity index 100%
rename from res/drawable-mdpi/ic_warning_dark.png
rename to src/main/res/drawable-mdpi/ic_warning_dark.png
diff --git a/res/drawable-mdpi/ic_warning_light.png b/src/main/res/drawable-mdpi/ic_warning_light.png
similarity index 100%
rename from res/drawable-mdpi/ic_warning_light.png
rename to src/main/res/drawable-mdpi/ic_warning_light.png
diff --git a/res/drawable-mdpi/ic_wb_sunny_white_24dp.png b/src/main/res/drawable-mdpi/ic_wb_sunny_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_wb_sunny_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_wb_sunny_white_24dp.png
diff --git a/res/drawable-mdpi/ic_work_white_24dp.png b/src/main/res/drawable-mdpi/ic_work_white_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_work_white_24dp.png
rename to src/main/res/drawable-mdpi/ic_work_white_24dp.png
diff --git a/res/drawable-mdpi/msg_encr_out.png b/src/main/res/drawable-mdpi/msg_encr_out.png
similarity index 100%
rename from res/drawable-mdpi/msg_encr_out.png
rename to src/main/res/drawable-mdpi/msg_encr_out.png
diff --git a/res/drawable-mdpi/notification_permanent.png b/src/main/res/drawable-mdpi/notification_permanent.png
similarity index 100%
rename from res/drawable-mdpi/notification_permanent.png
rename to src/main/res/drawable-mdpi/notification_permanent.png
diff --git a/res/drawable-mdpi/notify_panel_notification_icon_bg.png b/src/main/res/drawable-mdpi/notify_panel_notification_icon_bg.png
similarity index 100%
rename from res/drawable-mdpi/notify_panel_notification_icon_bg.png
rename to src/main/res/drawable-mdpi/notify_panel_notification_icon_bg.png
diff --git a/res/drawable-mdpi/quick_camera_dark.png b/src/main/res/drawable-mdpi/quick_camera_dark.png
similarity index 100%
rename from res/drawable-mdpi/quick_camera_dark.png
rename to src/main/res/drawable-mdpi/quick_camera_dark.png
diff --git a/res/drawable-mdpi/quick_camera_exit_fullscreen.png b/src/main/res/drawable-mdpi/quick_camera_exit_fullscreen.png
similarity index 100%
rename from res/drawable-mdpi/quick_camera_exit_fullscreen.png
rename to src/main/res/drawable-mdpi/quick_camera_exit_fullscreen.png
diff --git a/res/drawable-mdpi/quick_camera_front.png b/src/main/res/drawable-mdpi/quick_camera_front.png
similarity index 100%
rename from res/drawable-mdpi/quick_camera_front.png
rename to src/main/res/drawable-mdpi/quick_camera_front.png
diff --git a/res/drawable-mdpi/quick_camera_fullscreen.png b/src/main/res/drawable-mdpi/quick_camera_fullscreen.png
similarity index 100%
rename from res/drawable-mdpi/quick_camera_fullscreen.png
rename to src/main/res/drawable-mdpi/quick_camera_fullscreen.png
diff --git a/res/drawable-mdpi/quick_camera_hide.png b/src/main/res/drawable-mdpi/quick_camera_hide.png
similarity index 100%
rename from res/drawable-mdpi/quick_camera_hide.png
rename to src/main/res/drawable-mdpi/quick_camera_hide.png
diff --git a/res/drawable-mdpi/quick_camera_light.png b/src/main/res/drawable-mdpi/quick_camera_light.png
similarity index 100%
rename from res/drawable-mdpi/quick_camera_light.png
rename to src/main/res/drawable-mdpi/quick_camera_light.png
diff --git a/res/drawable-mdpi/quick_camera_rear.png b/src/main/res/drawable-mdpi/quick_camera_rear.png
similarity index 100%
rename from res/drawable-mdpi/quick_camera_rear.png
rename to src/main/res/drawable-mdpi/quick_camera_rear.png
diff --git a/res/drawable-mdpi/quick_shutter_button.png b/src/main/res/drawable-mdpi/quick_shutter_button.png
similarity index 100%
rename from res/drawable-mdpi/quick_shutter_button.png
rename to src/main/res/drawable-mdpi/quick_shutter_button.png
diff --git a/res/drawable-night-v21/pinned_list_item_background.xml b/src/main/res/drawable-night-v21/pinned_list_item_background.xml
similarity index 100%
rename from res/drawable-night-v21/pinned_list_item_background.xml
rename to src/main/res/drawable-night-v21/pinned_list_item_background.xml
diff --git a/res/drawable-night-v21/pinned_list_item_background_blue.xml b/src/main/res/drawable-night-v21/pinned_list_item_background_blue.xml
similarity index 100%
rename from res/drawable-night-v21/pinned_list_item_background_blue.xml
rename to src/main/res/drawable-night-v21/pinned_list_item_background_blue.xml
diff --git a/res/drawable-night-v21/pinned_list_item_background_gray.xml b/src/main/res/drawable-night-v21/pinned_list_item_background_gray.xml
similarity index 100%
rename from res/drawable-night-v21/pinned_list_item_background_gray.xml
rename to src/main/res/drawable-night-v21/pinned_list_item_background_gray.xml
diff --git a/res/drawable-night-v21/pinned_list_item_background_green.xml b/src/main/res/drawable-night-v21/pinned_list_item_background_green.xml
similarity index 100%
rename from res/drawable-night-v21/pinned_list_item_background_green.xml
rename to src/main/res/drawable-night-v21/pinned_list_item_background_green.xml
diff --git a/res/drawable-night-v21/pinned_list_item_background_pink.xml b/src/main/res/drawable-night-v21/pinned_list_item_background_pink.xml
similarity index 100%
rename from res/drawable-night-v21/pinned_list_item_background_pink.xml
rename to src/main/res/drawable-night-v21/pinned_list_item_background_pink.xml
diff --git a/res/drawable-night-v21/pinned_list_item_background_purple.xml b/src/main/res/drawable-night-v21/pinned_list_item_background_purple.xml
similarity index 100%
rename from res/drawable-night-v21/pinned_list_item_background_purple.xml
rename to src/main/res/drawable-night-v21/pinned_list_item_background_purple.xml
diff --git a/res/drawable-night-v21/pinned_list_item_background_red.xml b/src/main/res/drawable-night-v21/pinned_list_item_background_red.xml
similarity index 100%
rename from res/drawable-night-v21/pinned_list_item_background_red.xml
rename to src/main/res/drawable-night-v21/pinned_list_item_background_red.xml
diff --git a/res/drawable-night/background_hd.jpg b/src/main/res/drawable-night/background_hd.jpg
similarity index 100%
rename from res/drawable-night/background_hd.jpg
rename to src/main/res/drawable-night/background_hd.jpg
diff --git a/res/drawable-night/button_secondary_background.xml b/src/main/res/drawable-night/button_secondary_background.xml
similarity index 100%
rename from res/drawable-night/button_secondary_background.xml
rename to src/main/res/drawable-night/button_secondary_background.xml
diff --git a/res/drawable-night/pinned_list_item_background.xml b/src/main/res/drawable-night/pinned_list_item_background.xml
similarity index 100%
rename from res/drawable-night/pinned_list_item_background.xml
rename to src/main/res/drawable-night/pinned_list_item_background.xml
diff --git a/res/drawable-night/pinned_list_item_background_blue.xml b/src/main/res/drawable-night/pinned_list_item_background_blue.xml
similarity index 100%
rename from res/drawable-night/pinned_list_item_background_blue.xml
rename to src/main/res/drawable-night/pinned_list_item_background_blue.xml
diff --git a/res/drawable-night/pinned_list_item_background_gray.xml b/src/main/res/drawable-night/pinned_list_item_background_gray.xml
similarity index 100%
rename from res/drawable-night/pinned_list_item_background_gray.xml
rename to src/main/res/drawable-night/pinned_list_item_background_gray.xml
diff --git a/res/drawable-night/pinned_list_item_background_green.xml b/src/main/res/drawable-night/pinned_list_item_background_green.xml
similarity index 100%
rename from res/drawable-night/pinned_list_item_background_green.xml
rename to src/main/res/drawable-night/pinned_list_item_background_green.xml
diff --git a/res/drawable-night/pinned_list_item_background_pink.xml b/src/main/res/drawable-night/pinned_list_item_background_pink.xml
similarity index 100%
rename from res/drawable-night/pinned_list_item_background_pink.xml
rename to src/main/res/drawable-night/pinned_list_item_background_pink.xml
diff --git a/res/drawable-night/pinned_list_item_background_purple.xml b/src/main/res/drawable-night/pinned_list_item_background_purple.xml
similarity index 100%
rename from res/drawable-night/pinned_list_item_background_purple.xml
rename to src/main/res/drawable-night/pinned_list_item_background_purple.xml
diff --git a/res/drawable-night/pinned_list_item_background_red.xml b/src/main/res/drawable-night/pinned_list_item_background_red.xml
similarity index 100%
rename from res/drawable-night/pinned_list_item_background_red.xml
rename to src/main/res/drawable-night/pinned_list_item_background_red.xml
diff --git a/res/drawable-v21/circle_touch_highlight_background.xml b/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 src/main/res/drawable-v21/circle_touch_highlight_background.xml
diff --git a/res/drawable-v21/conversation_list_item_background.xml b/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 src/main/res/drawable-v21/conversation_list_item_background.xml
diff --git a/res/drawable-v21/conversation_list_item_background_blue.xml b/src/main/res/drawable-v21/conversation_list_item_background_blue.xml
similarity index 100%
rename from res/drawable-v21/conversation_list_item_background_blue.xml
rename to src/main/res/drawable-v21/conversation_list_item_background_blue.xml
diff --git a/res/drawable-v21/conversation_list_item_background_gray.xml b/src/main/res/drawable-v21/conversation_list_item_background_gray.xml
similarity index 100%
rename from res/drawable-v21/conversation_list_item_background_gray.xml
rename to src/main/res/drawable-v21/conversation_list_item_background_gray.xml
diff --git a/res/drawable-v21/conversation_list_item_background_green.xml b/src/main/res/drawable-v21/conversation_list_item_background_green.xml
similarity index 100%
rename from res/drawable-v21/conversation_list_item_background_green.xml
rename to src/main/res/drawable-v21/conversation_list_item_background_green.xml
diff --git a/res/drawable-v21/conversation_list_item_background_pink.xml b/src/main/res/drawable-v21/conversation_list_item_background_pink.xml
similarity index 100%
rename from res/drawable-v21/conversation_list_item_background_pink.xml
rename to src/main/res/drawable-v21/conversation_list_item_background_pink.xml
diff --git a/res/drawable-v21/conversation_list_item_background_purple.xml b/src/main/res/drawable-v21/conversation_list_item_background_purple.xml
similarity index 100%
rename from res/drawable-v21/conversation_list_item_background_purple.xml
rename to src/main/res/drawable-v21/conversation_list_item_background_purple.xml
diff --git a/res/drawable-v21/conversation_list_item_background_red.xml b/src/main/res/drawable-v21/conversation_list_item_background_red.xml
similarity index 100%
rename from res/drawable-v21/conversation_list_item_background_red.xml
rename to src/main/res/drawable-v21/conversation_list_item_background_red.xml
diff --git a/res/drawable-v21/pinned_list_item_background.xml b/src/main/res/drawable-v21/pinned_list_item_background.xml
similarity index 100%
rename from res/drawable-v21/pinned_list_item_background.xml
rename to src/main/res/drawable-v21/pinned_list_item_background.xml
diff --git a/res/drawable-v21/pinned_list_item_background_blue.xml b/src/main/res/drawable-v21/pinned_list_item_background_blue.xml
similarity index 100%
rename from res/drawable-v21/pinned_list_item_background_blue.xml
rename to src/main/res/drawable-v21/pinned_list_item_background_blue.xml
diff --git a/res/drawable-v21/pinned_list_item_background_gray.xml b/src/main/res/drawable-v21/pinned_list_item_background_gray.xml
similarity index 100%
rename from res/drawable-v21/pinned_list_item_background_gray.xml
rename to src/main/res/drawable-v21/pinned_list_item_background_gray.xml
diff --git a/res/drawable-v21/pinned_list_item_background_green.xml b/src/main/res/drawable-v21/pinned_list_item_background_green.xml
similarity index 100%
rename from res/drawable-v21/pinned_list_item_background_green.xml
rename to src/main/res/drawable-v21/pinned_list_item_background_green.xml
diff --git a/res/drawable-v21/pinned_list_item_background_pink.xml b/src/main/res/drawable-v21/pinned_list_item_background_pink.xml
similarity index 100%
rename from res/drawable-v21/pinned_list_item_background_pink.xml
rename to src/main/res/drawable-v21/pinned_list_item_background_pink.xml
diff --git a/res/drawable-v21/pinned_list_item_background_purple.xml b/src/main/res/drawable-v21/pinned_list_item_background_purple.xml
similarity index 100%
rename from res/drawable-v21/pinned_list_item_background_purple.xml
rename to src/main/res/drawable-v21/pinned_list_item_background_purple.xml
diff --git a/res/drawable-v21/pinned_list_item_background_red.xml b/src/main/res/drawable-v21/pinned_list_item_background_red.xml
similarity index 100%
rename from res/drawable-v21/pinned_list_item_background_red.xml
rename to src/main/res/drawable-v21/pinned_list_item_background_red.xml
diff --git a/res/drawable-v21/touch_highlight_background.xml b/src/main/res/drawable-v21/touch_highlight_background.xml
similarity index 100%
rename from res/drawable-v21/touch_highlight_background.xml
rename to src/main/res/drawable-v21/touch_highlight_background.xml
diff --git a/res/drawable-xhdpi-v11/icon_notification.png b/src/main/res/drawable-xhdpi-v11/icon_notification.png
similarity index 100%
rename from res/drawable-xhdpi-v11/icon_notification.png
rename to src/main/res/drawable-xhdpi-v11/icon_notification.png
diff --git a/res/drawable-xhdpi/attach_camera.png b/src/main/res/drawable-xhdpi/attach_camera.png
similarity index 100%
rename from res/drawable-xhdpi/attach_camera.png
rename to src/main/res/drawable-xhdpi/attach_camera.png
diff --git a/res/drawable-xhdpi/attach_record_video.png b/src/main/res/drawable-xhdpi/attach_record_video.png
similarity index 100%
rename from res/drawable-xhdpi/attach_record_video.png
rename to src/main/res/drawable-xhdpi/attach_record_video.png
diff --git a/res/drawable-xhdpi/check.png b/src/main/res/drawable-xhdpi/check.png
similarity index 100%
rename from res/drawable-xhdpi/check.png
rename to src/main/res/drawable-xhdpi/check.png
diff --git a/res/drawable-xhdpi/divet_lower_right_dark.png b/src/main/res/drawable-xhdpi/divet_lower_right_dark.png
similarity index 100%
rename from res/drawable-xhdpi/divet_lower_right_dark.png
rename to src/main/res/drawable-xhdpi/divet_lower_right_dark.png
diff --git a/res/drawable-xhdpi/divet_lower_right_light.png b/src/main/res/drawable-xhdpi/divet_lower_right_light.png
similarity index 100%
rename from res/drawable-xhdpi/divet_lower_right_light.png
rename to src/main/res/drawable-xhdpi/divet_lower_right_light.png
diff --git a/res/drawable-xhdpi/ic_account_box_dark.png b/src/main/res/drawable-xhdpi/ic_account_box_dark.png
similarity index 100%
rename from res/drawable-xhdpi/ic_account_box_dark.png
rename to src/main/res/drawable-xhdpi/ic_account_box_dark.png
diff --git a/res/drawable-xhdpi/ic_account_box_light.png b/src/main/res/drawable-xhdpi/ic_account_box_light.png
similarity index 100%
rename from res/drawable-xhdpi/ic_account_box_light.png
rename to src/main/res/drawable-xhdpi/ic_account_box_light.png
diff --git a/res/drawable-xhdpi/ic_add_white_24dp.png b/src/main/res/drawable-xhdpi/ic_add_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_add_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_add_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_advanced_white_24dp.png b/src/main/res/drawable-xhdpi/ic_advanced_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_advanced_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_advanced_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_archive_white_24dp.png b/src/main/res/drawable-xhdpi/ic_archive_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_archive_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_archive_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_arrow_back_white_24dp.png b/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_arrow_back_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_attach_grey600_24dp.png b/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 src/main/res/drawable-xhdpi/ic_attach_grey600_24dp.png
diff --git a/res/drawable-xhdpi/ic_attach_white_24dp.png b/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 src/main/res/drawable-xhdpi/ic_attach_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_backspace_grey600_24dp.png b/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 src/main/res/drawable-xhdpi/ic_backspace_grey600_24dp.png
diff --git a/res/drawable-xhdpi/ic_blur_on_white_24.png b/src/main/res/drawable-xhdpi/ic_blur_on_white_24.png
similarity index 100%
rename from res/drawable-xhdpi/ic_blur_on_white_24.png
rename to src/main/res/drawable-xhdpi/ic_blur_on_white_24.png
diff --git a/res/drawable-xhdpi/ic_brightness_6_white_24dp.png b/src/main/res/drawable-xhdpi/ic_brightness_6_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_brightness_6_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_brightness_6_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_brush_highlight_32.webp b/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 src/main/res/drawable-xhdpi/ic_brush_highlight_32.webp
diff --git a/res/drawable-xhdpi/ic_brush_marker_32.webp b/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 src/main/res/drawable-xhdpi/ic_brush_marker_32.webp
diff --git a/res/drawable-xhdpi/ic_camera_alt_white_24dp.png b/src/main/res/drawable-xhdpi/ic_camera_alt_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_camera_alt_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_camera_alt_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_check_white_24dp.png b/src/main/res/drawable-xhdpi/ic_check_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_check_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_check_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_circle_fill_white_48dp.png b/src/main/res/drawable-xhdpi/ic_circle_fill_white_48dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_circle_fill_white_48dp.png
rename to src/main/res/drawable-xhdpi/ic_circle_fill_white_48dp.png
diff --git a/res/drawable-xhdpi/ic_clear_white_24dp.png b/src/main/res/drawable-xhdpi/ic_clear_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_clear_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_clear_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_close_white_18dp.webp b/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 src/main/res/drawable-xhdpi/ic_close_white_18dp.webp
diff --git a/res/drawable-xhdpi/ic_close_white_24dp.png b/src/main/res/drawable-xhdpi/ic_close_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_close_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_close_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_contact_picture.png b/src/main/res/drawable-xhdpi/ic_contact_picture.png
similarity index 100%
rename from res/drawable-xhdpi/ic_contact_picture.png
rename to src/main/res/drawable-xhdpi/ic_contact_picture.png
diff --git a/res/drawable-xhdpi/ic_content_copy_white_24dp.png b/src/main/res/drawable-xhdpi/ic_content_copy_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_content_copy_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_content_copy_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_create_white_24dp.png b/src/main/res/drawable-xhdpi/ic_create_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_create_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_create_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_crop_32.webp b/src/main/res/drawable-xhdpi/ic_crop_32.webp
similarity index 100%
rename from res/drawable-xhdpi/ic_crop_32.webp
rename to src/main/res/drawable-xhdpi/ic_crop_32.webp
diff --git a/res/drawable-xhdpi/ic_delete_white_24dp.png b/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_delete_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_delete_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_delivery_status_read.png b/src/main/res/drawable-xhdpi/ic_delivery_status_read.png
similarity index 100%
rename from res/drawable-xhdpi/ic_delivery_status_read.png
rename to src/main/res/drawable-xhdpi/ic_delivery_status_read.png
diff --git a/res/drawable-xhdpi/ic_delivery_status_sending.png b/src/main/res/drawable-xhdpi/ic_delivery_status_sending.png
similarity index 100%
rename from res/drawable-xhdpi/ic_delivery_status_sending.png
rename to src/main/res/drawable-xhdpi/ic_delivery_status_sending.png
diff --git a/res/drawable-xhdpi/ic_delivery_status_sent.png b/src/main/res/drawable-xhdpi/ic_delivery_status_sent.png
similarity index 100%
rename from res/drawable-xhdpi/ic_delivery_status_sent.png
rename to src/main/res/drawable-xhdpi/ic_delivery_status_sent.png
diff --git a/res/drawable-xhdpi/ic_emoji_32.webp b/src/main/res/drawable-xhdpi/ic_emoji_32.webp
similarity index 100%
rename from res/drawable-xhdpi/ic_emoji_32.webp
rename to src/main/res/drawable-xhdpi/ic_emoji_32.webp
diff --git a/res/drawable-xhdpi/ic_flip_32.webp b/src/main/res/drawable-xhdpi/ic_flip_32.webp
similarity index 100%
rename from res/drawable-xhdpi/ic_flip_32.webp
rename to src/main/res/drawable-xhdpi/ic_flip_32.webp
diff --git a/res/drawable-xhdpi/ic_forum_white_24dp.png b/src/main/res/drawable-xhdpi/ic_forum_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_forum_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_forum_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_forward_white_24dp.png b/src/main/res/drawable-xhdpi/ic_forward_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_forward_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_forward_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_group_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_group_grey600_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_group_grey600_24dp.png
rename to src/main/res/drawable-xhdpi/ic_group_grey600_24dp.png
diff --git a/res/drawable-xhdpi/ic_group_white_24dp.png b/src/main/res/drawable-xhdpi/ic_group_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_group_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_group_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_headset_white_24dp.png b/src/main/res/drawable-xhdpi/ic_headset_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_headset_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_headset_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_help_white_24dp.png b/src/main/res/drawable-xhdpi/ic_help_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_help_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_help_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_image_dark.png b/src/main/res/drawable-xhdpi/ic_image_dark.png
similarity index 100%
rename from res/drawable-xhdpi/ic_image_dark.png
rename to src/main/res/drawable-xhdpi/ic_image_dark.png
diff --git a/res/drawable-xhdpi/ic_image_light.png b/src/main/res/drawable-xhdpi/ic_image_light.png
similarity index 100%
rename from res/drawable-xhdpi/ic_image_light.png
rename to src/main/res/drawable-xhdpi/ic_image_light.png
diff --git a/res/drawable-xhdpi/ic_image_white_24dp.png b/src/main/res/drawable-xhdpi/ic_image_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_image_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_image_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_info_outline_dark.png b/src/main/res/drawable-xhdpi/ic_info_outline_dark.png
similarity index 100%
rename from res/drawable-xhdpi/ic_info_outline_dark.png
rename to src/main/res/drawable-xhdpi/ic_info_outline_dark.png
diff --git a/res/drawable-xhdpi/ic_info_outline_light.png b/src/main/res/drawable-xhdpi/ic_info_outline_light.png
similarity index 100%
rename from res/drawable-xhdpi/ic_info_outline_light.png
rename to src/main/res/drawable-xhdpi/ic_info_outline_light.png
diff --git a/res/drawable-xhdpi/ic_info_outline_white_24dp.png b/src/main/res/drawable-xhdpi/ic_info_outline_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_info_outline_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_info_outline_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_insert_drive_file_white_24dp.png b/src/main/res/drawable-xhdpi/ic_insert_drive_file_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_insert_drive_file_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_insert_drive_file_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_keyboard_arrow_down_white_24dp.png b/src/main/res/drawable-xhdpi/ic_keyboard_arrow_down_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_keyboard_arrow_down_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_keyboard_arrow_down_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_keyboard_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_keyboard_grey600_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_keyboard_grey600_24dp.png
rename to src/main/res/drawable-xhdpi/ic_keyboard_grey600_24dp.png
diff --git a/res/drawable-xhdpi/ic_keyboard_white_24dp.png b/src/main/res/drawable-xhdpi/ic_keyboard_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_keyboard_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_keyboard_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_launch_white_24dp.png b/src/main/res/drawable-xhdpi/ic_launch_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_launch_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_launch_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_local_dining_white_24dp.png b/src/main/res/drawable-xhdpi/ic_local_dining_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_local_dining_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_local_dining_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_location_chatlist.png b/src/main/res/drawable-xhdpi/ic_location_chatlist.png
similarity index 100%
rename from res/drawable-xhdpi/ic_location_chatlist.png
rename to src/main/res/drawable-xhdpi/ic_location_chatlist.png
diff --git a/res/drawable-xhdpi/ic_location_msg.png b/src/main/res/drawable-xhdpi/ic_location_msg.png
similarity index 100%
rename from res/drawable-xhdpi/ic_location_msg.png
rename to src/main/res/drawable-xhdpi/ic_location_msg.png
diff --git a/res/drawable-xhdpi/ic_location_off_white_24.png b/src/main/res/drawable-xhdpi/ic_location_off_white_24.png
similarity index 100%
rename from res/drawable-xhdpi/ic_location_off_white_24.png
rename to src/main/res/drawable-xhdpi/ic_location_off_white_24.png
diff --git a/res/drawable-xhdpi/ic_location_on_white_24dp.png b/src/main/res/drawable-xhdpi/ic_location_on_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_location_on_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_location_on_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_lock_white_18dp.png b/src/main/res/drawable-xhdpi/ic_lock_white_18dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_lock_white_18dp.png
rename to src/main/res/drawable-xhdpi/ic_lock_white_18dp.png
diff --git a/res/drawable-xhdpi/ic_lock_white_24dp.png b/src/main/res/drawable-xhdpi/ic_lock_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_lock_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_lock_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_mic_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_mic_grey600_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_mic_grey600_24dp.png
rename to src/main/res/drawable-xhdpi/ic_mic_grey600_24dp.png
diff --git a/res/drawable-xhdpi/ic_mic_white_24dp.png b/src/main/res/drawable-xhdpi/ic_mic_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_mic_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_mic_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_mic_white_48dp.png b/src/main/res/drawable-xhdpi/ic_mic_white_48dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_mic_white_48dp.png
rename to src/main/res/drawable-xhdpi/ic_mic_white_48dp.png
diff --git a/res/drawable-xhdpi/ic_mood_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_mood_grey600_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_mood_grey600_24dp.png
rename to src/main/res/drawable-xhdpi/ic_mood_grey600_24dp.png
diff --git a/res/drawable-xhdpi/ic_mood_white_24dp.png b/src/main/res/drawable-xhdpi/ic_mood_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_mood_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_mood_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_movie_creation_dark.png b/src/main/res/drawable-xhdpi/ic_movie_creation_dark.png
similarity index 100%
rename from res/drawable-xhdpi/ic_movie_creation_dark.png
rename to src/main/res/drawable-xhdpi/ic_movie_creation_dark.png
diff --git a/res/drawable-xhdpi/ic_movie_creation_light.png b/src/main/res/drawable-xhdpi/ic_movie_creation_light.png
similarity index 100%
rename from res/drawable-xhdpi/ic_movie_creation_light.png
rename to src/main/res/drawable-xhdpi/ic_movie_creation_light.png
diff --git a/res/drawable-xhdpi/ic_notifications_white_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_notifications_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_notifications_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_pause_circle_fill_white_48dp.png b/src/main/res/drawable-xhdpi/ic_pause_circle_fill_white_48dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_pause_circle_fill_white_48dp.png
rename to src/main/res/drawable-xhdpi/ic_pause_circle_fill_white_48dp.png
diff --git a/res/drawable-xhdpi/ic_person_white_24dp.png b/src/main/res/drawable-xhdpi/ic_person_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_person_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_person_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_pets_white_24dp.png b/src/main/res/drawable-xhdpi/ic_pets_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_pets_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_pets_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_photo_camera_dark.png b/src/main/res/drawable-xhdpi/ic_photo_camera_dark.png
similarity index 100%
rename from res/drawable-xhdpi/ic_photo_camera_dark.png
rename to src/main/res/drawable-xhdpi/ic_photo_camera_dark.png
diff --git a/res/drawable-xhdpi/ic_photo_camera_light.png b/src/main/res/drawable-xhdpi/ic_photo_camera_light.png
similarity index 100%
rename from res/drawable-xhdpi/ic_photo_camera_light.png
rename to src/main/res/drawable-xhdpi/ic_photo_camera_light.png
diff --git a/res/drawable-xhdpi/ic_pin_white.png b/src/main/res/drawable-xhdpi/ic_pin_white.png
similarity index 100%
rename from res/drawable-xhdpi/ic_pin_white.png
rename to src/main/res/drawable-xhdpi/ic_pin_white.png
diff --git a/res/drawable-xhdpi/ic_pinned_chatlist.png b/src/main/res/drawable-xhdpi/ic_pinned_chatlist.png
similarity index 100%
rename from res/drawable-xhdpi/ic_pinned_chatlist.png
rename to src/main/res/drawable-xhdpi/ic_pinned_chatlist.png
diff --git a/res/drawable-xhdpi/ic_play_circle_fill_white_48dp.png b/src/main/res/drawable-xhdpi/ic_play_circle_fill_white_48dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_play_circle_fill_white_48dp.png
rename to src/main/res/drawable-xhdpi/ic_play_circle_fill_white_48dp.png
diff --git a/res/drawable-xhdpi/ic_reply.png b/src/main/res/drawable-xhdpi/ic_reply.png
similarity index 100%
rename from res/drawable-xhdpi/ic_reply.png
rename to src/main/res/drawable-xhdpi/ic_reply.png
diff --git a/res/drawable-xhdpi/ic_reply_white_24dp.png b/src/main/res/drawable-xhdpi/ic_reply_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_reply_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_reply_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_reply_white_36dp.png b/src/main/res/drawable-xhdpi/ic_reply_white_36dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_reply_white_36dp.png
rename to src/main/res/drawable-xhdpi/ic_reply_white_36dp.png
diff --git a/res/drawable-xhdpi/ic_rotate_32.webp b/src/main/res/drawable-xhdpi/ic_rotate_32.webp
similarity index 100%
rename from res/drawable-xhdpi/ic_rotate_32.webp
rename to src/main/res/drawable-xhdpi/ic_rotate_32.webp
diff --git a/res/drawable-xhdpi/ic_search_down.png b/src/main/res/drawable-xhdpi/ic_search_down.png
similarity index 100%
rename from res/drawable-xhdpi/ic_search_down.png
rename to src/main/res/drawable-xhdpi/ic_search_down.png
diff --git a/res/drawable-xhdpi/ic_search_up.png b/src/main/res/drawable-xhdpi/ic_search_up.png
similarity index 100%
rename from res/drawable-xhdpi/ic_search_up.png
rename to src/main/res/drawable-xhdpi/ic_search_up.png
diff --git a/res/drawable-xhdpi/ic_send_push.png b/src/main/res/drawable-xhdpi/ic_send_push.png
similarity index 100%
rename from res/drawable-xhdpi/ic_send_push.png
rename to src/main/res/drawable-xhdpi/ic_send_push.png
diff --git a/res/drawable-xhdpi/ic_send_push_white_24dp.png b/src/main/res/drawable-xhdpi/ic_send_push_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_send_push_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_send_push_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_send_sms_insecure.png b/src/main/res/drawable-xhdpi/ic_send_sms_insecure.png
similarity index 100%
rename from res/drawable-xhdpi/ic_send_sms_insecure.png
rename to src/main/res/drawable-xhdpi/ic_send_sms_insecure.png
diff --git a/res/drawable-xhdpi/ic_send_sms_insecure_dark.png b/src/main/res/drawable-xhdpi/ic_send_sms_insecure_dark.png
similarity index 100%
rename from res/drawable-xhdpi/ic_send_sms_insecure_dark.png
rename to src/main/res/drawable-xhdpi/ic_send_sms_insecure_dark.png
diff --git a/res/drawable-xhdpi/ic_send_sms_white_24dp.png b/src/main/res/drawable-xhdpi/ic_send_sms_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_send_sms_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_send_sms_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_swap_vert_white_24dp.png b/src/main/res/drawable-xhdpi/ic_swap_vert_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_swap_vert_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_swap_vert_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_tag_faces_white_24dp.png b/src/main/res/drawable-xhdpi/ic_tag_faces_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_tag_faces_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_tag_faces_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_text_32.webp b/src/main/res/drawable-xhdpi/ic_text_32.webp
similarity index 100%
rename from res/drawable-xhdpi/ic_text_32.webp
rename to src/main/res/drawable-xhdpi/ic_text_32.webp
diff --git a/res/drawable-xhdpi/ic_trash_filled_32.webp b/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 src/main/res/drawable-xhdpi/ic_trash_filled_32.webp
diff --git a/res/drawable-xhdpi/ic_unarchive_white_24dp.png b/src/main/res/drawable-xhdpi/ic_unarchive_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_unarchive_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_unarchive_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_undo_32.webp b/src/main/res/drawable-xhdpi/ic_undo_32.webp
similarity index 100%
rename from res/drawable-xhdpi/ic_undo_32.webp
rename to src/main/res/drawable-xhdpi/ic_undo_32.webp
diff --git a/res/drawable-xhdpi/ic_unlocked_white_24dp.png b/src/main/res/drawable-xhdpi/ic_unlocked_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_unlocked_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_unlocked_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_unpin_white.png b/src/main/res/drawable-xhdpi/ic_unpin_white.png
similarity index 100%
rename from res/drawable-xhdpi/ic_unpin_white.png
rename to src/main/res/drawable-xhdpi/ic_unpin_white.png
diff --git a/res/drawable-xhdpi/ic_volume_off_grey600_18dp.png b/src/main/res/drawable-xhdpi/ic_volume_off_grey600_18dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_volume_off_grey600_18dp.png
rename to src/main/res/drawable-xhdpi/ic_volume_off_grey600_18dp.png
diff --git a/res/drawable-xhdpi/ic_volume_off_white_18dp.png b/src/main/res/drawable-xhdpi/ic_volume_off_white_18dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_volume_off_white_18dp.png
rename to src/main/res/drawable-xhdpi/ic_volume_off_white_18dp.png
diff --git a/res/drawable-xhdpi/ic_volume_up_dark.png b/src/main/res/drawable-xhdpi/ic_volume_up_dark.png
similarity index 100%
rename from res/drawable-xhdpi/ic_volume_up_dark.png
rename to src/main/res/drawable-xhdpi/ic_volume_up_dark.png
diff --git a/res/drawable-xhdpi/ic_volume_up_light.png b/src/main/res/drawable-xhdpi/ic_volume_up_light.png
similarity index 100%
rename from res/drawable-xhdpi/ic_volume_up_light.png
rename to src/main/res/drawable-xhdpi/ic_volume_up_light.png
diff --git a/res/drawable-xhdpi/ic_warning_dark.png b/src/main/res/drawable-xhdpi/ic_warning_dark.png
similarity index 100%
rename from res/drawable-xhdpi/ic_warning_dark.png
rename to src/main/res/drawable-xhdpi/ic_warning_dark.png
diff --git a/res/drawable-xhdpi/ic_warning_light.png b/src/main/res/drawable-xhdpi/ic_warning_light.png
similarity index 100%
rename from res/drawable-xhdpi/ic_warning_light.png
rename to src/main/res/drawable-xhdpi/ic_warning_light.png
diff --git a/res/drawable-xhdpi/ic_wb_sunny_white_24dp.png b/src/main/res/drawable-xhdpi/ic_wb_sunny_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_wb_sunny_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_wb_sunny_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_work_white_24dp.png b/src/main/res/drawable-xhdpi/ic_work_white_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_work_white_24dp.png
rename to src/main/res/drawable-xhdpi/ic_work_white_24dp.png
diff --git a/res/drawable-xhdpi/msg_encr_out.png b/src/main/res/drawable-xhdpi/msg_encr_out.png
similarity index 100%
rename from res/drawable-xhdpi/msg_encr_out.png
rename to src/main/res/drawable-xhdpi/msg_encr_out.png
diff --git a/res/drawable-xhdpi/notification_permanent.png b/src/main/res/drawable-xhdpi/notification_permanent.png
similarity index 100%
rename from res/drawable-xhdpi/notification_permanent.png
rename to src/main/res/drawable-xhdpi/notification_permanent.png
diff --git a/res/drawable-xhdpi/notify_panel_notification_icon_bg.png b/src/main/res/drawable-xhdpi/notify_panel_notification_icon_bg.png
similarity index 100%
rename from res/drawable-xhdpi/notify_panel_notification_icon_bg.png
rename to src/main/res/drawable-xhdpi/notify_panel_notification_icon_bg.png
diff --git a/res/drawable-xhdpi/quick_camera_dark.png b/src/main/res/drawable-xhdpi/quick_camera_dark.png
similarity index 100%
rename from res/drawable-xhdpi/quick_camera_dark.png
rename to src/main/res/drawable-xhdpi/quick_camera_dark.png
diff --git a/res/drawable-xhdpi/quick_camera_exit_fullscreen.png b/src/main/res/drawable-xhdpi/quick_camera_exit_fullscreen.png
similarity index 100%
rename from res/drawable-xhdpi/quick_camera_exit_fullscreen.png
rename to src/main/res/drawable-xhdpi/quick_camera_exit_fullscreen.png
diff --git a/res/drawable-xhdpi/quick_camera_front.png b/src/main/res/drawable-xhdpi/quick_camera_front.png
similarity index 100%
rename from res/drawable-xhdpi/quick_camera_front.png
rename to src/main/res/drawable-xhdpi/quick_camera_front.png
diff --git a/res/drawable-xhdpi/quick_camera_fullscreen.png b/src/main/res/drawable-xhdpi/quick_camera_fullscreen.png
similarity index 100%
rename from res/drawable-xhdpi/quick_camera_fullscreen.png
rename to src/main/res/drawable-xhdpi/quick_camera_fullscreen.png
diff --git a/res/drawable-xhdpi/quick_camera_hide.png b/src/main/res/drawable-xhdpi/quick_camera_hide.png
similarity index 100%
rename from res/drawable-xhdpi/quick_camera_hide.png
rename to src/main/res/drawable-xhdpi/quick_camera_hide.png
diff --git a/res/drawable-xhdpi/quick_camera_light.png b/src/main/res/drawable-xhdpi/quick_camera_light.png
similarity index 100%
rename from res/drawable-xhdpi/quick_camera_light.png
rename to src/main/res/drawable-xhdpi/quick_camera_light.png
diff --git a/res/drawable-xhdpi/quick_camera_rear.png b/src/main/res/drawable-xhdpi/quick_camera_rear.png
similarity index 100%
rename from res/drawable-xhdpi/quick_camera_rear.png
rename to src/main/res/drawable-xhdpi/quick_camera_rear.png
diff --git a/res/drawable-xhdpi/quick_shutter_button.png b/src/main/res/drawable-xhdpi/quick_shutter_button.png
similarity index 100%
rename from res/drawable-xhdpi/quick_shutter_button.png
rename to src/main/res/drawable-xhdpi/quick_shutter_button.png
diff --git a/res/drawable-xhdpi/slidearrow.png b/src/main/res/drawable-xhdpi/slidearrow.png
similarity index 100%
rename from res/drawable-xhdpi/slidearrow.png
rename to src/main/res/drawable-xhdpi/slidearrow.png
diff --git a/res/drawable-xxhdpi-v11/icon_notification.png b/src/main/res/drawable-xxhdpi-v11/icon_notification.png
similarity index 100%
rename from res/drawable-xxhdpi-v11/icon_notification.png
rename to src/main/res/drawable-xxhdpi-v11/icon_notification.png
diff --git a/res/drawable-xxhdpi/check.png b/src/main/res/drawable-xxhdpi/check.png
similarity index 100%
rename from res/drawable-xxhdpi/check.png
rename to src/main/res/drawable-xxhdpi/check.png
diff --git a/res/drawable-xxhdpi/divet_lower_right_dark.png b/src/main/res/drawable-xxhdpi/divet_lower_right_dark.png
similarity index 100%
rename from res/drawable-xxhdpi/divet_lower_right_dark.png
rename to src/main/res/drawable-xxhdpi/divet_lower_right_dark.png
diff --git a/res/drawable-xxhdpi/divet_lower_right_light.png b/src/main/res/drawable-xxhdpi/divet_lower_right_light.png
similarity index 100%
rename from res/drawable-xxhdpi/divet_lower_right_light.png
rename to src/main/res/drawable-xxhdpi/divet_lower_right_light.png
diff --git a/res/drawable-xxhdpi/ic_account_box_dark.png b/src/main/res/drawable-xxhdpi/ic_account_box_dark.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_account_box_dark.png
rename to src/main/res/drawable-xxhdpi/ic_account_box_dark.png
diff --git a/res/drawable-xxhdpi/ic_account_box_light.png b/src/main/res/drawable-xxhdpi/ic_account_box_light.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_account_box_light.png
rename to src/main/res/drawable-xxhdpi/ic_account_box_light.png
diff --git a/res/drawable-xxhdpi/ic_add_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_add_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_add_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_advanced_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_advanced_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_advanced_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_advanced_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_archive_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_archive_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_archive_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_archive_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_arrow_back_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_attach_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_attach_grey600_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_attach_grey600_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_attach_grey600_24dp.png
diff --git a/res/drawable-xxhdpi/ic_attach_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_attach_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_attach_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_attach_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_backspace_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_backspace_grey600_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_backspace_grey600_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_backspace_grey600_24dp.png
diff --git a/res/drawable-xxhdpi/ic_blur_on_white_24.png b/src/main/res/drawable-xxhdpi/ic_blur_on_white_24.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_blur_on_white_24.png
rename to src/main/res/drawable-xxhdpi/ic_blur_on_white_24.png
diff --git a/res/drawable-xxhdpi/ic_brightness_6_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_brightness_6_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_brightness_6_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_brightness_6_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_brush_highlight_32.webp b/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 src/main/res/drawable-xxhdpi/ic_brush_highlight_32.webp
diff --git a/res/drawable-xxhdpi/ic_brush_marker_32.webp b/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 src/main/res/drawable-xxhdpi/ic_brush_marker_32.webp
diff --git a/res/drawable-xxhdpi/ic_camera_alt_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_camera_alt_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_camera_alt_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_camera_alt_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_check_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_check_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_check_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_circle_fill_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_circle_fill_white_48dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_circle_fill_white_48dp.png
rename to src/main/res/drawable-xxhdpi/ic_circle_fill_white_48dp.png
diff --git a/res/drawable-xxhdpi/ic_clear_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_clear_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_clear_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_clear_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_close_white_18dp.webp b/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 src/main/res/drawable-xxhdpi/ic_close_white_18dp.webp
diff --git a/res/drawable-xxhdpi/ic_close_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_close_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_close_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_contact_picture.png b/src/main/res/drawable-xxhdpi/ic_contact_picture.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_contact_picture.png
rename to src/main/res/drawable-xxhdpi/ic_contact_picture.png
diff --git a/res/drawable-xxhdpi/ic_content_copy_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_content_copy_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_content_copy_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_content_copy_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_create_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_create_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_create_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_create_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_crop_32.webp b/src/main/res/drawable-xxhdpi/ic_crop_32.webp
similarity index 100%
rename from res/drawable-xxhdpi/ic_crop_32.webp
rename to src/main/res/drawable-xxhdpi/ic_crop_32.webp
diff --git a/res/drawable-xxhdpi/ic_delete_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_delete_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_delivery_status_read.png b/src/main/res/drawable-xxhdpi/ic_delivery_status_read.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_delivery_status_read.png
rename to src/main/res/drawable-xxhdpi/ic_delivery_status_read.png
diff --git a/res/drawable-xxhdpi/ic_delivery_status_sending.png b/src/main/res/drawable-xxhdpi/ic_delivery_status_sending.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_delivery_status_sending.png
rename to src/main/res/drawable-xxhdpi/ic_delivery_status_sending.png
diff --git a/res/drawable-xxhdpi/ic_delivery_status_sent.png b/src/main/res/drawable-xxhdpi/ic_delivery_status_sent.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_delivery_status_sent.png
rename to src/main/res/drawable-xxhdpi/ic_delivery_status_sent.png
diff --git a/res/drawable-xxhdpi/ic_emoji_32.webp b/src/main/res/drawable-xxhdpi/ic_emoji_32.webp
similarity index 100%
rename from res/drawable-xxhdpi/ic_emoji_32.webp
rename to src/main/res/drawable-xxhdpi/ic_emoji_32.webp
diff --git a/res/drawable-xxhdpi/ic_flip_32.webp b/src/main/res/drawable-xxhdpi/ic_flip_32.webp
similarity index 100%
rename from res/drawable-xxhdpi/ic_flip_32.webp
rename to src/main/res/drawable-xxhdpi/ic_flip_32.webp
diff --git a/res/drawable-xxhdpi/ic_forum_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_forum_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_forum_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_forum_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_forward_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_forward_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_forward_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_forward_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_group_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_group_grey600_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_group_grey600_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_group_grey600_24dp.png
diff --git a/res/drawable-xxhdpi/ic_group_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_group_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_group_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_group_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_headset_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_headset_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_headset_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_headset_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_help_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_help_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_help_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_help_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_image_dark.png b/src/main/res/drawable-xxhdpi/ic_image_dark.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_image_dark.png
rename to src/main/res/drawable-xxhdpi/ic_image_dark.png
diff --git a/res/drawable-xxhdpi/ic_image_light.png b/src/main/res/drawable-xxhdpi/ic_image_light.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_image_light.png
rename to src/main/res/drawable-xxhdpi/ic_image_light.png
diff --git a/res/drawable-xxhdpi/ic_image_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_image_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_image_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_image_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_info_outline_dark.png b/src/main/res/drawable-xxhdpi/ic_info_outline_dark.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_info_outline_dark.png
rename to src/main/res/drawable-xxhdpi/ic_info_outline_dark.png
diff --git a/res/drawable-xxhdpi/ic_info_outline_light.png b/src/main/res/drawable-xxhdpi/ic_info_outline_light.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_info_outline_light.png
rename to src/main/res/drawable-xxhdpi/ic_info_outline_light.png
diff --git a/res/drawable-xxhdpi/ic_info_outline_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_info_outline_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_info_outline_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_info_outline_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_insert_drive_file_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_insert_drive_file_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_insert_drive_file_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_insert_drive_file_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_keyboard_arrow_down_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_down_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_keyboard_arrow_down_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_keyboard_arrow_down_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_keyboard_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_keyboard_grey600_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_keyboard_grey600_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_keyboard_grey600_24dp.png
diff --git a/res/drawable-xxhdpi/ic_keyboard_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_keyboard_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_keyboard_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_keyboard_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_launch_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_launch_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_launch_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_launch_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_local_dining_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_local_dining_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_local_dining_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_local_dining_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_location_off_white_24.png b/src/main/res/drawable-xxhdpi/ic_location_off_white_24.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_location_off_white_24.png
rename to src/main/res/drawable-xxhdpi/ic_location_off_white_24.png
diff --git a/res/drawable-xxhdpi/ic_location_on_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_location_on_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_location_on_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_location_on_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_lock_white_18dp.png b/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_lock_white_18dp.png
rename to src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png
diff --git a/res/drawable-xxhdpi/ic_lock_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_lock_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_lock_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_lock_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_mic_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_mic_grey600_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_mic_grey600_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_mic_grey600_24dp.png
diff --git a/res/drawable-xxhdpi/ic_mic_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_mic_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_mic_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_mic_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_mic_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_mic_white_48dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_mic_white_48dp.png
rename to src/main/res/drawable-xxhdpi/ic_mic_white_48dp.png
diff --git a/res/drawable-xxhdpi/ic_mood_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_mood_grey600_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_mood_grey600_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_mood_grey600_24dp.png
diff --git a/res/drawable-xxhdpi/ic_mood_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_mood_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_mood_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_mood_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_movie_creation_dark.png b/src/main/res/drawable-xxhdpi/ic_movie_creation_dark.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_movie_creation_dark.png
rename to src/main/res/drawable-xxhdpi/ic_movie_creation_dark.png
diff --git a/res/drawable-xxhdpi/ic_movie_creation_light.png b/src/main/res/drawable-xxhdpi/ic_movie_creation_light.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_movie_creation_light.png
rename to src/main/res/drawable-xxhdpi/ic_movie_creation_light.png
diff --git a/res/drawable-xxhdpi/ic_notifications_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_notifications_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_notifications_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_pause_circle_fill_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_pause_circle_fill_white_48dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_pause_circle_fill_white_48dp.png
rename to src/main/res/drawable-xxhdpi/ic_pause_circle_fill_white_48dp.png
diff --git a/res/drawable-xxhdpi/ic_person_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_person_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_person_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_person_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_pets_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_pets_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_pets_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_pets_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_photo_camera_dark.png b/src/main/res/drawable-xxhdpi/ic_photo_camera_dark.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_photo_camera_dark.png
rename to src/main/res/drawable-xxhdpi/ic_photo_camera_dark.png
diff --git a/res/drawable-xxhdpi/ic_photo_camera_light.png b/src/main/res/drawable-xxhdpi/ic_photo_camera_light.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_photo_camera_light.png
rename to src/main/res/drawable-xxhdpi/ic_photo_camera_light.png
diff --git a/res/drawable-xxhdpi/ic_pin_white.png b/src/main/res/drawable-xxhdpi/ic_pin_white.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_pin_white.png
rename to src/main/res/drawable-xxhdpi/ic_pin_white.png
diff --git a/res/drawable-xxhdpi/ic_play_circle_fill_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_play_circle_fill_white_48dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_play_circle_fill_white_48dp.png
rename to src/main/res/drawable-xxhdpi/ic_play_circle_fill_white_48dp.png
diff --git a/res/drawable-xxhdpi/ic_reply.png b/src/main/res/drawable-xxhdpi/ic_reply.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_reply.png
rename to src/main/res/drawable-xxhdpi/ic_reply.png
diff --git a/res/drawable-xxhdpi/ic_reply_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_reply_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_reply_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_reply_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_reply_white_36dp.png b/src/main/res/drawable-xxhdpi/ic_reply_white_36dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_reply_white_36dp.png
rename to src/main/res/drawable-xxhdpi/ic_reply_white_36dp.png
diff --git a/res/drawable-xxhdpi/ic_rotate_32.webp b/src/main/res/drawable-xxhdpi/ic_rotate_32.webp
similarity index 100%
rename from res/drawable-xxhdpi/ic_rotate_32.webp
rename to src/main/res/drawable-xxhdpi/ic_rotate_32.webp
diff --git a/res/drawable-xxhdpi/ic_search_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_search_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_search_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_send_push.png b/src/main/res/drawable-xxhdpi/ic_send_push.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_send_push.png
rename to src/main/res/drawable-xxhdpi/ic_send_push.png
diff --git a/res/drawable-xxhdpi/ic_send_push_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_send_push_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_send_push_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_send_push_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_send_sms_insecure.png b/src/main/res/drawable-xxhdpi/ic_send_sms_insecure.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_send_sms_insecure.png
rename to src/main/res/drawable-xxhdpi/ic_send_sms_insecure.png
diff --git a/res/drawable-xxhdpi/ic_send_sms_insecure_dark.png b/src/main/res/drawable-xxhdpi/ic_send_sms_insecure_dark.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_send_sms_insecure_dark.png
rename to src/main/res/drawable-xxhdpi/ic_send_sms_insecure_dark.png
diff --git a/res/drawable-xxhdpi/ic_send_sms_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_send_sms_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_send_sms_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_send_sms_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_swap_vert_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_swap_vert_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_swap_vert_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_swap_vert_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_tag_faces_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_tag_faces_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_tag_faces_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_tag_faces_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_text_32.webp b/src/main/res/drawable-xxhdpi/ic_text_32.webp
similarity index 100%
rename from res/drawable-xxhdpi/ic_text_32.webp
rename to src/main/res/drawable-xxhdpi/ic_text_32.webp
diff --git a/res/drawable-xxhdpi/ic_trash_filled_32.webp b/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 src/main/res/drawable-xxhdpi/ic_trash_filled_32.webp
diff --git a/res/drawable-xxhdpi/ic_unarchive_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_unarchive_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_unarchive_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_unarchive_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_undo_32.webp b/src/main/res/drawable-xxhdpi/ic_undo_32.webp
similarity index 100%
rename from res/drawable-xxhdpi/ic_undo_32.webp
rename to src/main/res/drawable-xxhdpi/ic_undo_32.webp
diff --git a/res/drawable-xxhdpi/ic_unlocked_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_unlocked_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_unlocked_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_unlocked_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_unpin_white.png b/src/main/res/drawable-xxhdpi/ic_unpin_white.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_unpin_white.png
rename to src/main/res/drawable-xxhdpi/ic_unpin_white.png
diff --git a/res/drawable-xxhdpi/ic_volume_off_grey600_18dp.png b/src/main/res/drawable-xxhdpi/ic_volume_off_grey600_18dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_volume_off_grey600_18dp.png
rename to src/main/res/drawable-xxhdpi/ic_volume_off_grey600_18dp.png
diff --git a/res/drawable-xxhdpi/ic_volume_off_white_18dp.png b/src/main/res/drawable-xxhdpi/ic_volume_off_white_18dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_volume_off_white_18dp.png
rename to src/main/res/drawable-xxhdpi/ic_volume_off_white_18dp.png
diff --git a/res/drawable-xxhdpi/ic_volume_up_dark.png b/src/main/res/drawable-xxhdpi/ic_volume_up_dark.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_volume_up_dark.png
rename to src/main/res/drawable-xxhdpi/ic_volume_up_dark.png
diff --git a/res/drawable-xxhdpi/ic_volume_up_light.png b/src/main/res/drawable-xxhdpi/ic_volume_up_light.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_volume_up_light.png
rename to src/main/res/drawable-xxhdpi/ic_volume_up_light.png
diff --git a/res/drawable-xxhdpi/ic_warning_dark.png b/src/main/res/drawable-xxhdpi/ic_warning_dark.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_warning_dark.png
rename to src/main/res/drawable-xxhdpi/ic_warning_dark.png
diff --git a/res/drawable-xxhdpi/ic_warning_light.png b/src/main/res/drawable-xxhdpi/ic_warning_light.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_warning_light.png
rename to src/main/res/drawable-xxhdpi/ic_warning_light.png
diff --git a/res/drawable-xxhdpi/ic_wb_sunny_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_wb_sunny_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_wb_sunny_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_wb_sunny_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_work_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_work_white_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_work_white_24dp.png
rename to src/main/res/drawable-xxhdpi/ic_work_white_24dp.png
diff --git a/res/drawable-xxhdpi/msg_encr_out.png b/src/main/res/drawable-xxhdpi/msg_encr_out.png
similarity index 100%
rename from res/drawable-xxhdpi/msg_encr_out.png
rename to src/main/res/drawable-xxhdpi/msg_encr_out.png
diff --git a/res/drawable-xxhdpi/notification_permanent.png b/src/main/res/drawable-xxhdpi/notification_permanent.png
similarity index 100%
rename from res/drawable-xxhdpi/notification_permanent.png
rename to src/main/res/drawable-xxhdpi/notification_permanent.png
diff --git a/res/drawable-xxhdpi/quick_camera_dark.png b/src/main/res/drawable-xxhdpi/quick_camera_dark.png
similarity index 100%
rename from res/drawable-xxhdpi/quick_camera_dark.png
rename to src/main/res/drawable-xxhdpi/quick_camera_dark.png
diff --git a/res/drawable-xxhdpi/quick_camera_exit_fullscreen.png b/src/main/res/drawable-xxhdpi/quick_camera_exit_fullscreen.png
similarity index 100%
rename from res/drawable-xxhdpi/quick_camera_exit_fullscreen.png
rename to src/main/res/drawable-xxhdpi/quick_camera_exit_fullscreen.png
diff --git a/res/drawable-xxhdpi/quick_camera_front.png b/src/main/res/drawable-xxhdpi/quick_camera_front.png
similarity index 100%
rename from res/drawable-xxhdpi/quick_camera_front.png
rename to src/main/res/drawable-xxhdpi/quick_camera_front.png
diff --git a/res/drawable-xxhdpi/quick_camera_fullscreen.png b/src/main/res/drawable-xxhdpi/quick_camera_fullscreen.png
similarity index 100%
rename from res/drawable-xxhdpi/quick_camera_fullscreen.png
rename to src/main/res/drawable-xxhdpi/quick_camera_fullscreen.png
diff --git a/res/drawable-xxhdpi/quick_camera_hide.png b/src/main/res/drawable-xxhdpi/quick_camera_hide.png
similarity index 100%
rename from res/drawable-xxhdpi/quick_camera_hide.png
rename to src/main/res/drawable-xxhdpi/quick_camera_hide.png
diff --git a/res/drawable-xxhdpi/quick_camera_light.png b/src/main/res/drawable-xxhdpi/quick_camera_light.png
similarity index 100%
rename from res/drawable-xxhdpi/quick_camera_light.png
rename to src/main/res/drawable-xxhdpi/quick_camera_light.png
diff --git a/res/drawable-xxhdpi/quick_camera_rear.png b/src/main/res/drawable-xxhdpi/quick_camera_rear.png
similarity index 100%
rename from res/drawable-xxhdpi/quick_camera_rear.png
rename to src/main/res/drawable-xxhdpi/quick_camera_rear.png
diff --git a/res/drawable-xxhdpi/quick_shutter_button.png b/src/main/res/drawable-xxhdpi/quick_shutter_button.png
similarity index 100%
rename from res/drawable-xxhdpi/quick_shutter_button.png
rename to src/main/res/drawable-xxhdpi/quick_shutter_button.png
diff --git a/res/drawable-xxxhdpi/ic_advanced_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_advanced_white_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_advanced_white_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_advanced_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_archive_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_archive_white_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_archive_white_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_archive_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_arrow_back_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_arrow_back_white_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_arrow_back_white_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_arrow_back_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_blur_on_white_24.png b/src/main/res/drawable-xxxhdpi/ic_blur_on_white_24.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_blur_on_white_24.png
rename to src/main/res/drawable-xxxhdpi/ic_blur_on_white_24.png
diff --git a/res/drawable-xxxhdpi/ic_brightness_6_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_brightness_6_white_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_brightness_6_white_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_brightness_6_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_brush_highlight_32.webp b/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 src/main/res/drawable-xxxhdpi/ic_brush_highlight_32.webp
diff --git a/res/drawable-xxxhdpi/ic_brush_marker_32.webp b/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 src/main/res/drawable-xxxhdpi/ic_brush_marker_32.webp
diff --git a/res/drawable-xxxhdpi/ic_camera_alt_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_camera_alt_white_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_camera_alt_white_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_camera_alt_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_check_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_check_white_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_check_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_circle_fill_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_circle_fill_white_48dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_circle_fill_white_48dp.png
rename to src/main/res/drawable-xxxhdpi/ic_circle_fill_white_48dp.png
diff --git a/res/drawable-xxxhdpi/ic_clear_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_clear_white_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_clear_white_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_clear_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_close_white_18dp.webp b/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 src/main/res/drawable-xxxhdpi/ic_close_white_18dp.webp
diff --git a/res/drawable-xxxhdpi/ic_close_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_close_white_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_content_copy_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_content_copy_white_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_content_copy_white_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_content_copy_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_crop_32.webp b/src/main/res/drawable-xxxhdpi/ic_crop_32.webp
similarity index 100%
rename from res/drawable-xxxhdpi/ic_crop_32.webp
rename to src/main/res/drawable-xxxhdpi/ic_crop_32.webp
diff --git a/res/drawable-xxxhdpi/ic_delete_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_delete_white_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_delivery_status_read.png b/src/main/res/drawable-xxxhdpi/ic_delivery_status_read.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_delivery_status_read.png
rename to src/main/res/drawable-xxxhdpi/ic_delivery_status_read.png
diff --git a/res/drawable-xxxhdpi/ic_delivery_status_sending.png b/src/main/res/drawable-xxxhdpi/ic_delivery_status_sending.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_delivery_status_sending.png
rename to src/main/res/drawable-xxxhdpi/ic_delivery_status_sending.png
diff --git a/res/drawable-xxxhdpi/ic_delivery_status_sent.png b/src/main/res/drawable-xxxhdpi/ic_delivery_status_sent.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_delivery_status_sent.png
rename to src/main/res/drawable-xxxhdpi/ic_delivery_status_sent.png
diff --git a/res/drawable-xxxhdpi/ic_emoji_32.webp b/src/main/res/drawable-xxxhdpi/ic_emoji_32.webp
similarity index 100%
rename from res/drawable-xxxhdpi/ic_emoji_32.webp
rename to src/main/res/drawable-xxxhdpi/ic_emoji_32.webp
diff --git a/res/drawable-xxxhdpi/ic_flip_32.webp b/src/main/res/drawable-xxxhdpi/ic_flip_32.webp
similarity index 100%
rename from res/drawable-xxxhdpi/ic_flip_32.webp
rename to src/main/res/drawable-xxxhdpi/ic_flip_32.webp
diff --git a/res/drawable-xxxhdpi/ic_forum_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_forum_white_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_forum_white_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_forum_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_headset_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_headset_white_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_headset_white_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_headset_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_help_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_help_white_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_help_white_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_help_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_image_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_image_white_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_image_white_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_image_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_insert_drive_file_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_insert_drive_file_white_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_insert_drive_file_white_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_insert_drive_file_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_keyboard_arrow_down_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_down_white_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_keyboard_arrow_down_white_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_down_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_keyboard_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_keyboard_white_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_keyboard_white_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_keyboard_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_launch_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_launch_white_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_launch_white_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_launch_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_local_dining_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_local_dining_white_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_local_dining_white_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_local_dining_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_location_off_white_24.png b/src/main/res/drawable-xxxhdpi/ic_location_off_white_24.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_location_off_white_24.png
rename to src/main/res/drawable-xxxhdpi/ic_location_off_white_24.png
diff --git a/res/drawable-xxxhdpi/ic_location_on_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_location_on_white_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_location_on_white_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_location_on_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_mic_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_mic_grey600_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_mic_grey600_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_mic_grey600_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_mic_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_mic_white_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_mic_white_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_mic_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_mic_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_mic_white_48dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_mic_white_48dp.png
rename to src/main/res/drawable-xxxhdpi/ic_mic_white_48dp.png
diff --git a/res/drawable-xxxhdpi/ic_notifications_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_white_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_notifications_white_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_notifications_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_pause_circle_fill_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_pause_circle_fill_white_48dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_pause_circle_fill_white_48dp.png
rename to src/main/res/drawable-xxxhdpi/ic_pause_circle_fill_white_48dp.png
diff --git a/res/drawable-xxxhdpi/ic_person_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_person_white_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_person_white_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_person_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_pets_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_pets_white_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_pets_white_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_pets_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_photo_camera_dark.png b/src/main/res/drawable-xxxhdpi/ic_photo_camera_dark.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_photo_camera_dark.png
rename to src/main/res/drawable-xxxhdpi/ic_photo_camera_dark.png
diff --git a/res/drawable-xxxhdpi/ic_photo_camera_light.png b/src/main/res/drawable-xxxhdpi/ic_photo_camera_light.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_photo_camera_light.png
rename to src/main/res/drawable-xxxhdpi/ic_photo_camera_light.png
diff --git a/res/drawable-xxxhdpi/ic_pin_white.png b/src/main/res/drawable-xxxhdpi/ic_pin_white.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_pin_white.png
rename to src/main/res/drawable-xxxhdpi/ic_pin_white.png
diff --git a/res/drawable-xxxhdpi/ic_play_circle_fill_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_play_circle_fill_white_48dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_play_circle_fill_white_48dp.png
rename to src/main/res/drawable-xxxhdpi/ic_play_circle_fill_white_48dp.png
diff --git a/res/drawable-xxxhdpi/ic_reply_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_reply_white_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_reply_white_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_reply_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_reply_white_36dp.png b/src/main/res/drawable-xxxhdpi/ic_reply_white_36dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_reply_white_36dp.png
rename to src/main/res/drawable-xxxhdpi/ic_reply_white_36dp.png
diff --git a/res/drawable-xxxhdpi/ic_rotate_32.webp b/src/main/res/drawable-xxxhdpi/ic_rotate_32.webp
similarity index 100%
rename from res/drawable-xxxhdpi/ic_rotate_32.webp
rename to src/main/res/drawable-xxxhdpi/ic_rotate_32.webp
diff --git a/res/drawable-xxxhdpi/ic_send_push_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_send_push_white_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_send_push_white_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_send_push_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_send_sms_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_send_sms_white_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_send_sms_white_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_send_sms_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_swap_vert_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_swap_vert_white_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_swap_vert_white_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_swap_vert_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_tag_faces_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_tag_faces_white_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_tag_faces_white_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_tag_faces_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_text_32.webp b/src/main/res/drawable-xxxhdpi/ic_text_32.webp
similarity index 100%
rename from res/drawable-xxxhdpi/ic_text_32.webp
rename to src/main/res/drawable-xxxhdpi/ic_text_32.webp
diff --git a/res/drawable-xxxhdpi/ic_trash_filled_32.webp b/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 src/main/res/drawable-xxxhdpi/ic_trash_filled_32.webp
diff --git a/res/drawable-xxxhdpi/ic_unarchive_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_unarchive_white_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_unarchive_white_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_unarchive_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_undo_32.webp b/src/main/res/drawable-xxxhdpi/ic_undo_32.webp
similarity index 100%
rename from res/drawable-xxxhdpi/ic_undo_32.webp
rename to src/main/res/drawable-xxxhdpi/ic_undo_32.webp
diff --git a/res/drawable-xxxhdpi/ic_unpin_white.png b/src/main/res/drawable-xxxhdpi/ic_unpin_white.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_unpin_white.png
rename to src/main/res/drawable-xxxhdpi/ic_unpin_white.png
diff --git a/res/drawable-xxxhdpi/ic_volume_off_grey600_18dp.png b/src/main/res/drawable-xxxhdpi/ic_volume_off_grey600_18dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_volume_off_grey600_18dp.png
rename to src/main/res/drawable-xxxhdpi/ic_volume_off_grey600_18dp.png
diff --git a/res/drawable-xxxhdpi/ic_volume_off_white_18dp.png b/src/main/res/drawable-xxxhdpi/ic_volume_off_white_18dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_volume_off_white_18dp.png
rename to src/main/res/drawable-xxxhdpi/ic_volume_off_white_18dp.png
diff --git a/res/drawable-xxxhdpi/ic_wb_sunny_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_wb_sunny_white_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_wb_sunny_white_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_wb_sunny_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_work_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_work_white_24dp.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_work_white_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_work_white_24dp.png
diff --git a/res/drawable/archived_indicator_background.xml b/src/main/res/drawable/archived_indicator_background.xml
similarity index 100%
rename from res/drawable/archived_indicator_background.xml
rename to src/main/res/drawable/archived_indicator_background.xml
diff --git a/res/drawable/attachment_selector_shadow.xml b/src/main/res/drawable/attachment_selector_shadow.xml
similarity index 100%
rename from res/drawable/attachment_selector_shadow.xml
rename to src/main/res/drawable/attachment_selector_shadow.xml
diff --git a/res/drawable/background_hd.jpg b/src/main/res/drawable/background_hd.jpg
similarity index 100%
rename from res/drawable/background_hd.jpg
rename to src/main/res/drawable/background_hd.jpg
diff --git a/res/drawable/badge_divider.xml b/src/main/res/drawable/badge_divider.xml
similarity index 100%
rename from res/drawable/badge_divider.xml
rename to src/main/res/drawable/badge_divider.xml
diff --git a/res/drawable/baseline_qr_code_24.xml b/src/main/res/drawable/baseline_qr_code_24.xml
similarity index 100%
rename from res/drawable/baseline_qr_code_24.xml
rename to src/main/res/drawable/baseline_qr_code_24.xml
diff --git a/res/drawable/button_bg.xml b/src/main/res/drawable/button_bg.xml
similarity index 100%
rename from res/drawable/button_bg.xml
rename to src/main/res/drawable/button_bg.xml
diff --git a/res/drawable/button_bg_blue.xml b/src/main/res/drawable/button_bg_blue.xml
similarity index 100%
rename from res/drawable/button_bg_blue.xml
rename to src/main/res/drawable/button_bg_blue.xml
diff --git a/res/drawable/button_bg_gray.xml b/src/main/res/drawable/button_bg_gray.xml
similarity index 100%
rename from res/drawable/button_bg_gray.xml
rename to src/main/res/drawable/button_bg_gray.xml
diff --git a/res/drawable/button_bg_green.xml b/src/main/res/drawable/button_bg_green.xml
similarity index 100%
rename from res/drawable/button_bg_green.xml
rename to src/main/res/drawable/button_bg_green.xml
diff --git a/res/drawable/button_bg_pink.xml b/src/main/res/drawable/button_bg_pink.xml
similarity index 100%
rename from res/drawable/button_bg_pink.xml
rename to src/main/res/drawable/button_bg_pink.xml
diff --git a/res/drawable/button_bg_purple.xml b/src/main/res/drawable/button_bg_purple.xml
similarity index 100%
rename from res/drawable/button_bg_purple.xml
rename to src/main/res/drawable/button_bg_purple.xml
diff --git a/res/drawable/button_bg_red.xml b/src/main/res/drawable/button_bg_red.xml
similarity index 100%
rename from res/drawable/button_bg_red.xml
rename to src/main/res/drawable/button_bg_red.xml
diff --git a/res/drawable/button_secondary_background.xml b/src/main/res/drawable/button_secondary_background.xml
similarity index 100%
rename from res/drawable/button_secondary_background.xml
rename to src/main/res/drawable/button_secondary_background.xml
diff --git a/res/drawable/circle_alpha.xml b/src/main/res/drawable/circle_alpha.xml
similarity index 100%
rename from res/drawable/circle_alpha.xml
rename to src/main/res/drawable/circle_alpha.xml
diff --git a/res/drawable/circle_tintable.xml b/src/main/res/drawable/circle_tintable.xml
similarity index 100%
rename from res/drawable/circle_tintable.xml
rename to src/main/res/drawable/circle_tintable.xml
diff --git a/res/drawable/circle_touch_highlight_background.xml b/src/main/res/drawable/circle_touch_highlight_background.xml
similarity index 100%
rename from res/drawable/circle_touch_highlight_background.xml
rename to src/main/res/drawable/circle_touch_highlight_background.xml
diff --git a/res/drawable/circle_universal_overlay.xml b/src/main/res/drawable/circle_universal_overlay.xml
similarity index 100%
rename from res/drawable/circle_universal_overlay.xml
rename to src/main/res/drawable/circle_universal_overlay.xml
diff --git a/res/drawable/circle_white.xml b/src/main/res/drawable/circle_white.xml
similarity index 100%
rename from res/drawable/circle_white.xml
rename to src/main/res/drawable/circle_white.xml
diff --git a/res/drawable/clickable_card_dark.xml b/src/main/res/drawable/clickable_card_dark.xml
similarity index 100%
rename from res/drawable/clickable_card_dark.xml
rename to src/main/res/drawable/clickable_card_dark.xml
diff --git a/res/drawable/clickable_card_light.xml b/src/main/res/drawable/clickable_card_light.xml
similarity index 100%
rename from res/drawable/clickable_card_light.xml
rename to src/main/res/drawable/clickable_card_light.xml
diff --git a/res/drawable/compose_background_dark.xml b/src/main/res/drawable/compose_background_dark.xml
similarity index 100%
rename from res/drawable/compose_background_dark.xml
rename to src/main/res/drawable/compose_background_dark.xml
diff --git a/res/drawable/compose_background_light.xml b/src/main/res/drawable/compose_background_light.xml
similarity index 100%
rename from res/drawable/compose_background_light.xml
rename to src/main/res/drawable/compose_background_light.xml
diff --git a/res/drawable/compose_divider_background.xml b/src/main/res/drawable/compose_divider_background.xml
similarity index 100%
rename from res/drawable/compose_divider_background.xml
rename to src/main/res/drawable/compose_divider_background.xml
diff --git a/res/drawable/contact_list_divider_dark.xml b/src/main/res/drawable/contact_list_divider_dark.xml
similarity index 100%
rename from res/drawable/contact_list_divider_dark.xml
rename to src/main/res/drawable/contact_list_divider_dark.xml
diff --git a/res/drawable/contact_list_divider_light.xml b/src/main/res/drawable/contact_list_divider_light.xml
similarity index 100%
rename from res/drawable/contact_list_divider_light.xml
rename to src/main/res/drawable/contact_list_divider_light.xml
diff --git a/res/drawable/contact_photo_background.xml b/src/main/res/drawable/contact_photo_background.xml
similarity index 100%
rename from res/drawable/contact_photo_background.xml
rename to src/main/res/drawable/contact_photo_background.xml
diff --git a/res/drawable/conversation_attachment_close_circle.xml b/src/main/res/drawable/conversation_attachment_close_circle.xml
similarity index 100%
rename from res/drawable/conversation_attachment_close_circle.xml
rename to src/main/res/drawable/conversation_attachment_close_circle.xml
diff --git a/res/drawable/conversation_attachment_edit.xml b/src/main/res/drawable/conversation_attachment_edit.xml
similarity index 100%
rename from res/drawable/conversation_attachment_edit.xml
rename to src/main/res/drawable/conversation_attachment_edit.xml
diff --git a/res/drawable/conversation_item_background.xml b/src/main/res/drawable/conversation_item_background.xml
similarity index 100%
rename from res/drawable/conversation_item_background.xml
rename to src/main/res/drawable/conversation_item_background.xml
diff --git a/res/drawable/conversation_item_background_animated.xml b/src/main/res/drawable/conversation_item_background_animated.xml
similarity index 100%
rename from res/drawable/conversation_item_background_animated.xml
rename to src/main/res/drawable/conversation_item_background_animated.xml
diff --git a/res/drawable/conversation_item_background_animated_blue.xml b/src/main/res/drawable/conversation_item_background_animated_blue.xml
similarity index 100%
rename from res/drawable/conversation_item_background_animated_blue.xml
rename to src/main/res/drawable/conversation_item_background_animated_blue.xml
diff --git a/res/drawable/conversation_item_background_animated_gray.xml b/src/main/res/drawable/conversation_item_background_animated_gray.xml
similarity index 100%
rename from res/drawable/conversation_item_background_animated_gray.xml
rename to src/main/res/drawable/conversation_item_background_animated_gray.xml
diff --git a/res/drawable/conversation_item_background_animated_green.xml b/src/main/res/drawable/conversation_item_background_animated_green.xml
similarity index 100%
rename from res/drawable/conversation_item_background_animated_green.xml
rename to src/main/res/drawable/conversation_item_background_animated_green.xml
diff --git a/res/drawable/conversation_item_background_animated_pink.xml b/src/main/res/drawable/conversation_item_background_animated_pink.xml
similarity index 100%
rename from res/drawable/conversation_item_background_animated_pink.xml
rename to src/main/res/drawable/conversation_item_background_animated_pink.xml
diff --git a/res/drawable/conversation_item_background_animated_purple.xml b/src/main/res/drawable/conversation_item_background_animated_purple.xml
similarity index 100%
rename from res/drawable/conversation_item_background_animated_purple.xml
rename to src/main/res/drawable/conversation_item_background_animated_purple.xml
diff --git a/res/drawable/conversation_item_background_animated_red.xml b/src/main/res/drawable/conversation_item_background_animated_red.xml
similarity index 100%
rename from res/drawable/conversation_item_background_animated_red.xml
rename to src/main/res/drawable/conversation_item_background_animated_red.xml
diff --git a/res/drawable/conversation_item_background_blue.xml b/src/main/res/drawable/conversation_item_background_blue.xml
similarity index 100%
rename from res/drawable/conversation_item_background_blue.xml
rename to src/main/res/drawable/conversation_item_background_blue.xml
diff --git a/res/drawable/conversation_item_background_gray.xml b/src/main/res/drawable/conversation_item_background_gray.xml
similarity index 100%
rename from res/drawable/conversation_item_background_gray.xml
rename to src/main/res/drawable/conversation_item_background_gray.xml
diff --git a/res/drawable/conversation_item_background_green.xml b/src/main/res/drawable/conversation_item_background_green.xml
similarity index 100%
rename from res/drawable/conversation_item_background_green.xml
rename to src/main/res/drawable/conversation_item_background_green.xml
diff --git a/res/drawable/conversation_item_background_pink.xml b/src/main/res/drawable/conversation_item_background_pink.xml
similarity index 100%
rename from res/drawable/conversation_item_background_pink.xml
rename to src/main/res/drawable/conversation_item_background_pink.xml
diff --git a/res/drawable/conversation_item_background_purple.xml b/src/main/res/drawable/conversation_item_background_purple.xml
similarity index 100%
rename from res/drawable/conversation_item_background_purple.xml
rename to src/main/res/drawable/conversation_item_background_purple.xml
diff --git a/res/drawable/conversation_item_background_red.xml b/src/main/res/drawable/conversation_item_background_red.xml
similarity index 100%
rename from res/drawable/conversation_item_background_red.xml
rename to src/main/res/drawable/conversation_item_background_red.xml
diff --git a/res/drawable/conversation_item_sent_indicator_text_shape.xml b/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 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/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 src/main/res/drawable/conversation_item_sent_indicator_text_shape_dark.xml
diff --git a/res/drawable/conversation_item_update_background.xml b/src/main/res/drawable/conversation_item_update_background.xml
similarity index 100%
rename from res/drawable/conversation_item_update_background.xml
rename to src/main/res/drawable/conversation_item_update_background.xml
diff --git a/res/drawable/conversation_list_divider_shape.xml b/src/main/res/drawable/conversation_list_divider_shape.xml
similarity index 100%
rename from res/drawable/conversation_list_divider_shape.xml
rename to src/main/res/drawable/conversation_list_divider_shape.xml
diff --git a/res/drawable/conversation_list_divider_shape_dark.xml b/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 src/main/res/drawable/conversation_list_divider_shape_dark.xml
diff --git a/res/drawable/conversation_list_item_background.xml b/src/main/res/drawable/conversation_list_item_background.xml
similarity index 100%
rename from res/drawable/conversation_list_item_background.xml
rename to src/main/res/drawable/conversation_list_item_background.xml
diff --git a/res/drawable/conversation_list_item_background_blue.xml b/src/main/res/drawable/conversation_list_item_background_blue.xml
similarity index 100%
rename from res/drawable/conversation_list_item_background_blue.xml
rename to src/main/res/drawable/conversation_list_item_background_blue.xml
diff --git a/res/drawable/conversation_list_item_background_gray.xml b/src/main/res/drawable/conversation_list_item_background_gray.xml
similarity index 100%
rename from res/drawable/conversation_list_item_background_gray.xml
rename to src/main/res/drawable/conversation_list_item_background_gray.xml
diff --git a/res/drawable/conversation_list_item_background_green.xml b/src/main/res/drawable/conversation_list_item_background_green.xml
similarity index 100%
rename from res/drawable/conversation_list_item_background_green.xml
rename to src/main/res/drawable/conversation_list_item_background_green.xml
diff --git a/res/drawable/conversation_list_item_background_pink.xml b/src/main/res/drawable/conversation_list_item_background_pink.xml
similarity index 100%
rename from res/drawable/conversation_list_item_background_pink.xml
rename to src/main/res/drawable/conversation_list_item_background_pink.xml
diff --git a/res/drawable/conversation_list_item_background_purple.xml b/src/main/res/drawable/conversation_list_item_background_purple.xml
similarity index 100%
rename from res/drawable/conversation_list_item_background_purple.xml
rename to src/main/res/drawable/conversation_list_item_background_purple.xml
diff --git a/res/drawable/conversation_list_item_background_red.xml b/src/main/res/drawable/conversation_list_item_background_red.xml
similarity index 100%
rename from res/drawable/conversation_list_item_background_red.xml
rename to src/main/res/drawable/conversation_list_item_background_red.xml
diff --git a/res/drawable/dismiss_background.xml b/src/main/res/drawable/dismiss_background.xml
similarity index 100%
rename from res/drawable/dismiss_background.xml
rename to src/main/res/drawable/dismiss_background.xml
diff --git a/res/drawable/emoji_variation_selector_background_dark.xml b/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 src/main/res/drawable/emoji_variation_selector_background_dark.xml
diff --git a/res/drawable/emoji_variation_selector_background_light.xml b/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 src/main/res/drawable/emoji_variation_selector_background_light.xml
diff --git a/res/drawable/floating_mini_bg_dark.xml b/src/main/res/drawable/floating_mini_bg_dark.xml
similarity index 100%
rename from res/drawable/floating_mini_bg_dark.xml
rename to src/main/res/drawable/floating_mini_bg_dark.xml
diff --git a/res/drawable/floating_mini_bg_light.xml b/src/main/res/drawable/floating_mini_bg_light.xml
similarity index 100%
rename from res/drawable/floating_mini_bg_light.xml
rename to src/main/res/drawable/floating_mini_bg_light.xml
diff --git a/res/drawable/ic_advanced_24dp.xml b/src/main/res/drawable/ic_advanced_24dp.xml
similarity index 100%
rename from res/drawable/ic_advanced_24dp.xml
rename to src/main/res/drawable/ic_advanced_24dp.xml
diff --git a/res/drawable/ic_alternate_email_24.xml b/src/main/res/drawable/ic_alternate_email_24.xml
similarity index 100%
rename from res/drawable/ic_alternate_email_24.xml
rename to src/main/res/drawable/ic_alternate_email_24.xml
diff --git a/res/drawable/ic_baseline_devices_24.xml b/src/main/res/drawable/ic_baseline_devices_24.xml
similarity index 100%
rename from res/drawable/ic_baseline_devices_24.xml
rename to src/main/res/drawable/ic_baseline_devices_24.xml
diff --git a/res/drawable/ic_blur_on_white_24.png b/src/main/res/drawable/ic_blur_on_white_24.png
similarity index 100%
rename from res/drawable/ic_blur_on_white_24.png
rename to src/main/res/drawable/ic_blur_on_white_24.png
diff --git a/res/drawable/ic_brightness_6_24dp.xml b/src/main/res/drawable/ic_brightness_6_24dp.xml
similarity index 100%
rename from res/drawable/ic_brightness_6_24dp.xml
rename to src/main/res/drawable/ic_brightness_6_24dp.xml
diff --git a/res/drawable/ic_check_outline_22.xml b/src/main/res/drawable/ic_check_outline_22.xml
similarity index 100%
rename from res/drawable/ic_check_outline_22.xml
rename to src/main/res/drawable/ic_check_outline_22.xml
diff --git a/res/drawable/ic_chevron_up.xml b/src/main/res/drawable/ic_chevron_up.xml
similarity index 100%
rename from res/drawable/ic_chevron_up.xml
rename to src/main/res/drawable/ic_chevron_up.xml
diff --git a/res/drawable/ic_circle_checkbox.xml b/src/main/res/drawable/ic_circle_checkbox.xml
similarity index 100%
rename from res/drawable/ic_circle_checkbox.xml
rename to src/main/res/drawable/ic_circle_checkbox.xml
diff --git a/res/drawable/ic_circle_checkbox_blue.xml b/src/main/res/drawable/ic_circle_checkbox_blue.xml
similarity index 100%
rename from res/drawable/ic_circle_checkbox_blue.xml
rename to src/main/res/drawable/ic_circle_checkbox_blue.xml
diff --git a/res/drawable/ic_circle_checkbox_gray.xml b/src/main/res/drawable/ic_circle_checkbox_gray.xml
similarity index 100%
rename from res/drawable/ic_circle_checkbox_gray.xml
rename to src/main/res/drawable/ic_circle_checkbox_gray.xml
diff --git a/res/drawable/ic_circle_checkbox_green.xml b/src/main/res/drawable/ic_circle_checkbox_green.xml
similarity index 100%
rename from res/drawable/ic_circle_checkbox_green.xml
rename to src/main/res/drawable/ic_circle_checkbox_green.xml
diff --git a/res/drawable/ic_circle_checkbox_pink.xml b/src/main/res/drawable/ic_circle_checkbox_pink.xml
similarity index 100%
rename from res/drawable/ic_circle_checkbox_pink.xml
rename to src/main/res/drawable/ic_circle_checkbox_pink.xml
diff --git a/res/drawable/ic_circle_checkbox_purple.xml b/src/main/res/drawable/ic_circle_checkbox_purple.xml
similarity index 100%
rename from res/drawable/ic_circle_checkbox_purple.xml
rename to src/main/res/drawable/ic_circle_checkbox_purple.xml
diff --git a/res/drawable/ic_circle_checkbox_red.xml b/src/main/res/drawable/ic_circle_checkbox_red.xml
similarity index 100%
rename from res/drawable/ic_circle_checkbox_red.xml
rename to src/main/res/drawable/ic_circle_checkbox_red.xml
diff --git a/res/drawable/ic_circle_status_online.xml b/src/main/res/drawable/ic_circle_status_online.xml
similarity index 100%
rename from res/drawable/ic_circle_status_online.xml
rename to src/main/res/drawable/ic_circle_status_online.xml
diff --git a/res/drawable/ic_delivery_status_failed.xml b/src/main/res/drawable/ic_delivery_status_failed.xml
similarity index 100%
rename from res/drawable/ic_delivery_status_failed.xml
rename to src/main/res/drawable/ic_delivery_status_failed.xml
diff --git a/res/drawable/ic_emoji_activity_dark_20.xml b/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 src/main/res/drawable/ic_emoji_activity_dark_20.xml
diff --git a/res/drawable/ic_emoji_activity_light_20.xml b/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 src/main/res/drawable/ic_emoji_activity_light_20.xml
diff --git a/res/drawable/ic_emoji_animal_dark_20.xml b/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 src/main/res/drawable/ic_emoji_animal_dark_20.xml
diff --git a/res/drawable/ic_emoji_animal_light_20.xml b/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 src/main/res/drawable/ic_emoji_animal_light_20.xml
diff --git a/res/drawable/ic_emoji_emoticon_dark_20.xml b/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 src/main/res/drawable/ic_emoji_emoticon_dark_20.xml
diff --git a/res/drawable/ic_emoji_emoticon_light_20.xml b/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 src/main/res/drawable/ic_emoji_emoticon_light_20.xml
diff --git a/res/drawable/ic_emoji_filled.xml b/src/main/res/drawable/ic_emoji_filled.xml
similarity index 100%
rename from res/drawable/ic_emoji_filled.xml
rename to src/main/res/drawable/ic_emoji_filled.xml
diff --git a/res/drawable/ic_emoji_flag_dark_20.xml b/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 src/main/res/drawable/ic_emoji_flag_dark_20.xml
diff --git a/res/drawable/ic_emoji_flag_light_20.xml b/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 src/main/res/drawable/ic_emoji_flag_light_20.xml
diff --git a/res/drawable/ic_emoji_food_dark_20.xml b/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 src/main/res/drawable/ic_emoji_food_dark_20.xml
diff --git a/res/drawable/ic_emoji_food_light_20.xml b/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 src/main/res/drawable/ic_emoji_food_light_20.xml
diff --git a/res/drawable/ic_emoji_object_dark_20.xml b/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 src/main/res/drawable/ic_emoji_object_dark_20.xml
diff --git a/res/drawable/ic_emoji_object_light_20.xml b/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 src/main/res/drawable/ic_emoji_object_light_20.xml
diff --git a/res/drawable/ic_emoji_outline.xml b/src/main/res/drawable/ic_emoji_outline.xml
similarity index 100%
rename from res/drawable/ic_emoji_outline.xml
rename to src/main/res/drawable/ic_emoji_outline.xml
diff --git a/res/drawable/ic_emoji_people_dark_20.xml b/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 src/main/res/drawable/ic_emoji_people_dark_20.xml
diff --git a/res/drawable/ic_emoji_people_light_20.xml b/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 src/main/res/drawable/ic_emoji_people_light_20.xml
diff --git a/res/drawable/ic_emoji_symbol_dark_20.xml b/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 src/main/res/drawable/ic_emoji_symbol_dark_20.xml
diff --git a/res/drawable/ic_emoji_symbol_light_20.xml b/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 src/main/res/drawable/ic_emoji_symbol_light_20.xml
diff --git a/res/drawable/ic_emoji_travel_dark_20.xml b/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 src/main/res/drawable/ic_emoji_travel_dark_20.xml
diff --git a/res/drawable/ic_emoji_travel_light_20.xml b/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 src/main/res/drawable/ic_emoji_travel_light_20.xml
diff --git a/res/drawable/ic_forum_24dp.xml b/src/main/res/drawable/ic_forum_24dp.xml
similarity index 100%
rename from res/drawable/ic_forum_24dp.xml
rename to src/main/res/drawable/ic_forum_24dp.xml
diff --git a/res/drawable/ic_help_24dp.xml b/src/main/res/drawable/ic_help_24dp.xml
similarity index 100%
rename from res/drawable/ic_help_24dp.xml
rename to src/main/res/drawable/ic_help_24dp.xml
diff --git a/res/drawable/ic_lock.xml b/src/main/res/drawable/ic_lock.xml
similarity index 100%
rename from res/drawable/ic_lock.xml
rename to src/main/res/drawable/ic_lock.xml
diff --git a/res/drawable/ic_lock_24dp.xml b/src/main/res/drawable/ic_lock_24dp.xml
similarity index 100%
rename from res/drawable/ic_lock_24dp.xml
rename to src/main/res/drawable/ic_lock_24dp.xml
diff --git a/res/drawable/ic_map_white_24dp.xml b/src/main/res/drawable/ic_map_white_24dp.xml
similarity index 100%
rename from res/drawable/ic_map_white_24dp.xml
rename to src/main/res/drawable/ic_map_white_24dp.xml
diff --git a/res/drawable/ic_notifications_24dp.xml b/src/main/res/drawable/ic_notifications_24dp.xml
similarity index 100%
rename from res/drawable/ic_notifications_24dp.xml
rename to src/main/res/drawable/ic_notifications_24dp.xml
diff --git a/res/drawable/ic_person_large.xml b/src/main/res/drawable/ic_person_large.xml
similarity index 100%
rename from res/drawable/ic_person_large.xml
rename to src/main/res/drawable/ic_person_large.xml
diff --git a/res/drawable/ic_recent_dark_20.xml b/src/main/res/drawable/ic_recent_dark_20.xml
similarity index 100%
rename from res/drawable/ic_recent_dark_20.xml
rename to src/main/res/drawable/ic_recent_dark_20.xml
diff --git a/res/drawable/ic_recent_light_20.xml b/src/main/res/drawable/ic_recent_light_20.xml
similarity index 100%
rename from res/drawable/ic_recent_light_20.xml
rename to src/main/res/drawable/ic_recent_light_20.xml
diff --git a/res/drawable/ic_share_white_24dp.xml b/src/main/res/drawable/ic_share_white_24dp.xml
similarity index 100%
rename from res/drawable/ic_share_white_24dp.xml
rename to src/main/res/drawable/ic_share_white_24dp.xml
diff --git a/res/drawable/ic_swap_vert_24dp.xml b/src/main/res/drawable/ic_swap_vert_24dp.xml
similarity index 100%
rename from res/drawable/ic_swap_vert_24dp.xml
rename to src/main/res/drawable/ic_swap_vert_24dp.xml
diff --git a/res/drawable/ic_timer_gray_18dp.xml b/src/main/res/drawable/ic_timer_gray_18dp.xml
similarity index 100%
rename from res/drawable/ic_timer_gray_18dp.xml
rename to src/main/res/drawable/ic_timer_gray_18dp.xml
diff --git a/res/drawable/ic_verified.xml b/src/main/res/drawable/ic_verified.xml
similarity index 100%
rename from res/drawable/ic_verified.xml
rename to src/main/res/drawable/ic_verified.xml
diff --git a/res/drawable/ic_verified_broken.xml b/src/main/res/drawable/ic_verified_broken.xml
similarity index 100%
rename from res/drawable/ic_verified_broken.xml
rename to src/main/res/drawable/ic_verified_broken.xml
diff --git a/res/drawable/ic_videocam_white_24dp.xml b/src/main/res/drawable/ic_videocam_white_24dp.xml
similarity index 100%
rename from res/drawable/ic_videocam_white_24dp.xml
rename to src/main/res/drawable/ic_videocam_white_24dp.xml
diff --git a/res/drawable/image_shade.xml b/src/main/res/drawable/image_shade.xml
similarity index 100%
rename from res/drawable/image_shade.xml
rename to src/main/res/drawable/image_shade.xml
diff --git a/res/drawable/import_export_item_background_dark.xml b/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 src/main/res/drawable/import_export_item_background_dark.xml
diff --git a/res/drawable/import_export_item_background_light.xml b/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 src/main/res/drawable/import_export_item_background_light.xml
diff --git a/res/drawable/intro1.png b/src/main/res/drawable/intro1.png
similarity index 100%
rename from res/drawable/intro1.png
rename to src/main/res/drawable/intro1.png
diff --git a/res/drawable/media_keyboard_selected_background_dark.xml b/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 src/main/res/drawable/media_keyboard_selected_background_dark.xml
diff --git a/res/drawable/media_keyboard_selected_background_light.xml b/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 src/main/res/drawable/media_keyboard_selected_background_light.xml
diff --git a/res/drawable/message_bubble_background_received_alone.xml b/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 src/main/res/drawable/message_bubble_background_received_alone.xml
diff --git a/res/drawable/message_bubble_background_sent_alone.xml b/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 src/main/res/drawable/message_bubble_background_sent_alone.xml
diff --git a/res/drawable/pause_icon.xml b/src/main/res/drawable/pause_icon.xml
similarity index 100%
rename from res/drawable/pause_icon.xml
rename to src/main/res/drawable/pause_icon.xml
diff --git a/res/drawable/pause_to_play_animation.xml b/src/main/res/drawable/pause_to_play_animation.xml
similarity index 100%
rename from res/drawable/pause_to_play_animation.xml
rename to src/main/res/drawable/pause_to_play_animation.xml
diff --git a/res/drawable/pinned_list_item_background.xml b/src/main/res/drawable/pinned_list_item_background.xml
similarity index 100%
rename from res/drawable/pinned_list_item_background.xml
rename to src/main/res/drawable/pinned_list_item_background.xml
diff --git a/res/drawable/pinned_list_item_background_blue.xml b/src/main/res/drawable/pinned_list_item_background_blue.xml
similarity index 100%
rename from res/drawable/pinned_list_item_background_blue.xml
rename to src/main/res/drawable/pinned_list_item_background_blue.xml
diff --git a/res/drawable/pinned_list_item_background_gray.xml b/src/main/res/drawable/pinned_list_item_background_gray.xml
similarity index 100%
rename from res/drawable/pinned_list_item_background_gray.xml
rename to src/main/res/drawable/pinned_list_item_background_gray.xml
diff --git a/res/drawable/pinned_list_item_background_green.xml b/src/main/res/drawable/pinned_list_item_background_green.xml
similarity index 100%
rename from res/drawable/pinned_list_item_background_green.xml
rename to src/main/res/drawable/pinned_list_item_background_green.xml
diff --git a/res/drawable/pinned_list_item_background_pink.xml b/src/main/res/drawable/pinned_list_item_background_pink.xml
similarity index 100%
rename from res/drawable/pinned_list_item_background_pink.xml
rename to src/main/res/drawable/pinned_list_item_background_pink.xml
diff --git a/res/drawable/pinned_list_item_background_purple.xml b/src/main/res/drawable/pinned_list_item_background_purple.xml
similarity index 100%
rename from res/drawable/pinned_list_item_background_purple.xml
rename to src/main/res/drawable/pinned_list_item_background_purple.xml
diff --git a/res/drawable/pinned_list_item_background_red.xml b/src/main/res/drawable/pinned_list_item_background_red.xml
similarity index 100%
rename from res/drawable/pinned_list_item_background_red.xml
rename to src/main/res/drawable/pinned_list_item_background_red.xml
diff --git a/res/drawable/play_icon.xml b/src/main/res/drawable/play_icon.xml
similarity index 100%
rename from res/drawable/play_icon.xml
rename to src/main/res/drawable/play_icon.xml
diff --git a/res/drawable/play_to_pause_animation.xml b/src/main/res/drawable/play_to_pause_animation.xml
similarity index 100%
rename from res/drawable/play_to_pause_animation.xml
rename to src/main/res/drawable/play_to_pause_animation.xml
diff --git a/res/drawable/quick_camera_shutter_ring.xml b/src/main/res/drawable/quick_camera_shutter_ring.xml
similarity index 100%
rename from res/drawable/quick_camera_shutter_ring.xml
rename to src/main/res/drawable/quick_camera_shutter_ring.xml
diff --git a/res/drawable/reaction_pill_background.xml b/src/main/res/drawable/reaction_pill_background.xml
similarity index 100%
rename from res/drawable/reaction_pill_background.xml
rename to src/main/res/drawable/reaction_pill_background.xml
diff --git a/res/drawable/reaction_pill_background_selected.xml b/src/main/res/drawable/reaction_pill_background_selected.xml
similarity index 100%
rename from res/drawable/reaction_pill_background_selected.xml
rename to src/main/res/drawable/reaction_pill_background_selected.xml
diff --git a/res/drawable/recording_lock_background_dark.xml b/src/main/res/drawable/recording_lock_background_dark.xml
similarity index 100%
rename from res/drawable/recording_lock_background_dark.xml
rename to src/main/res/drawable/recording_lock_background_dark.xml
diff --git a/res/drawable/recording_lock_background_light.xml b/src/main/res/drawable/recording_lock_background_light.xml
similarity index 100%
rename from res/drawable/recording_lock_background_light.xml
rename to src/main/res/drawable/recording_lock_background_light.xml
diff --git a/res/drawable/search_toolbar_shadow.xml b/src/main/res/drawable/search_toolbar_shadow.xml
similarity index 100%
rename from res/drawable/search_toolbar_shadow.xml
rename to src/main/res/drawable/search_toolbar_shadow.xml
diff --git a/res/drawable/send_button_bg.xml b/src/main/res/drawable/send_button_bg.xml
similarity index 100%
rename from res/drawable/send_button_bg.xml
rename to src/main/res/drawable/send_button_bg.xml
diff --git a/res/drawable/send_button_bg_blue.xml b/src/main/res/drawable/send_button_bg_blue.xml
similarity index 100%
rename from res/drawable/send_button_bg_blue.xml
rename to src/main/res/drawable/send_button_bg_blue.xml
diff --git a/res/drawable/send_button_bg_gray.xml b/src/main/res/drawable/send_button_bg_gray.xml
similarity index 100%
rename from res/drawable/send_button_bg_gray.xml
rename to src/main/res/drawable/send_button_bg_gray.xml
diff --git a/res/drawable/send_button_bg_green.xml b/src/main/res/drawable/send_button_bg_green.xml
similarity index 100%
rename from res/drawable/send_button_bg_green.xml
rename to src/main/res/drawable/send_button_bg_green.xml
diff --git a/res/drawable/send_button_bg_pink.xml b/src/main/res/drawable/send_button_bg_pink.xml
similarity index 100%
rename from res/drawable/send_button_bg_pink.xml
rename to src/main/res/drawable/send_button_bg_pink.xml
diff --git a/res/drawable/send_button_bg_purple.xml b/src/main/res/drawable/send_button_bg_purple.xml
similarity index 100%
rename from res/drawable/send_button_bg_purple.xml
rename to src/main/res/drawable/send_button_bg_purple.xml
diff --git a/res/drawable/send_button_bg_red.xml b/src/main/res/drawable/send_button_bg_red.xml
similarity index 100%
rename from res/drawable/send_button_bg_red.xml
rename to src/main/res/drawable/send_button_bg_red.xml
diff --git a/res/drawable/sticker_missing_background.xml b/src/main/res/drawable/sticker_missing_background.xml
similarity index 100%
rename from res/drawable/sticker_missing_background.xml
rename to src/main/res/drawable/sticker_missing_background.xml
diff --git a/res/drawable/sticky_date_header_background_dark.xml b/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 src/main/res/drawable/sticky_date_header_background_dark.xml
diff --git a/res/drawable/sticky_date_header_background_light.xml b/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 src/main/res/drawable/sticky_date_header_background_light.xml
diff --git a/res/drawable/touch_highlight_background.xml b/src/main/res/drawable/touch_highlight_background.xml
similarity index 100%
rename from res/drawable/touch_highlight_background.xml
rename to src/main/res/drawable/touch_highlight_background.xml
diff --git a/res/drawable/triangle_bottom_right_corner.xml b/src/main/res/drawable/triangle_bottom_right_corner.xml
similarity index 100%
rename from res/drawable/triangle_bottom_right_corner.xml
rename to src/main/res/drawable/triangle_bottom_right_corner.xml
diff --git a/res/drawable/triangle_right.xml b/src/main/res/drawable/triangle_right.xml
similarity index 100%
rename from res/drawable/triangle_right.xml
rename to src/main/res/drawable/triangle_right.xml
diff --git a/res/layout-v16/video_player.xml b/src/main/res/layout-v16/video_player.xml
similarity index 100%
rename from res/layout-v16/video_player.xml
rename to src/main/res/layout-v16/video_player.xml
diff --git a/res/layout/account_selection_list_fragment.xml b/src/main/res/layout/account_selection_list_fragment.xml
similarity index 100%
rename from res/layout/account_selection_list_fragment.xml
rename to src/main/res/layout/account_selection_list_fragment.xml
diff --git a/res/layout/account_selection_list_item.xml b/src/main/res/layout/account_selection_list_item.xml
similarity index 100%
rename from res/layout/account_selection_list_item.xml
rename to src/main/res/layout/account_selection_list_item.xml
diff --git a/res/layout/activity_qr.xml b/src/main/res/layout/activity_qr.xml
similarity index 100%
rename from res/layout/activity_qr.xml
rename to src/main/res/layout/activity_qr.xml
diff --git a/res/layout/activity_qr_show.xml b/src/main/res/layout/activity_qr_show.xml
similarity index 100%
rename from res/layout/activity_qr_show.xml
rename to src/main/res/layout/activity_qr_show.xml
diff --git a/res/layout/activity_registration_2nd_device_qr.xml b/src/main/res/layout/activity_registration_2nd_device_qr.xml
similarity index 100%
rename from res/layout/activity_registration_2nd_device_qr.xml
rename to src/main/res/layout/activity_registration_2nd_device_qr.xml
diff --git a/res/layout/activity_registration_qr.xml b/src/main/res/layout/activity_registration_qr.xml
similarity index 100%
rename from res/layout/activity_registration_qr.xml
rename to src/main/res/layout/activity_registration_qr.xml
diff --git a/res/layout/activity_select_chat_background.xml b/src/main/res/layout/activity_select_chat_background.xml
similarity index 100%
rename from res/layout/activity_select_chat_background.xml
rename to src/main/res/layout/activity_select_chat_background.xml
diff --git a/res/layout/activity_zhv.xml b/src/main/res/layout/activity_zhv.xml
similarity index 100%
rename from res/layout/activity_zhv.xml
rename to src/main/res/layout/activity_zhv.xml
diff --git a/res/layout/attachment_type_selector.xml b/src/main/res/layout/attachment_type_selector.xml
similarity index 100%
rename from res/layout/attachment_type_selector.xml
rename to src/main/res/layout/attachment_type_selector.xml
diff --git a/res/layout/audio_view.xml b/src/main/res/layout/audio_view.xml
similarity index 100%
rename from res/layout/audio_view.xml
rename to src/main/res/layout/audio_view.xml
diff --git a/res/layout/avatar_selector.xml b/src/main/res/layout/avatar_selector.xml
similarity index 100%
rename from res/layout/avatar_selector.xml
rename to src/main/res/layout/avatar_selector.xml
diff --git a/res/layout/avatar_view.xml b/src/main/res/layout/avatar_view.xml
similarity index 100%
rename from res/layout/avatar_view.xml
rename to src/main/res/layout/avatar_view.xml
diff --git a/res/layout/backup_provider_activity.xml b/src/main/res/layout/backup_provider_activity.xml
similarity index 100%
rename from res/layout/backup_provider_activity.xml
rename to src/main/res/layout/backup_provider_activity.xml
diff --git a/res/layout/backup_provider_fragment.xml b/src/main/res/layout/backup_provider_fragment.xml
similarity index 100%
rename from res/layout/backup_provider_fragment.xml
rename to src/main/res/layout/backup_provider_fragment.xml
diff --git a/res/layout/backup_receiver_fragment.xml b/src/main/res/layout/backup_receiver_fragment.xml
similarity index 100%
rename from res/layout/backup_receiver_fragment.xml
rename to src/main/res/layout/backup_receiver_fragment.xml
diff --git a/res/layout/contact_filter_toolbar.xml b/src/main/res/layout/contact_filter_toolbar.xml
similarity index 100%
rename from res/layout/contact_filter_toolbar.xml
rename to src/main/res/layout/contact_filter_toolbar.xml
diff --git a/res/layout/contact_selection_activity.xml b/src/main/res/layout/contact_selection_activity.xml
similarity index 100%
rename from res/layout/contact_selection_activity.xml
rename to src/main/res/layout/contact_selection_activity.xml
diff --git a/res/layout/contact_selection_list_divider.xml b/src/main/res/layout/contact_selection_list_divider.xml
similarity index 100%
rename from res/layout/contact_selection_list_divider.xml
rename to src/main/res/layout/contact_selection_list_divider.xml
diff --git a/res/layout/contact_selection_list_fragment.xml b/src/main/res/layout/contact_selection_list_fragment.xml
similarity index 100%
rename from res/layout/contact_selection_list_fragment.xml
rename to src/main/res/layout/contact_selection_list_fragment.xml
diff --git a/res/layout/contact_selection_list_item.xml b/src/main/res/layout/contact_selection_list_item.xml
similarity index 100%
rename from res/layout/contact_selection_list_item.xml
rename to src/main/res/layout/contact_selection_list_item.xml
diff --git a/res/layout/conversation_activity.xml b/src/main/res/layout/conversation_activity.xml
similarity index 100%
rename from res/layout/conversation_activity.xml
rename to src/main/res/layout/conversation_activity.xml
diff --git a/res/layout/conversation_activity_attachment_editor_stub.xml b/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 src/main/res/layout/conversation_activity_attachment_editor_stub.xml
diff --git a/res/layout/conversation_activity_emojidrawer_stub.xml b/src/main/res/layout/conversation_activity_emojidrawer_stub.xml
similarity index 100%
rename from res/layout/conversation_activity_emojidrawer_stub.xml
rename to src/main/res/layout/conversation_activity_emojidrawer_stub.xml
diff --git a/res/layout/conversation_fragment.xml b/src/main/res/layout/conversation_fragment.xml
similarity index 100%
rename from res/layout/conversation_fragment.xml
rename to src/main/res/layout/conversation_fragment.xml
diff --git a/res/layout/conversation_input_panel.xml b/src/main/res/layout/conversation_input_panel.xml
similarity index 100%
rename from res/layout/conversation_input_panel.xml
rename to src/main/res/layout/conversation_input_panel.xml
diff --git a/res/layout/conversation_item_footer.xml b/src/main/res/layout/conversation_item_footer.xml
similarity index 100%
rename from res/layout/conversation_item_footer.xml
rename to src/main/res/layout/conversation_item_footer.xml
diff --git a/res/layout/conversation_item_header.xml b/src/main/res/layout/conversation_item_header.xml
similarity index 100%
rename from res/layout/conversation_item_header.xml
rename to src/main/res/layout/conversation_item_header.xml
diff --git a/res/layout/conversation_item_last_seen.xml b/src/main/res/layout/conversation_item_last_seen.xml
similarity index 100%
rename from res/layout/conversation_item_last_seen.xml
rename to src/main/res/layout/conversation_item_last_seen.xml
diff --git a/res/layout/conversation_item_received.xml b/src/main/res/layout/conversation_item_received.xml
similarity index 100%
rename from res/layout/conversation_item_received.xml
rename to src/main/res/layout/conversation_item_received.xml
diff --git a/res/layout/conversation_item_received_audio.xml b/src/main/res/layout/conversation_item_received_audio.xml
similarity index 100%
rename from res/layout/conversation_item_received_audio.xml
rename to src/main/res/layout/conversation_item_received_audio.xml
diff --git a/res/layout/conversation_item_received_document.xml b/src/main/res/layout/conversation_item_received_document.xml
similarity index 100%
rename from res/layout/conversation_item_received_document.xml
rename to src/main/res/layout/conversation_item_received_document.xml
diff --git a/res/layout/conversation_item_received_thumbnail.xml b/src/main/res/layout/conversation_item_received_thumbnail.xml
similarity index 100%
rename from res/layout/conversation_item_received_thumbnail.xml
rename to src/main/res/layout/conversation_item_received_thumbnail.xml
diff --git a/res/layout/conversation_item_sent.xml b/src/main/res/layout/conversation_item_sent.xml
similarity index 100%
rename from res/layout/conversation_item_sent.xml
rename to src/main/res/layout/conversation_item_sent.xml
diff --git a/res/layout/conversation_item_sent_audio.xml b/src/main/res/layout/conversation_item_sent_audio.xml
similarity index 100%
rename from res/layout/conversation_item_sent_audio.xml
rename to src/main/res/layout/conversation_item_sent_audio.xml
diff --git a/res/layout/conversation_item_sent_document.xml b/src/main/res/layout/conversation_item_sent_document.xml
similarity index 100%
rename from res/layout/conversation_item_sent_document.xml
rename to src/main/res/layout/conversation_item_sent_document.xml
diff --git a/res/layout/conversation_item_sent_thumbnail.xml b/src/main/res/layout/conversation_item_sent_thumbnail.xml
similarity index 100%
rename from res/layout/conversation_item_sent_thumbnail.xml
rename to src/main/res/layout/conversation_item_sent_thumbnail.xml
diff --git a/res/layout/conversation_item_sticker.xml b/src/main/res/layout/conversation_item_sticker.xml
similarity index 100%
rename from res/layout/conversation_item_sticker.xml
rename to src/main/res/layout/conversation_item_sticker.xml
diff --git a/res/layout/conversation_item_thumbnail.xml b/src/main/res/layout/conversation_item_thumbnail.xml
similarity index 100%
rename from res/layout/conversation_item_thumbnail.xml
rename to src/main/res/layout/conversation_item_thumbnail.xml
diff --git a/res/layout/conversation_item_update.xml b/src/main/res/layout/conversation_item_update.xml
similarity index 100%
rename from res/layout/conversation_item_update.xml
rename to src/main/res/layout/conversation_item_update.xml
diff --git a/res/layout/conversation_item_vcard.xml b/src/main/res/layout/conversation_item_vcard.xml
similarity index 100%
rename from res/layout/conversation_item_vcard.xml
rename to src/main/res/layout/conversation_item_vcard.xml
diff --git a/res/layout/conversation_item_videochat.xml b/src/main/res/layout/conversation_item_videochat.xml
similarity index 100%
rename from res/layout/conversation_item_videochat.xml
rename to src/main/res/layout/conversation_item_videochat.xml
diff --git a/res/layout/conversation_item_webxdc.xml b/src/main/res/layout/conversation_item_webxdc.xml
similarity index 100%
rename from res/layout/conversation_item_webxdc.xml
rename to src/main/res/layout/conversation_item_webxdc.xml
diff --git a/res/layout/conversation_list_activity.xml b/src/main/res/layout/conversation_list_activity.xml
similarity index 100%
rename from res/layout/conversation_list_activity.xml
rename to src/main/res/layout/conversation_list_activity.xml
diff --git a/res/layout/conversation_list_fragment.xml b/src/main/res/layout/conversation_list_fragment.xml
similarity index 100%
rename from res/layout/conversation_list_fragment.xml
rename to src/main/res/layout/conversation_list_fragment.xml
diff --git a/res/layout/conversation_list_item_inbox_zero.xml b/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 src/main/res/layout/conversation_list_item_inbox_zero.xml
diff --git a/res/layout/conversation_list_item_view.xml b/src/main/res/layout/conversation_list_item_view.xml
similarity index 100%
rename from res/layout/conversation_list_item_view.xml
rename to src/main/res/layout/conversation_list_item_view.xml
diff --git a/res/layout/conversation_title_view.xml b/src/main/res/layout/conversation_title_view.xml
similarity index 100%
rename from res/layout/conversation_title_view.xml
rename to src/main/res/layout/conversation_title_view.xml
diff --git a/res/layout/custom_default_preference_dialog.xml b/src/main/res/layout/custom_default_preference_dialog.xml
similarity index 100%
rename from res/layout/custom_default_preference_dialog.xml
rename to src/main/res/layout/custom_default_preference_dialog.xml
diff --git a/res/layout/dialog_extended_options.xml b/src/main/res/layout/dialog_extended_options.xml
similarity index 100%
rename from res/layout/dialog_extended_options.xml
rename to src/main/res/layout/dialog_extended_options.xml
diff --git a/res/layout/dialog_progress.xml b/src/main/res/layout/dialog_progress.xml
similarity index 100%
rename from res/layout/dialog_progress.xml
rename to src/main/res/layout/dialog_progress.xml
diff --git a/res/layout/dialog_with_checkbox.xml b/src/main/res/layout/dialog_with_checkbox.xml
similarity index 100%
rename from res/layout/dialog_with_checkbox.xml
rename to src/main/res/layout/dialog_with_checkbox.xml
diff --git a/res/layout/document_view.xml b/src/main/res/layout/document_view.xml
similarity index 100%
rename from res/layout/document_view.xml
rename to src/main/res/layout/document_view.xml
diff --git a/res/layout/emoji_display_item.xml b/src/main/res/layout/emoji_display_item.xml
similarity index 100%
rename from res/layout/emoji_display_item.xml
rename to src/main/res/layout/emoji_display_item.xml
diff --git a/res/layout/emoji_grid_layout.xml b/src/main/res/layout/emoji_grid_layout.xml
similarity index 100%
rename from res/layout/emoji_grid_layout.xml
rename to src/main/res/layout/emoji_grid_layout.xml
diff --git a/res/layout/emoji_keyboard_icon_dark.xml b/src/main/res/layout/emoji_keyboard_icon_dark.xml
similarity index 100%
rename from res/layout/emoji_keyboard_icon_dark.xml
rename to src/main/res/layout/emoji_keyboard_icon_dark.xml
diff --git a/res/layout/emoji_keyboard_icon_dark_selected.xml b/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 src/main/res/layout/emoji_keyboard_icon_dark_selected.xml
diff --git a/res/layout/emoji_keyboard_icon_light.xml b/src/main/res/layout/emoji_keyboard_icon_light.xml
similarity index 100%
rename from res/layout/emoji_keyboard_icon_light.xml
rename to src/main/res/layout/emoji_keyboard_icon_light.xml
diff --git a/res/layout/emoji_keyboard_icon_light_selected.xml b/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 src/main/res/layout/emoji_keyboard_icon_light_selected.xml
diff --git a/res/layout/emoji_variation_selector.xml b/src/main/res/layout/emoji_variation_selector.xml
similarity index 100%
rename from res/layout/emoji_variation_selector.xml
rename to src/main/res/layout/emoji_variation_selector.xml
diff --git a/res/layout/emoji_variation_selector_item.xml b/src/main/res/layout/emoji_variation_selector_item.xml
similarity index 100%
rename from res/layout/emoji_variation_selector_item.xml
rename to src/main/res/layout/emoji_variation_selector_item.xml
diff --git a/res/layout/fragment_search.xml b/src/main/res/layout/fragment_search.xml
similarity index 100%
rename from res/layout/fragment_search.xml
rename to src/main/res/layout/fragment_search.xml
diff --git a/res/layout/fragment_view_log.xml b/src/main/res/layout/fragment_view_log.xml
similarity index 100%
rename from res/layout/fragment_view_log.xml
rename to src/main/res/layout/fragment_view_log.xml
diff --git a/res/layout/group_create_activity.xml b/src/main/res/layout/group_create_activity.xml
similarity index 100%
rename from res/layout/group_create_activity.xml
rename to src/main/res/layout/group_create_activity.xml
diff --git a/res/layout/image_editor_fragment.xml b/src/main/res/layout/image_editor_fragment.xml
similarity index 100%
rename from res/layout/image_editor_fragment.xml
rename to src/main/res/layout/image_editor_fragment.xml
diff --git a/res/layout/image_editor_hud.xml b/src/main/res/layout/image_editor_hud.xml
similarity index 100%
rename from res/layout/image_editor_hud.xml
rename to src/main/res/layout/image_editor_hud.xml
diff --git a/res/layout/instant_onboarding_activity.xml b/src/main/res/layout/instant_onboarding_activity.xml
similarity index 100%
rename from res/layout/instant_onboarding_activity.xml
rename to src/main/res/layout/instant_onboarding_activity.xml
diff --git a/res/layout/item_color.xml b/src/main/res/layout/item_color.xml
similarity index 100%
rename from res/layout/item_color.xml
rename to src/main/res/layout/item_color.xml
diff --git a/res/layout/log_view_activity.xml b/src/main/res/layout/log_view_activity.xml
similarity index 100%
rename from res/layout/log_view_activity.xml
rename to src/main/res/layout/log_view_activity.xml
diff --git a/res/layout/login_options_view.xml b/src/main/res/layout/login_options_view.xml
similarity index 100%
rename from res/layout/login_options_view.xml
rename to src/main/res/layout/login_options_view.xml
diff --git a/res/layout/media_keyboard.xml b/src/main/res/layout/media_keyboard.xml
similarity index 100%
rename from res/layout/media_keyboard.xml
rename to src/main/res/layout/media_keyboard.xml
diff --git a/res/layout/media_keyboard_bottom_tab_item.xml b/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 src/main/res/layout/media_keyboard_bottom_tab_item.xml
diff --git a/res/layout/media_preview_activity.xml b/src/main/res/layout/media_preview_activity.xml
similarity index 100%
rename from res/layout/media_preview_activity.xml
rename to src/main/res/layout/media_preview_activity.xml
diff --git a/res/layout/media_view.xml b/src/main/res/layout/media_view.xml
similarity index 100%
rename from res/layout/media_view.xml
rename to src/main/res/layout/media_view.xml
diff --git a/res/layout/media_view_edit_button.xml b/src/main/res/layout/media_view_edit_button.xml
similarity index 100%
rename from res/layout/media_view_edit_button.xml
rename to src/main/res/layout/media_view_edit_button.xml
diff --git a/res/layout/media_view_page.xml b/src/main/res/layout/media_view_page.xml
similarity index 100%
rename from res/layout/media_view_page.xml
rename to src/main/res/layout/media_view_page.xml
diff --git a/res/layout/media_view_remove_button.xml b/src/main/res/layout/media_view_remove_button.xml
similarity index 100%
rename from res/layout/media_view_remove_button.xml
rename to src/main/res/layout/media_view_remove_button.xml
diff --git a/res/layout/media_view_video.xml b/src/main/res/layout/media_view_video.xml
similarity index 100%
rename from res/layout/media_view_video.xml
rename to src/main/res/layout/media_view_video.xml
diff --git a/res/layout/message_details_view.xml b/src/main/res/layout/message_details_view.xml
similarity index 100%
rename from res/layout/message_details_view.xml
rename to src/main/res/layout/message_details_view.xml
diff --git a/res/layout/message_request_bottom_bar.xml b/src/main/res/layout/message_request_bottom_bar.xml
similarity index 100%
rename from res/layout/message_request_bottom_bar.xml
rename to src/main/res/layout/message_request_bottom_bar.xml
diff --git a/res/layout/microphone_recorder_view.xml b/src/main/res/layout/microphone_recorder_view.xml
similarity index 100%
rename from res/layout/microphone_recorder_view.xml
rename to src/main/res/layout/microphone_recorder_view.xml
diff --git a/res/layout/new_contact_activity.xml b/src/main/res/layout/new_contact_activity.xml
similarity index 100%
rename from res/layout/new_contact_activity.xml
rename to src/main/res/layout/new_contact_activity.xml
diff --git a/res/layout/permissions_rationale_dialog.xml b/src/main/res/layout/permissions_rationale_dialog.xml
similarity index 100%
rename from res/layout/permissions_rationale_dialog.xml
rename to src/main/res/layout/permissions_rationale_dialog.xml
diff --git a/res/layout/preference_item.xml b/src/main/res/layout/preference_item.xml
similarity index 100%
rename from res/layout/preference_item.xml
rename to src/main/res/layout/preference_item.xml
diff --git a/res/layout/profile_activity.xml b/src/main/res/layout/profile_activity.xml
similarity index 100%
rename from res/layout/profile_activity.xml
rename to src/main/res/layout/profile_activity.xml
diff --git a/res/layout/profile_create_activity.xml b/src/main/res/layout/profile_create_activity.xml
similarity index 100%
rename from res/layout/profile_create_activity.xml
rename to src/main/res/layout/profile_create_activity.xml
diff --git a/res/layout/profile_document_item.xml b/src/main/res/layout/profile_document_item.xml
similarity index 100%
rename from res/layout/profile_document_item.xml
rename to src/main/res/layout/profile_document_item.xml
diff --git a/res/layout/profile_documents_fragment.xml b/src/main/res/layout/profile_documents_fragment.xml
similarity index 100%
rename from res/layout/profile_documents_fragment.xml
rename to src/main/res/layout/profile_documents_fragment.xml
diff --git a/res/layout/profile_gallery_fragment.xml b/src/main/res/layout/profile_gallery_fragment.xml
similarity index 100%
rename from res/layout/profile_gallery_fragment.xml
rename to src/main/res/layout/profile_gallery_fragment.xml
diff --git a/res/layout/profile_gallery_item.xml b/src/main/res/layout/profile_gallery_item.xml
similarity index 100%
rename from res/layout/profile_gallery_item.xml
rename to src/main/res/layout/profile_gallery_item.xml
diff --git a/res/layout/profile_preference_view.xml b/src/main/res/layout/profile_preference_view.xml
similarity index 100%
rename from res/layout/profile_preference_view.xml
rename to src/main/res/layout/profile_preference_view.xml
diff --git a/res/layout/profile_settings_fragment.xml b/src/main/res/layout/profile_settings_fragment.xml
similarity index 100%
rename from res/layout/profile_settings_fragment.xml
rename to src/main/res/layout/profile_settings_fragment.xml
diff --git a/res/layout/profile_settings_item.xml b/src/main/res/layout/profile_settings_item.xml
similarity index 100%
rename from res/layout/profile_settings_item.xml
rename to src/main/res/layout/profile_settings_item.xml
diff --git a/res/layout/profile_status_item.xml b/src/main/res/layout/profile_status_item.xml
similarity index 100%
rename from res/layout/profile_status_item.xml
rename to src/main/res/layout/profile_status_item.xml
diff --git a/res/layout/qr_scan_fragment.xml b/src/main/res/layout/qr_scan_fragment.xml
similarity index 100%
rename from res/layout/qr_scan_fragment.xml
rename to src/main/res/layout/qr_scan_fragment.xml
diff --git a/res/layout/qr_show_fragment.xml b/src/main/res/layout/qr_show_fragment.xml
similarity index 100%
rename from res/layout/qr_show_fragment.xml
rename to src/main/res/layout/qr_show_fragment.xml
diff --git a/res/layout/quick_camera_controls.xml b/src/main/res/layout/quick_camera_controls.xml
similarity index 100%
rename from res/layout/quick_camera_controls.xml
rename to src/main/res/layout/quick_camera_controls.xml
diff --git a/res/layout/quick_camera_controls_land.xml b/src/main/res/layout/quick_camera_controls_land.xml
similarity index 100%
rename from res/layout/quick_camera_controls_land.xml
rename to src/main/res/layout/quick_camera_controls_land.xml
diff --git a/res/layout/quote_view.xml b/src/main/res/layout/quote_view.xml
similarity index 100%
rename from res/layout/quote_view.xml
rename to src/main/res/layout/quote_view.xml
diff --git a/res/layout/reaction_picker.xml b/src/main/res/layout/reaction_picker.xml
similarity index 100%
rename from res/layout/reaction_picker.xml
rename to src/main/res/layout/reaction_picker.xml
diff --git a/res/layout/reaction_recipient_item.xml b/src/main/res/layout/reaction_recipient_item.xml
similarity index 100%
rename from res/layout/reaction_recipient_item.xml
rename to src/main/res/layout/reaction_recipient_item.xml
diff --git a/res/layout/reactions_details_fragment.xml b/src/main/res/layout/reactions_details_fragment.xml
similarity index 100%
rename from res/layout/reactions_details_fragment.xml
rename to src/main/res/layout/reactions_details_fragment.xml
diff --git a/res/layout/reactions_pill.xml b/src/main/res/layout/reactions_pill.xml
similarity index 100%
rename from res/layout/reactions_pill.xml
rename to src/main/res/layout/reactions_pill.xml
diff --git a/res/layout/recent_photo_view.xml b/src/main/res/layout/recent_photo_view.xml
similarity index 100%
rename from res/layout/recent_photo_view.xml
rename to src/main/res/layout/recent_photo_view.xml
diff --git a/res/layout/recent_photo_view_item.xml b/src/main/res/layout/recent_photo_view_item.xml
similarity index 100%
rename from res/layout/recent_photo_view_item.xml
rename to src/main/res/layout/recent_photo_view_item.xml
diff --git a/res/layout/recording_layout.xml b/src/main/res/layout/recording_layout.xml
similarity index 100%
rename from res/layout/recording_layout.xml
rename to src/main/res/layout/recording_layout.xml
diff --git a/res/layout/registration_activity.xml b/src/main/res/layout/registration_activity.xml
similarity index 100%
rename from res/layout/registration_activity.xml
rename to src/main/res/layout/registration_activity.xml
diff --git a/res/layout/scribble_activity.xml b/src/main/res/layout/scribble_activity.xml
similarity index 100%
rename from res/layout/scribble_activity.xml
rename to src/main/res/layout/scribble_activity.xml
diff --git a/res/layout/scribble_select_sticker_activity.xml b/src/main/res/layout/scribble_select_sticker_activity.xml
similarity index 100%
rename from res/layout/scribble_select_sticker_activity.xml
rename to src/main/res/layout/scribble_select_sticker_activity.xml
diff --git a/res/layout/scribble_select_sticker_fragment.xml b/src/main/res/layout/scribble_select_sticker_fragment.xml
similarity index 100%
rename from res/layout/scribble_select_sticker_fragment.xml
rename to src/main/res/layout/scribble_select_sticker_fragment.xml
diff --git a/res/layout/scribble_sticker_item.xml b/src/main/res/layout/scribble_sticker_item.xml
similarity index 100%
rename from res/layout/scribble_sticker_item.xml
rename to src/main/res/layout/scribble_sticker_item.xml
diff --git a/res/layout/search_toolbar.xml b/src/main/res/layout/search_toolbar.xml
similarity index 100%
rename from res/layout/search_toolbar.xml
rename to src/main/res/layout/search_toolbar.xml
diff --git a/res/layout/selected_contact_list_item.xml b/src/main/res/layout/selected_contact_list_item.xml
similarity index 100%
rename from res/layout/selected_contact_list_item.xml
rename to src/main/res/layout/selected_contact_list_item.xml
diff --git a/res/layout/setup_code_grid.xml b/src/main/res/layout/setup_code_grid.xml
similarity index 100%
rename from res/layout/setup_code_grid.xml
rename to src/main/res/layout/setup_code_grid.xml
diff --git a/res/layout/share_activity.xml b/src/main/res/layout/share_activity.xml
similarity index 100%
rename from res/layout/share_activity.xml
rename to src/main/res/layout/share_activity.xml
diff --git a/res/layout/signup_options_view.xml b/src/main/res/layout/signup_options_view.xml
similarity index 100%
rename from res/layout/signup_options_view.xml
rename to src/main/res/layout/signup_options_view.xml
diff --git a/res/layout/single_line_input.xml b/src/main/res/layout/single_line_input.xml
similarity index 100%
rename from res/layout/single_line_input.xml
rename to src/main/res/layout/single_line_input.xml
diff --git a/res/layout/sticker_view.xml b/src/main/res/layout/sticker_view.xml
similarity index 100%
rename from res/layout/sticker_view.xml
rename to src/main/res/layout/sticker_view.xml
diff --git a/res/layout/switch_compat_preference.xml b/src/main/res/layout/switch_compat_preference.xml
similarity index 100%
rename from res/layout/switch_compat_preference.xml
rename to src/main/res/layout/switch_compat_preference.xml
diff --git a/res/layout/thumbnail_view.xml b/src/main/res/layout/thumbnail_view.xml
similarity index 100%
rename from res/layout/thumbnail_view.xml
rename to src/main/res/layout/thumbnail_view.xml
diff --git a/res/layout/transport_selection_list_item.xml b/src/main/res/layout/transport_selection_list_item.xml
similarity index 100%
rename from res/layout/transport_selection_list_item.xml
rename to src/main/res/layout/transport_selection_list_item.xml
diff --git a/res/layout/vcard_view.xml b/src/main/res/layout/vcard_view.xml
similarity index 100%
rename from res/layout/vcard_view.xml
rename to src/main/res/layout/vcard_view.xml
diff --git a/res/layout/video_player.xml b/src/main/res/layout/video_player.xml
similarity index 100%
rename from res/layout/video_player.xml
rename to src/main/res/layout/video_player.xml
diff --git a/res/layout/web_view_activity.xml b/src/main/res/layout/web_view_activity.xml
similarity index 100%
rename from res/layout/web_view_activity.xml
rename to src/main/res/layout/web_view_activity.xml
diff --git a/res/layout/webxdc_compact_view.xml b/src/main/res/layout/webxdc_compact_view.xml
similarity index 100%
rename from res/layout/webxdc_compact_view.xml
rename to src/main/res/layout/webxdc_compact_view.xml
diff --git a/res/layout/webxdc_view.xml b/src/main/res/layout/webxdc_view.xml
similarity index 100%
rename from res/layout/webxdc_view.xml
rename to src/main/res/layout/webxdc_view.xml
diff --git a/res/layout/welcome_activity.xml b/src/main/res/layout/welcome_activity.xml
similarity index 100%
rename from res/layout/welcome_activity.xml
rename to src/main/res/layout/welcome_activity.xml
diff --git a/res/layout/zooming_image_view.xml b/src/main/res/layout/zooming_image_view.xml
similarity index 100%
rename from res/layout/zooming_image_view.xml
rename to src/main/res/layout/zooming_image_view.xml
diff --git a/res/menu/add_members.xml b/src/main/res/menu/add_members.xml
similarity index 100%
rename from res/menu/add_members.xml
rename to src/main/res/menu/add_members.xml
diff --git a/res/menu/archived_list.xml b/src/main/res/menu/archived_list.xml
similarity index 100%
rename from res/menu/archived_list.xml
rename to src/main/res/menu/archived_list.xml
diff --git a/res/menu/backup_transfer_menu.xml b/src/main/res/menu/backup_transfer_menu.xml
similarity index 100%
rename from res/menu/backup_transfer_menu.xml
rename to src/main/res/menu/backup_transfer_menu.xml
diff --git a/res/menu/chat_background.xml b/src/main/res/menu/chat_background.xml
similarity index 100%
rename from res/menu/chat_background.xml
rename to src/main/res/menu/chat_background.xml
diff --git a/res/menu/contact_list.xml b/src/main/res/menu/contact_list.xml
similarity index 100%
rename from res/menu/contact_list.xml
rename to src/main/res/menu/contact_list.xml
diff --git a/res/menu/conversation.xml b/src/main/res/menu/conversation.xml
similarity index 100%
rename from res/menu/conversation.xml
rename to src/main/res/menu/conversation.xml
diff --git a/res/menu/conversation_archive.xml b/src/main/res/menu/conversation_archive.xml
similarity index 100%
rename from res/menu/conversation_archive.xml
rename to src/main/res/menu/conversation_archive.xml
diff --git a/res/menu/conversation_clear.xml b/src/main/res/menu/conversation_clear.xml
similarity index 100%
rename from res/menu/conversation_clear.xml
rename to src/main/res/menu/conversation_clear.xml
diff --git a/res/menu/conversation_context.xml b/src/main/res/menu/conversation_context.xml
similarity index 100%
rename from res/menu/conversation_context.xml
rename to src/main/res/menu/conversation_context.xml
diff --git a/res/menu/conversation_delete.xml b/src/main/res/menu/conversation_delete.xml
similarity index 100%
rename from res/menu/conversation_delete.xml
rename to src/main/res/menu/conversation_delete.xml
diff --git a/res/menu/conversation_list.xml b/src/main/res/menu/conversation_list.xml
similarity index 100%
rename from res/menu/conversation_list.xml
rename to src/main/res/menu/conversation_list.xml
diff --git a/res/menu/conversation_list_search.xml b/src/main/res/menu/conversation_list_search.xml
similarity index 100%
rename from res/menu/conversation_list_search.xml
rename to src/main/res/menu/conversation_list_search.xml
diff --git a/res/menu/conversation_push_group_options.xml b/src/main/res/menu/conversation_push_group_options.xml
similarity index 100%
rename from res/menu/conversation_push_group_options.xml
rename to src/main/res/menu/conversation_push_group_options.xml
diff --git a/res/menu/full_msg.xml b/src/main/res/menu/full_msg.xml
similarity index 100%
rename from res/menu/full_msg.xml
rename to src/main/res/menu/full_msg.xml
diff --git a/res/menu/group_create.xml b/src/main/res/menu/group_create.xml
similarity index 100%
rename from res/menu/group_create.xml
rename to src/main/res/menu/group_create.xml
diff --git a/res/menu/local_help.xml b/src/main/res/menu/local_help.xml
similarity index 100%
rename from res/menu/local_help.xml
rename to src/main/res/menu/local_help.xml
diff --git a/res/menu/media_preview.xml b/src/main/res/menu/media_preview.xml
similarity index 100%
rename from res/menu/media_preview.xml
rename to src/main/res/menu/media_preview.xml
diff --git a/res/menu/new_contact.xml b/src/main/res/menu/new_contact.xml
similarity index 100%
rename from res/menu/new_contact.xml
rename to src/main/res/menu/new_contact.xml
diff --git a/res/menu/preferences_create_profile_menu.xml b/src/main/res/menu/preferences_create_profile_menu.xml
similarity index 100%
rename from res/menu/preferences_create_profile_menu.xml
rename to src/main/res/menu/preferences_create_profile_menu.xml
diff --git a/res/menu/profile_common.xml b/src/main/res/menu/profile_common.xml
similarity index 100%
rename from res/menu/profile_common.xml
rename to src/main/res/menu/profile_common.xml
diff --git a/res/menu/profile_context.xml b/src/main/res/menu/profile_context.xml
similarity index 100%
rename from res/menu/profile_context.xml
rename to src/main/res/menu/profile_context.xml
diff --git a/res/menu/qr_show.xml b/src/main/res/menu/qr_show.xml
similarity index 100%
rename from res/menu/qr_show.xml
rename to src/main/res/menu/qr_show.xml
diff --git a/res/menu/registration.xml b/src/main/res/menu/registration.xml
similarity index 100%
rename from res/menu/registration.xml
rename to src/main/res/menu/registration.xml
diff --git a/res/menu/registration_qr_activity.xml b/src/main/res/menu/registration_qr_activity.xml
similarity index 100%
rename from res/menu/registration_qr_activity.xml
rename to src/main/res/menu/registration_qr_activity.xml
diff --git a/res/menu/search_menu.xml b/src/main/res/menu/search_menu.xml
similarity index 100%
rename from res/menu/search_menu.xml
rename to src/main/res/menu/search_menu.xml
diff --git a/res/menu/text_secure_normal.xml b/src/main/res/menu/text_secure_normal.xml
similarity index 100%
rename from res/menu/text_secure_normal.xml
rename to src/main/res/menu/text_secure_normal.xml
diff --git a/res/menu/view_log.xml b/src/main/res/menu/view_log.xml
similarity index 100%
rename from res/menu/view_log.xml
rename to src/main/res/menu/view_log.xml
diff --git a/res/menu/web_view.xml b/src/main/res/menu/web_view.xml
similarity index 100%
rename from res/menu/web_view.xml
rename to src/main/res/menu/web_view.xml
diff --git a/res/menu/web_view_context.xml b/src/main/res/menu/web_view_context.xml
similarity index 100%
rename from res/menu/web_view_context.xml
rename to src/main/res/menu/web_view_context.xml
diff --git a/res/menu/webxdc.xml b/src/main/res/menu/webxdc.xml
similarity index 100%
rename from res/menu/webxdc.xml
rename to src/main/res/menu/webxdc.xml
diff --git a/res/mipmap-anydpi-v26/ic_launcher.xml b/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from res/mipmap-anydpi-v26/ic_launcher.xml
rename to src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/res/mipmap-anydpi-v26/ic_launcher_round.xml b/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/res/mipmap-hdpi/ic_launcher.webp b/src/main/res/mipmap-hdpi/ic_launcher.webp
similarity index 100%
rename from res/mipmap-hdpi/ic_launcher.webp
rename to src/main/res/mipmap-hdpi/ic_launcher.webp
diff --git a/res/mipmap-hdpi/ic_launcher_foreground.webp b/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
similarity index 100%
rename from res/mipmap-hdpi/ic_launcher_foreground.webp
rename to src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
diff --git a/res/mipmap-hdpi/ic_launcher_round.webp b/src/main/res/mipmap-hdpi/ic_launcher_round.webp
similarity index 100%
rename from res/mipmap-hdpi/ic_launcher_round.webp
rename to src/main/res/mipmap-hdpi/ic_launcher_round.webp
diff --git a/res/mipmap-mdpi/ic_launcher.webp b/src/main/res/mipmap-mdpi/ic_launcher.webp
similarity index 100%
rename from res/mipmap-mdpi/ic_launcher.webp
rename to src/main/res/mipmap-mdpi/ic_launcher.webp
diff --git a/res/mipmap-mdpi/ic_launcher_foreground.webp b/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
similarity index 100%
rename from res/mipmap-mdpi/ic_launcher_foreground.webp
rename to src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
diff --git a/res/mipmap-mdpi/ic_launcher_round.webp b/src/main/res/mipmap-mdpi/ic_launcher_round.webp
similarity index 100%
rename from res/mipmap-mdpi/ic_launcher_round.webp
rename to src/main/res/mipmap-mdpi/ic_launcher_round.webp
diff --git a/res/mipmap-xhdpi/ic_launcher.webp b/src/main/res/mipmap-xhdpi/ic_launcher.webp
similarity index 100%
rename from res/mipmap-xhdpi/ic_launcher.webp
rename to src/main/res/mipmap-xhdpi/ic_launcher.webp
diff --git a/res/mipmap-xhdpi/ic_launcher_foreground.webp b/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
similarity index 100%
rename from res/mipmap-xhdpi/ic_launcher_foreground.webp
rename to src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
diff --git a/res/mipmap-xhdpi/ic_launcher_round.webp b/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
similarity index 100%
rename from res/mipmap-xhdpi/ic_launcher_round.webp
rename to src/main/res/mipmap-xhdpi/ic_launcher_round.webp
diff --git a/res/mipmap-xxhdpi/ic_launcher.webp b/src/main/res/mipmap-xxhdpi/ic_launcher.webp
similarity index 100%
rename from res/mipmap-xxhdpi/ic_launcher.webp
rename to src/main/res/mipmap-xxhdpi/ic_launcher.webp
diff --git a/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
similarity index 100%
rename from res/mipmap-xxhdpi/ic_launcher_foreground.webp
rename to src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
diff --git a/res/mipmap-xxhdpi/ic_launcher_round.webp b/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
similarity index 100%
rename from res/mipmap-xxhdpi/ic_launcher_round.webp
rename to src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
diff --git a/res/mipmap-xxxhdpi/ic_launcher.webp b/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
similarity index 100%
rename from res/mipmap-xxxhdpi/ic_launcher.webp
rename to src/main/res/mipmap-xxxhdpi/ic_launcher.webp
diff --git a/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
similarity index 100%
rename from res/mipmap-xxxhdpi/ic_launcher_foreground.webp
rename to src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
diff --git a/res/mipmap-xxxhdpi/ic_launcher_round.webp b/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
similarity index 100%
rename from res/mipmap-xxxhdpi/ic_launcher_round.webp
rename to src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
diff --git a/res/raw/sandboxed_iframe_rtcpeerconnection_check.html b/src/main/res/raw/sandboxed_iframe_rtcpeerconnection_check.html
similarity index 100%
rename from res/raw/sandboxed_iframe_rtcpeerconnection_check.html
rename to src/main/res/raw/sandboxed_iframe_rtcpeerconnection_check.html
diff --git a/res/raw/sound_in.wav b/src/main/res/raw/sound_in.wav
similarity index 100%
rename from res/raw/sound_in.wav
rename to src/main/res/raw/sound_in.wav
diff --git a/res/raw/sound_out.wav b/src/main/res/raw/sound_out.wav
similarity index 100%
rename from res/raw/sound_out.wav
rename to src/main/res/raw/sound_out.wav
diff --git a/res/raw/webxdc.js b/src/main/res/raw/webxdc.js
similarity index 100%
rename from res/raw/webxdc.js
rename to src/main/res/raw/webxdc.js
diff --git a/res/raw/webxdc_wrapper.html b/src/main/res/raw/webxdc_wrapper.html
similarity index 100%
rename from res/raw/webxdc_wrapper.html
rename to src/main/res/raw/webxdc_wrapper.html
diff --git a/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
similarity index 100%
rename from res/values-ar/strings.xml
rename to src/main/res/values-ar/strings.xml
diff --git a/res/values-az/strings.xml b/src/main/res/values-az/strings.xml
similarity index 100%
rename from res/values-az/strings.xml
rename to src/main/res/values-az/strings.xml
diff --git a/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
similarity index 100%
rename from res/values-bg/strings.xml
rename to src/main/res/values-bg/strings.xml
diff --git a/res/values-bqi/strings.xml b/src/main/res/values-bqi/strings.xml
similarity index 100%
rename from res/values-bqi/strings.xml
rename to src/main/res/values-bqi/strings.xml
diff --git a/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
similarity index 100%
rename from res/values-ca/strings.xml
rename to src/main/res/values-ca/strings.xml
diff --git a/res/values-ckb/strings.xml b/src/main/res/values-ckb/strings.xml
similarity index 100%
rename from res/values-ckb/strings.xml
rename to src/main/res/values-ckb/strings.xml
diff --git a/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
similarity index 100%
rename from res/values-cs/strings.xml
rename to src/main/res/values-cs/strings.xml
diff --git a/res/values-da/strings.xml b/src/main/res/values-da/strings.xml
similarity index 100%
rename from res/values-da/strings.xml
rename to src/main/res/values-da/strings.xml
diff --git a/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
similarity index 100%
rename from res/values-de/strings.xml
rename to src/main/res/values-de/strings.xml
diff --git a/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
similarity index 100%
rename from res/values-el/strings.xml
rename to src/main/res/values-el/strings.xml
diff --git a/res/values-eo/strings.xml b/src/main/res/values-eo/strings.xml
similarity index 100%
rename from res/values-eo/strings.xml
rename to src/main/res/values-eo/strings.xml
diff --git a/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
similarity index 100%
rename from res/values-es/strings.xml
rename to src/main/res/values-es/strings.xml
diff --git a/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
similarity index 100%
rename from res/values-eu/strings.xml
rename to src/main/res/values-eu/strings.xml
diff --git a/res/values-fa/strings.xml b/src/main/res/values-fa/strings.xml
similarity index 100%
rename from res/values-fa/strings.xml
rename to src/main/res/values-fa/strings.xml
diff --git a/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml
similarity index 100%
rename from res/values-fi/strings.xml
rename to src/main/res/values-fi/strings.xml
diff --git a/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
similarity index 100%
rename from res/values-fr/strings.xml
rename to src/main/res/values-fr/strings.xml
diff --git a/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
similarity index 100%
rename from res/values-gl/strings.xml
rename to src/main/res/values-gl/strings.xml
diff --git a/res/values-hr/strings.xml b/src/main/res/values-hr/strings.xml
similarity index 100%
rename from res/values-hr/strings.xml
rename to src/main/res/values-hr/strings.xml
diff --git a/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
similarity index 100%
rename from res/values-hu/strings.xml
rename to src/main/res/values-hu/strings.xml
diff --git a/res/values-in/strings.xml b/src/main/res/values-in/strings.xml
similarity index 100%
rename from res/values-in/strings.xml
rename to src/main/res/values-in/strings.xml
diff --git a/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
similarity index 100%
rename from res/values-it/strings.xml
rename to src/main/res/values-it/strings.xml
diff --git a/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
similarity index 100%
rename from res/values-ja/strings.xml
rename to src/main/res/values-ja/strings.xml
diff --git a/res/values-km/strings.xml b/src/main/res/values-km/strings.xml
similarity index 100%
rename from res/values-km/strings.xml
rename to src/main/res/values-km/strings.xml
diff --git a/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
similarity index 100%
rename from res/values-ko/strings.xml
rename to src/main/res/values-ko/strings.xml
diff --git a/res/values-lt/strings.xml b/src/main/res/values-lt/strings.xml
similarity index 100%
rename from res/values-lt/strings.xml
rename to src/main/res/values-lt/strings.xml
diff --git a/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml
similarity index 100%
rename from res/values-nb/strings.xml
rename to src/main/res/values-nb/strings.xml
diff --git a/res/values-night/colors.xml b/src/main/res/values-night/colors.xml
similarity index 100%
rename from res/values-night/colors.xml
rename to src/main/res/values-night/colors.xml
diff --git a/res/values-night/themes_splash.xml b/src/main/res/values-night/themes_splash.xml
similarity index 100%
rename from res/values-night/themes_splash.xml
rename to src/main/res/values-night/themes_splash.xml
diff --git a/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
similarity index 100%
rename from res/values-nl/strings.xml
rename to src/main/res/values-nl/strings.xml
diff --git a/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
similarity index 100%
rename from res/values-pl/strings.xml
rename to src/main/res/values-pl/strings.xml
diff --git a/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
similarity index 100%
rename from res/values-pt-rBR/strings.xml
rename to src/main/res/values-pt-rBR/strings.xml
diff --git a/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
similarity index 100%
rename from res/values-pt/strings.xml
rename to src/main/res/values-pt/strings.xml
diff --git a/res/values-ro/strings.xml b/src/main/res/values-ro/strings.xml
similarity index 100%
rename from res/values-ro/strings.xml
rename to src/main/res/values-ro/strings.xml
diff --git a/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
similarity index 100%
rename from res/values-ru/strings.xml
rename to src/main/res/values-ru/strings.xml
diff --git a/res/values-sc/strings.xml b/src/main/res/values-sc/strings.xml
similarity index 100%
rename from res/values-sc/strings.xml
rename to src/main/res/values-sc/strings.xml
diff --git a/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
similarity index 100%
rename from res/values-sk/strings.xml
rename to src/main/res/values-sk/strings.xml
diff --git a/res/values-sq/strings.xml b/src/main/res/values-sq/strings.xml
similarity index 100%
rename from res/values-sq/strings.xml
rename to src/main/res/values-sq/strings.xml
diff --git a/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
similarity index 100%
rename from res/values-sr/strings.xml
rename to src/main/res/values-sr/strings.xml
diff --git a/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
similarity index 100%
rename from res/values-sv/strings.xml
rename to src/main/res/values-sv/strings.xml
diff --git a/res/values-sw320dp/dimens.xml b/src/main/res/values-sw320dp/dimens.xml
similarity index 100%
rename from res/values-sw320dp/dimens.xml
rename to src/main/res/values-sw320dp/dimens.xml
diff --git a/res/values-sw360dp-v13/values-preferences.xml b/src/main/res/values-sw360dp-v13/values-preferences.xml
similarity index 100%
rename from res/values-sw360dp-v13/values-preferences.xml
rename to src/main/res/values-sw360dp-v13/values-preferences.xml
diff --git a/res/values-sw480dp/dimens.xml b/src/main/res/values-sw480dp/dimens.xml
similarity index 100%
rename from res/values-sw480dp/dimens.xml
rename to src/main/res/values-sw480dp/dimens.xml
diff --git a/res/values-sw600dp/attrs.xml b/src/main/res/values-sw600dp/attrs.xml
similarity index 100%
rename from res/values-sw600dp/attrs.xml
rename to src/main/res/values-sw600dp/attrs.xml
diff --git a/res/values-ta/strings.xml b/src/main/res/values-ta/strings.xml
similarity index 100%
rename from res/values-ta/strings.xml
rename to src/main/res/values-ta/strings.xml
diff --git a/res/values-te/strings.xml b/src/main/res/values-te/strings.xml
similarity index 100%
rename from res/values-te/strings.xml
rename to src/main/res/values-te/strings.xml
diff --git a/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
similarity index 100%
rename from res/values-tr/strings.xml
rename to src/main/res/values-tr/strings.xml
diff --git a/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
similarity index 100%
rename from res/values-uk/strings.xml
rename to src/main/res/values-uk/strings.xml
diff --git a/res/values-v19/colors.xml b/src/main/res/values-v19/colors.xml
similarity index 100%
rename from res/values-v19/colors.xml
rename to src/main/res/values-v19/colors.xml
diff --git a/res/values-v19/themes.xml b/src/main/res/values-v19/themes.xml
similarity index 100%
rename from res/values-v19/themes.xml
rename to src/main/res/values-v19/themes.xml
diff --git a/res/values-v29/arrays.xml b/src/main/res/values-v29/arrays.xml
similarity index 100%
rename from res/values-v29/arrays.xml
rename to src/main/res/values-v29/arrays.xml
diff --git a/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
similarity index 100%
rename from res/values-vi/strings.xml
rename to src/main/res/values-vi/strings.xml
diff --git a/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
similarity index 100%
rename from res/values-zh-rCN/strings.xml
rename to src/main/res/values-zh-rCN/strings.xml
diff --git a/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
similarity index 100%
rename from res/values-zh-rTW/strings.xml
rename to src/main/res/values-zh-rTW/strings.xml
diff --git a/res/values/arrays.xml b/src/main/res/values/arrays.xml
similarity index 100%
rename from res/values/arrays.xml
rename to src/main/res/values/arrays.xml
diff --git a/res/values/attrs.xml b/src/main/res/values/attrs.xml
similarity index 100%
rename from res/values/attrs.xml
rename to src/main/res/values/attrs.xml
diff --git a/res/values/colors.xml b/src/main/res/values/colors.xml
similarity index 100%
rename from res/values/colors.xml
rename to src/main/res/values/colors.xml
diff --git a/res/values/core_colors.xml b/src/main/res/values/core_colors.xml
similarity index 100%
rename from res/values/core_colors.xml
rename to src/main/res/values/core_colors.xml
diff --git a/res/values/crop_area_renderer.xml b/src/main/res/values/crop_area_renderer.xml
similarity index 100%
rename from res/values/crop_area_renderer.xml
rename to src/main/res/values/crop_area_renderer.xml
diff --git a/res/values/dimens.xml b/src/main/res/values/dimens.xml
similarity index 100%
rename from res/values/dimens.xml
rename to src/main/res/values/dimens.xml
diff --git a/res/values/emoji.xml b/src/main/res/values/emoji.xml
similarity index 100%
rename from res/values/emoji.xml
rename to src/main/res/values/emoji.xml
diff --git a/res/values/ic_launcher_background.xml b/src/main/res/values/ic_launcher_background.xml
similarity index 100%
rename from res/values/ic_launcher_background.xml
rename to src/main/res/values/ic_launcher_background.xml
diff --git a/res/values/ids.xml b/src/main/res/values/ids.xml
similarity index 100%
rename from res/values/ids.xml
rename to src/main/res/values/ids.xml
diff --git a/res/values/integers.xml b/src/main/res/values/integers.xml
similarity index 100%
rename from res/values/integers.xml
rename to src/main/res/values/integers.xml
diff --git a/res/values/material_colors.xml b/src/main/res/values/material_colors.xml
similarity index 100%
rename from res/values/material_colors.xml
rename to src/main/res/values/material_colors.xml
diff --git a/res/values/strings.xml b/src/main/res/values/strings.xml
similarity index 100%
rename from res/values/strings.xml
rename to src/main/res/values/strings.xml
diff --git a/res/values/styles.xml b/src/main/res/values/styles.xml
similarity index 100%
rename from res/values/styles.xml
rename to src/main/res/values/styles.xml
diff --git a/res/values/text_styles.xml b/src/main/res/values/text_styles.xml
similarity index 100%
rename from res/values/text_styles.xml
rename to src/main/res/values/text_styles.xml
diff --git a/res/values/themes.xml b/src/main/res/values/themes.xml
similarity index 100%
rename from res/values/themes.xml
rename to src/main/res/values/themes.xml
diff --git a/res/values/themes_splash.xml b/src/main/res/values/themes_splash.xml
similarity index 100%
rename from res/values/themes_splash.xml
rename to src/main/res/values/themes_splash.xml
diff --git a/res/values/vector_paths.xml b/src/main/res/values/vector_paths.xml
similarity index 100%
rename from res/values/vector_paths.xml
rename to src/main/res/values/vector_paths.xml
diff --git a/res/xml-v29/preferences_appearance.xml b/src/main/res/xml-v29/preferences_appearance.xml
similarity index 100%
rename from res/xml-v29/preferences_appearance.xml
rename to src/main/res/xml-v29/preferences_appearance.xml
diff --git a/res/xml/file_provider_paths.xml b/src/main/res/xml/file_provider_paths.xml
similarity index 100%
rename from res/xml/file_provider_paths.xml
rename to src/main/res/xml/file_provider_paths.xml
diff --git a/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
similarity index 100%
rename from res/xml/preferences.xml
rename to src/main/res/xml/preferences.xml
diff --git a/res/xml/preferences_advanced.xml b/src/main/res/xml/preferences_advanced.xml
similarity index 100%
rename from res/xml/preferences_advanced.xml
rename to src/main/res/xml/preferences_advanced.xml
diff --git a/res/xml/preferences_appearance.xml b/src/main/res/xml/preferences_appearance.xml
similarity index 100%
rename from res/xml/preferences_appearance.xml
rename to src/main/res/xml/preferences_appearance.xml
diff --git a/res/xml/preferences_chats.xml b/src/main/res/xml/preferences_chats.xml
similarity index 100%
rename from res/xml/preferences_chats.xml
rename to src/main/res/xml/preferences_chats.xml
diff --git a/res/xml/preferences_notifications.xml b/src/main/res/xml/preferences_notifications.xml
similarity index 100%
rename from res/xml/preferences_notifications.xml
rename to src/main/res/xml/preferences_notifications.xml
diff --git a/res/xml/preferences_privacy.xml b/src/main/res/xml/preferences_privacy.xml
similarity index 100%
rename from res/xml/preferences_privacy.xml
rename to src/main/res/xml/preferences_privacy.xml
diff --git a/res/xml/shortcuts.xml b/src/main/res/xml/shortcuts.xml
similarity index 100%
rename from res/xml/shortcuts.xml
rename to src/main/res/xml/shortcuts.xml