diff --git a/app/app.iml b/app/app.iml
index 9867421a..c57d64ba 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -8,12 +8,12 @@
     </facet>
     <facet type="android" name="Android">
       <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="lollipopDebug" />
+        <option name="SELECTED_BUILD_VARIANT" value="kitkat-and-earlierDebug" />
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleLollipopDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileLollipopDebugSources" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleKitkat-and-earlierDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileKitkat-and-earlierDebugSources" />
         <afterSyncTasks>
-          <task>generateLollipopDebugSources</task>
+          <task>generateKitkat-and-earlierDebugSources</task>
         </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -24,62 +24,62 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/lollipop/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/lollipop/debug" />
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/kitkat-and-earlier/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/kitkat-and-earlier/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/lollipop/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/lollipop/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/lollipop/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/lollipop/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/lollipop/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/lollipop/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/lollipopDebug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/lollipopDebug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/lollipopDebug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/lollipopDebug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/lollipopDebug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/lollipopDebug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/lollipopDebug/renderscript" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/lollipopDebug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/lollipop/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/lollipop/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/lollipop/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/lollipop/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/lollipop/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/lollipop/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testLollipopDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testLollipopDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testLollipopDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testLollipopDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testLollipopDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testLollipopDebug/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testLollipopDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testLollipopDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/lollipop/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/lollipop/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/lollipop/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/lollipop/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/lollipop/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/lollipop/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/lollipop/renderscript" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/lollipop/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testLollipop/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testLollipop/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testLollipop/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testLollipop/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testLollipop/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testLollipop/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testLollipop/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testLollipop/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLollipop/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLollipop/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLollipop/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLollipop/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLollipop/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLollipop/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLollipop/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLollipop/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/kitkat-and-earlier/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/kitkat-and-earlier/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/kitkat-and-earlier/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/kitkat-and-earlier/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/kitkat-and-earlier/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/kitkat-and-earlier/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlierDebug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlierDebug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlierDebug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlierDebug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlierDebug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlierDebug/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlierDebug/renderscript" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlierDebug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlierDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlierDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlierDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlierDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlierDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlierDebug/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlierDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlierDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/kitkat-and-earlier/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/kitkat-and-earlier/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/kitkat-and-earlier/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/kitkat-and-earlier/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/kitkat-and-earlier/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/kitkat-and-earlier/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlier/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlier/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlier/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlier/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlier/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlier/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlier/renderscript" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlier/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestKitkat-and-earlier/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestKitkat-and-earlier/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestKitkat-and-earlier/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestKitkat-and-earlier/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestKitkat-and-earlier/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestKitkat-and-earlier/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestKitkat-and-earlier/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestKitkat-and-earlier/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlier/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlier/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlier/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlier/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlier/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlier/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlier/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlier/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -104,14 +104,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/renderscript" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/renderscript" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -120,6 +112,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/renderscript" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/renderscript" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/binaries" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
diff --git a/app/build.gradle b/app/build.gradle
index 87a18377..12e6d17c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -54,7 +54,7 @@ model {
         }
 
         productFlavors {
-            create("kitkat") {
+            create("kitkat-and-earlier") {
                 versionName = "2.44"
                 minSdkVersion.apiLevel = 14
                 maxSdkVersion = 19
@@ -62,7 +62,7 @@ model {
                 versionCode = 2016072411
                 archivesBaseName = "NetGuard-v$versionName"
             }
-            create("lollipop") {
+            create("lollipop-and-later") {
                 versionName = "2.44"
                 minSdkVersion.apiLevel = 20
                 targetSdkVersion.apiLevel = 24