diff --git a/.editorconfig b/mapbox-gl-native-android/.editorconfig
similarity index 100%
rename from .editorconfig
rename to mapbox-gl-native-android/.editorconfig
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/mapbox-gl-native-android/.github/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from .github/PULL_REQUEST_TEMPLATE.md
rename to mapbox-gl-native-android/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/.github/stale.yml b/mapbox-gl-native-android/.github/stale.yml
similarity index 100%
rename from .github/stale.yml
rename to mapbox-gl-native-android/.github/stale.yml
diff --git a/.gitignore b/mapbox-gl-native-android/.gitignore
similarity index 100%
rename from .gitignore
rename to mapbox-gl-native-android/.gitignore
diff --git a/.gitmodules b/mapbox-gl-native-android/.gitmodules
similarity index 100%
rename from .gitmodules
rename to mapbox-gl-native-android/.gitmodules
diff --git a/CHANGELOG.md b/mapbox-gl-native-android/CHANGELOG.md
similarity index 100%
rename from CHANGELOG.md
rename to mapbox-gl-native-android/CHANGELOG.md
diff --git a/DISTRIBUTE.md b/mapbox-gl-native-android/DISTRIBUTE.md
similarity index 100%
rename from DISTRIBUTE.md
rename to mapbox-gl-native-android/DISTRIBUTE.md
diff --git a/LICENSE.md b/mapbox-gl-native-android/LICENSE.md
similarity index 100%
rename from LICENSE.md
rename to mapbox-gl-native-android/LICENSE.md
diff --git a/Makefile b/mapbox-gl-native-android/Makefile
similarity index 100%
rename from Makefile
rename to mapbox-gl-native-android/Makefile
diff --git a/MapboxGLAndroidSDK/.gitignore b/mapbox-gl-native-android/MapboxGLAndroidSDK/.gitignore
similarity index 100%
rename from MapboxGLAndroidSDK/.gitignore
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/.gitignore
diff --git a/MapboxGLAndroidSDK/build.gradle b/mapbox-gl-native-android/MapboxGLAndroidSDK/build.gradle
similarity index 100%
rename from MapboxGLAndroidSDK/build.gradle
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/build.gradle
diff --git a/MapboxGLAndroidSDK/gradle.properties b/mapbox-gl-native-android/MapboxGLAndroidSDK/gradle.properties
similarity index 100%
rename from MapboxGLAndroidSDK/gradle.properties
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/gradle.properties
diff --git a/MapboxGLAndroidSDK/lint.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/lint.xml
similarity index 100%
rename from MapboxGLAndroidSDK/lint.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/lint.xml
diff --git a/MapboxGLAndroidSDK/proguard-rules.pro b/mapbox-gl-native-android/MapboxGLAndroidSDK/proguard-rules.pro
similarity index 100%
rename from MapboxGLAndroidSDK/proguard-rules.pro
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/proguard-rules.pro
diff --git a/MapboxGLAndroidSDK/src/cpp/CMakeLists.txt b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/CMakeLists.txt
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/CMakeLists.txt
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/CMakeLists.txt
diff --git a/MapboxGLAndroidSDK/src/cpp/android_renderer_backend.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/android_renderer_backend.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/android_renderer_backend.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/android_renderer_backend.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/android_renderer_backend.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/android_renderer_backend.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/android_renderer_backend.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/android_renderer_backend.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/android_renderer_frontend.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/android_renderer_frontend.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/android_renderer_frontend.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/android_renderer_frontend.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/android_renderer_frontend.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/android_renderer_frontend.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/android_renderer_frontend.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/android_renderer_frontend.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/annotation/marker.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/annotation/marker.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/annotation/marker.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/annotation/marker.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/annotation/marker.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/annotation/marker.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/annotation/marker.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/annotation/marker.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/annotation/multi_point.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/annotation/multi_point.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/annotation/multi_point.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/annotation/multi_point.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/annotation/polygon.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/annotation/polygon.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/annotation/polygon.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/annotation/polygon.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/annotation/polygon.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/annotation/polygon.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/annotation/polygon.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/annotation/polygon.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/annotation/polyline.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/annotation/polyline.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/annotation/polyline.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/annotation/polyline.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/annotation/polyline.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/annotation/polyline.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/annotation/polyline.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/annotation/polyline.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/asset_manager.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/asset_manager.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/asset_manager.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/asset_manager.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/asset_manager_file_source.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/asset_manager_file_source.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/asset_manager_file_source.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/asset_manager_file_source.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/asset_manager_file_source.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/asset_manager_file_source.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/asset_manager_file_source.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/asset_manager_file_source.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/connectivity_listener.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/connectivity_listener.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/connectivity_listener.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/connectivity_listener.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/connectivity_listener.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/connectivity_listener.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/connectivity_listener.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/connectivity_listener.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/conversion/collection.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/conversion/collection.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/conversion/collection.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/conversion/collection.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/conversion/collection.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/conversion/collection.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/conversion/collection.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/conversion/collection.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/conversion/color.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/conversion/color.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/conversion/color.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/conversion/color.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/conversion/color.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/conversion/color.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/conversion/color.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/conversion/color.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/conversion/constant.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/conversion/constant.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/conversion/constant.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/conversion/constant.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/conversion/constant.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/conversion/constant.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/conversion/constant.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/conversion/constant.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/conversion/conversion.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/conversion/conversion.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/conversion/conversion.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/conversion/conversion.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/file_source.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/file_source.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/file_source.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/file_source.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/file_source.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/file_source.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/file_source.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/file_source.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/geojson/feature.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/feature.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/geojson/feature.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/feature.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/geojson/feature.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/feature.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/geojson/feature.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/feature.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/geojson/feature_collection.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/feature_collection.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/geojson/feature_collection.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/feature_collection.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/geojson/feature_collection.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/feature_collection.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/geojson/feature_collection.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/feature_collection.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/geojson/geometry.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/geometry.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/geojson/geometry.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/geometry.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/geojson/geometry.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/geometry.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/geojson/geometry.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/geometry.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/geojson/geometry_collection.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/geometry_collection.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/geojson/geometry_collection.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/geometry_collection.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/geojson/geometry_collection.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/geometry_collection.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/geojson/geometry_collection.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/geometry_collection.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/geojson/line_string.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/line_string.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/geojson/line_string.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/line_string.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/geojson/line_string.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/line_string.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/geojson/line_string.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/line_string.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/geojson/multi_line_string.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/multi_line_string.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/geojson/multi_line_string.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/multi_line_string.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/geojson/multi_line_string.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/multi_line_string.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/geojson/multi_line_string.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/multi_line_string.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/geojson/multi_point.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/multi_point.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/geojson/multi_point.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/multi_point.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/geojson/multi_point.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/multi_point.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/geojson/multi_point.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/multi_point.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/geojson/multi_polygon.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/multi_polygon.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/geojson/multi_polygon.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/multi_polygon.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/geojson/multi_polygon.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/multi_polygon.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/geojson/multi_polygon.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/multi_polygon.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/geojson/point.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/point.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/geojson/point.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/point.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/geojson/point.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/point.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/geojson/point.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/point.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/geojson/polygon.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/polygon.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/geojson/polygon.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/polygon.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/geojson/polygon.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/polygon.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/geojson/polygon.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/polygon.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/geojson/util.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/util.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/geojson/util.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/util.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/geometry/lat_lng.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/geometry/lat_lng.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_bounds.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_bounds.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_bounds.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_bounds.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_bounds.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_bounds.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_bounds.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_bounds.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_quad.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_quad.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_quad.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_quad.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_quad.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_quad.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_quad.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_quad.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/geometry/projected_meters.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geometry/projected_meters.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/geometry/projected_meters.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geometry/projected_meters.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/geometry/projected_meters.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geometry/projected_meters.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/geometry/projected_meters.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geometry/projected_meters.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/graphics/pointf.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/graphics/pointf.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/graphics/pointf.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/graphics/pointf.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/graphics/pointf.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/graphics/pointf.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/graphics/pointf.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/graphics/pointf.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/graphics/rectf.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/graphics/rectf.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/graphics/rectf.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/graphics/rectf.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/graphics/rectf.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/graphics/rectf.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/graphics/rectf.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/graphics/rectf.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/gson/json_array.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/gson/json_array.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/gson/json_array.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/gson/json_array.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/gson/json_array.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/gson/json_array.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/gson/json_array.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/gson/json_array.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/gson/json_element.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/gson/json_element.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/gson/json_element.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/gson/json_element.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/gson/json_element.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/gson/json_element.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/gson/json_element.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/gson/json_element.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/gson/json_object.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/gson/json_object.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/gson/json_object.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/gson/json_object.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/gson/json_object.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/gson/json_object.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/gson/json_object.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/gson/json_object.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/gson/json_primitive.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/gson/json_primitive.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/gson/json_primitive.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/gson/json_primitive.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/gson/json_primitive.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/gson/json_primitive.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/gson/json_primitive.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/gson/json_primitive.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/http_file_source.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/http_file_source.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/http_file_source.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/http_file_source.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/i18n/collator.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/i18n/collator.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/i18n/collator.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/i18n/collator.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/i18n/collator_jni.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/i18n/collator_jni.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/i18n/collator_jni.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/i18n/collator_jni.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/i18n/number_format.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/i18n/number_format.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/i18n/number_format.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/i18n/number_format.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/i18n/number_format_jni.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/i18n/number_format_jni.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/i18n/number_format_jni.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/i18n/number_format_jni.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/java/util.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/java/util.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/java/util.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/java/util.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/java/util.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/java/util.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/java/util.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/java/util.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/java_types.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/java_types.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/java_types.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/java_types.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/java_types.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/java_types.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/java_types.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/java_types.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/jni_native.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/jni_native.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/jni_native.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/jni_native.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/jni_native.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/jni_native.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/jni_native.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/jni_native.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/logger.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/logger.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/logger.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/logger.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/logger.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/logger.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/logger.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/logger.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/logging_android.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/logging_android.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/logging_android.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/logging_android.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/main.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/main.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/main.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/main.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/map/camera_position.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/map/camera_position.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/map/camera_position.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/map/camera_position.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/map/camera_position.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/map/camera_position.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/map/camera_position.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/map/camera_position.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/map/image.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/map/image.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/map/image.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/map/image.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/map/image.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/map/image.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/map/image.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/map/image.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/map_renderer.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/map_renderer.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/map_renderer.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/map_renderer.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/map_renderer.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/map_renderer.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/map_renderer.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/map_renderer.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/map_renderer_runnable.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/map_renderer_runnable.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/map_renderer_runnable.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/map_renderer_runnable.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/map_renderer_runnable.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/map_renderer_runnable.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/map_renderer_runnable.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/map_renderer_runnable.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/mapbox.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/mapbox.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/mapbox.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/mapbox.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/mapbox.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/mapbox.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/mapbox.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/mapbox.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/native_map_view.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/native_map_view.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/native_map_view.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/native_map_view.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/native_map_view.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/native_map_view.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/native_map_view.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/native_map_view.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/offline/offline_manager.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_manager.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/offline/offline_manager.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_manager.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/offline/offline_manager.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_manager.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/offline/offline_manager.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_manager.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/offline/offline_region.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_region.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/offline/offline_region.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_region.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/offline/offline_region.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_region.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/offline/offline_region.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_region.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/offline/offline_region_definition.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_definition.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/offline/offline_region_definition.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_definition.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/offline/offline_region_definition.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_definition.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/offline/offline_region_definition.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_definition.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/offline/offline_region_error.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_error.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/offline/offline_region_error.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_error.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/offline/offline_region_error.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_error.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/offline/offline_region_error.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_error.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/offline/offline_region_status.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_status.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/offline/offline_region_status.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_status.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/offline/offline_region_status.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_status.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/offline/offline_region_status.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_status.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshot.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshot.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshot.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshot.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshot.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshot.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshot.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshot.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshotter.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshotter.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshotter.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshotter.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshotter.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshotter.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshotter.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshotter.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/android_conversion.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/android_conversion.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/android_conversion.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/android_conversion.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/conversion/filter.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/filter.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/conversion/filter.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/filter.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/conversion/filter.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/filter.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/conversion/filter.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/filter.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/conversion/position.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/position.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/conversion/position.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/position.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/conversion/position.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/position.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/conversion/position.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/position.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/conversion/property_expression.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/property_expression.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/conversion/property_expression.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/property_expression.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/conversion/property_value.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/property_value.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/conversion/property_value.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/property_value.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/conversion/transition_options.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/transition_options.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/conversion/transition_options.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/transition_options.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/conversion/transition_options.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/transition_options.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/conversion/transition_options.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/transition_options.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/conversion/url_or_tileset.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/url_or_tileset.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/conversion/url_or_tileset.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/url_or_tileset.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/conversion/url_or_tileset.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/url_or_tileset.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/conversion/url_or_tileset.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/url_or_tileset.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/formatted.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/formatted.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/formatted.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/formatted.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/formatted.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/formatted.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/formatted.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/formatted.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/formatted_section.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/formatted_section.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/formatted_section.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/formatted_section.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/formatted_section.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/formatted_section.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/formatted_section.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/formatted_section.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/layers/background_layer.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/background_layer.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/layers/background_layer.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/background_layer.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/layers/background_layer.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/background_layer.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/layers/background_layer.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/background_layer.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/layers/circle_layer.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/circle_layer.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/layers/circle_layer.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/circle_layer.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/layers/circle_layer.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/circle_layer.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/layers/circle_layer.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/circle_layer.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/layers/custom_layer.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/custom_layer.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/layers/custom_layer.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/custom_layer.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/layers/custom_layer.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/custom_layer.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/layers/custom_layer.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/custom_layer.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/layers/fill_extrusion_layer.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_extrusion_layer.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/layers/fill_extrusion_layer.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_extrusion_layer.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/layers/fill_extrusion_layer.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_extrusion_layer.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/layers/fill_extrusion_layer.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_extrusion_layer.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/layers/fill_layer.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_layer.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/layers/fill_layer.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_layer.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/layers/fill_layer.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_layer.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/layers/fill_layer.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_layer.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/layers/heatmap_layer.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/heatmap_layer.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/layers/heatmap_layer.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/heatmap_layer.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/layers/heatmap_layer.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/heatmap_layer.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/layers/heatmap_layer.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/heatmap_layer.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/layers/hillshade_layer.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/hillshade_layer.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/layers/hillshade_layer.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/hillshade_layer.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/layers/hillshade_layer.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/hillshade_layer.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/layers/hillshade_layer.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/hillshade_layer.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/layers/layer.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/layers/layer.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/layers/layer.cpp.ejs b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.cpp.ejs
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/layers/layer.cpp.ejs
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.cpp.ejs
diff --git a/MapboxGLAndroidSDK/src/cpp/style/layers/layer.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/layers/layer.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/layers/layer.hpp.ejs b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.hpp.ejs
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/layers/layer.hpp.ejs
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.hpp.ejs
diff --git a/MapboxGLAndroidSDK/src/cpp/style/layers/layer_manager.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/layer_manager.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/layers/layer_manager.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/layer_manager.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/layers/layer_manager.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/layer_manager.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/layers/layer_manager.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/layer_manager.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/layers/line_layer.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/line_layer.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/layers/line_layer.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/line_layer.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/layers/line_layer.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/line_layer.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/layers/line_layer.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/line_layer.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/layers/location_indicator_layer.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/location_indicator_layer.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/layers/location_indicator_layer.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/location_indicator_layer.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/layers/location_indicator_layer.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/location_indicator_layer.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/layers/location_indicator_layer.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/location_indicator_layer.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/layers/raster_layer.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/raster_layer.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/layers/raster_layer.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/raster_layer.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/layers/raster_layer.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/raster_layer.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/layers/raster_layer.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/raster_layer.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/layers/symbol_layer.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/symbol_layer.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/layers/symbol_layer.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/symbol_layer.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/layers/symbol_layer.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/symbol_layer.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/layers/symbol_layer.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/symbol_layer.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/light.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/light.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/light.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/light.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/light.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/light.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/light.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/light.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/position.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/position.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/position.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/position.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/position.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/position.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/position.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/position.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/sources/custom_geometry_source.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/custom_geometry_source.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/sources/custom_geometry_source.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/custom_geometry_source.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/sources/custom_geometry_source.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/custom_geometry_source.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/sources/custom_geometry_source.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/custom_geometry_source.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/sources/geojson_source.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/geojson_source.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/sources/geojson_source.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/geojson_source.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/sources/geojson_source.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/geojson_source.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/sources/geojson_source.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/geojson_source.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/sources/image_source.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/image_source.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/sources/image_source.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/image_source.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/sources/image_source.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/image_source.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/sources/image_source.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/image_source.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/sources/raster_dem_source.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_dem_source.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/sources/raster_dem_source.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_dem_source.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/sources/raster_dem_source.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_dem_source.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/sources/raster_dem_source.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_dem_source.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/sources/raster_source.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_source.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/sources/raster_source.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_source.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/sources/raster_source.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_source.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/sources/raster_source.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_source.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/sources/source.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/source.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/sources/source.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/source.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/sources/source.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/source.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/sources/source.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/source.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/sources/unknown_source.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/unknown_source.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/sources/unknown_source.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/unknown_source.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/sources/unknown_source.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/unknown_source.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/sources/unknown_source.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/unknown_source.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/sources/vector_source.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/vector_source.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/sources/vector_source.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/vector_source.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/sources/vector_source.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/vector_source.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/sources/vector_source.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/vector_source.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/transition_options.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/transition_options.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/transition_options.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/transition_options.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/transition_options.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/transition_options.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/transition_options.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/transition_options.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/value.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/value.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/value.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/value.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/style/value.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/value.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/style/value.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/value.hpp
diff --git a/MapboxGLAndroidSDK/src/cpp/text/local_glyph_rasterizer.cpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/text/local_glyph_rasterizer.cpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/text/local_glyph_rasterizer.cpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/text/local_glyph_rasterizer.cpp
diff --git a/MapboxGLAndroidSDK/src/cpp/text/local_glyph_rasterizer_jni.hpp b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/text/local_glyph_rasterizer_jni.hpp
similarity index 100%
rename from MapboxGLAndroidSDK/src/cpp/text/local_glyph_rasterizer_jni.hpp
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/text/local_glyph_rasterizer_jni.hpp
diff --git a/MapboxGLAndroidSDK/src/main/AndroidManifest.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/AndroidManifest.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml
diff --git a/MapboxGLAndroidSDK/src/main/assets/sdk_versions/com.mapbox.mapboxsdk b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/assets/sdk_versions/com.mapbox.mapboxsdk
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/assets/sdk_versions/com.mapbox.mapboxsdk
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/assets/sdk_versions/com.mapbox.mapboxsdk
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/AccountsManager.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/AccountsManager.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/AccountsManager.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/AccountsManager.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/LibraryLoader.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/LibraryLoader.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/LibraryLoader.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/LibraryLoader.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/LibraryLoaderProvider.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/LibraryLoaderProvider.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/LibraryLoaderProvider.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/LibraryLoaderProvider.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapStrictMode.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapStrictMode.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapStrictMode.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapStrictMode.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapStrictModeException.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapStrictModeException.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapStrictModeException.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapStrictModeException.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/ModuleProvider.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/ModuleProvider.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/ModuleProvider.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/ModuleProvider.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/ModuleProviderImpl.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/ModuleProviderImpl.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/ModuleProviderImpl.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/ModuleProviderImpl.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/ArrowDirection.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/ArrowDirection.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/ArrowDirection.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/ArrowDirection.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerOptions.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerOptions.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerOptions.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerOptions.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BasePointCollection.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BasePointCollection.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BasePointCollection.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BasePointCollection.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Bubble.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Bubble.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Bubble.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Bubble.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubbleLayout.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubbleLayout.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubbleLayout.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubbleLayout.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubblePopupHelper.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubblePopupHelper.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubblePopupHelper.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubblePopupHelper.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Icon.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Icon.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Icon.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Icon.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolygonOptions.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolygonOptions.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolygonOptions.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolygonOptions.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolylineOptions.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolylineOptions.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolylineOptions.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolylineOptions.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/package-info.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/package-info.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/package-info.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/package-info.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/Attribution.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/Attribution.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/Attribution.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/Attribution.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionLayout.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionLayout.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionLayout.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionLayout.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionMeasure.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionMeasure.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionMeasure.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionMeasure.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionParser.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionParser.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionParser.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionParser.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/package-info.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/package-info.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/package-info.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/package-info.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdate.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdate.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdate.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdate.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/package-info.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/package-info.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/package-info.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/package-info.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/GeometryConstants.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/GeometryConstants.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/GeometryConstants.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/GeometryConstants.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/TelemetryConstants.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/TelemetryConstants.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/TelemetryConstants.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/TelemetryConstants.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/package-info.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/package-info.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/package-info.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/package-info.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/CalledFromWorkerThreadException.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/CalledFromWorkerThreadException.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/CalledFromWorkerThreadException.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/CalledFromWorkerThreadException.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/ConversionException.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/ConversionException.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/ConversionException.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/ConversionException.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/IconBitmapChangedException.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/IconBitmapChangedException.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/IconBitmapChangedException.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/IconBitmapChangedException.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/InvalidLatLngBoundsException.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/InvalidLatLngBoundsException.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/InvalidLatLngBoundsException.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/InvalidLatLngBoundsException.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/InvalidMarkerPositionException.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/InvalidMarkerPositionException.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/InvalidMarkerPositionException.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/InvalidMarkerPositionException.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/MapboxConfigurationException.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/MapboxConfigurationException.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/MapboxConfigurationException.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/MapboxConfigurationException.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/TooManyIconsException.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/TooManyIconsException.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/TooManyIconsException.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/TooManyIconsException.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/package-info.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/package-info.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/package-info.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/package-info.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngQuad.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngQuad.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngQuad.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngQuad.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngSpan.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngSpan.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngSpan.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngSpan.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ProjectedMeters.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ProjectedMeters.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ProjectedMeters.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ProjectedMeters.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/VisibleRegion.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/VisibleRegion.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/VisibleRegion.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/VisibleRegion.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/package-info.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/package-info.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/package-info.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/package-info.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpIdentifier.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpIdentifier.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpIdentifier.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpIdentifier.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpLogger.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpLogger.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpLogger.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpLogger.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequest.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequestUrl.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequestUrl.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequestUrl.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequestUrl.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpResponder.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpResponder.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpResponder.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpResponder.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/LocalRequestTask.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/LocalRequestTask.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/LocalRequestTask.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/LocalRequestTask.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/NativeHttpRequest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/NativeHttpRequest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/NativeHttpRequest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/NativeHttpRequest.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/package-info.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/package-info.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/package-info.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/package-info.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/AnimatorListenerHolder.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/AnimatorListenerHolder.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/AnimatorListenerHolder.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/AnimatorListenerHolder.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CompassEngine.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CompassEngine.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CompassEngine.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CompassEngine.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CompassListener.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CompassListener.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CompassListener.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CompassListener.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/IndicatorLocationLayerRenderer.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/IndicatorLocationLayerRenderer.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/IndicatorLocationLayerRenderer.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/IndicatorLocationLayerRenderer.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LatLngEvaluator.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LatLngEvaluator.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LatLngEvaluator.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LatLngEvaluator.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerBitmapProvider.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerBitmapProvider.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerBitmapProvider.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerBitmapProvider.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerFeatureProvider.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerFeatureProvider.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerFeatureProvider.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerFeatureProvider.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerSourceProvider.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerSourceProvider.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerSourceProvider.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerSourceProvider.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinator.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinator.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinator.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinator.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationCameraController.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationCameraController.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationCameraController.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationCameraController.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentActivationOptions.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentActivationOptions.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentActivationOptions.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentActivationOptions.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentCompassEngine.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentCompassEngine.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentCompassEngine.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentCompassEngine.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentConstants.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentConstants.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentConstants.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentConstants.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentNotInitializedException.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentNotInitializedException.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentNotInitializedException.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentNotInitializedException.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentOptions.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentOptions.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentOptions.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentOptions.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentPositionManager.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentPositionManager.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentPositionManager.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentPositionManager.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationIndicatorLayer.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationIndicatorLayer.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationIndicatorLayer.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationIndicatorLayer.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerController.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerController.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerController.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerController.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerRenderer.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerRenderer.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerRenderer.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerRenderer.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationPropertyFactory.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationPropertyFactory.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationPropertyFactory.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationPropertyFactory.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxAnimator.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxAnimator.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxAnimator.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxAnimator.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxAnimatorProvider.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxAnimatorProvider.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxAnimatorProvider.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxAnimatorProvider.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxAnimatorSetProvider.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxAnimatorSetProvider.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxAnimatorSetProvider.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxAnimatorSetProvider.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxCameraAnimatorAdapter.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxCameraAnimatorAdapter.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxCameraAnimatorAdapter.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxCameraAnimatorAdapter.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxFloatAnimator.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxFloatAnimator.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxFloatAnimator.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxFloatAnimator.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxLatLngAnimator.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxLatLngAnimator.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxLatLngAnimator.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxLatLngAnimator.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnCameraMoveInvalidateListener.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnCameraMoveInvalidateListener.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnCameraMoveInvalidateListener.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnCameraMoveInvalidateListener.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnCameraTrackingChangedListener.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnCameraTrackingChangedListener.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnCameraTrackingChangedListener.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnCameraTrackingChangedListener.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnLocationCameraTransitionListener.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnLocationCameraTransitionListener.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnLocationCameraTransitionListener.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnLocationCameraTransitionListener.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnLocationClickListener.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnLocationClickListener.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnLocationClickListener.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnLocationClickListener.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnLocationLongClickListener.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnLocationLongClickListener.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnLocationLongClickListener.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnLocationLongClickListener.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnLocationStaleListener.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnLocationStaleListener.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnLocationStaleListener.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnLocationStaleListener.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnRenderModeChangedListener.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnRenderModeChangedListener.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnRenderModeChangedListener.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnRenderModeChangedListener.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/PulsingLocationCircleAnimator.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/PulsingLocationCircleAnimator.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/PulsingLocationCircleAnimator.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/PulsingLocationCircleAnimator.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/StaleStateManager.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/StaleStateManager.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/StaleStateManager.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/StaleStateManager.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/SymbolLocationLayerRenderer.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/SymbolLocationLayerRenderer.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/SymbolLocationLayerRenderer.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/SymbolLocationLayerRenderer.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/Utils.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/Utils.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/Utils.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/Utils.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/modes/CameraMode.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/modes/CameraMode.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/modes/CameraMode.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/modes/CameraMode.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/modes/RenderMode.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/modes/RenderMode.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/modes/RenderMode.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/modes/RenderMode.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/modes/package-info.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/modes/package-info.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/modes/package-info.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/modes/package-info.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/package-info.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/package-info.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/package-info.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/package-info.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/Logger.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/Logger.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/Logger.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/Logger.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/LoggerDefinition.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/LoggerDefinition.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/LoggerDefinition.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/LoggerDefinition.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/package-info.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/package-info.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/package-info.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/package-info.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationContainer.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationContainer.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationContainer.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationContainer.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Annotations.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Annotations.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Annotations.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Annotations.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/FocalPointChangeListener.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/FocalPointChangeListener.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/FocalPointChangeListener.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/FocalPointChangeListener.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Image.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Image.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Image.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Image.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ImageContent.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ImageContent.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ImageContent.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ImageContent.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ImageStretches.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ImageStretches.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ImageStretches.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ImageStretches.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/InfoWindowManager.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/InfoWindowManager.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/InfoWindowManager.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/InfoWindowManager.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapChangeReceiver.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapChangeReceiver.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapChangeReceiver.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapChangeReceiver.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapKeyListener.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapKeyListener.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapKeyListener.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapKeyListener.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MarkerContainer.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MarkerContainer.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MarkerContainer.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MarkerContainer.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Markers.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Markers.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Markers.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Markers.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMap.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMap.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMap.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMap.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/OnMapReadyCallback.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/OnMapReadyCallback.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/OnMapReadyCallback.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/OnMapReadyCallback.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/PolygonContainer.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/PolygonContainer.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/PolygonContainer.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/PolygonContainer.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Polygons.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Polygons.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Polygons.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Polygons.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/PolylineContainer.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/PolylineContainer.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/PolylineContainer.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/PolylineContainer.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Polylines.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Polylines.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Polylines.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Polylines.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Projection.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Projection.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Projection.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Projection.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ShapeAnnotationContainer.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ShapeAnnotationContainer.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ShapeAnnotationContainer.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ShapeAnnotationContainer.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ShapeAnnotations.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ShapeAnnotations.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ShapeAnnotations.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ShapeAnnotations.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Style.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Style.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Style.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Style.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TelemetryDefinition.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TelemetryDefinition.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TelemetryDefinition.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TelemetryDefinition.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/package-info.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/package-info.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/package-info.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/package-info.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRenderer.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRenderer.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRenderer.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRenderer.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRendererRunnable.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRendererRunnable.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRendererRunnable.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRendererRunnable.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRendererScheduler.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRendererScheduler.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRendererScheduler.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRendererScheduler.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLConfigChooser.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLConfigChooser.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLConfigChooser.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLConfigChooser.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLContextFactory.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLContextFactory.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLContextFactory.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLContextFactory.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLLogWrapper.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLLogWrapper.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLLogWrapper.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLLogWrapper.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLWindowSurfaceFactory.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLWindowSurfaceFactory.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLWindowSurfaceFactory.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLWindowSurfaceFactory.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/package-info.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/package-info.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/package-info.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/package-info.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/glsurfaceview/GLSurfaceViewMapRenderer.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/glsurfaceview/GLSurfaceViewMapRenderer.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/glsurfaceview/GLSurfaceViewMapRenderer.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/glsurfaceview/GLSurfaceViewMapRenderer.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/glsurfaceview/MapboxGLSurfaceView.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/glsurfaceview/MapboxGLSurfaceView.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/glsurfaceview/MapboxGLSurfaceView.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/glsurfaceview/MapboxGLSurfaceView.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/glsurfaceview/package-info.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/glsurfaceview/package-info.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/glsurfaceview/package-info.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/glsurfaceview/package-info.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/package-info.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/package-info.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/package-info.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/package-info.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/TextureViewMapRenderer.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/TextureViewMapRenderer.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/TextureViewMapRenderer.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/TextureViewMapRenderer.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/TextureViewRenderThread.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/TextureViewRenderThread.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/TextureViewRenderThread.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/TextureViewRenderThread.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/package-info.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/package-info.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/package-info.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/package-info.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/package-info.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/package-info.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/package-info.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/package-info.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestImpl.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestImpl.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestImpl.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestImpl.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestUtil.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestUtil.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestUtil.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestUtil.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/package-info.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/package-info.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/package-info.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/package-info.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/loader/LibraryLoaderProviderImpl.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/loader/LibraryLoaderProviderImpl.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/loader/LibraryLoaderProviderImpl.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/loader/LibraryLoaderProviderImpl.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/loader/package-info.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/loader/package-info.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/loader/package-info.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/loader/package-info.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapBaseEvent.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapBaseEvent.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapBaseEvent.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapBaseEvent.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapEventFactory.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapEventFactory.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapEventFactory.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapEventFactory.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapLoadEvent.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapLoadEvent.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapLoadEvent.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapLoadEvent.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/OfflineDownloadEndEvent.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/OfflineDownloadEndEvent.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/OfflineDownloadEndEvent.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/OfflineDownloadEndEvent.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/OfflineDownloadStartEvent.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/OfflineDownloadStartEvent.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/OfflineDownloadStartEvent.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/OfflineDownloadStartEvent.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/PerformanceEvent.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/PerformanceEvent.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/PerformanceEvent.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/PerformanceEvent.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/PhoneState.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/PhoneState.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/PhoneState.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/PhoneState.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/TelemetryImpl.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/TelemetryImpl.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/TelemetryImpl.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/TelemetryImpl.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/package-info.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/package-info.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/package-info.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/package-info.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/ConnectivityListener.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/ConnectivityListener.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/ConnectivityListener.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/ConnectivityListener.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/ConnectivityReceiver.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/ConnectivityReceiver.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/ConnectivityReceiver.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/ConnectivityReceiver.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/NativeConnectivityListener.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/NativeConnectivityListener.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/NativeConnectivityListener.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/NativeConnectivityListener.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/package-info.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/package-info.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/package-info.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/package-info.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineGeometryRegionDefinition.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineGeometryRegionDefinition.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineGeometryRegionDefinition.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineGeometryRegionDefinition.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionDefinition.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionDefinition.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionDefinition.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionDefinition.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionError.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionError.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionError.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionError.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionStatus.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionStatus.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionStatus.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionStatus.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineTilePyramidRegionDefinition.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineTilePyramidRegionDefinition.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineTilePyramidRegionDefinition.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineTilePyramidRegionDefinition.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/package-info.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/package-info.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/package-info.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/package-info.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/package-info.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/package-info.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/package-info.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/package-info.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnaphotUtil.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnaphotUtil.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnaphotUtil.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnaphotUtil.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshot.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshot.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshot.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshot.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/package-info.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/package-info.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/package-info.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/package-info.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/Resource.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/Resource.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/Resource.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/Resource.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/package-info.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/package-info.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/package-info.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/package-info.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/package-info.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/package-info.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/package-info.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/package-info.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CannotAddLayerException.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CannotAddLayerException.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CannotAddLayerException.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CannotAddLayerException.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CustomLayer.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CustomLayer.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CustomLayer.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CustomLayer.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LayoutPropertyValue.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LayoutPropertyValue.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LayoutPropertyValue.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LayoutPropertyValue.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PaintPropertyValue.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PaintPropertyValue.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PaintPropertyValue.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PaintPropertyValue.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Property.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Property.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Property.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Property.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/TransitionOptions.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/TransitionOptions.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/TransitionOptions.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/TransitionOptions.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/package-info.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/package-info.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/package-info.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/package-info.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property.java.ejs b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property.java.ejs
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property.java.ejs
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property.java.ejs
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property_factory.java.ejs b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property_factory.java.ejs
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property_factory.java.ejs
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property_factory.java.ejs
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Light.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Light.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Light.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Light.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Position.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Position.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Position.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Position.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/package-info.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/package-info.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/package-info.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/package-info.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CannotAddSourceException.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CannotAddSourceException.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CannotAddSourceException.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CannotAddSourceException.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySource.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySource.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySource.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySource.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySourceOptions.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySourceOptions.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySourceOptions.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySourceOptions.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonOptions.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonOptions.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonOptions.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonOptions.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeometryTileProvider.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeometryTileProvider.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeometryTileProvider.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeometryTileProvider.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/ImageSource.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/ImageSource.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/ImageSource.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/ImageSource.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterDemSource.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterDemSource.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterDemSource.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterDemSource.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterSource.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterSource.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterSource.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterSource.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/Source.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/Source.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/Source.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/Source.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/TileSet.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/TileSet.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/TileSet.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/TileSet.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/UnknownSource.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/UnknownSource.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/UnknownSource.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/UnknownSource.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/package-info.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/package-info.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/package-info.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/package-info.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/Formatted.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/Formatted.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/Formatted.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/Formatted.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/FormattedSection.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/FormattedSection.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/FormattedSection.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/FormattedSection.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/package-info.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/package-info.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/package-info.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/package-info.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/LocalGlyphRasterizer.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/LocalGlyphRasterizer.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/LocalGlyphRasterizer.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/LocalGlyphRasterizer.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/package-info.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/package-info.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/package-info.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/package-info.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/AnimatorUtils.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/AnimatorUtils.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/AnimatorUtils.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/AnimatorUtils.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/Compare.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/Compare.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/Compare.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/Compare.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/FileUtils.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/FileUtils.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/FileUtils.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/FileUtils.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/FontUtils.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/FontUtils.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/FontUtils.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/FontUtils.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/MapFragmentUtils.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/MapFragmentUtils.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/MapFragmentUtils.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/MapFragmentUtils.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/MathUtils.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/MathUtils.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/MathUtils.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/MathUtils.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/StringUtils.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/StringUtils.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/StringUtils.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/StringUtils.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ThreadUtils.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ThreadUtils.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ThreadUtils.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ThreadUtils.java
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/package-info.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/package-info.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/package-info.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/package-info.java
diff --git a/MapboxGLAndroidSDK/src/main/java/overview.html b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/overview.html
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/java/overview.html
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/overview.html
diff --git a/MapboxGLAndroidSDK/src/main/res-public/values/public.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res-public/values/public.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_compass_icon.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_compass_icon.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_compass_icon.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_compass_icon.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_logo_helmet.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_logo_helmet.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_logo_helmet.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_logo_helmet.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_logo_icon.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_logo_icon.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_logo_icon.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_logo_icon.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_marker_icon_default.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_marker_icon_default.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_marker_icon_default.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_marker_icon_default.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_markerview_icon_default.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_markerview_icon_default.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_markerview_icon_default.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_markerview_icon_default.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_bearing.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_bearing.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_bearing.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_bearing.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_default.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_default.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_default.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_default.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_compass_icon.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_compass_icon.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_compass_icon.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_compass_icon.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_logo_helmet.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_logo_helmet.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_logo_helmet.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_logo_helmet.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_logo_icon.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_logo_icon.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_logo_icon.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_logo_icon.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_marker_icon_default.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_marker_icon_default.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_marker_icon_default.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_marker_icon_default.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_markerview_icon_default.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_markerview_icon_default.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_markerview_icon_default.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_markerview_icon_default.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_bearing.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_bearing.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_bearing.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_bearing.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_default.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_default.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_default.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_default.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_compass_icon.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_compass_icon.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_compass_icon.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_compass_icon.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_logo_helmet.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_logo_helmet.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_logo_helmet.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_logo_helmet.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_logo_icon.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_logo_icon.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_logo_icon.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_logo_icon.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_marker_icon_default.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_marker_icon_default.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_marker_icon_default.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_marker_icon_default.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_markerview_icon_default.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_markerview_icon_default.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_markerview_icon_default.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_markerview_icon_default.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_bearing.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_bearing.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_bearing.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_bearing.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_default.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_default.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_default.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_default.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_compass_icon.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_compass_icon.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_compass_icon.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_compass_icon.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_logo_helmet.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_logo_helmet.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_logo_helmet.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_logo_helmet.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_logo_icon.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_logo_icon.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_logo_icon.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_logo_icon.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_marker_icon_default.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_marker_icon_default.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_marker_icon_default.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_marker_icon_default.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_markerview_icon_default.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_markerview_icon_default.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_markerview_icon_default.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_markerview_icon_default.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_bearing.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_bearing.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_bearing.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_bearing.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_default.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_default.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_default.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_default.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_compass_icon.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_compass_icon.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_compass_icon.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_compass_icon.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_logo_helmet.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_logo_helmet.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_logo_helmet.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_logo_helmet.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_logo_icon.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_logo_icon.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_logo_icon.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_logo_icon.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_marker_icon_default.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_marker_icon_default.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_marker_icon_default.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_marker_icon_default.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_markerview_icon_default.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_markerview_icon_default.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_markerview_icon_default.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_markerview_icon_default.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_bearing.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_bearing.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_bearing.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_bearing.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_default.png b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_default.png
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_default.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_default.png
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_bg_selector.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_bg_selector.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_bg_selector.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_bg_selector.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_icon_default.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_icon_default.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_icon_default.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_icon_default.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_icon_selected.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_icon_selected.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_icon_selected.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_icon_selected.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_mylocation_bg_shape.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_mylocation_bg_shape.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable/mapbox_mylocation_bg_shape.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_mylocation_bg_shape.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_popup_window_transparent.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_popup_window_transparent.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable/mapbox_popup_window_transparent.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_popup_window_transparent.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_rounded_corner.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_rounded_corner.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable/mapbox_rounded_corner.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_rounded_corner.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_bearing_icon.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_bearing_icon.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_bearing_icon.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_bearing_icon.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon_shadow.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon_shadow.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon_shadow.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon_shadow.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon_stale.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon_stale.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon_stale.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon_stale.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_puck_icon.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_puck_icon.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_puck_icon.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_puck_icon.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_stroke_icon.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_stroke_icon.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_stroke_icon.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_stroke_icon.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/layout/mapbox_attribution_list_item.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_attribution_list_item.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/layout/mapbox_attribution_list_item.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_attribution_list_item.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/layout/mapbox_infowindow_content.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_infowindow_content.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/layout/mapbox_infowindow_content.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_infowindow_content.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/layout/mapbox_view_image_marker.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_view_image_marker.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/layout/mapbox_view_image_marker.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_view_image_marker.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/values-bg/strings.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-bg/strings.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/values-bg/strings.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-bg/strings.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/values-ca/strings.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-ca/strings.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/values-ca/strings.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-ca/strings.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/values-cs/strings.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-cs/strings.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/values-cs/strings.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-cs/strings.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/values-es/strings.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-es/strings.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/values-es/strings.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-es/strings.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/values-fr/strings.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-fr/strings.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/values-fr/strings.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-fr/strings.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/values-gl/strings.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-gl/strings.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/values-gl/strings.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-gl/strings.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/values-he/strings.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-he/strings.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/values-he/strings.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-he/strings.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/values-hu/strings.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-hu/strings.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/values-hu/strings.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-hu/strings.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/values-iw/strings.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-iw/strings.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/values-iw/strings.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-iw/strings.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/values-ko/strings.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-ko/strings.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/values-ko/strings.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-ko/strings.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/values-lt/strings.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-lt/strings.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/values-lt/strings.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-lt/strings.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/values-nl/strings.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-nl/strings.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/values-nl/strings.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-nl/strings.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/values-pl/strings.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-pl/strings.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/values-pl/strings.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-pl/strings.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/values-pt-rPT/strings.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-pt-rPT/strings.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/values-pt-rPT/strings.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-pt-rPT/strings.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/values-ru/strings.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-ru/strings.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/values-ru/strings.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-ru/strings.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/values-sv/strings.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-sv/strings.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/values-sv/strings.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-sv/strings.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/values-uk/strings.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-uk/strings.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/values-uk/strings.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-uk/strings.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/values-vi/strings.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-vi/strings.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/values-vi/strings.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-vi/strings.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/values-zh-rCN/strings.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-zh-rCN/strings.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/values-zh-rCN/strings.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-zh-rCN/strings.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/values-zh-rHK/strings.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-zh-rHK/strings.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/values-zh-rHK/strings.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-zh-rHK/strings.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/values-zh-rTW/strings.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-zh-rTW/strings.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/values-zh-rTW/strings.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-zh-rTW/strings.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/values/attrs.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/values/attrs.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/values/colors.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values/colors.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/values/colors.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values/colors.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/values/dimens.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/values/dimens.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/values/strings.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values/strings.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/values/strings.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values/strings.xml
diff --git a/MapboxGLAndroidSDK/src/main/res/values/styles.xml b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values/styles.xml
similarity index 100%
rename from MapboxGLAndroidSDK/src/main/res/values/styles.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values/styles.xml
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/AccountsManagerTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/AccountsManagerTest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/AccountsManagerTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/AccountsManagerTest.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/MapboxInjector.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/MapboxInjector.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/MapboxInjector.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/MapboxInjector.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/MapboxTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/MapboxTest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/MapboxTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/MapboxTest.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/AnnotationTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/AnnotationTest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/AnnotationTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/AnnotationTest.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/IconTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/IconTest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/IconTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/IconTest.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/InfoWindowTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/InfoWindowTest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/InfoWindowTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/InfoWindowTest.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/MarkerTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/MarkerTest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/MarkerTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/MarkerTest.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/PolygonTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/PolygonTest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/PolygonTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/PolygonTest.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/PolylineTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/PolylineTest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/PolylineTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/PolylineTest.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/attribution/AttributionParseTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/attribution/AttributionParseTest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/attribution/AttributionParseTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/attribution/AttributionParseTest.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/constants/AppConstant.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/constants/AppConstant.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/constants/AppConstant.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/constants/AppConstant.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngSpanTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngSpanTest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngSpanTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngSpanTest.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngTest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngTest.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/ProjectedMetersTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/ProjectedMetersTest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/ProjectedMetersTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/ProjectedMetersTest.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/VisibleRegionTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/VisibleRegionTest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/VisibleRegionTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/VisibleRegionTest.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/CompassEngineTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/CompassEngineTest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/CompassEngineTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/CompassEngineTest.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/IndicatorLocationLayerRendererTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/IndicatorLocationLayerRendererTest.kt
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/IndicatorLocationLayerRendererTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/IndicatorLocationLayerRendererTest.kt
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinatorTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinatorTest.kt
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinatorTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinatorTest.kt
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationCameraControllerTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationCameraControllerTest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationCameraControllerTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationCameraControllerTest.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentActivationOptionsTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentActivationOptionsTest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentActivationOptionsTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentActivationOptionsTest.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentOptionsTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentOptionsTest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentOptionsTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentOptionsTest.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentPositionManagerTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentPositionManagerTest.kt
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentPositionManagerTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentPositionManagerTest.kt
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentTest.kt
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentTest.kt
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/MapboxAnimatorTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/MapboxAnimatorTest.kt
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/MapboxAnimatorTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/MapboxAnimatorTest.kt
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/UtilsTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/UtilsTest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/UtilsTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/UtilsTest.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/log/LoggerTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/log/LoggerTest.kt
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/log/LoggerTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/log/LoggerTest.kt
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/AnnotationManagerTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/AnnotationManagerTest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/AnnotationManagerTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/AnnotationManagerTest.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/AttributionDialogManagerTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/AttributionDialogManagerTest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/AttributionDialogManagerTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/AttributionDialogManagerTest.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapChangeReceiverTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapChangeReceiverTest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapChangeReceiverTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapChangeReceiverTest.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapTouchListenersTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapTouchListenersTest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapTouchListenersTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapTouchListenersTest.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsAttrsTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsAttrsTest.kt
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsAttrsTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsAttrsTest.kt
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsTest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsTest.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.kt
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.kt
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/StyleBuilderTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/StyleBuilderTest.kt
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/StyleBuilderTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/StyleBuilderTest.kt
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/StyleTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/StyleTest.kt
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/StyleTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/StyleTest.kt
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/TransformTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/TransformTest.kt
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/TransformTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/TransformTest.kt
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/UiSettingsTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/UiSettingsTest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/UiSettingsTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/UiSettingsTest.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/http/HttpRequestUrlTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/http/HttpRequestUrlTest.kt
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/http/HttpRequestUrlTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/http/HttpRequestUrlTest.kt
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/http/HttpRequestUtilTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/http/HttpRequestUtilTest.kt
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/http/HttpRequestUtilTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/http/HttpRequestUtilTest.kt
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/telemetry/MapEventFactoryTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/telemetry/MapEventFactoryTest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/telemetry/MapEventFactoryTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/telemetry/MapEventFactoryTest.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/telemetry/SchemaTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/telemetry/SchemaTest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/telemetry/SchemaTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/telemetry/SchemaTest.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/style/expressions/ExpressionTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/style/expressions/ExpressionTest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/style/expressions/ExpressionTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/style/expressions/ExpressionTest.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/telemetry/HttpTransportTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/telemetry/HttpTransportTest.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/telemetry/HttpTransportTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/telemetry/HttpTransportTest.java
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/utils/ColorUtilsTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/utils/ColorUtilsTest.kt
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/utils/ColorUtilsTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/utils/ColorUtilsTest.kt
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/utils/MockParcel.java b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/utils/MockParcel.java
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/utils/MockParcel.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/utils/MockParcel.java
diff --git a/MapboxGLAndroidSDK/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
similarity index 100%
rename from MapboxGLAndroidSDK/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
rename to mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/MapboxGLAndroidSDKLint/.gitignore b/mapbox-gl-native-android/MapboxGLAndroidSDKLint/.gitignore
similarity index 100%
rename from MapboxGLAndroidSDKLint/.gitignore
rename to mapbox-gl-native-android/MapboxGLAndroidSDKLint/.gitignore
diff --git a/MapboxGLAndroidSDKLint/build.gradle b/mapbox-gl-native-android/MapboxGLAndroidSDKLint/build.gradle
similarity index 100%
rename from MapboxGLAndroidSDKLint/build.gradle
rename to mapbox-gl-native-android/MapboxGLAndroidSDKLint/build.gradle
diff --git a/MapboxGLAndroidSDKLint/src/main/java/com/mapbox/mapboxsdk/lint/KeepDetector.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKLint/src/main/java/com/mapbox/mapboxsdk/lint/KeepDetector.kt
similarity index 100%
rename from MapboxGLAndroidSDKLint/src/main/java/com/mapbox/mapboxsdk/lint/KeepDetector.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKLint/src/main/java/com/mapbox/mapboxsdk/lint/KeepDetector.kt
diff --git a/MapboxGLAndroidSDKLint/src/main/java/com/mapbox/mapboxsdk/lint/MapboxIssueRegistry.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKLint/src/main/java/com/mapbox/mapboxsdk/lint/MapboxIssueRegistry.kt
similarity index 100%
rename from MapboxGLAndroidSDKLint/src/main/java/com/mapbox/mapboxsdk/lint/MapboxIssueRegistry.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKLint/src/main/java/com/mapbox/mapboxsdk/lint/MapboxIssueRegistry.kt
diff --git a/MapboxGLAndroidSDKLint/src/test/java/com/mapbox/mapboxsdk/lint/KeepDetectorTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKLint/src/test/java/com/mapbox/mapboxsdk/lint/KeepDetectorTest.kt
similarity index 100%
rename from MapboxGLAndroidSDKLint/src/test/java/com/mapbox/mapboxsdk/lint/KeepDetectorTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKLint/src/test/java/com/mapbox/mapboxsdk/lint/KeepDetectorTest.kt
diff --git a/MapboxGLAndroidSDKTestApp/.gitignore b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/.gitignore
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/.gitignore
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/.gitignore
diff --git a/MapboxGLAndroidSDKTestApp/README.md b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/README.md
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/README.md
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/README.md
diff --git a/MapboxGLAndroidSDKTestApp/build.gradle b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/build.gradle
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/build.gradle
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/build.gradle
diff --git a/MapboxGLAndroidSDKTestApp/lint-baseline-local.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/lint-baseline-local.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/lint-baseline-local.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/lint-baseline-local.xml
diff --git a/MapboxGLAndroidSDKTestApp/lint/lint-baseline-ci.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/lint/lint-baseline-ci.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/lint/lint-baseline-ci.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/lint/lint-baseline-ci.xml
diff --git a/MapboxGLAndroidSDKTestApp/proguard-rules.pro b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/proguard-rules.pro
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/proguard-rules.pro
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/proguard-rules.pro
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/AndroidManifest.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/AndroidManifest.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/AndroidManifest.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/assets/streets.json b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/assets/streets.json
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/assets/streets.json
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/assets/streets.json
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/AppCenter.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/AppCenter.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/AppCenter.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/AppCenter.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/InstrumentationApplication.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/InstrumentationApplication.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/InstrumentationApplication.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/InstrumentationApplication.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/InstrumentationRunner.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/InstrumentationRunner.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/InstrumentationRunner.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/InstrumentationRunner.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactoryTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactoryTest.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactoryTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactoryTest.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/BaseIntegrationTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/BaseIntegrationTest.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/BaseIntegrationTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/BaseIntegrationTest.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/FragmentBackStackTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/FragmentBackStackTest.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/FragmentBackStackTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/FragmentBackStackTest.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/GLSurfaceViewReopenTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/GLSurfaceViewReopenTest.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/GLSurfaceViewReopenTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/GLSurfaceViewReopenTest.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/GLSurfaceViewReuseTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/GLSurfaceViewReuseTest.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/GLSurfaceViewReuseTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/GLSurfaceViewReuseTest.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/OrientationChangeTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/OrientationChangeTest.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/OrientationChangeTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/OrientationChangeTest.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/QueryRenderedFeaturesBoxCountTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/QueryRenderedFeaturesBoxCountTest.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/QueryRenderedFeaturesBoxCountTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/QueryRenderedFeaturesBoxCountTest.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/TextureViewReopenTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/TextureViewReopenTest.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/TextureViewReopenTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/TextureViewReopenTest.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/TextureViewReuseTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/TextureViewReuseTest.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/TextureViewReuseTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/TextureViewReuseTest.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/ViewPagerScrollTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/ViewPagerScrollTest.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/ViewPagerScrollTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/ViewPagerScrollTest.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationComponentTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationComponentTest.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationComponentTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationComponentTest.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationIndicatorLayerTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationIndicatorLayerTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationIndicatorLayerTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationIndicatorLayerTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/utils/LocationComponentAction.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/utils/LocationComponentAction.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/utils/LocationComponentAction.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/utils/LocationComponentAction.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/utils/MapboxLocationTestingUtils.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/utils/MapboxLocationTestingUtils.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/utils/MapboxLocationTestingUtils.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/utils/MapboxLocationTestingUtils.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/utils/StyleChangeIdlingResource.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/utils/StyleChangeIdlingResource.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/utils/StyleChangeIdlingResource.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/utils/StyleChangeIdlingResource.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/BaseLayerTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/BaseLayerTest.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/BaseLayerTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/BaseLayerTest.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/GesturesUiTestUtils.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/GesturesUiTestUtils.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/GesturesUiTestUtils.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/GesturesUiTestUtils.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/IconManagerResolver.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/IconManagerResolver.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/IconManagerResolver.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/IconManagerResolver.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapGestureDetectorTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapGestureDetectorTest.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapGestureDetectorTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapGestureDetectorTest.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/NativeMapViewTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/NativeMapViewTest.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/NativeMapViewTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/NativeMapViewTest.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/TransformTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/TransformTest.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/TransformTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/TransformTest.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/VisibleRegionTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/VisibleRegionTest.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/VisibleRegionTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/VisibleRegionTest.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/offline/OfflineDownloadTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/offline/OfflineDownloadTest.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/offline/OfflineDownloadTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/offline/OfflineDownloadTest.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotterTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotterTest.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotterTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotterTest.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/MapboxMapAction.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/MapboxMapAction.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/MapboxMapAction.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/MapboxMapAction.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/OrientationAction.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/OrientationAction.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/OrientationAction.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/OrientationAction.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/WaitAction.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/WaitAction.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/WaitAction.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/WaitAction.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/BaseTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/BaseTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/BaseTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/BaseTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/EspressoTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/EspressoTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/EspressoTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/EspressoTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/activity.junit.ejs b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/activity.junit.ejs
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/activity.junit.ejs
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/activity.junit.ejs
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/IconTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/IconTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/IconTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/IconTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/MarkerTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/MarkerTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/MarkerTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/MarkerTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/PolygonTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/PolygonTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/PolygonTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/PolygonTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/PolylineTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/PolylineTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/PolylineTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/PolylineTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraAnimateTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraAnimateTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraAnimateTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraAnimateTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraEaseTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraEaseTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraEaseTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraEaseTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraForTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraForTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraForTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraForTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraMoveTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraMoveTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraMoveTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraMoveTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/fragment/MapDialogFragmentTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/fragment/MapDialogFragmentTest.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/fragment/MapDialogFragmentTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/fragment/MapDialogFragmentTest.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/geometry/GeoJsonConversionTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/geometry/GeoJsonConversionTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/geometry/GeoJsonConversionTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/geometry/GeoJsonConversionTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/geometry/LatLngBoundsTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/geometry/LatLngBoundsTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/geometry/LatLngBoundsTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/geometry/LatLngBoundsTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/ImageMissingTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/ImageMissingTest.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/ImageMissingTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/ImageMissingTest.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/RemoveUnusedImagesTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/RemoveUnusedImagesTest.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/RemoveUnusedImagesTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/RemoveUnusedImagesTest.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/RenderViewGetterTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/RenderViewGetterTest.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/RenderViewGetterTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/RenderViewGetterTest.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/ScreenCoordinateConversion.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/ScreenCoordinateConversion.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/ScreenCoordinateConversion.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/ScreenCoordinateConversion.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/StyleLoadTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/StyleLoadTest.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/StyleLoadTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/StyleLoadTest.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/AttributionTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/AttributionTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/AttributionTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/AttributionTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/CompassViewTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/CompassViewTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/CompassViewTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/CompassViewTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/LogoTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/LogoTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/LogoTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/LogoTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/CacheTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/CacheTest.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/CacheTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/CacheTest.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineManagerTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineManagerTest.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineManagerTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineManagerTest.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineUtilsTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineUtilsTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineUtilsTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineUtilsTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/render/RenderTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/render/RenderTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/render/RenderTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/render/RenderTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/storage/FileSourceMapTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/storage/FileSourceMapTest.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/storage/FileSourceMapTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/storage/FileSourceMapTest.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/storage/FileSourceStandaloneTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/storage/FileSourceStandaloneTest.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/storage/FileSourceStandaloneTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/storage/FileSourceStandaloneTest.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/storage/FileSourceTestUtils.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/storage/FileSourceTestUtils.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/storage/FileSourceTestUtils.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/storage/FileSourceTestUtils.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/string/UppperLowerCaseTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/string/UppperLowerCaseTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/string/UppperLowerCaseTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/string/UppperLowerCaseTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BackgroundLayerTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BackgroundLayerTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BackgroundLayerTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BackgroundLayerTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CustomGeometrySourceTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CustomGeometrySourceTest.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CustomGeometrySourceTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CustomGeometrySourceTest.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/ExpressionTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/ExpressionTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/ExpressionTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/ExpressionTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillExtrusionLayerTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillExtrusionLayerTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillExtrusionLayerTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillExtrusionLayerTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/GeoJsonSourceTests.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/GeoJsonSourceTests.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/GeoJsonSourceTests.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/GeoJsonSourceTests.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/HeatmapLayerTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/HeatmapLayerTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/HeatmapLayerTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/HeatmapLayerTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/HillshadeLayerTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/HillshadeLayerTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/HillshadeLayerTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/HillshadeLayerTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/ImageTest.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/ImageTest.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/ImageTest.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/ImageTest.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LightTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LightTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LightTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LightTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTests.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTests.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTests.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTests.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTimingTests.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTimingTests.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTimingTests.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTimingTests.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/StyleLoaderTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/StyleLoaderTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/StyleLoaderTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/StyleLoaderTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/light.junit.ejs b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/light.junit.ejs
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/light.junit.ejs
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/light.junit.ejs
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/SnapshotterIdlingResource.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/SnapshotterIdlingResource.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/SnapshotterIdlingResource.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/SnapshotterIdlingResource.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/TestConstants.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/TestConstants.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/TestConstants.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/TestConstants.java
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/TestingAsyncUtils.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/TestingAsyncUtils.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/TestingAsyncUtils.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/TestingAsyncUtils.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/utils/FontUtilsTest.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/utils/FontUtilsTest.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/utils/FontUtilsTest.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/utils/FontUtilsTest.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/assets/Roboto-Medium.ttf b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/Roboto-Medium.ttf
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/assets/Roboto-Medium.ttf
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/Roboto-Medium.ttf
diff --git a/MapboxGLAndroidSDKTestApp/src/main/assets/Roboto-Regular.ttf b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/Roboto-Regular.ttf
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/assets/Roboto-Regular.ttf
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/Roboto-Regular.ttf
diff --git a/MapboxGLAndroidSDKTestApp/src/main/assets/commercial-24.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/commercial-24.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/assets/commercial-24.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/commercial-24.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/assets/dog-park-24.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/dog-park-24.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/assets/dog-park-24.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/dog-park-24.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/assets/earthquakes.geojson b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/earthquakes.geojson
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/assets/earthquakes.geojson
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/earthquakes.geojson
diff --git a/MapboxGLAndroidSDKTestApp/src/main/assets/fill_color_style.json b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/fill_color_style.json
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/assets/fill_color_style.json
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/fill_color_style.json
diff --git a/MapboxGLAndroidSDKTestApp/src/main/assets/fill_filter_style.json b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/fill_filter_style.json
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/assets/fill_filter_style.json
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/fill_filter_style.json
diff --git a/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Bold,Arial Unicode MS Bold/0-255.pbf b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Bold,Arial Unicode MS Bold/0-255.pbf
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Bold,Arial Unicode MS Bold/0-255.pbf
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Bold,Arial Unicode MS Bold/0-255.pbf
diff --git a/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Italic,Arial Unicode MS Regular/0-255.pbf b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Italic,Arial Unicode MS Regular/0-255.pbf
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Italic,Arial Unicode MS Regular/0-255.pbf
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Italic,Arial Unicode MS Regular/0-255.pbf
diff --git a/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Medium,Arial Unicode MS Regular/0-255.pbf b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Medium,Arial Unicode MS Regular/0-255.pbf
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Medium,Arial Unicode MS Regular/0-255.pbf
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Medium,Arial Unicode MS Regular/0-255.pbf
diff --git a/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Regular,Arial Unicode MS Regular/0-255.pbf b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Regular,Arial Unicode MS Regular/0-255.pbf
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Regular,Arial Unicode MS Regular/0-255.pbf
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Regular,Arial Unicode MS Regular/0-255.pbf
diff --git a/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Regular,Arial Unicode MS Regular/8192-8447.pbf b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Regular,Arial Unicode MS Regular/8192-8447.pbf
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Regular,Arial Unicode MS Regular/8192-8447.pbf
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Regular,Arial Unicode MS Regular/8192-8447.pbf
diff --git a/MapboxGLAndroidSDKTestApp/src/main/assets/heavy_style.json b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/heavy_style.json
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/assets/heavy_style.json
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/heavy_style.json
diff --git a/MapboxGLAndroidSDKTestApp/src/main/assets/line_filter_style.json b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/line_filter_style.json
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/assets/line_filter_style.json
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/line_filter_style.json
diff --git a/MapboxGLAndroidSDKTestApp/src/main/assets/london-underground-24.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/london-underground-24.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/assets/london-underground-24.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/london-underground-24.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/assets/numeric_filter_style.json b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/numeric_filter_style.json
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/assets/numeric_filter_style.json
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/numeric_filter_style.json
diff --git a/MapboxGLAndroidSDKTestApp/src/main/assets/offline_test.db b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/offline_test.db
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/assets/offline_test.db
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/offline_test.db
diff --git a/MapboxGLAndroidSDKTestApp/src/main/assets/points-sf.geojson b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/points-sf.geojson
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/assets/points-sf.geojson
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/points-sf.geojson
diff --git a/MapboxGLAndroidSDKTestApp/src/main/assets/points.geojson b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/points.geojson
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/assets/points.geojson
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/points.geojson
diff --git a/MapboxGLAndroidSDKTestApp/src/main/assets/small_line.geojson b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/small_line.geojson
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/assets/small_line.geojson
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/small_line.geojson
diff --git a/MapboxGLAndroidSDKTestApp/src/main/assets/small_poly.geojson b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/small_poly.geojson
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/assets/small_poly.geojson
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/small_poly.geojson
diff --git a/MapboxGLAndroidSDKTestApp/src/main/assets/streets.json b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/streets.json
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/assets/streets.json
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/streets.json
diff --git a/MapboxGLAndroidSDKTestApp/src/main/assets/stretchable_image.geojson b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/stretchable_image.geojson
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/assets/stretchable_image.geojson
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/stretchable_image.geojson
diff --git a/MapboxGLAndroidSDKTestApp/src/main/assets/town-hall-24.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/town-hall-24.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/assets/town-hall-24.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/town-hall-24.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapboxApplication.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapboxApplication.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapboxApplication.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapboxApplication.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/FeatureOverviewActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/FeatureOverviewActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/FeatureOverviewActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/FeatureOverviewActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedSymbolLayerActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedSymbolLayerActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedSymbolLayerActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedSymbolLayerActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/DynamicMarkerChangeActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/DynamicMarkerChangeActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/DynamicMarkerChangeActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/DynamicMarkerChangeActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolygonActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolygonActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolygonActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolygonActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolylineActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolylineActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolylineActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolylineActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PressForMarkerActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PressForMarkerActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PressForMarkerActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PressForMarkerActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimationTypeActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimationTypeActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimationTypeActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimationTypeActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimatorActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimatorActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimatorActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimatorActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/GestureDetectorActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/GestureDetectorActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/GestureDetectorActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/GestureDetectorActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ManualZoomActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ManualZoomActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ManualZoomActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ManualZoomActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/MaxMinZoomActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/MaxMinZoomActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/MaxMinZoomActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/MaxMinZoomActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ScrollByActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ScrollByActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ScrollByActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ScrollByActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/customlayer/CustomLayerActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/customlayer/CustomLayerActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/customlayer/CustomLayerActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/customlayer/CustomLayerActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/espresso/DeviceIndependentTestActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/espresso/DeviceIndependentTestActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/espresso/DeviceIndependentTestActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/espresso/DeviceIndependentTestActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/espresso/EspressoTestActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/espresso/EspressoTestActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/espresso/EspressoTestActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/espresso/EspressoTestActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/espresso/PixelTestActivity.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/espresso/PixelTestActivity.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/espresso/PixelTestActivity.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/espresso/PixelTestActivity.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxCountActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxCountActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxCountActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxCountActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxHighlightActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxHighlightActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxHighlightActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxHighlightActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesPropertiesActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesPropertiesActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesPropertiesActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesPropertiesActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QuerySourceFeaturesActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QuerySourceFeaturesActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QuerySourceFeaturesActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QuerySourceFeaturesActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/FragmentBackStackActivity.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/FragmentBackStackActivity.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/FragmentBackStackActivity.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/FragmentBackStackActivity.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MapFragmentActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MapFragmentActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MapFragmentActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MapFragmentActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MultiMapActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MultiMapActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MultiMapActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MultiMapActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/NestedViewPagerActivity.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/NestedViewPagerActivity.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/NestedViewPagerActivity.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/NestedViewPagerActivity.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/SupportMapFragmentActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/SupportMapFragmentActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/SupportMapFragmentActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/SupportMapFragmentActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/ViewPagerActivity.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/ViewPagerActivity.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/ViewPagerActivity.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/ViewPagerActivity.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/imagegenerator/PrintActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/imagegenerator/PrintActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/imagegenerator/PrintActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/imagegenerator/PrintActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/imagegenerator/SnapshotActivity.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/imagegenerator/SnapshotActivity.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/imagegenerator/SnapshotActivity.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/imagegenerator/SnapshotActivity.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/DynamicInfoWindowAdapterActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/DynamicInfoWindowAdapterActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/DynamicInfoWindowAdapterActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/DynamicInfoWindowAdapterActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/InfoWindowActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/InfoWindowActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/InfoWindowActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/InfoWindowActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/InfoWindowAdapterActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/InfoWindowAdapterActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/InfoWindowAdapterActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/InfoWindowAdapterActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/BasicLocationPulsingCircleActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/BasicLocationPulsingCircleActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/BasicLocationPulsingCircleActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/BasicLocationPulsingCircleActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/CustomizedLocationPulsingCircleActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/CustomizedLocationPulsingCircleActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/CustomizedLocationPulsingCircleActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/CustomizedLocationPulsingCircleActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationComponentActivationActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationComponentActivationActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationComponentActivationActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationComponentActivationActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationFragmentActivity.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationFragmentActivity.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationFragmentActivity.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationFragmentActivity.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationMapChangeActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationMapChangeActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationMapChangeActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationMapChangeActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationModesActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationModesActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationModesActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationModesActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/ManualLocationUpdatesActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/ManualLocationUpdatesActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/ManualLocationUpdatesActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/ManualLocationUpdatesActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/Utils.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/Utils.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/Utils.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/Utils.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/BottomSheetActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/BottomSheetActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/BottomSheetActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/BottomSheetActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DoubleMapActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DoubleMapActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DoubleMapActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DoubleMapActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/GLSurfaceRecyclerViewActivity.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/GLSurfaceRecyclerViewActivity.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/GLSurfaceRecyclerViewActivity.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/GLSurfaceRecyclerViewActivity.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LatLngBoundsForCameraActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LatLngBoundsForCameraActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LatLngBoundsForCameraActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LatLngBoundsForCameraActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LocalGlyphActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LocalGlyphActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LocalGlyphActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LocalGlyphActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapChangeActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapChangeActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapChangeActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapChangeActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapInDialogActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapInDialogActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapInDialogActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapInDialogActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapPaddingActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapPaddingActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapPaddingActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapPaddingActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/OverlayMapActivity.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/OverlayMapActivity.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/OverlayMapActivity.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/OverlayMapActivity.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/SimpleMapActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/SimpleMapActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/SimpleMapActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/SimpleMapActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/TextureRecyclerViewActivity.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/TextureRecyclerViewActivity.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/TextureRecyclerViewActivity.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/TextureRecyclerViewActivity.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/VisibilityChangeActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/VisibilityChangeActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/VisibilityChangeActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/VisibilityChangeActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/ChangeResourcesCachePathActivity.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/ChangeResourcesCachePathActivity.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/ChangeResourcesCachePathActivity.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/ChangeResourcesCachePathActivity.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/DeleteRegionActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/DeleteRegionActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/DeleteRegionActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/DeleteRegionActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/DownloadRegionActivity.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/DownloadRegionActivity.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/DownloadRegionActivity.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/DownloadRegionActivity.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/MergeOfflineRegionsActivity.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/MergeOfflineRegionsActivity.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/MergeOfflineRegionsActivity.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/MergeOfflineRegionsActivity.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/OfflineActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/OfflineActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/OfflineActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/OfflineActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/UpdateMetadataActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/UpdateMetadataActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/UpdateMetadataActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/UpdateMetadataActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestDefinition.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestDefinition.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestDefinition.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestDefinition.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestSnapshotter.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestSnapshotter.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestSnapshotter.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestSnapshotter.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestStyleDefinition.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestStyleDefinition.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestStyleDefinition.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestStyleDefinition.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterBitMapOverlayActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterBitMapOverlayActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterBitMapOverlayActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterBitMapOverlayActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterHeatMapActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterHeatMapActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterHeatMapActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterHeatMapActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterLocalStyleActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterLocalStyleActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterLocalStyleActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterLocalStyleActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterReuseActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterReuseActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterReuseActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterReuseActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/storage/CacheManagementActivity.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/storage/CacheManagementActivity.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/storage/CacheManagementActivity.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/storage/CacheManagementActivity.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/storage/UrlTransformActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/storage/UrlTransformActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/storage/UrlTransformActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/storage/UrlTransformActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/AnimatedImageSourceActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/AnimatedImageSourceActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/AnimatedImageSourceActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/AnimatedImageSourceActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/BuildingFillExtrusionActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/BuildingFillExtrusionActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/BuildingFillExtrusionActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/BuildingFillExtrusionActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CircleLayerActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CircleLayerActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CircleLayerActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CircleLayerActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CollectionUpdateOnStyleChange.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CollectionUpdateOnStyleChange.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CollectionUpdateOnStyleChange.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CollectionUpdateOnStyleChange.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CustomSpriteActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CustomSpriteActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CustomSpriteActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CustomSpriteActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DataDrivenStyleActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DataDrivenStyleActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DataDrivenStyleActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DataDrivenStyleActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DistanceExpressionActivity.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DistanceExpressionActivity.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DistanceExpressionActivity.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DistanceExpressionActivity.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DraggableMarkerActivity.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DraggableMarkerActivity.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DraggableMarkerActivity.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DraggableMarkerActivity.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/FillExtrusionActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/FillExtrusionActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/FillExtrusionActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/FillExtrusionActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/FillExtrusionStyleTestActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/FillExtrusionStyleTestActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/FillExtrusionStyleTestActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/FillExtrusionStyleTestActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/GeoJsonClusteringActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/GeoJsonClusteringActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/GeoJsonClusteringActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/GeoJsonClusteringActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/GradientLineActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/GradientLineActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/GradientLineActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/GradientLineActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/GridSourceActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/GridSourceActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/GridSourceActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/GridSourceActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/HeatmapLayerActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/HeatmapLayerActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/HeatmapLayerActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/HeatmapLayerActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/HillshadeLayerActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/HillshadeLayerActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/HillshadeLayerActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/HillshadeLayerActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/ImageInLabelActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/ImageInLabelActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/ImageInLabelActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/ImageInLabelActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/NoStyleActivity.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/NoStyleActivity.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/NoStyleActivity.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/NoStyleActivity.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RealTimeGeoJsonActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RealTimeGeoJsonActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RealTimeGeoJsonActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RealTimeGeoJsonActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleTimingTestActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleTimingTestActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleTimingTestActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleTimingTestActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/StretchableImageActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/StretchableImageActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/StretchableImageActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/StretchableImageActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/StyleFileActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/StyleFileActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/StyleFileActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/StyleFileActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolGeneratorActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolGeneratorActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolGeneratorActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolGeneratorActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolLayerActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolLayerActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolLayerActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolLayerActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/ZoomFunctionSymbolLayerActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/ZoomFunctionSymbolLayerActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/ZoomFunctionSymbolLayerActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/ZoomFunctionSymbolLayerActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/telemetry/PerformanceMeasurementActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/telemetry/PerformanceMeasurementActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/telemetry/PerformanceMeasurementActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/telemetry/PerformanceMeasurementActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewAnimationActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewAnimationActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewAnimationActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewAnimationActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewDebugModeActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewDebugModeActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewDebugModeActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewDebugModeActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewResizeActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewResizeActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewResizeActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewResizeActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewTransparentBackgroundActivity.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewTransparentBackgroundActivity.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewTransparentBackgroundActivity.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewTransparentBackgroundActivity.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/turf/MapSnapshotterWithinExpression.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/turf/MapSnapshotterWithinExpression.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/turf/MapSnapshotterWithinExpression.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/turf/MapSnapshotterWithinExpression.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/turf/PhysicalUnitCircleActivity.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/turf/PhysicalUnitCircleActivity.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/turf/PhysicalUnitCircleActivity.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/turf/PhysicalUnitCircleActivity.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/turf/WithinExpressionActivity.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/turf/WithinExpressionActivity.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/turf/WithinExpressionActivity.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/turf/WithinExpressionActivity.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/adapter/FeatureAdapter.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/adapter/FeatureAdapter.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/adapter/FeatureAdapter.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/adapter/FeatureAdapter.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/adapter/FeatureSectionAdapter.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/adapter/FeatureSectionAdapter.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/adapter/FeatureSectionAdapter.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/adapter/FeatureSectionAdapter.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/activity/Feature.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/activity/Feature.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/activity/Feature.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/activity/Feature.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CityStateMarker.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CityStateMarker.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CityStateMarker.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CityStateMarker.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CityStateMarkerOptions.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CityStateMarkerOptions.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CityStateMarkerOptions.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CityStateMarkerOptions.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CountryMarker.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CountryMarker.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CountryMarker.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CountryMarker.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CountryMarkerOptions.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CountryMarkerOptions.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CountryMarkerOptions.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CountryMarkerOptions.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/customlayer/ExampleCustomLayer.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/customlayer/ExampleCustomLayer.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/customlayer/ExampleCustomLayer.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/customlayer/ExampleCustomLayer.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/OfflineDownloadRegionDialog.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/OfflineDownloadRegionDialog.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/OfflineDownloadRegionDialog.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/OfflineDownloadRegionDialog.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/OfflineListRegionsDialog.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/OfflineListRegionsDialog.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/OfflineListRegionsDialog.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/OfflineListRegionsDialog.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/FileUtils.kt b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/FileUtils.kt
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/FileUtils.kt
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/FileUtils.kt
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/FontCache.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/FontCache.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/FontCache.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/FontCache.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/GeoParseUtil.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/GeoParseUtil.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/GeoParseUtil.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/GeoParseUtil.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/IconUtils.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/IconUtils.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/IconUtils.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/IconUtils.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/IdleZoomListener.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/IdleZoomListener.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/IdleZoomListener.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/IdleZoomListener.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/ItemClickSupport.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/ItemClickSupport.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/ItemClickSupport.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/ItemClickSupport.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/NavUtils.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/NavUtils.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/NavUtils.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/NavUtils.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/OfflineUtils.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/OfflineUtils.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/OfflineUtils.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/OfflineUtils.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/ResourceUtils.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/ResourceUtils.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/ResourceUtils.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/ResourceUtils.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TileLoadingMeasurementUtils.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TileLoadingMeasurementUtils.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TileLoadingMeasurementUtils.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TileLoadingMeasurementUtils.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimberLogger.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimberLogger.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimberLogger.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimberLogger.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimingLogger.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimingLogger.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimingLogger.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimingLogger.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TokenUtils.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TokenUtils.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TokenUtils.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TokenUtils.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/ViewToBitmapUtil.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/ViewToBitmapUtil.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/ViewToBitmapUtil.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/ViewToBitmapUtil.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/view/LockableBottomSheetBehavior.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/view/LockableBottomSheetBehavior.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/view/LockableBottomSheetBehavior.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/view/LockableBottomSheetBehavior.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/view/MapViewPager.java b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/view/MapViewPager.java
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/view/MapViewPager.java
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/view/MapViewPager.java
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/animator/scale_down.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/animator/scale_down.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/animator/scale_down.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/animator/scale_down.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/animator/scale_up.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/animator/scale_up.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/animator/scale_up.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/animator/scale_up.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_android.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_android.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_android.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_android.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_android_2.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_android_2.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_android_2.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_android_2.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_launcher_round.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_launcher_round.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_launcher_round.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_launcher_round.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon_burned.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon_burned.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon_burned.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon_burned.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/popup.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/popup.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/popup.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/popup.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/popup_debug.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/popup_debug.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/popup_debug.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/popup_debug.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_android.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_android.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_android.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_android.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_android_2.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_android_2.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_android_2.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_android_2.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_launcher_round.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_launcher_round.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_launcher_round.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_launcher_round.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon_burned.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon_burned.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon_burned.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon_burned.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_0.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_0.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_0.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_0.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_1.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_1.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_1.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_1.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_2.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_2.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_2.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_2.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_3.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_3.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_3.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_3.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_android.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_android.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_android.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_android.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_android_2.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_android_2.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_android_2.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_android_2.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_launcher_round.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_launcher_round.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_launcher_round.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_launcher_round.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon_burned.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon_burned.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon_burned.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon_burned.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_android.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_android.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_android.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_android.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_android_2.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_android_2.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_android_2.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_android_2.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_launcher_round.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_launcher_round.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_launcher_round.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_us.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_us.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_us.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_us.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon_burned.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon_burned.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon_burned.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon_burned.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_android.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_android.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_android.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_android.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_android_2.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_android_2.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_android_2.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_android_2.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_car_top.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_car_top.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_car_top.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_car_top.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_launcher_round.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_launcher_round.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_launcher_round.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_taxi_top.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_taxi_top.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_taxi_top.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_taxi_top.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon_burned.png b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon_burned.png
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon_burned.png
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon_burned.png
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/water.jpg b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/water.jpg
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/water.jpg
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/water.jpg
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable/custom_user_arrow.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/custom_user_arrow.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable/custom_user_arrow.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/custom_user_arrow.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable/custom_user_icon.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/custom_user_icon.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable/custom_user_icon.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/custom_user_icon.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable/custom_user_puck_icon.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/custom_user_puck_icon.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable/custom_user_puck_icon.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/custom_user_puck_icon.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_ab_back.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_ab_back.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_ab_back.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_ab_back.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add_a_photo_black.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add_a_photo_black.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add_a_photo_black.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add_a_photo_black.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add_white.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add_white.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add_white.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add_white.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_airplanemode_active_black.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_airplanemode_active_black.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_airplanemode_active_black.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_airplanemode_active_black.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_animate_coordinates.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_animate_coordinates.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_animate_coordinates.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_animate_coordinates.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_arrow_downward.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_arrow_downward.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_arrow_downward.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_arrow_downward.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_arrow_upward.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_arrow_upward.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_arrow_upward.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_arrow_upward.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_check_box.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_check_box.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_check_box.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_check_box.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_delete.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_delete.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_delete.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_delete.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_bus_black.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_bus_black.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_bus_black.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_bus_black.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_car_black.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_car_black.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_car_black.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_car_black.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_run_black.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_run_black.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_run_black.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_run_black.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_droppin.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_droppin.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_droppin.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_droppin.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_hearing_black_24dp.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_hearing_black_24dp.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_hearing_black_24dp.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_hearing_black_24dp.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_input.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_input.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_input.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_input.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_layers.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_layers.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_layers.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_layers.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_layers_clear.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_layers_clear.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_layers_clear.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_layers_clear.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_city.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_city.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_city.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_city.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_disabled.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_disabled.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_disabled.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_disabled.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_my_location.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_my_location.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_my_location.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_my_location.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_paint.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_paint.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_paint.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_paint.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_pause_black_24dp.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_pause_black_24dp.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_pause_black_24dp.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_pause_black_24dp.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_play_arrow_black_24dp.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_play_arrow_black_24dp.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_play_arrow_black_24dp.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_play_arrow_black_24dp.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_print.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_print.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_print.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_print.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_refresh.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_refresh.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_refresh.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_refresh.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_stars.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_stars.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_stars.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_stars.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable/line_divider.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/line_divider.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable/line_divider.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/line_divider.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/drawable/mapbox_user_icon_shadow_0px_test.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/mapbox_user_icon_shadow_0px_test.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/drawable/mapbox_user_icon_shadow_0px_test.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/mapbox_user_icon_shadow_0px_test.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_sprite.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_sprite.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_sprite.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_sprite.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_image_source.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_image_source.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_image_source.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_image_source.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_backstack_fragment.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_backstack_fragment.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_backstack_fragment.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_backstack_fragment.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_bottom_sheet.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_bottom_sheet.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_bottom_sheet.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_bottom_sheet.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_building_layer.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_building_layer.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_building_layer.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_building_layer.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_cache_management.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_cache_management.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_cache_management.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_cache_management.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animator.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animator.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animator.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animator.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_position.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_position.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_position.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_position.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_test.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_test.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_test.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_test.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_change_resources_cache_path.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_change_resources_cache_path.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_change_resources_cache_path.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_change_resources_cache_path.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circle_layer.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circle_layer.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circle_layer.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circle_layer.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_collection_update_on_style_change.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_collection_update_on_style_change.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_collection_update_on_style_change.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_collection_update_on_style_change.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_custom_layer.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_custom_layer.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_custom_layer.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_custom_layer.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_data_driven_style.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_data_driven_style.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_data_driven_style.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_data_driven_style.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_debug_mode.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_debug_mode.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_debug_mode.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_debug_mode.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_default.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_default.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_default.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_default.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_draggable_marker.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_draggable_marker.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_draggable_marker.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_draggable_marker.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_dynamic_marker.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_dynamic_marker.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_dynamic_marker.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_dynamic_marker.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_espresso_test.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_espresso_test.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_espresso_test.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_espresso_test.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_extrusion_test.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_extrusion_test.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_extrusion_test.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_extrusion_test.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_feature_overview.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_feature_overview.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_feature_overview.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_feature_overview.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_fill_extrusion_layer.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_fill_extrusion_layer.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_fill_extrusion_layer.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_fill_extrusion_layer.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_geojson_clustering.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_geojson_clustering.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_geojson_clustering.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_geojson_clustering.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_gesture_detector.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_gesture_detector.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_gesture_detector.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_gesture_detector.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_gradient_line.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_gradient_line.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_gradient_line.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_gradient_line.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_grid_source.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_grid_source.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_grid_source.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_grid_source.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_heatmaplayer.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_heatmaplayer.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_heatmaplayer.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_heatmaplayer.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_hillshade_layer.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_hillshade_layer.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_hillshade_layer.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_hillshade_layer.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_latlngbounds.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_latlngbounds.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_latlngbounds.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_latlngbounds.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_activation_builder.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_activation_builder.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_activation_builder.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_activation_builder.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_basic_pulsing_circle.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_basic_pulsing_circle.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_basic_pulsing_circle.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_basic_pulsing_circle.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_customized_pulsing_circle.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_customized_pulsing_circle.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_customized_pulsing_circle.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_customized_pulsing_circle.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_fragment.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_fragment.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_fragment.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_fragment.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_map_change.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_map_change.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_map_change.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_map_change.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_mode.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_mode.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_mode.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_mode.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_manual_update.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_manual_update.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_manual_update.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_manual_update.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_manual_zoom.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_manual_zoom.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_manual_zoom.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_manual_zoom.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_in_dialog.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_in_dialog.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_in_dialog.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_in_dialog.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_padding.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_padding.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_padding.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_padding.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_simple.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_simple.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_simple.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_simple.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_snapshotter.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_snapshotter.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_snapshotter.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_snapshotter.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_snapshotter_marker.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_snapshotter_marker.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_snapshotter_marker.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_snapshotter_marker.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_snapshotter_reuse.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_snapshotter_reuse.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_snapshotter_reuse.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_snapshotter_reuse.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_visibility.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_visibility.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_visibility.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_visibility.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_mapsnapshotter_within_expression.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_mapsnapshotter_within_expression.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_mapsnapshotter_within_expression.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_mapsnapshotter_within_expression.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_maxmin_zoom.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_maxmin_zoom.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_maxmin_zoom.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_maxmin_zoom.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_merge_offline_regions.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_merge_offline_regions.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_merge_offline_regions.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_merge_offline_regions.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_metadata_update.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_metadata_update.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_metadata_update.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_metadata_update.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_offline.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_offline.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_offline.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_offline.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_offline_region_delete.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_offline_region_delete.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_offline_region_delete.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_offline_region_delete.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_overlay.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_overlay.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_overlay.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_overlay.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_physical_circle.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_physical_circle.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_physical_circle.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_physical_circle.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_pixel_test.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_pixel_test.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_pixel_test.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_pixel_test.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_print.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_print.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_print.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_print.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_box.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_box.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_box.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_box.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_point.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_point.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_point.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_point.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_source_features.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_source_features.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_source_features.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_source_features.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_recyclerview.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_recyclerview.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_recyclerview.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_recyclerview.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_region_download.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_region_download.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_region_download.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_region_download.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_restricted_bounds.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_restricted_bounds.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_restricted_bounds.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_restricted_bounds.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_runtime_style.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_runtime_style.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_runtime_style.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_runtime_style.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_snapshot.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_snapshot.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_snapshot.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_snapshot.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_stretchable_image.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_stretchable_image.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_stretchable_image.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_stretchable_image.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_symbol_generator.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_symbol_generator.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_symbol_generator.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_symbol_generator.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_symbollayer.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_symbollayer.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_symbollayer.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_symbollayer.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_animate.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_animate.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_animate.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_animate.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_debug_mode.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_debug_mode.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_debug_mode.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_debug_mode.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_resize.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_resize.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_resize.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_resize.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_transparent.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_transparent.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_transparent.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_transparent.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_viewpager.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_viewpager.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_viewpager.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_viewpager.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_within_expression.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_within_expression.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_within_expression.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_within_expression.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_zoom_symbol_layer.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_zoom_symbol_layer.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_zoom_symbol_layer.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_zoom_symbol_layer.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/dialog_camera_position.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/dialog_camera_position.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/dialog_camera_position.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/dialog_camera_position.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/drawer_navigation_drawer.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/drawer_navigation_drawer.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/drawer_navigation_drawer.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/drawer_navigation_drawer.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_gesture_alert.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_gesture_alert.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/item_gesture_alert.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_gesture_alert.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_main_feature.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_main_feature.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/item_main_feature.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_main_feature.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_gl.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_gl.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_gl.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_gl.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_texture.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_texture.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_texture.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_texture.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_viewpager.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_viewpager.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/item_viewpager.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_viewpager.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/section_main_layout.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/section_main_layout.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/section_main_layout.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/section_main_layout.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_custom_marker.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_custom_marker.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/view_custom_marker.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_custom_marker.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_text_marker.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_text_marker.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/layout/view_text_marker.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_text_marker.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_animator.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_animator.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_animator.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_animator.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_bounds.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_bounds.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_bounds.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_bounds.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_building.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_building.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_building.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_building.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_bulk_marker.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_bulk_marker.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_bulk_marker.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_bulk_marker.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_custom_layer.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_custom_layer.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_custom_layer.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_custom_layer.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_data_driven_style.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_data_driven_style.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_data_driven_style.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_data_driven_style.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_debug.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_debug.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_debug.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_debug.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_generator_symbol.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_generator_symbol.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_generator_symbol.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_generator_symbol.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_gestures.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_gestures.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_gestures.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_gestures.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_infowindow.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_infowindow.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_infowindow.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_infowindow.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_location_mode.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_location_mode.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_location_mode.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_location_mode.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_padding.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_padding.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_padding.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_padding.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_polygon.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_polygon.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_polygon.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_polygon.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_polyline.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_polyline.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_polyline.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_polyline.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_press_for_marker.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_press_for_marker.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_press_for_marker.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_press_for_marker.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_pulsing_location_mode.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_pulsing_location_mode.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_pulsing_location_mode.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_pulsing_location_mode.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_runtime_style.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_runtime_style.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_runtime_style.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_runtime_style.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_symbol_layer.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_symbol_layer.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_symbol_layer.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_symbol_layer.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_symbols.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_symbols.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_symbols.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_symbols.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_zoom.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_zoom.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_zoom.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_zoom.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/raw/amsterdam.geojson b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/amsterdam.geojson
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/raw/amsterdam.geojson
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/amsterdam.geojson
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/raw/local_style.json b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/local_style.json
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/raw/local_style.json
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/local_style.json
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/raw/no_bg_style.json b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/no_bg_style.json
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/raw/no_bg_style.json
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/no_bg_style.json
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/raw/sat_style.json b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/sat_style.json
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/raw/sat_style.json
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/sat_style.json
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_feature_collection.geojson b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_feature_collection.geojson
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/raw/test_feature_collection.geojson
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_feature_collection.geojson
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_feature_properties.geojson b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_feature_properties.geojson
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/raw/test_feature_properties.geojson
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_feature_properties.geojson
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_line_gradient_feature.geojson b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_line_gradient_feature.geojson
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/raw/test_line_gradient_feature.geojson
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_line_gradient_feature.geojson
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_line_string_feature.geojson b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_line_string_feature.geojson
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/raw/test_line_string_feature.geojson
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_line_string_feature.geojson
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_multi_line_string_feature.geojson b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_multi_line_string_feature.geojson
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/raw/test_multi_line_string_feature.geojson
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_multi_line_string_feature.geojson
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_multi_point_feature.geojson b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_multi_point_feature.geojson
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/raw/test_multi_point_feature.geojson
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_multi_point_feature.geojson
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_multi_polygon_feature.geojson b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_multi_polygon_feature.geojson
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/raw/test_multi_polygon_feature.geojson
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_multi_polygon_feature.geojson
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_point_feature.geojson b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_point_feature.geojson
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/raw/test_point_feature.geojson
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_point_feature.geojson
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_points_utrecht.geojson b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_points_utrecht.geojson
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/raw/test_points_utrecht.geojson
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_points_utrecht.geojson
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_polygon_feature.geojson b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_polygon_feature.geojson
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/raw/test_polygon_feature.geojson
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_polygon_feature.geojson
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_polygon_with_hole_feature.geojson b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_polygon_with_hole_feature.geojson
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/raw/test_polygon_with_hole_feature.geojson
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_polygon_with_hole_feature.geojson
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/raw/tiny_countries.geojson b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/tiny_countries.geojson
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/raw/tiny_countries.geojson
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/tiny_countries.geojson
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/values-v21/attrs.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values-v21/attrs.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/values-v21/attrs.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values-v21/attrs.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/values-v21/styles.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values-v21/styles.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/values-v21/styles.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values-v21/styles.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/values/actions.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/actions.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/values/actions.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/actions.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/values/arrays.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/arrays.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/values/arrays.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/arrays.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/values/categories.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/categories.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/values/categories.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/categories.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/values/ids.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/ids.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/values/ids.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/ids.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml
diff --git a/MapboxGLAndroidSDKTestApp/src/main/res/values/titles.xml b/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/titles.xml
similarity index 100%
rename from MapboxGLAndroidSDKTestApp/src/main/res/values/titles.xml
rename to mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/titles.xml
diff --git a/README.md b/mapbox-gl-native-android/README.md
similarity index 100%
rename from README.md
rename to mapbox-gl-native-android/README.md
diff --git a/TESTS.md b/mapbox-gl-native-android/TESTS.md
similarity index 100%
rename from TESTS.md
rename to mapbox-gl-native-android/TESTS.md
diff --git a/build.gradle b/mapbox-gl-native-android/build.gradle
similarity index 100%
rename from build.gradle
rename to mapbox-gl-native-android/build.gradle
diff --git a/checkstyle.xml b/mapbox-gl-native-android/checkstyle.xml
similarity index 100%
rename from checkstyle.xml
rename to mapbox-gl-native-android/checkstyle.xml
diff --git a/circle.yml b/mapbox-gl-native-android/circle.yml
similarity index 100%
rename from circle.yml
rename to mapbox-gl-native-android/circle.yml
diff --git a/gradle.properties b/mapbox-gl-native-android/gradle.properties
similarity index 100%
rename from gradle.properties
rename to mapbox-gl-native-android/gradle.properties
diff --git a/gradle/android-nitpick.gradle b/mapbox-gl-native-android/gradle/android-nitpick.gradle
similarity index 100%
rename from gradle/android-nitpick.gradle
rename to mapbox-gl-native-android/gradle/android-nitpick.gradle
diff --git a/gradle/artifact-settings.gradle b/mapbox-gl-native-android/gradle/artifact-settings.gradle
similarity index 100%
rename from gradle/artifact-settings.gradle
rename to mapbox-gl-native-android/gradle/artifact-settings.gradle
diff --git a/gradle/dependencies.gradle b/mapbox-gl-native-android/gradle/dependencies.gradle
similarity index 100%
rename from gradle/dependencies.gradle
rename to mapbox-gl-native-android/gradle/dependencies.gradle
diff --git a/gradle/gradle-bintray.gradle b/mapbox-gl-native-android/gradle/gradle-bintray.gradle
similarity index 100%
rename from gradle/gradle-bintray.gradle
rename to mapbox-gl-native-android/gradle/gradle-bintray.gradle
diff --git a/gradle/gradle-checkstyle.gradle b/mapbox-gl-native-android/gradle/gradle-checkstyle.gradle
similarity index 100%
rename from gradle/gradle-checkstyle.gradle
rename to mapbox-gl-native-android/gradle/gradle-checkstyle.gradle
diff --git a/gradle/gradle-config.gradle b/mapbox-gl-native-android/gradle/gradle-config.gradle
similarity index 100%
rename from gradle/gradle-config.gradle
rename to mapbox-gl-native-android/gradle/gradle-config.gradle
diff --git a/gradle/gradle-dependencies-graph.gradle b/mapbox-gl-native-android/gradle/gradle-dependencies-graph.gradle
similarity index 100%
rename from gradle/gradle-dependencies-graph.gradle
rename to mapbox-gl-native-android/gradle/gradle-dependencies-graph.gradle
diff --git a/gradle/gradle-javadoc.gradle b/mapbox-gl-native-android/gradle/gradle-javadoc.gradle
similarity index 100%
rename from gradle/gradle-javadoc.gradle
rename to mapbox-gl-native-android/gradle/gradle-javadoc.gradle
diff --git a/gradle/gradle-lint.gradle b/mapbox-gl-native-android/gradle/gradle-lint.gradle
similarity index 100%
rename from gradle/gradle-lint.gradle
rename to mapbox-gl-native-android/gradle/gradle-lint.gradle
diff --git a/gradle/gradle-make.gradle b/mapbox-gl-native-android/gradle/gradle-make.gradle
similarity index 100%
rename from gradle/gradle-make.gradle
rename to mapbox-gl-native-android/gradle/gradle-make.gradle
diff --git a/gradle/gradle-update-vendor-modules.gradle b/mapbox-gl-native-android/gradle/gradle-update-vendor-modules.gradle
similarity index 100%
rename from gradle/gradle-update-vendor-modules.gradle
rename to mapbox-gl-native-android/gradle/gradle-update-vendor-modules.gradle
diff --git a/gradle/jacoco-report.gradle b/mapbox-gl-native-android/gradle/jacoco-report.gradle
similarity index 100%
rename from gradle/jacoco-report.gradle
rename to mapbox-gl-native-android/gradle/jacoco-report.gradle
diff --git a/gradle/ktlint.gradle b/mapbox-gl-native-android/gradle/ktlint.gradle
similarity index 100%
rename from gradle/ktlint.gradle
rename to mapbox-gl-native-android/gradle/ktlint.gradle
diff --git a/gradle/native-build.gradle b/mapbox-gl-native-android/gradle/native-build.gradle
similarity index 100%
rename from gradle/native-build.gradle
rename to mapbox-gl-native-android/gradle/native-build.gradle
diff --git a/gradle/wrapper/gradle-wrapper.jar b/mapbox-gl-native-android/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from gradle/wrapper/gradle-wrapper.jar
rename to mapbox-gl-native-android/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/mapbox-gl-native-android/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from gradle/wrapper/gradle-wrapper.properties
rename to mapbox-gl-native-android/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew b/mapbox-gl-native-android/gradlew
similarity index 100%
rename from gradlew
rename to mapbox-gl-native-android/gradlew
diff --git a/gradlew.bat b/mapbox-gl-native-android/gradlew.bat
similarity index 100%
rename from gradlew.bat
rename to mapbox-gl-native-android/gradlew.bat
diff --git a/package-lock.json b/mapbox-gl-native-android/package-lock.json
similarity index 100%
rename from package-lock.json
rename to mapbox-gl-native-android/package-lock.json
diff --git a/package.json b/mapbox-gl-native-android/package.json
similarity index 100%
rename from package.json
rename to mapbox-gl-native-android/package.json
diff --git a/resources/compass.svg b/mapbox-gl-native-android/resources/compass.svg
similarity index 100%
rename from resources/compass.svg
rename to mapbox-gl-native-android/resources/compass.svg
diff --git a/resources/direction-dot.svg b/mapbox-gl-native-android/resources/direction-dot.svg
similarity index 100%
rename from resources/direction-dot.svg
rename to mapbox-gl-native-android/resources/direction-dot.svg
diff --git a/resources/dot-arrow.svg b/mapbox-gl-native-android/resources/dot-arrow.svg
similarity index 100%
rename from resources/dot-arrow.svg
rename to mapbox-gl-native-android/resources/dot-arrow.svg
diff --git a/resources/location-dot.svg b/mapbox-gl-native-android/resources/location-dot.svg
similarity index 100%
rename from resources/location-dot.svg
rename to mapbox-gl-native-android/resources/location-dot.svg
diff --git a/resources/location-static-dot.svg b/mapbox-gl-native-android/resources/location-static-dot.svg
similarity index 100%
rename from resources/location-static-dot.svg
rename to mapbox-gl-native-android/resources/location-static-dot.svg
diff --git a/scripts/exclude-activity-gen.json b/mapbox-gl-native-android/scripts/exclude-activity-gen.json
similarity index 100%
rename from scripts/exclude-activity-gen.json
rename to mapbox-gl-native-android/scripts/exclude-activity-gen.json
diff --git a/scripts/generate-license.py b/mapbox-gl-native-android/scripts/generate-license.py
similarity index 100%
rename from scripts/generate-license.py
rename to mapbox-gl-native-android/scripts/generate-license.py
diff --git a/scripts/generate-style-code.js b/mapbox-gl-native-android/scripts/generate-style-code.js
similarity index 100%
rename from scripts/generate-style-code.js
rename to mapbox-gl-native-android/scripts/generate-style-code.js
diff --git a/scripts/generate-test-code.js b/mapbox-gl-native-android/scripts/generate-test-code.js
similarity index 100%
rename from scripts/generate-test-code.js
rename to mapbox-gl-native-android/scripts/generate-test-code.js
diff --git a/scripts/metrics.sh b/mapbox-gl-native-android/scripts/metrics.sh
similarity index 100%
rename from scripts/metrics.sh
rename to mapbox-gl-native-android/scripts/metrics.sh
diff --git a/scripts/parse-jacoco-report.py b/mapbox-gl-native-android/scripts/parse-jacoco-report.py
similarity index 100%
rename from scripts/parse-jacoco-report.py
rename to mapbox-gl-native-android/scripts/parse-jacoco-report.py
diff --git a/scripts/release.py b/mapbox-gl-native-android/scripts/release.py
similarity index 100%
rename from scripts/release.py
rename to mapbox-gl-native-android/scripts/release.py
diff --git a/scripts/run-render-test.py b/mapbox-gl-native-android/scripts/run-render-test.py
similarity index 100%
rename from scripts/run-render-test.py
rename to mapbox-gl-native-android/scripts/run-render-test.py
diff --git a/scripts/trigger-maps-documentation-deploy-steps.sh b/mapbox-gl-native-android/scripts/trigger-maps-documentation-deploy-steps.sh
similarity index 100%
rename from scripts/trigger-maps-documentation-deploy-steps.sh
rename to mapbox-gl-native-android/scripts/trigger-maps-documentation-deploy-steps.sh
diff --git a/scripts/upload-to-github-release.py b/mapbox-gl-native-android/scripts/upload-to-github-release.py
similarity index 100%
rename from scripts/upload-to-github-release.py
rename to mapbox-gl-native-android/scripts/upload-to-github-release.py
diff --git a/scripts/validate-license.py b/mapbox-gl-native-android/scripts/validate-license.py
similarity index 100%
rename from scripts/validate-license.py
rename to mapbox-gl-native-android/scripts/validate-license.py
diff --git a/settings.gradle b/mapbox-gl-native-android/settings.gradle
similarity index 100%
rename from settings.gradle
rename to mapbox-gl-native-android/settings.gradle
diff --git a/version-script b/mapbox-gl-native-android/version-script
similarity index 100%
rename from version-script
rename to mapbox-gl-native-android/version-script
diff --git a/vendor/mapbox-events-android b/vendor/mapbox-events-android
deleted file mode 160000
index 8ee3e93c3..000000000
--- a/vendor/mapbox-events-android
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8ee3e93c3bcfc07af3fb2f778b804590eda2c61f
diff --git a/vendor/mapbox-gestures-android b/vendor/mapbox-gestures-android
deleted file mode 160000
index 6fc34d91f..000000000
--- a/vendor/mapbox-gestures-android
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6fc34d91fc8d8758c51830127c49223624d446aa
diff --git a/vendor/mapbox-gl-native b/vendor/mapbox-gl-native
deleted file mode 160000
index d60fd302b..000000000
--- a/vendor/mapbox-gl-native
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d60fd302b1f6563e7d16952f8855122fdcc85f73
diff --git a/vendor/mapbox-java b/vendor/mapbox-java
deleted file mode 160000
index 71f3a6a75..000000000
--- a/vendor/mapbox-java
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 71f3a6a75d8d2afa606fb8118f6bbbc7151215b3