diff --git a/OffloadingDemo/mobile/mobile.iml b/OffloadingDemo/mobile/mobile.iml
index e37d7de..bd78d65 100755
--- a/OffloadingDemo/mobile/mobile.iml
+++ b/OffloadingDemo/mobile/mobile.iml
@@ -66,14 +66,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" 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/rs" 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" />
@@ -82,13 +74,16 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" 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/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/Icon&#13;" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/Icon&#13;" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/mediarouter-v7/22.2.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.1/jars" />
@@ -115,22 +110,11 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-wearable/7.8.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services/7.8.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git "a/OffloadingDemo/mobile/src/androidTest/java/Icon\r" "b/OffloadingDemo/mobile/src/androidTest/java/Icon\r"
deleted file mode 100644
index e69de29..0000000
diff --git "a/OffloadingDemo/mobile/src/main/java/Icon\r" "b/OffloadingDemo/mobile/src/main/java/Icon\r"
deleted file mode 100644
index e69de29..0000000
diff --git "a/OffloadingDemo/mobile/src/main/java/edu/Icon\r" "b/OffloadingDemo/mobile/src/main/java/edu/Icon\r"
deleted file mode 100644
index e69de29..0000000
diff --git "a/OffloadingDemo/mobile/src/main/java/edu/ucsb/Icon\r" "b/OffloadingDemo/mobile/src/main/java/edu/ucsb/Icon\r"
deleted file mode 100644
index e69de29..0000000
diff --git "a/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/Icon\r" "b/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/Icon\r"
deleted file mode 100644
index e69de29..0000000
diff --git "a/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/Icon\r" "b/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/Icon\r"
deleted file mode 100644
index e69de29..0000000
diff --git "a/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/offloadingdemo/Icon\r" "b/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/offloadingdemo/Icon\r"
deleted file mode 100644
index e69de29..0000000
diff --git "a/OffloadingDemo/mobile/src/main/res/drawable/Icon\r" "b/OffloadingDemo/mobile/src/main/res/drawable/Icon\r"
deleted file mode 100644
index e69de29..0000000
diff --git "a/OffloadingDemo/mobile/src/main/res/layout/Icon\r" "b/OffloadingDemo/mobile/src/main/res/layout/Icon\r"
deleted file mode 100644
index e69de29..0000000
diff --git "a/OffloadingDemo/mobile/src/main/res/mipmap-hdpi/Icon\r" "b/OffloadingDemo/mobile/src/main/res/mipmap-hdpi/Icon\r"
deleted file mode 100644
index e69de29..0000000
diff --git "a/OffloadingDemo/mobile/src/main/res/mipmap-mdpi/Icon\r" "b/OffloadingDemo/mobile/src/main/res/mipmap-mdpi/Icon\r"
deleted file mode 100644
index e69de29..0000000
diff --git "a/OffloadingDemo/mobile/src/main/res/mipmap-xhdpi/Icon\r" "b/OffloadingDemo/mobile/src/main/res/mipmap-xhdpi/Icon\r"
deleted file mode 100644
index e69de29..0000000
diff --git "a/OffloadingDemo/mobile/src/main/res/mipmap-xxhdpi/Icon\r" "b/OffloadingDemo/mobile/src/main/res/mipmap-xxhdpi/Icon\r"
deleted file mode 100644
index e69de29..0000000
diff --git "a/OffloadingDemo/mobile/src/main/res/mipmap-xxxhdpi/Icon\r" "b/OffloadingDemo/mobile/src/main/res/mipmap-xxxhdpi/Icon\r"
deleted file mode 100644
index e69de29..0000000
diff --git "a/OffloadingDemo/mobile/src/main/res/values/Icon\r" "b/OffloadingDemo/mobile/src/main/res/values/Icon\r"
deleted file mode 100644
index e69de29..0000000
diff --git "a/OffloadingDemo/mobile/src/test/java/Icon\r" "b/OffloadingDemo/mobile/src/test/java/Icon\r"
deleted file mode 100644
index e69de29..0000000
diff --git "a/OffloadingDemo/wear/src/main/java/Icon\r" "b/OffloadingDemo/wear/src/main/java/Icon\r"
deleted file mode 100644
index e69de29..0000000
diff --git "a/OffloadingDemo/wear/src/main/res/drawable/Icon\r" "b/OffloadingDemo/wear/src/main/res/drawable/Icon\r"
deleted file mode 100644
index e69de29..0000000
diff --git "a/OffloadingDemo/wear/src/main/res/layout/Icon\r" "b/OffloadingDemo/wear/src/main/res/layout/Icon\r"
deleted file mode 100644
index e69de29..0000000
diff --git "a/OffloadingDemo/wear/src/main/res/mipmap-hdpi/Icon\r" "b/OffloadingDemo/wear/src/main/res/mipmap-hdpi/Icon\r"
deleted file mode 100644
index e69de29..0000000
diff --git "a/OffloadingDemo/wear/src/main/res/mipmap-mdpi/Icon\r" "b/OffloadingDemo/wear/src/main/res/mipmap-mdpi/Icon\r"
deleted file mode 100644
index e69de29..0000000
diff --git "a/OffloadingDemo/wear/src/main/res/mipmap-xhdpi/Icon\r" "b/OffloadingDemo/wear/src/main/res/mipmap-xhdpi/Icon\r"
deleted file mode 100644
index e69de29..0000000
diff --git "a/OffloadingDemo/wear/src/main/res/mipmap-xxhdpi/Icon\r" "b/OffloadingDemo/wear/src/main/res/mipmap-xxhdpi/Icon\r"
deleted file mode 100644
index e69de29..0000000
diff --git "a/OffloadingDemo/wear/src/main/res/mipmap-xxxhdpi/Icon\r" "b/OffloadingDemo/wear/src/main/res/mipmap-xxxhdpi/Icon\r"
deleted file mode 100644
index e69de29..0000000
diff --git "a/OffloadingDemo/wear/src/main/res/values/Icon\r" "b/OffloadingDemo/wear/src/main/res/values/Icon\r"
deleted file mode 100644
index e69de29..0000000
diff --git a/OffloadingDemo/wear/wear.iml b/OffloadingDemo/wear/wear.iml
index 795e1fb..37ff89b 100755
--- a/OffloadingDemo/wear/wear.iml
+++ b/OffloadingDemo/wear/wear.iml
@@ -66,14 +66,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" 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/rs" 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" />
@@ -82,9 +74,15 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <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/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/22.0.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/7.8.0/jars" />
@@ -94,9 +92,9 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />