diff --git a/.gitignore b/.gitignore
index e06e7294b..9515b957a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,6 @@ project.properties
 .settings
 bin/
 gen/
-gplay/
 .idea/
 *.iml
 *.so
@@ -45,3 +44,5 @@ jni/x86_64
 jni/armeabi
 jni/armeabi-v7a
 jni/arm64-v8a
+
+*~
\ No newline at end of file
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 35f1b8952..7878941cf 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -40,8 +40,8 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
-    <!-- force compiling emojipicker on sdk<21 and firebase on sdk<19; runtime checks are required then -->
-    <uses-sdk tools:overrideLibrary="androidx.emoji2.emojipicker, com.google.firebase.messaging, com.google.android.gms.cloudmessaging"/>
+    <!-- force compiling emojipicker on sdk<21; runtime checks are required then -->
+    <uses-sdk tools:overrideLibrary="androidx.emoji2.emojipicker"/>
 
     <application android:name=".ApplicationContext"
                  android:icon="@mipmap/ic_launcher"
@@ -57,10 +57,6 @@
                  android:hasFragileUserData="true"
         >
 
-    <meta-data android:name="firebase_analytics_collection_deactivated" android:value="true" />
-    <meta-data android:name="google_analytics_adid_collection_enabled" android:value="false" />
-    <meta-data android:name="firebase_messaging_auto_init_enabled" android:value="false" />
-
     <!-- android car support, see https://developer.android.com/training/auto/start/,
          as this potentially blocks releases on gplay due to extra-checks,
          we disable this during the first gplay releases -->
@@ -381,12 +377,6 @@
         </intent-filter>
     </service>
 
-    <service android:name=".notifications.FcmReceiveService" android:exported="true">
-        <intent-filter>
-            <action android:name="com.google.firebase.MESSAGING_EVENT" />
-        </intent-filter>
-    </service>
-
     <receiver android:name=".notifications.MarkReadReceiver"
               android:enabled="true"
               android:exported="false">
@@ -441,12 +431,6 @@
 
     </provider>
 
-    <provider
-        android:name="com.google.firebase.provider.FirebaseInitProvider"
-        android:authorities="${applicationId}.firebaseinitprovider"
-        tools:node="remove">
-    </provider>
-
     <receiver android:name=".service.BootReceiver"
         android:exported="true">
         <intent-filter>
diff --git a/build.gradle b/build.gradle
index de8c0f078..bb6727540 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,86 +14,6 @@ repositories {
     jcenter()
 }
 
-dependencies {
-    implementation 'androidx.sharetarget:sharetarget:1.2.0'
-    implementation 'androidx.webkit:webkit:1.8.0'
-    implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.10.0'
-    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
-    implementation ('androidx.preference:preference:1.2.1') {
-        exclude group: 'androidx.lifecycle', module:'lifecycle-viewmodel'
-        exclude group: 'androidx.lifecycle', module:'lifecycle-viewmodel-ktx'
-    }
-    implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
-    implementation 'androidx.exifinterface:exifinterface:1.3.6'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'androidx.lifecycle:lifecycle-common-java8:2.6.2'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.6.2'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
-    implementation 'androidx.work:work-runtime:2.8.1'
-    implementation 'androidx.emoji2:emoji2-emojipicker:1.4.0'
-    implementation 'com.google.guava:guava:29.0-android'
-    implementation 'com.google.android.exoplayer:exoplayer-core:2.9.6' // plays video and audio
-    implementation 'com.google.android.exoplayer:exoplayer-ui:2.9.6'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'com.journeyapps:zxing-android-embedded:3.4.0' // QR Code scanner
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.11.1' // used as JSON library
-    implementation 'com.google.code.gson:gson:2.9.1' // used as JSON library. Don't upgrade to 2.10.1: https://github.com/deltachat/deltachat-android/pull/2610
-    implementation "me.leolin:ShortcutBadger:1.1.16" // display messagecount on the home screen icon.
-    implementation 'com.jpardogo.materialtabstrip:library:1.0.9' // used in the emoji selector for the tab selection.
-    implementation 'com.github.chrisbanes:PhotoView:2.1.3' // does the zooming on photos / media
-    implementation 'com.github.penfeizhou.android.animation:glide-plugin:2.25.0' // APNG & animated webp support.
-    implementation 'com.caverock:androidsvg-aar:1.4' // SVG support.
-    implementation 'com.github.bumptech.glide:glide:4.12.0'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
-    annotationProcessor 'androidx.annotation:annotation:1.7.0'
-    implementation 'com.makeramen:roundedimageview:2.1.0' // crops the avatars to circles
-    implementation 'com.pnikosis:materialish-progress:1.5' // used only in the "Progress Wheel" in Share Activity.
-    implementation 'com.soundcloud.android:android-crop:1.0.1@aar' // used for profile and group avatar selection in Android SDK<19
-    implementation 'com.nineoldandroids:library:2.4.0' // DEPRECATED! Used to slide in the half-camera.
-    implementation 'mobi.upod:time-duration-picker:1.1.3' // Used to pick the time for inactivity.
-    implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'  // number of unread messages,
-         // the one-letter circle for the contacts (when there is not avatar) and a white background.
-    implementation 'com.googlecode.mp4parser:isoparser:1.0.6' // MP4 recoding; upgrading eg. to 1.1.22 breaks recoding, however, i have not investigated further, just reset to 1.0.6
-    implementation ('com.davemorrissey.labs:subsampling-scale-image-view:3.6.0') { // for the zooming on photos / media
-        exclude group: 'com.android.support', module: 'support-annotations'
-    }
-    implementation 'com.annimon:stream:1.1.8' // brings future java streams api to SDK Version < 24
-    implementation 'com.codewaves.stickyheadergrid:stickyheadergrid:0.9.4' // glues the current time segment text in the gallery to the top.
-
-    // Replacement for ContentResolver
-    // that protects against the Surreptitious Sharing attack.
-    // <https://github.com/cketti/SafeContentResolver>
-    implementation 'de.cketti.safecontentresolver:safe-content-resolver-v14:1.0.0'
-
-    gplayImplementation ('com.google.firebase:firebase-messaging:23.4.1') { // for PUSH notifications
-        exclude group: 'com.google.firebase', module: 'firebase-core'
-        exclude group: 'com.google.firebase', module: 'firebase-analytics'
-        exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
-    }
-
-    testImplementation 'junit:junit:4.13.1'
-    testImplementation 'org.assertj:assertj-core:1.7.1'
-    testImplementation 'org.mockito:mockito-core:1.9.5'
-    testImplementation 'org.powermock:powermock-api-mockito:1.6.1'
-    testImplementation 'org.powermock:powermock-module-junit4:1.6.1'
-    testImplementation 'org.powermock:powermock-module-junit4-rule:1.6.1'
-    testImplementation 'org.powermock:powermock-classloading-xstream:1.6.1'
-
-    androidTestImplementation 'androidx.test:runner:1.4.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.4.0'
-    androidTestImplementation 'androidx.test:rules:1.4.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'com.android.support:support-annotations:28.0.0'
-
-    androidTestImplementation ('org.assertj:assertj-core:1.7.1') {
-        exclude group: 'org.hamcrest', module: 'hamcrest-core'
-    }
-}
-
-
 android {
     namespace "org.thoughtcrime.securesms"
     flavorDimensions "none"
@@ -124,7 +44,6 @@ android {
         project.ext.set("archivesBaseName", "deltachat");
 
         buildConfigField "boolean", "DEV_BUILD", "false"
-        buildConfigField "boolean", "USE_PLAY_SERVICES", "false"
 
         ndk {
             abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
@@ -197,7 +116,6 @@ android {
             dimension "none"
             applicationId "chat.delta"
             apply plugin: "com.google.gms.google-services"
-            buildConfigField "boolean", "USE_PLAY_SERVICES", "true"
         }
     }
 
@@ -212,17 +130,10 @@ android {
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            resources.srcDirs = ['src']
-            aidl.srcDirs = ['src']
-            renderscript.srcDirs = ['src']
             res.srcDirs = ['res']
             assets.srcDirs = ['assets']
             jniLibs.srcDirs = ['libs']
         }
-        androidTest {
-            java.srcDirs = ['androidTest']
-        }
     }
     lint {
         abortOnError false
@@ -234,6 +145,85 @@ android {
 
 }
 
+dependencies {
+    implementation 'androidx.sharetarget:sharetarget:1.2.0'
+    implementation 'androidx.webkit:webkit:1.8.0'
+    implementation 'androidx.multidex:multidex:2.0.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.10.0'
+    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
+    implementation ('androidx.preference:preference:1.2.1') {
+        exclude group: 'androidx.lifecycle', module:'lifecycle-viewmodel'
+        exclude group: 'androidx.lifecycle', module:'lifecycle-viewmodel-ktx'
+    }
+    implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
+    implementation 'androidx.exifinterface:exifinterface:1.3.6'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+    implementation 'androidx.lifecycle:lifecycle-common-java8:2.6.2'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.6.2'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
+    implementation 'androidx.work:work-runtime:2.8.1'
+    implementation 'androidx.emoji2:emoji2-emojipicker:1.4.0'
+    implementation 'com.google.guava:guava:29.0-android'
+    implementation 'com.google.android.exoplayer:exoplayer-core:2.9.6' // plays video and audio
+    implementation 'com.google.android.exoplayer:exoplayer-ui:2.9.6'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'com.journeyapps:zxing-android-embedded:3.4.0' // QR Code scanner
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.11.1' // used as JSON library
+    implementation 'com.google.code.gson:gson:2.9.1' // used as JSON library. Don't upgrade to 2.10.1: https://github.com/deltachat/deltachat-android/pull/2610
+    implementation "me.leolin:ShortcutBadger:1.1.16" // display messagecount on the home screen icon.
+    implementation 'com.jpardogo.materialtabstrip:library:1.0.9' // used in the emoji selector for the tab selection.
+    implementation 'com.github.chrisbanes:PhotoView:2.1.3' // does the zooming on photos / media
+    implementation 'com.github.penfeizhou.android.animation:glide-plugin:2.25.0' // APNG & animated webp support.
+    implementation 'com.caverock:androidsvg-aar:1.4' // SVG support.
+    implementation 'com.github.bumptech.glide:glide:4.12.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
+    annotationProcessor 'androidx.annotation:annotation:1.7.0'
+    implementation 'com.makeramen:roundedimageview:2.1.0' // crops the avatars to circles
+    implementation 'com.pnikosis:materialish-progress:1.5' // used only in the "Progress Wheel" in Share Activity.
+    implementation 'com.soundcloud.android:android-crop:1.0.1@aar' // used for profile and group avatar selection in Android SDK<19
+    implementation 'com.nineoldandroids:library:2.4.0' // DEPRECATED! Used to slide in the half-camera.
+    implementation 'mobi.upod:time-duration-picker:1.1.3' // Used to pick the time for inactivity.
+    implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'  // number of unread messages,
+    // the one-letter circle for the contacts (when there is not avatar) and a white background.
+    implementation 'com.googlecode.mp4parser:isoparser:1.0.6' // MP4 recoding; upgrading eg. to 1.1.22 breaks recoding, however, i have not investigated further, just reset to 1.0.6
+    implementation ('com.davemorrissey.labs:subsampling-scale-image-view:3.6.0') { // for the zooming on photos / media
+        exclude group: 'com.android.support', module: 'support-annotations'
+    }
+    implementation 'com.annimon:stream:1.1.8' // brings future java streams api to SDK Version < 24
+    implementation 'com.codewaves.stickyheadergrid:stickyheadergrid:0.9.4' // glues the current time segment text in the gallery to the top.
+
+    // Replacement for ContentResolver
+    // that protects against the Surreptitious Sharing attack.
+    // <https://github.com/cketti/SafeContentResolver>
+    implementation 'de.cketti.safecontentresolver:safe-content-resolver-v14:1.0.0'
+
+    gplayImplementation('com.google.firebase:firebase-messaging:23.4.1') { // for PUSH notifications
+        exclude group: 'com.google.firebase', module: 'firebase-core'
+        exclude group: 'com.google.firebase', module: 'firebase-analytics'
+        exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
+    }
+
+    testImplementation 'junit:junit:4.13.1'
+    testImplementation 'org.assertj:assertj-core:1.7.1'
+    testImplementation 'org.mockito:mockito-core:1.9.5'
+    testImplementation 'org.powermock:powermock-api-mockito:1.6.1'
+    testImplementation 'org.powermock:powermock-module-junit4:1.6.1'
+    testImplementation 'org.powermock:powermock-module-junit4-rule:1.6.1'
+    testImplementation 'org.powermock:powermock-classloading-xstream:1.6.1'
+
+    androidTestImplementation 'androidx.test:runner:1.4.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.4.0'
+    androidTestImplementation 'androidx.test:rules:1.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'com.android.support:support-annotations:28.0.0'
+
+    androidTestImplementation ('org.assertj:assertj-core:1.7.1') {
+        exclude group: 'org.hamcrest', module: 'hamcrest-core'
+    }
+}
+
 String buildConfigProperty(String name) {
     return "\"${propertyOrEmpty(name)}\""
 }
diff --git a/androidTest/com/b44t/messenger/TestUtils.java b/src/androidTest/java/com/b44t/messenger/TestUtils.java
similarity index 100%
rename from androidTest/com/b44t/messenger/TestUtils.java
rename to src/androidTest/java/com/b44t/messenger/TestUtils.java
diff --git a/androidTest/com/b44t/messenger/uibenchmarks/EnterChatsBenchmark.java b/src/androidTest/java/com/b44t/messenger/uibenchmarks/EnterChatsBenchmark.java
similarity index 100%
rename from androidTest/com/b44t/messenger/uibenchmarks/EnterChatsBenchmark.java
rename to src/androidTest/java/com/b44t/messenger/uibenchmarks/EnterChatsBenchmark.java
diff --git a/androidTest/com/b44t/messenger/uitests/offline/ForwardingTest.java b/src/androidTest/java/com/b44t/messenger/uitests/offline/ForwardingTest.java
similarity index 100%
rename from androidTest/com/b44t/messenger/uitests/offline/ForwardingTest.java
rename to src/androidTest/java/com/b44t/messenger/uitests/offline/ForwardingTest.java
diff --git a/androidTest/com/b44t/messenger/uitests/offline/SharingTest.java b/src/androidTest/java/com/b44t/messenger/uitests/offline/SharingTest.java
similarity index 100%
rename from androidTest/com/b44t/messenger/uitests/offline/SharingTest.java
rename to src/androidTest/java/com/b44t/messenger/uitests/offline/SharingTest.java
diff --git a/androidTest/com/b44t/messenger/uitests/online/OnboardingTest.java b/src/androidTest/java/com/b44t/messenger/uitests/online/OnboardingTest.java
similarity index 100%
rename from androidTest/com/b44t/messenger/uitests/online/OnboardingTest.java
rename to src/androidTest/java/com/b44t/messenger/uitests/online/OnboardingTest.java
diff --git a/src/fat/java/org/thoughtcrime/securesms/notifications/FcmReceiveService.java b/src/fat/java/org/thoughtcrime/securesms/notifications/FcmReceiveService.java
new file mode 100644
index 000000000..693cb6401
--- /dev/null
+++ b/src/fat/java/org/thoughtcrime/securesms/notifications/FcmReceiveService.java
@@ -0,0 +1,11 @@
+package org.thoughtcrime.securesms.notifications;
+
+import android.content.Context;
+import androidx.annotation.Nullable;
+
+public class FcmReceiveService {
+  public static void register(Context context) {}
+  public static void waitForRegisterFinished() {}
+  public static void deleteToken() {}
+  @Nullable public static String getToken() { return null; }
+}
diff --git a/src/gplay/AndroidManifest.xml b/src/gplay/AndroidManifest.xml
new file mode 100644
index 000000000..f2f978857
--- /dev/null
+++ b/src/gplay/AndroidManifest.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools">
+
+  <!-- force compiling emojipicker on sdk<21 and firebase on sdk<19; runtime checks are required then -->
+  <uses-sdk tools:overrideLibrary="androidx.emoji2.emojipicker, com.google.firebase.messaging, com.google.android.gms.cloudmessaging"/>
+
+  <meta-data android:name="firebase_analytics_collection_deactivated" android:value="true" />
+  <meta-data android:name="google_analytics_adid_collection_enabled" android:value="false" />
+  <meta-data android:name="firebase_messaging_auto_init_enabled" android:value="false" />
+
+  <application>
+    <service
+        android:name=".notifications.FcmReceiveService"
+        android:exported="true">
+      <intent-filter>
+        <action android:name="com.google.firebase.MESSAGING_EVENT" />
+      </intent-filter>
+    </service>
+
+    <provider
+        android:name="com.google.firebase.provider.FirebaseInitProvider"
+        android:authorities="${applicationId}.firebaseinitprovider"
+        tools:node="remove">
+    </provider>
+  </application>
+
+</manifest>
diff --git a/google-services.json b/src/gplay/google-services.json
similarity index 100%
rename from google-services.json
rename to src/gplay/google-services.json
diff --git a/src/org/thoughtcrime/securesms/notifications/FcmReceiveService.java b/src/gplay/java/org/thoughtcrime/securesms/notifications/FcmReceiveService.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/notifications/FcmReceiveService.java
rename to src/gplay/java/org/thoughtcrime/securesms/notifications/FcmReceiveService.java
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/camera/CameraSurfaceView.java b/src/main/java/org/thoughtcrime/securesms/components/camera/CameraSurfaceView.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/camera/CameraSurfaceView.java
rename to src/main/java/org/thoughtcrime/securesms/components/camera/CameraSurfaceView.java
diff --git a/src/org/thoughtcrime/securesms/components/camera/CameraUtils.java b/src/main/java/org/thoughtcrime/securesms/components/camera/CameraUtils.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/camera/CameraUtils.java
rename to src/main/java/org/thoughtcrime/securesms/components/camera/CameraUtils.java
diff --git a/src/org/thoughtcrime/securesms/components/camera/CameraView.java b/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/camera/CameraView.java
rename to src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java
diff --git a/src/org/thoughtcrime/securesms/components/camera/QuickAttachmentDrawer.java b/src/main/java/org/thoughtcrime/securesms/components/camera/QuickAttachmentDrawer.java
similarity index 100%
rename from src/org/thoughtcrime/securesms/components/camera/QuickAttachmentDrawer.java
rename to src/main/java/org/thoughtcrime/securesms/components/camera/QuickAttachmentDrawer.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/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/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/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/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/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/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