diff --git a/build.gradle b/app/build.gradle
similarity index 89%
rename from build.gradle
rename to app/build.gradle
index 1d30b13ef0..b55942ef35 100644
--- a/build.gradle
+++ b/app/build.gradle
@@ -274,26 +274,26 @@ android {
         debug {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'),
-                          'proguard-firebase-messaging.pro',
-                          'proguard-google-play-services.pro',
-                          'proguard-jackson.pro',
-                          'proguard-sqlite.pro',
-                          'proguard-appcompat-v7.pro',
-                          'proguard-square-okhttp.pro',
-                          'proguard-square-okio.pro',
-                          'proguard-spongycastle.pro',
-                          'proguard-rounded-image-view.pro',
-                          'proguard-glide.pro',
-                          'proguard-shortcutbadger.pro',
-                          'proguard-retrofit.pro',
-                          'proguard-webrtc.pro',
-                          'proguard-klinker.pro',
-                          'proguard-retrolambda.pro',
-                          'proguard-okhttp.pro',
-                          'proguard-ez-vcard.pro',
-                          'proguard.cfg'
-            testProguardFiles 'proguard-automation.pro',
-                          'proguard.cfg'
+                    'proguard/proguard-firebase-messaging.pro',
+                    'proguard/proguard-google-play-services.pro',
+                    'proguard/proguard-jackson.pro',
+                    'proguard/proguard-sqlite.pro',
+                    'proguard/proguard-appcompat-v7.pro',
+                    'proguard/proguard-square-okhttp.pro',
+                    'proguard/proguard-square-okio.pro',
+                    'proguard/proguard-spongycastle.pro',
+                    'proguard/proguard-rounded-image-view.pro',
+                    'proguard/proguard-glide.pro',
+                    'proguard/proguard-shortcutbadger.pro',
+                    'proguard/proguard-retrofit.pro',
+                    'proguard/proguard-webrtc.pro',
+                    'proguard/proguard-klinker.pro',
+                    'proguard/proguard-retrolambda.pro',
+                    'proguard/proguard-okhttp.pro',
+                    'proguard/proguard-ez-vcard.pro',
+                    'proguard/proguard.cfg'
+            testProguardFiles 'proguard/proguard-automation.pro',
+                    'proguard/proguard.cfg'
         }
         staging {
             initWith debug
@@ -340,28 +340,28 @@ android {
 
     sourceSets {
         main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            resources.srcDirs = ['src']
-            aidl.srcDirs = ['src']
-            renderscript.srcDirs = ['src']
-            res.srcDirs = ['res']
-            assets.srcDirs = ['assets']
-            jniLibs.srcDirs = ['libs']
-            proto.srcDir 'protobuf'
+            manifest.srcFile '../AndroidManifest.xml'
+            java.srcDirs = ['../src']
+            resources.srcDirs = ['../src']
+            aidl.srcDirs = ['../src']
+            renderscript.srcDirs = ['../src']
+            res.srcDirs = ['../res']
+            assets.srcDirs = ['../assets']
+            jniLibs.srcDirs = ['../libs']
+            proto.srcDir '../protobuf'
         }
         androidTest {
-            java.srcDirs = ['test/androidTest/java']
+            java.srcDirs = ['../test/androidTest/java']
         }
         test {
-            java.srcDirs = ['test/unitTest/java']
-            resources.srcDirs = ['test/unitTest/resources']
+            java.srcDirs = ['../test/unitTest/java']
+            resources.srcDirs = ['../test/unitTest/resources']
         }
         staging {
-            res.srcDirs = ['staging/res']
+            res.srcDirs = ['../staging/res']
         }
 
-        website.manifest.srcFile 'website/AndroidManifest.xml'
+        website.manifest.srcFile '../website/AndroidManifest.xml'
     }
 
     lintOptions {
@@ -457,9 +457,5 @@ def getLastCommitTimestamp() {
 task qa {
   group 'Verification'
   description 'Quality Assurance. Run before pushing.'
-  dependsOn ':testPlayReleaseUnitTest', ':lintPlayRelease', ':assemblePlayDebug'
-}
-
-wrapper {
-    distributionType = Wrapper.DistributionType.ALL
+  dependsOn 'testPlayReleaseUnitTest', 'lintPlayRelease', 'assemblePlayDebug'
 }
diff --git a/lint-baseline.xml b/app/lint-baseline.xml
similarity index 100%
rename from lint-baseline.xml
rename to app/lint-baseline.xml
diff --git a/lint.xml b/app/lint.xml
similarity index 80%
rename from lint.xml
rename to app/lint.xml
index 5009276e2a..66a887aa4c 100644
--- a/lint.xml
+++ b/app/lint.xml
@@ -18,8 +18,8 @@
     <issue id="ExtraTranslation" severity="warning" />
 
     <issue id="RestrictedApi" severity="error">
-        <ignore path="src/org/thoughtcrime/securesms/mediasend/camerax/VideoCapture.java" />
-        <ignore path="src/org/thoughtcrime/securesms/mediasend/camerax/CameraXModule.java" />
+        <ignore path="*/org/thoughtcrime/securesms/mediasend/camerax/VideoCapture.java" />
+        <ignore path="*/org/thoughtcrime/securesms/mediasend/camerax/CameraXModule.java" />
     </issue>
 
 </lint>
diff --git a/proguard-appcompat-v7.pro b/app/proguard/proguard-appcompat-v7.pro
similarity index 100%
rename from proguard-appcompat-v7.pro
rename to app/proguard/proguard-appcompat-v7.pro
diff --git a/proguard-automation.pro b/app/proguard/proguard-automation.pro
similarity index 100%
rename from proguard-automation.pro
rename to app/proguard/proguard-automation.pro
diff --git a/proguard-ez-vcard.pro b/app/proguard/proguard-ez-vcard.pro
similarity index 100%
rename from proguard-ez-vcard.pro
rename to app/proguard/proguard-ez-vcard.pro
diff --git a/proguard-firebase-messaging.pro b/app/proguard/proguard-firebase-messaging.pro
similarity index 100%
rename from proguard-firebase-messaging.pro
rename to app/proguard/proguard-firebase-messaging.pro
diff --git a/proguard-glide.pro b/app/proguard/proguard-glide.pro
similarity index 100%
rename from proguard-glide.pro
rename to app/proguard/proguard-glide.pro
diff --git a/proguard-google-play-services.pro b/app/proguard/proguard-google-play-services.pro
similarity index 100%
rename from proguard-google-play-services.pro
rename to app/proguard/proguard-google-play-services.pro
diff --git a/proguard-jackson.pro b/app/proguard/proguard-jackson.pro
similarity index 100%
rename from proguard-jackson.pro
rename to app/proguard/proguard-jackson.pro
diff --git a/proguard-klinker.pro b/app/proguard/proguard-klinker.pro
similarity index 100%
rename from proguard-klinker.pro
rename to app/proguard/proguard-klinker.pro
diff --git a/proguard-okhttp.pro b/app/proguard/proguard-okhttp.pro
similarity index 100%
rename from proguard-okhttp.pro
rename to app/proguard/proguard-okhttp.pro
diff --git a/proguard-retrofit.pro b/app/proguard/proguard-retrofit.pro
similarity index 100%
rename from proguard-retrofit.pro
rename to app/proguard/proguard-retrofit.pro
diff --git a/proguard-retrolambda.pro b/app/proguard/proguard-retrolambda.pro
similarity index 100%
rename from proguard-retrolambda.pro
rename to app/proguard/proguard-retrolambda.pro
diff --git a/proguard-rounded-image-view.pro b/app/proguard/proguard-rounded-image-view.pro
similarity index 100%
rename from proguard-rounded-image-view.pro
rename to app/proguard/proguard-rounded-image-view.pro
diff --git a/proguard-shortcutbadger.pro b/app/proguard/proguard-shortcutbadger.pro
similarity index 100%
rename from proguard-shortcutbadger.pro
rename to app/proguard/proguard-shortcutbadger.pro
diff --git a/proguard-sqlite.pro b/app/proguard/proguard-sqlite.pro
similarity index 100%
rename from proguard-sqlite.pro
rename to app/proguard/proguard-sqlite.pro
diff --git a/proguard-square-okhttp.pro b/app/proguard/proguard-square-okhttp.pro
similarity index 100%
rename from proguard-square-okhttp.pro
rename to app/proguard/proguard-square-okhttp.pro
diff --git a/proguard-square-okio.pro b/app/proguard/proguard-square-okio.pro
similarity index 100%
rename from proguard-square-okio.pro
rename to app/proguard/proguard-square-okio.pro
diff --git a/proguard.cfg b/app/proguard/proguard.cfg
similarity index 100%
rename from proguard.cfg
rename to app/proguard/proguard.cfg
diff --git a/translations.gradle b/app/translations.gradle
similarity index 98%
rename from translations.gradle
rename to app/translations.gradle
index b116ccb1ab..8bebca9c0f 100644
--- a/translations.gradle
+++ b/app/translations.gradle
@@ -7,7 +7,7 @@ ext {
 }
 
 def allStringsResourceFiles(@ClosureParams(value = SimpleType.class, options = ['java.io.File']) Closure c) {
-    file('res').eachFileRecurse(FileType.FILES) { f ->
+    file('../res').eachFileRecurse(FileType.FILES) { f ->
         if (f.name == 'strings.xml') {
             c(f)
         }
diff --git a/witness-verifications.gradle b/app/witness-verifications.gradle
similarity index 100%
rename from witness-verifications.gradle
rename to app/witness-verifications.gradle
diff --git a/main.gradle b/main.gradle
new file mode 100644
index 0000000000..979d65e56c
--- /dev/null
+++ b/main.gradle
@@ -0,0 +1,3 @@
+wrapper {
+    distributionType = Wrapper.DistributionType.ALL
+}
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000000..a4efc50c24
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,7 @@
+include ':app'
+
+project(':app').name = 'Signal-Android'
+
+project(':').buildFileName = 'main.gradle'
+
+rootProject.name='Signal'