diff --git a/Android/3D Cave Runner - Android Studio/.idea/misc.xml b/Android/3D Cave Runner - Android Studio/.idea/misc.xml
index 5d199810..fbb68289 100644
--- a/Android/3D Cave Runner - Android Studio/.idea/misc.xml	
+++ b/Android/3D Cave Runner - Android Studio/.idea/misc.xml	
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/Android/3D Cave Runner - Android Studio/.idea/workspace.xml b/Android/3D Cave Runner - Android Studio/.idea/workspace.xml
index 5d0016e2..a432f337 100644
--- a/Android/3D Cave Runner - Android Studio/.idea/workspace.xml	
+++ b/Android/3D Cave Runner - Android Studio/.idea/workspace.xml	
@@ -37,116 +37,7 @@
           <activation />
         </task>
         <projects_view>
-          <tree_state>
-            <PATH>
-              <PATH_ELEMENT>
-                <option name="myItemId" value="" />
-                <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ExternalProjectsStructure$RootNode" />
-              </PATH_ELEMENT>
-              <PATH_ELEMENT>
-                <option name="myItemId" value="3D Cave Runner - Android Studio" />
-                <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ProjectNode" />
-              </PATH_ELEMENT>
-              <PATH_ELEMENT>
-                <option name="myItemId" value=":app" />
-                <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ModuleNode" />
-              </PATH_ELEMENT>
-            </PATH>
-            <PATH>
-              <PATH_ELEMENT>
-                <option name="myItemId" value="" />
-                <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ExternalProjectsStructure$RootNode" />
-              </PATH_ELEMENT>
-              <PATH_ELEMENT>
-                <option name="myItemId" value="3D Cave Runner - Android Studio" />
-                <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ProjectNode" />
-              </PATH_ELEMENT>
-              <PATH_ELEMENT>
-                <option name="myItemId" value=":app" />
-                <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ModuleNode" />
-              </PATH_ELEMENT>
-              <PATH_ELEMENT>
-                <option name="myItemId" value="Tasks" />
-                <option name="myItemType" value="com.intellij.openapi.externalSystem.view.TasksNode" />
-              </PATH_ELEMENT>
-            </PATH>
-            <PATH>
-              <PATH_ELEMENT>
-                <option name="myItemId" value="" />
-                <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ExternalProjectsStructure$RootNode" />
-              </PATH_ELEMENT>
-              <PATH_ELEMENT>
-                <option name="myItemId" value="3D Cave Runner - Android Studio" />
-                <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ProjectNode" />
-              </PATH_ELEMENT>
-              <PATH_ELEMENT>
-                <option name="myItemId" value=":app" />
-                <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ModuleNode" />
-              </PATH_ELEMENT>
-              <PATH_ELEMENT>
-                <option name="myItemId" value="Tasks" />
-                <option name="myItemType" value="com.intellij.openapi.externalSystem.view.TasksNode" />
-              </PATH_ELEMENT>
-              <PATH_ELEMENT>
-                <option name="myItemId" value="other" />
-                <option name="myItemType" value="com.intellij.openapi.externalSystem.view.TasksNode$1" />
-              </PATH_ELEMENT>
-            </PATH>
-            <PATH>
-              <PATH_ELEMENT>
-                <option name="myItemId" value="" />
-                <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ExternalProjectsStructure$RootNode" />
-              </PATH_ELEMENT>
-              <PATH_ELEMENT>
-                <option name="myItemId" value="3D Cave Runner - Android Studio" />
-                <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ProjectNode" />
-              </PATH_ELEMENT>
-              <PATH_ELEMENT>
-                <option name="myItemId" value=":app" />
-                <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ModuleNode" />
-              </PATH_ELEMENT>
-              <PATH_ELEMENT>
-                <option name="myItemId" value="Tasks" />
-                <option name="myItemType" value="com.intellij.openapi.externalSystem.view.TasksNode" />
-              </PATH_ELEMENT>
-              <PATH_ELEMENT>
-                <option name="myItemId" value="build" />
-                <option name="myItemType" value="com.intellij.openapi.externalSystem.view.TasksNode$1" />
-              </PATH_ELEMENT>
-            </PATH>
-            <PATH>
-              <PATH_ELEMENT>
-                <option name="myItemId" value="" />
-                <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ExternalProjectsStructure$RootNode" />
-              </PATH_ELEMENT>
-              <PATH_ELEMENT>
-                <option name="myItemId" value="3D Cave Runner - Android Studio" />
-                <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ProjectNode" />
-              </PATH_ELEMENT>
-              <PATH_ELEMENT>
-                <option name="myItemId" value=":app" />
-                <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ModuleNode" />
-              </PATH_ELEMENT>
-              <PATH_ELEMENT>
-                <option name="myItemId" value="Tasks" />
-                <option name="myItemType" value="com.intellij.openapi.externalSystem.view.TasksNode" />
-              </PATH_ELEMENT>
-              <PATH_ELEMENT>
-                <option name="myItemId" value="android" />
-                <option name="myItemType" value="com.intellij.openapi.externalSystem.view.TasksNode$1" />
-              </PATH_ELEMENT>
-            </PATH>
-            <PATH>
-              <PATH_ELEMENT>
-                <option name="myItemId" value="" />
-                <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ExternalProjectsStructure$RootNode" />
-              </PATH_ELEMENT>
-              <PATH_ELEMENT>
-                <option name="myItemId" value="3D Cave Runner - Android Studio" />
-                <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ProjectNode" />
-              </PATH_ELEMENT>
-            </PATH>
-          </tree_state>
+          <tree_state />
         </projects_view>
       </state>
     </system>
@@ -156,11 +47,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="build.gradle" pinned="false" current-in-tab="false">
+      <file leaf-file-name="build.gradle" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/app/build.gradle">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="990">
-              <caret line="103" column="22" selection-start-line="103" selection-start-column="22" selection-end-line="103" selection-end-column="22" />
+            <state relative-caret-position="15">
+              <caret line="28" column="20" selection-start-line="28" selection-start-column="20" selection-end-line="28" selection-end-column="20" />
               <folding />
             </state>
           </provider>
@@ -186,18 +77,15 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="AndroidManifest.xml" pinned="false" current-in-tab="true">
+      <file leaf-file-name="AndroidManifest.xml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
           <provider editor-type-id="android-manifest">
             <state />
           </provider>
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="615">
-              <caret line="41" column="16" selection-start-line="41" selection-start-column="16" selection-end-line="41" selection-end-column="16" />
-              <folding>
-                <element signature="e#773#791#0" expanded="true" />
-                <element signature="e#863#882#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="225">
+              <caret line="15" column="40" selection-start-line="15" selection-start-column="40" selection-end-line="15" selection-end-column="40" />
+              <folding />
             </state>
           </provider>
         </entry>
@@ -208,7 +96,7 @@
             <state />
           </provider>
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="200">
+            <state relative-caret-position="570">
               <caret line="38" column="25" selection-start-line="38" selection-start-column="25" selection-end-line="38" selection-end-column="25" />
               <folding />
             </state>
@@ -690,6 +578,10 @@
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
                 <option name="name" value="prepareComFacebookSoloaderSoloader010Library" />
               </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="transformNative_libsWithStripDebugSymbolForMainRelease" />
+              </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="description" value="Injects the build id used by the Fabric SDK." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
@@ -1107,6 +999,10 @@
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
                 <option name="name" value="tasks" />
               </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="transformNative_libsWithStripDebugSymbolForVconlyRelease" />
+              </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
                 <option name="name" value="incrementalVconlyDebugUnitTestJavaCompilationSafeguard" />
@@ -1158,6 +1054,10 @@
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
                 <option name="name" value="processMainReleaseUnitTestJavaRes" />
               </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="transformNative_libsWithStripDebugSymbolForVconlyDebug" />
+              </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="description" value="Uninstalls the android (on device) tests for the MainDebug build." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
@@ -1388,6 +1288,10 @@
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
                 <option name="name" value="prepareVconlyReleaseUnitTestDependencies" />
               </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="transformNative_libsWithStripDebugSymbolForMainDebug" />
+              </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="description" value="Uninstall all applications." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
@@ -2175,6 +2079,10 @@
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
                 <option name="name" value="prepareComFacebookSoloaderSoloader010Library" />
               </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
+                <option name="name" value="transformNative_libsWithStripDebugSymbolForMainRelease" />
+              </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="description" value="Injects the build id used by the Fabric SDK." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
@@ -2592,6 +2500,10 @@
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
                 <option name="name" value="tasks" />
               </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
+                <option name="name" value="transformNative_libsWithStripDebugSymbolForVconlyRelease" />
+              </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
                 <option name="name" value="incrementalVconlyDebugUnitTestJavaCompilationSafeguard" />
@@ -2638,6 +2550,10 @@
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
                 <option name="name" value="processMainReleaseUnitTestJavaRes" />
               </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
+                <option name="name" value="transformNative_libsWithStripDebugSymbolForVconlyDebug" />
+              </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="description" value="Uninstalls the android (on device) tests for the MainDebug build." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
@@ -2868,6 +2784,10 @@
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
                 <option name="name" value="prepareVconlyReleaseUnitTestDependencies" />
               </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
+                <option name="name" value="transformNative_libsWithStripDebugSymbolForMainDebug" />
+              </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="description" value="Uninstall all applications." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
@@ -3267,7 +3187,7 @@
     </option>
     <option name="modificationStamps">
       <map>
-        <entry key="$PROJECT_DIR$" value="4517785428000" />
+        <entry key="$PROJECT_DIR$" value="4518475290000" />
       </map>
     </option>
     <option name="projectBuildClasspath">
@@ -3641,8 +3561,8 @@
         <option value="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" />
         <option value="$PROJECT_DIR$/build.gradle" />
         <option value="$PROJECT_DIR$/app/build.gradle" />
-        <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
         <option value="$PROJECT_DIR$/app/src/vconly/AndroidManifest.xml" />
+        <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
       </list>
     </option>
   </component>
@@ -3677,145 +3597,77 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="ProjectPane">
+      <pane id="AndroidView">
         <subPane>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="3D Cave Runner - Android Studio" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="3D Cave Runner - Android Studio" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="3D Cave Runner - Android Studio" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="3D Cave Runner - Android Studio" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="3D Cave Runner - Android Studio" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+              <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="sdk" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+              <option name="myItemId" value="Gradle Scripts" />
+              <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidBuildScriptsGroupNode" />
             </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="3D Cave Runner - Android Studio" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="3D Cave Runner - Android Studio" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="app" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+              <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
             </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
-      <pane id="AndroidView">
+      <pane id="PackagesPane" />
+      <pane id="ProjectPane">
         <subPane>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="3D Cave Runner - Android Studio" />
-              <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Gradle Scripts" />
-              <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidBuildScriptsGroupNode" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="3D Cave Runner - Android Studio" />
-              <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="app" />
-              <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="res" />
-              <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="3D Cave Runner - Android Studio" />
-              <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="app" />
-              <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="jniLibs" />
-              <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidSourceTypeNode" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="3D Cave Runner - Android Studio" />
-              <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="app" />
-              <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
+              <option name="myItemId" value="3D Cave Runner - Android Studio" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="assets" />
-              <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidSourceTypeNode" />
+              <option name="myItemId" value="sdk" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="3D Cave Runner - Android Studio" />
-              <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="app" />
-              <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidSourceTypeNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="caverun" />
-              <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidPsiDirectoryNode" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
-          </PATH>
-          <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="3D Cave Runner - Android Studio" />
-              <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
               <option name="myItemId" value="app" />
-              <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="manifests" />
-              <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidManifestsGroupNode" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scope" />
-      <pane id="PackagesPane" />
       <pane id="Scratches" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -3823,7 +3675,7 @@
     <property name="settings.editor.selected.configurable" value="instant.run" />
     <property name="settings.editor.splitter.proportion" value="0.2" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="device.picker.selection" value="1115fbb28e0a3703" />
+    <property name="device.picker.selection" value="32080f77910e51a5" />
     <property name="ExportApk.ApkPath" value="$PROJECT_DIR$/app" />
     <property name="ExportApk.Flavors" value="" />
     <property name="ExportApk.BuildType" value="release" />
@@ -4227,23 +4079,23 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="798" y="-1057" width="1920" height="1057" extended-state="6" />
-    <editor active="true" />
+    <editor active="false" />
     <layout>
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32949308" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.5292242" sideWeight="0.45047924" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21671991" sideWeight="0.4853273" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32943678" sideWeight="0.49574015" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5292242" sideWeight="0.43982962" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21671991" sideWeight="0.5225225" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.5292242" sideWeight="0.5495208" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Android Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5770457" sideWeight="0.47177848" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32814372" sideWeight="0.48592412" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.5281615" sideWeight="0.5601704" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Android Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.45377257" sideWeight="0.6890309" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32731137" sideWeight="0.48189563" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32949308" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Gradle Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2911796" sideWeight="0.5140759" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21671991" sideWeight="0.5146727" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.28700745" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21671991" sideWeight="0.4774775" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.28700745" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24984539" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Fabric" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Android Model" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
@@ -4360,10 +4212,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="236">
           <caret line="16" column="31" selection-start-line="16" selection-start-column="31" selection-end-line="16" selection-end-column="31" />
-          <folding>
-            <element signature="e#773#791#0" expanded="true" />
-            <element signature="e#863#882#0" expanded="true" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -4524,7 +4373,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="30">
           <caret line="2" column="19" selection-start-line="2" selection-start-column="19" selection-end-line="2" selection-end-column="19" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -4563,44 +4411,41 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/build.gradle">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="16" column="0" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
-          <folding />
-        </state>
+    <entry file="file://$PROJECT_DIR$/app/src/vconly/AndroidManifest.xml">
+      <provider editor-type-id="android-manifest">
+        <state />
       </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/build.gradle">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="990">
-          <caret line="103" column="22" selection-start-line="103" selection-start-column="22" selection-end-line="103" selection-end-column="22" />
+        <state relative-caret-position="570">
+          <caret line="38" column="25" selection-start-line="38" selection-start-column="25" selection-end-line="38" selection-end-column="25" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/vconly/AndroidManifest.xml">
+    <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
       <provider editor-type-id="android-manifest">
         <state />
       </provider>
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="200">
-          <caret line="38" column="25" selection-start-line="38" selection-start-column="25" selection-end-line="38" selection-end-column="25" />
+        <state relative-caret-position="225">
+          <caret line="15" column="40" selection-start-line="15" selection-start-column="40" selection-end-line="15" selection-end-column="40" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
-      <provider editor-type-id="android-manifest">
-        <state />
+    <entry file="file://$PROJECT_DIR$/build.gradle">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="16" column="0" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
+          <folding />
+        </state>
       </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/build.gradle">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="615">
-          <caret line="41" column="16" selection-start-line="41" selection-start-column="16" selection-end-line="41" selection-end-column="16" />
-          <folding>
-            <element signature="e#773#791#0" expanded="true" />
-            <element signature="e#863#882#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="15">
+          <caret line="28" column="20" selection-start-line="28" selection-start-column="20" selection-end-line="28" selection-end-column="20" />
+          <folding />
         </state>
       </provider>
     </entry>
diff --git a/Android/3D Cave Runner - Android Studio/app/app.iml b/Android/3D Cave Runner - Android Studio/app/app.iml
index 8620e515..57680192 100644
--- a/Android/3D Cave Runner - Android Studio/app/app.iml	
+++ b/Android/3D Cave Runner - Android Studio/app/app.iml	
@@ -8,11 +8,11 @@
     </facet>
     <facet type="android" name="Android">
       <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="vconlyDebug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleVconlyDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileVconlyDebugSources" />
+        <option name="SELECTED_BUILD_VARIANT" value="mainDebug" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleMainDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileMainDebugSources" />
         <afterSyncTasks>
-          <task>generateVconlyDebugSources</task>
+          <task>generateMainDebugSources</task>
         </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -23,63 +23,61 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/vconly/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/vconly/debug" />
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/main/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/main/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/vconly/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/vconly/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/vconly/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/vconly/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/vconly/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/fabric/res/vconly/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/google-services/vconly/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/vconly/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/vconly/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/vconlyDebug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/vconlyDebug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/vconlyDebug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/vconlyDebug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/vconlyDebug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/vconlyDebug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/vconlyDebug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testVconlyDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testVconlyDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testVconlyDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testVconlyDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testVconlyDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testVconlyDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testVconlyDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/vconly/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/vconly/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/vconly/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/vconly/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/vconly/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/vconly/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/vconly/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/vconly/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/main/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/main/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/main/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/main/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/main/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/fabric/res/main/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/google-services/main/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/main/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/main/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/mainDebug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/mainDebug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/mainDebug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/mainDebug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/mainDebug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/mainDebug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/mainDebug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testMainDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testMainDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testMainDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testMainDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testMainDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testMainDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testMainDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/main/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/main/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/main/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/main/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/main/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/main/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/main/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/vconly/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/vconly/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/vconly/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/vconly/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/vconly/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/vconly/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestVconly/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestVconly/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestVconly/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestVconly/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestVconly/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestVconly/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestVconly/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testVconly/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testVconly/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testVconly/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testVconly/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testVconly/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testVconly/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testVconly/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" 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/androidTestMain/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestMain/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestMain/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestMain/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestMain/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestMain/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestMain/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testMain/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testMain/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testMain/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testMain/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testMain/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testMain/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testMain/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" />
@@ -94,18 +92,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" 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/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" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" 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" />
@@ -113,12 +99,16 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" 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/.DS_Store" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/.DS_Store" />
+      <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" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" 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" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <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.BV/react-native-linear-gradient/2.0.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/25.3.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/jars" />
@@ -174,9 +164,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/multi-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
       <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/intermediates/transforms" />
diff --git a/Android/3D Cave Runner - Android Studio/app/libs/unity-classes.jar b/Android/3D Cave Runner - Android Studio/app/libs/unity-classes.jar
index b94225df..4e35a106 100644
Binary files a/Android/3D Cave Runner - Android Studio/app/libs/unity-classes.jar and b/Android/3D Cave Runner - Android Studio/app/libs/unity-classes.jar differ
diff --git a/Android/3D Cave Runner - Android Studio/app/src/main/AndroidManifest.xml b/Android/3D Cave Runner - Android Studio/app/src/main/AndroidManifest.xml
index d0530753..50b5f8ff 100644
--- a/Android/3D Cave Runner - Android Studio/app/src/main/AndroidManifest.xml	
+++ b/Android/3D Cave Runner - Android Studio/app/src/main/AndroidManifest.xml	
@@ -29,7 +29,7 @@
             android:value="1410" />
         <meta-data
             android:name="skillz_production"
-            android:value="true" />
+            android:value="false" />
 
         <meta-data android:name="skillz_orientation" android:value="portrait" />
     <meta-data android:name="skillz_game_activity" android:value="com.skillz.activity.UnityGameActivity"/>
diff --git a/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/Assembly-CSharp-firstpass.dll b/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/Assembly-CSharp-firstpass.dll
index 2f6de5ef..c0a977e7 100755
Binary files a/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/Assembly-CSharp-firstpass.dll and b/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/Assembly-CSharp-firstpass.dll differ
diff --git a/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/Assembly-CSharp-firstpass.dll.mdb b/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/Assembly-CSharp-firstpass.dll.mdb
deleted file mode 100644
index f34371ff..00000000
Binary files a/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/Assembly-CSharp-firstpass.dll.mdb and /dev/null differ
diff --git a/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/Assembly-CSharp.dll b/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/Assembly-CSharp.dll
index dfcdf707..ee2a2d00 100755
Binary files a/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/Assembly-CSharp.dll and b/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/Assembly-CSharp.dll differ
diff --git a/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/Assembly-CSharp.dll.mdb b/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/Assembly-CSharp.dll.mdb
deleted file mode 100644
index 871dd037..00000000
Binary files a/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/Assembly-CSharp.dll.mdb and /dev/null differ
diff --git a/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/Assembly-UnityScript.dll b/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/Assembly-UnityScript.dll
index dad315d3..45b64d93 100755
Binary files a/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/Assembly-UnityScript.dll and b/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/Assembly-UnityScript.dll differ
diff --git a/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/Assembly-UnityScript.dll.mdb b/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/Assembly-UnityScript.dll.mdb
deleted file mode 100644
index a6e303b7..00000000
Binary files a/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/Assembly-UnityScript.dll.mdb and /dev/null differ
diff --git a/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/Mono.Security.dll.mdb b/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/Mono.Security.dll.mdb
deleted file mode 100644
index 69392716..00000000
Binary files a/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/Mono.Security.dll.mdb and /dev/null differ
diff --git a/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/System.Core.dll.mdb b/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/System.Core.dll.mdb
deleted file mode 100644
index 4028460d..00000000
Binary files a/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/System.Core.dll.mdb and /dev/null differ
diff --git a/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/System.dll.mdb b/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/System.dll.mdb
deleted file mode 100644
index c169dcc3..00000000
Binary files a/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/System.dll.mdb and /dev/null differ
diff --git a/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/UnityEngine.Networking.dll.mdb b/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/UnityEngine.Networking.dll.mdb
deleted file mode 100644
index e4562163..00000000
Binary files a/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/UnityEngine.Networking.dll.mdb and /dev/null differ
diff --git a/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/UnityEngine.Timeline.dll.mdb b/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/UnityEngine.Timeline.dll.mdb
deleted file mode 100644
index e7c69743..00000000
Binary files a/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/UnityEngine.Timeline.dll.mdb and /dev/null differ
diff --git a/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/UnityEngine.UI.dll.mdb b/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/UnityEngine.UI.dll.mdb
deleted file mode 100644
index 005433a4..00000000
Binary files a/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/UnityEngine.UI.dll.mdb and /dev/null differ
diff --git a/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/UnityEngine.dll.mdb b/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/UnityEngine.dll.mdb
deleted file mode 100644
index 14c12333..00000000
Binary files a/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/UnityEngine.dll.mdb and /dev/null differ
diff --git a/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/mscorlib.dll.mdb b/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/mscorlib.dll.mdb
deleted file mode 100644
index 03ea936b..00000000
Binary files a/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Managed/mscorlib.dll.mdb and /dev/null differ
diff --git a/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Resources/unity_builtin_extra b/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Resources/unity_builtin_extra
deleted file mode 100644
index 94086236..00000000
Binary files a/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/Resources/unity_builtin_extra and /dev/null differ
diff --git a/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/data.unity3d b/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/data.unity3d
index 575566dc..f65c3351 100644
Binary files a/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/data.unity3d and b/Android/3D Cave Runner - Android Studio/app/src/main/assets/bin/Data/data.unity3d differ
diff --git a/Android/3D Cave Runner - Android Studio/app/src/main/jniLibs/armeabi-v7a/libmain.so b/Android/3D Cave Runner - Android Studio/app/src/main/jniLibs/armeabi-v7a/libmain.so
index aff0c0aa..d9eff033 100755
Binary files a/Android/3D Cave Runner - Android Studio/app/src/main/jniLibs/armeabi-v7a/libmain.so and b/Android/3D Cave Runner - Android Studio/app/src/main/jniLibs/armeabi-v7a/libmain.so differ
diff --git a/Android/3D Cave Runner - Android Studio/app/src/main/jniLibs/armeabi-v7a/libunity.so b/Android/3D Cave Runner - Android Studio/app/src/main/jniLibs/armeabi-v7a/libunity.so
index 3cc32bad..0f325948 100755
Binary files a/Android/3D Cave Runner - Android Studio/app/src/main/jniLibs/armeabi-v7a/libunity.so and b/Android/3D Cave Runner - Android Studio/app/src/main/jniLibs/armeabi-v7a/libunity.so differ
diff --git a/Android/3D Cave Runner - Android Studio/app/src/main/jniLibs/x86/libmain.so b/Android/3D Cave Runner - Android Studio/app/src/main/jniLibs/x86/libmain.so
index ac179215..7d6770e4 100755
Binary files a/Android/3D Cave Runner - Android Studio/app/src/main/jniLibs/x86/libmain.so and b/Android/3D Cave Runner - Android Studio/app/src/main/jniLibs/x86/libmain.so differ
diff --git a/Android/3D Cave Runner - Android Studio/app/src/main/jniLibs/x86/libunity.so b/Android/3D Cave Runner - Android Studio/app/src/main/jniLibs/x86/libunity.so
index 9d201eb1..d07846b3 100755
Binary files a/Android/3D Cave Runner - Android Studio/app/src/main/jniLibs/x86/libunity.so and b/Android/3D Cave Runner - Android Studio/app/src/main/jniLibs/x86/libunity.so differ
diff --git a/Android/3D Cave Runner - Android Studio/local.properties b/Android/3D Cave Runner - Android Studio/local.properties
index 009146c1..c62c08c3 100644
--- a/Android/3D Cave Runner - Android Studio/local.properties	
+++ b/Android/3D Cave Runner - Android Studio/local.properties	
@@ -7,5 +7,6 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Mon Sep 25 17:05:17 PDT 2017
+#Fri Sep 29 12:12:57 PDT 2017
+ndk.dir=/Users/gabbyfirmacion/Library/Android/sdk/ndk-bundle
 sdk.dir=/Users/gabbyfirmacion/Library/Android/sdk