diff --git a/build.gradle b/build.gradle
index 362e17ca8..9d1505bd4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -93,9 +93,21 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    flavorDimensions("distribution", "emoji")
+    flavorDimensions("mode", "distribution", "emoji")
 
     productFlavors {
+
+        quick {
+            dimension "mode"
+            applicationId = "im.conversations.quick"
+            resValue "string", "app_name", "Quick Conversations"
+            resValue "string", "applicationId", applicationId
+        }
+
+        full {
+            dimension "mode"
+        }
+
         playstore {
             dimension "distribution"
             versionNameSuffix "+p"
@@ -114,6 +126,35 @@ android {
         }
     }
 
+    sourceSets {
+        quickFreeCompat {
+            java {
+                srcDirs 'src/freeCompat/java'
+            }
+        }
+        quickPlaystoreCompat {
+            java {
+                srcDirs 'src/playstoreCompat/java'
+            }
+            res {
+                srcDir 'src/playstoreCompat/res'
+            }
+        }
+        fullFreeCompat {
+            java {
+                srcDirs 'src/freeCompat/java'
+            }
+        }
+        fullPlaystoreCompat {
+            java {
+                srcDirs 'src/playstoreCompat/java'
+            }
+            res {
+                srcDir 'src/playstoreCompat/res'
+            }
+        }
+    }
+
     buildTypes {
         release {
             shrinkResources true
@@ -131,7 +172,7 @@ android {
 
 
 
-    if(new File("signing.properties").exists()) {
+    if (new File("signing.properties").exists()) {
         Properties props = new Properties()
         props.load(new FileInputStream(file("signing.properties")))