diff --git a/android/java/app/build.gradle b/android/java/MapboxGLAndroidSDKTestApp/build.gradle
similarity index 93%
rename from android/java/app/build.gradle
rename to android/java/MapboxGLAndroidSDKTestApp/build.gradle
index 292c67ba4..c1dd00a52 100644
--- a/android/java/app/build.gradle
+++ b/android/java/MapboxGLAndroidSDKTestApp/build.gradle
@@ -13,9 +13,9 @@ apply plugin: 'com.android.application'
 apply plugin: 'checkstyle'
 
 task accessToken {
-    def rawDir = new File("app/src/main/res/raw")
-    rawDir.mkdirs()
-    def tokenFile = new File("app/src/main/res/raw/token.txt")
+//    def rawDir = new File("app/src/main/res/raw")
+//    rawDir.mkdirs()
+    def tokenFile = new File("MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt")
     if (!tokenFile.exists()) {
         String token = System.getenv('MAPBOX_ACCESS_TOKEN')
         if (token == null) {
diff --git a/android/java/app/lint.xml b/android/java/MapboxGLAndroidSDKTestApp/lint.xml
similarity index 100%
rename from android/java/app/lint.xml
rename to android/java/MapboxGLAndroidSDKTestApp/lint.xml
diff --git a/android/java/app/src/main/AndroidManifest.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
similarity index 100%
rename from android/java/app/src/main/AndroidManifest.xml
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
diff --git a/android/java/app/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java
similarity index 100%
rename from android/java/app/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java
diff --git a/android/java/app/src/main/java/com/mapbox/mapboxgl/app/MapFragment.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MapFragment.java
similarity index 100%
rename from android/java/app/src/main/java/com/mapbox/mapboxgl/app/MapFragment.java
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MapFragment.java
diff --git a/android/java/app/src/main/res/drawable-hdpi/ic_action_about.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_action_about.png
similarity index 100%
rename from android/java/app/src/main/res/drawable-hdpi/ic_action_about.png
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_action_about.png
diff --git a/android/java/app/src/main/res/drawable-hdpi/ic_action_location_found.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_action_location_found.png
similarity index 100%
rename from android/java/app/src/main/res/drawable-hdpi/ic_action_location_found.png
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_action_location_found.png
diff --git a/android/java/app/src/main/res/drawable-hdpi/ic_action_location_searching.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_action_location_searching.png
similarity index 100%
rename from android/java/app/src/main/res/drawable-hdpi/ic_action_location_searching.png
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_action_location_searching.png
diff --git a/android/java/app/src/main/res/drawable-hdpi/icon.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon.png
similarity index 100%
rename from android/java/app/src/main/res/drawable-hdpi/icon.png
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon.png
diff --git a/android/java/app/src/main/res/drawable-hdpi/icon_burned.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon_burned.png
similarity index 100%
rename from android/java/app/src/main/res/drawable-hdpi/icon_burned.png
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon_burned.png
diff --git a/android/java/app/src/main/res/drawable-mdpi/compass.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/compass.png
similarity index 100%
rename from android/java/app/src/main/res/drawable-mdpi/compass.png
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/compass.png
diff --git a/android/java/app/src/main/res/drawable-mdpi/ic_action_about.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_action_about.png
similarity index 100%
rename from android/java/app/src/main/res/drawable-mdpi/ic_action_about.png
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_action_about.png
diff --git a/android/java/app/src/main/res/drawable-mdpi/ic_action_location_found.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_action_location_found.png
similarity index 100%
rename from android/java/app/src/main/res/drawable-mdpi/ic_action_location_found.png
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_action_location_found.png
diff --git a/android/java/app/src/main/res/drawable-mdpi/ic_action_location_searching.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_action_location_searching.png
similarity index 100%
rename from android/java/app/src/main/res/drawable-mdpi/ic_action_location_searching.png
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_action_location_searching.png
diff --git a/android/java/app/src/main/res/drawable-mdpi/icon.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon.png
similarity index 100%
rename from android/java/app/src/main/res/drawable-mdpi/icon.png
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon.png
diff --git a/android/java/app/src/main/res/drawable-mdpi/icon_burned.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon_burned.png
similarity index 100%
rename from android/java/app/src/main/res/drawable-mdpi/icon_burned.png
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon_burned.png
diff --git a/android/java/app/src/main/res/drawable-xhdpi/ic_action_about.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_action_about.png
similarity index 100%
rename from android/java/app/src/main/res/drawable-xhdpi/ic_action_about.png
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_action_about.png
diff --git a/android/java/app/src/main/res/drawable-xhdpi/ic_action_location_found.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_action_location_found.png
similarity index 100%
rename from android/java/app/src/main/res/drawable-xhdpi/ic_action_location_found.png
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_action_location_found.png
diff --git a/android/java/app/src/main/res/drawable-xhdpi/ic_action_location_searching.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_action_location_searching.png
similarity index 100%
rename from android/java/app/src/main/res/drawable-xhdpi/ic_action_location_searching.png
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_action_location_searching.png
diff --git a/android/java/app/src/main/res/drawable-xhdpi/icon.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon.png
similarity index 100%
rename from android/java/app/src/main/res/drawable-xhdpi/icon.png
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon.png
diff --git a/android/java/app/src/main/res/drawable-xhdpi/icon_burned.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon_burned.png
similarity index 100%
rename from android/java/app/src/main/res/drawable-xhdpi/icon_burned.png
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon_burned.png
diff --git a/android/java/app/src/main/res/drawable-xxhdpi/ic_action_about.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_action_about.png
similarity index 100%
rename from android/java/app/src/main/res/drawable-xxhdpi/ic_action_about.png
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_action_about.png
diff --git a/android/java/app/src/main/res/drawable-xxhdpi/ic_action_location_found.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_action_location_found.png
similarity index 100%
rename from android/java/app/src/main/res/drawable-xxhdpi/ic_action_location_found.png
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_action_location_found.png
diff --git a/android/java/app/src/main/res/drawable-xxhdpi/ic_action_location_searching.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_action_location_searching.png
similarity index 100%
rename from android/java/app/src/main/res/drawable-xxhdpi/ic_action_location_searching.png
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_action_location_searching.png
diff --git a/android/java/app/src/main/res/drawable-xxhdpi/icon.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon.png
similarity index 100%
rename from android/java/app/src/main/res/drawable-xxhdpi/icon.png
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon.png
diff --git a/android/java/app/src/main/res/drawable-xxhdpi/icon_burned.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon_burned.png
similarity index 100%
rename from android/java/app/src/main/res/drawable-xxhdpi/icon_burned.png
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon_burned.png
diff --git a/android/java/app/src/main/res/drawable-xxxhdpi/icon.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon.png
similarity index 100%
rename from android/java/app/src/main/res/drawable-xxxhdpi/icon.png
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon.png
diff --git a/android/java/app/src/main/res/drawable-xxxhdpi/icon_burned.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon_burned.png
similarity index 100%
rename from android/java/app/src/main/res/drawable-xxxhdpi/icon_burned.png
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon_burned.png
diff --git a/android/java/app/src/main/res/layout/activity_main.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml
similarity index 100%
rename from android/java/app/src/main/res/layout/activity_main.xml
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml
diff --git a/android/java/app/src/main/res/layout/fragment_main.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_main.xml
similarity index 100%
rename from android/java/app/src/main/res/layout/fragment_main.xml
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_main.xml
diff --git a/android/java/app/src/main/res/menu/menu_main.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_main.xml
similarity index 100%
rename from android/java/app/src/main/res/menu/menu_main.xml
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_main.xml
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt
new file mode 100644
index 000000000..dd3ef5113
--- /dev/null
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt
@@ -0,0 +1 @@
+pk.eyJ1IjoiYmxlZWdlIiwiYSI6IlhFcHdyMlEifQ.A8U0V-ob2G0RjI_gznrjtg
\ No newline at end of file
diff --git a/android/java/app/src/main/res/values/strings.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
similarity index 100%
rename from android/java/app/src/main/res/values/strings.xml
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
diff --git a/android/java/app/src/main/res/values/styles.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml
similarity index 100%
rename from android/java/app/src/main/res/values/styles.xml
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml
diff --git a/android/java/settings.gradle b/android/java/settings.gradle
index 0959cbb33..9738fefb9 100644
--- a/android/java/settings.gradle
+++ b/android/java/settings.gradle
@@ -1,2 +1,2 @@
-include ':app'
+include ':MapboxGLAndroidSDKTestApp'
 include ':lib'