diff --git a/android/.idea/.gitignore b/android/.idea/.gitignore
deleted file mode 100644
index 26d3352..0000000
--- a/android/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/android/.idea/caches/build_file_checksums.ser b/android/.idea/caches/build_file_checksums.ser
deleted file mode 100644
index 019fee8..0000000
Binary files a/android/.idea/caches/build_file_checksums.ser and /dev/null differ
diff --git a/android/.idea/codeStyles/Project.xml b/android/.idea/codeStyles/Project.xml
deleted file mode 100644
index 30aa626..0000000
--- a/android/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <Objective-C-extensions>
-      <file>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-      </file>
-      <class>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-      </class>
-      <extensions>
-        <pair source="cpp" header="h" fileNamingConvention="NONE" />
-        <pair source="c" header="h" fileNamingConvention="NONE" />
-      </extensions>
-    </Objective-C-extensions>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/android/.idea/gradle.xml b/android/.idea/gradle.xml
deleted file mode 100644
index 626dda4..0000000
--- a/android/.idea/gradle.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Android Studio java home" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/lib" />
-          </set>
-        </option>
-        <option name="resolveModulePerSourceSet" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/android/.idea/libraries/Gradle__android_android_15.xml b/android/.idea/libraries/Gradle__android_android_15.xml
deleted file mode 100644
index eb4a4f8..0000000
--- a/android/.idea/libraries/Gradle__android_android_15.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: android-android-15">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/Library/Android/sdk/platforms/android-15/android.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/android/.idea/libraries/Gradle__annotations_android_15.xml b/android/.idea/libraries/Gradle__annotations_android_15.xml
deleted file mode 100644
index 9ac4832..0000000
--- a/android/.idea/libraries/Gradle__annotations_android_15.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: annotations-android-15">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/Library/Android/sdk/tools/support/annotations.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/android/.idea/misc.xml b/android/.idea/misc.xml
deleted file mode 100644
index 6ca7ac9..0000000
--- a/android/.idea/misc.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
-    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
-    <option name="myNullables">
-      <value>
-        <list size="5">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
-          <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-        </list>
-      </value>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-  <component name="SvnBranchConfigurationManager">
-    <option name="mySupportsUserInfoFilter" value="true" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/android/.idea/modules.xml b/android/.idea/modules.xml
deleted file mode 100644
index ef93a53..0000000
--- a/android/.idea/modules.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/android.iml" filepath="$PROJECT_DIR$/.idea/modules/android.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/lib/lib.iml" filepath="$PROJECT_DIR$/.idea/modules/lib/lib.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/android/.idea/modules/android.iml b/android/.idea/modules/android.iml
deleted file mode 100644
index 6103ed0..0000000
--- a/android/.idea/modules/android.iml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="android" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="java-gradle" name="Java-Gradle">
-      <configuration>
-        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/../../build" />
-        <option name="BUILDABLE" value="false" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../..">
-      <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/android/.idea/modules/lib/lib.iml b/android/.idea/modules/lib/lib.iml
deleted file mode 100644
index 8f3f717..0000000
--- a/android/.idea/modules/lib/lib.iml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":lib" external.linked.project.path="$MODULE_DIR$/../../../lib" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":lib" />
-      </configuration>
-    </facet>
-    <facet type="native-android-gradle" name="Native-Android-Gradle">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="-----" />
-      </configuration>
-    </facet>
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug_Debug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug_Debug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebug_DebugSources" />
-        <afterSyncTasks>
-          <task>generateDebug_DebugSources</task>
-        </afterSyncTasks>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-        <option name="PROJECT_TYPE" value="1" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6">
-    <output url="file://$MODULE_DIR$/../../../lib/build/intermediates/classes/debug_/debug" />
-    <output-test url="file://$MODULE_DIR$/../../../lib/build/intermediates/classes/test/debug_/debug" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../../lib">
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/build/generated/source/apt/debug_/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/build/generated/source/r/debug_/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/build/generated/source/aidl/debug_/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/build/generated/source/buildConfig/debug_/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/build/generated/source/rs/debug_/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/build/generated/res/rs/debug_/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/build/generated/res/resValues/debug_/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/debug_Debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/debug_Debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/debug_Debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/debug_Debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/debug_Debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/debug_Debug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/debug_Debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/debug_Debug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/build/generated/source/apt/androidTest/debug_/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/build/generated/source/r/androidTest/debug_/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/build/generated/source/aidl/androidTest/debug_/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/build/generated/source/buildConfig/androidTest/debug_/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/build/generated/source/rs/androidTest/debug_/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/build/generated/res/rs/androidTest/debug_/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/build/generated/res/resValues/androidTest/debug_/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/androidTestDebug_Debug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/androidTestDebug_Debug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/androidTestDebug_Debug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/androidTestDebug_Debug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/androidTestDebug_Debug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/androidTestDebug_Debug/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/androidTestDebug_Debug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/androidTestDebug_Debug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/build/generated/source/apt/test/debug_/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/testDebug_Debug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/testDebug_Debug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/testDebug_Debug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/testDebug_Debug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/testDebug_Debug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/testDebug_Debug/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/testDebug_Debug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/testDebug_Debug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/debug_/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/debug_/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/debug_/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/debug_/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/debug_/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/debug_/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/debug_/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/debug_/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/testDebug_/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/testDebug_/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/testDebug_/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/testDebug_/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/testDebug_/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/testDebug_/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/testDebug_/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/testDebug_/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/androidTestDebug_/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/androidTestDebug_/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/androidTestDebug_/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/androidTestDebug_/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/androidTestDebug_/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/androidTestDebug_/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/androidTestDebug_/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/androidTestDebug_/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/debug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/debug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/testDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/testDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/testDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/testDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/testDebug/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/testDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/testDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/androidTestDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/androidTestDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/androidTestDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/androidTestDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/androidTestDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/androidTestDebug/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/androidTestDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/androidTestDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/main/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/main/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/androidTest/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/test/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/test/shaders" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../lib/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../lib/build/intermediates/annotations" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../lib/build/intermediates/attr" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../lib/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../lib/build/intermediates/check-manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../lib/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../lib/build/intermediates/cmake" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../lib/build/intermediates/extractedTypedefs" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../lib/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../lib/build/intermediates/intermediate-jars" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../lib/build/intermediates/javaPrecompile" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../lib/build/intermediates/jniLibs" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../lib/build/intermediates/library_and_local_jars_jni" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../lib/build/intermediates/lint" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../lib/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../lib/build/intermediates/packaged-aidl" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../lib/build/intermediates/packaged-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../lib/build/intermediates/packagedAssets" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../lib/build/intermediates/packaged_res" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../lib/build/intermediates/public_res" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../lib/build/intermediates/publish-proguard" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../lib/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../lib/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../lib/build/intermediates/shaders" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../lib/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../lib/build/intermediates/transforms" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../lib/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../lib/build/reports" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../lib/build/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: android-android-15" level="project" />
-    <orderEntry type="library" name="Gradle: annotations-android-15" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/android/.idea/vcs.xml b/android/.idea/vcs.xml
deleted file mode 100644
index a829d33..0000000
--- a/android/.idea/vcs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="svn" />
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>
\ No newline at end of file