diff --git a/.gitmodules b/.gitmodules index 79fd16058..6e634fd03 100644 --- a/.gitmodules +++ b/.gitmodules @@ -55,3 +55,6 @@ [submodule "platform/ios/platform/darwin/docs/theme"] path = platform/ios/platform/darwin/docs/theme url = https://github.com/mapbox/jazzy-theme.git +[submodule "platform/android/vendor/mapbox-events-android"] + path = platform/android/vendor/mapbox-events-android + url = https://github.com/mapbox/mapbox-events-android.git diff --git a/mapbox-gl-native/ARCHITECTURE.md b/ARCHITECTURE.md similarity index 100% rename from mapbox-gl-native/ARCHITECTURE.md rename to ARCHITECTURE.md diff --git a/mapbox-gl-native/CHANGELOG.md b/CHANGELOG.md similarity index 100% rename from mapbox-gl-native/CHANGELOG.md rename to CHANGELOG.md diff --git a/mapbox-gl-native/CMakeLists.txt b/CMakeLists.txt similarity index 100% rename from mapbox-gl-native/CMakeLists.txt rename to CMakeLists.txt diff --git a/mapbox-gl-native-ios/CODE-OF-CONDUCT.md b/CODE-OF-CONDUCT.md similarity index 100% rename from mapbox-gl-native-ios/CODE-OF-CONDUCT.md rename to CODE-OF-CONDUCT.md diff --git a/mapbox-gl-native-ios/CONTRIBUTING.md b/CONTRIBUTING.md similarity index 100% rename from mapbox-gl-native-ios/CONTRIBUTING.md rename to CONTRIBUTING.md diff --git a/mapbox-gl-native/DEVELOPING.md b/DEVELOPING.md similarity index 100% rename from mapbox-gl-native/DEVELOPING.md rename to DEVELOPING.md diff --git a/mapbox-gl-native/LICENSE.mbgl-core.md b/LICENSE.mbgl-core.md similarity index 100% rename from mapbox-gl-native/LICENSE.mbgl-core.md rename to LICENSE.mbgl-core.md diff --git a/mapbox-gl-native/LICENSE.md b/LICENSE.md similarity index 100% rename from mapbox-gl-native/LICENSE.md rename to LICENSE.md diff --git a/README.md b/README.md index 0e4ae20c5..37b6fdbe4 100644 --- a/README.md +++ b/README.md @@ -6,10 +6,10 @@ For iOS and Android | SDK | Build | Build status | |---------------------------------------------------------------|---------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| [Mapbox Maps SDK for iOS](mapbox-gl-native-ios/platform/ios/) | CI | [![Github Action build status](https://github.com/maptiler/maplibre-gl-native/workflows/ios-ci/badge.svg)](https://github.com/maptiler/maplibre-gl-native/workflows/ios-ci) | -| [Mapbox Maps SDK for iOS](mapbox-gl-native-ios/platform/ios/) | Release | [![Github Action build status](https://github.com/maptiler/maplibre-gl-native/workflows/ios-release/badge.svg)](https://github.com/maptiler/maplibre-gl-native/workflows/ios-release) | -| [Mapbox Maps SDK for Android](mapbox-gl-native-android/) | CI | [![Github Action build status](https://github.com/maptiler/maplibre-gl-native/workflows/android-ci/badge.svg)](https://github.com/maptiler/maplibre-gl-native/workflows/android-ci) | -| [Mapbox Maps SDK for Android](mapbox-gl-native-iandroid/) | Release | [![Github Action build status](https://github.com/maptiler/maplibre-gl-native/workflows/android-release/badge.svg)](https://github.com/maptiler/maplibre-gl-native/workflows/android-release) | +| [Mapbox Maps SDK for iOS](platform/ios/) | CI | [![Github Action build status](https://github.com/maptiler/maplibre-gl-native/workflows/ios-ci/badge.svg)](https://github.com/maptiler/maplibre-gl-native/workflows/ios-ci) | +| [Mapbox Maps SDK for iOS](platform/ios/) | Release | [![Github Action build status](https://github.com/maptiler/maplibre-gl-native/workflows/ios-release/badge.svg)](https://github.com/maptiler/maplibre-gl-native/workflows/ios-release) | +| [Mapbox Maps SDK for Android](platform/android/) | CI | [![Github Action build status](https://github.com/maptiler/maplibre-gl-native/workflows/android-ci/badge.svg)](https://github.com/maptiler/maplibre-gl-native/workflows/android-ci) | +| [Mapbox Maps SDK for Android](platform/android/) | Release | [![Github Action build status](https://github.com/maptiler/maplibre-gl-native/workflows/android-release/badge.svg)](https://github.com/maptiler/maplibre-gl-native/workflows/android-release) | ## Installation @@ -57,40 +57,40 @@ You can also download pre-build from releases in this repository. ### Source code checkout ```bash -git clone --recurse-submodules https://github.com/maptiler/mapbox-gl-mobile.git +git clone --recurse-submodules https://github.com/maptiler/maplibre-gl-native.git ``` ### Build #### Android -> Make sure you have set Android SDK path in mapbox-gl-native-android/local.properties, variable sdk.dir +> Make sure you have set Android SDK path in platform/android/local.properties, variable sdk.dir ```bash -cd mapbox-gl-native-android +cd platform/android BUILDTYPE=Release make apackage ``` -Binaries are produced in `mapbox-gl-native-android/MapboxGLAndroidSDK/build/outputs/aar/MapboxGLAndroidSDK-release.aar` -Please refer to [Mapbox Maps SDK for Android](mapbox-gl-native-android/) for detailed instructions. +Binaries are produced in `platform/android/MapboxGLAndroidSDK/build/outputs/aar/MapboxGLAndroidSDK-release.aar` +Please refer to [Mapbox Maps SDK for Android](platform/android/) for detailed instructions. #### iOS ```bash -cd mapbox-gl-native-ios +cd platform/ios make xcframework BUILDTYPE=Release ``` -The packaging script will produce a `build/ios/pkg/dynamic` -Please refer to [Mapbox Maps SDK for iOS](mapbox-gl-native-ios/platform/ios/) for detailed instructions. +The packaging script will produce a `platform/ios/build/ios/pkg/dynamic` +Please refer to [Mapbox Maps SDK for iOS](platform/ios/platform/ios/) for detailed instructions. #### MacOS ```bash -cd mapbox-gl-native-ios +cd platform/ios make xpackage ``` -This produces a `Mapbox.framework` in the `build/macos/pkg/` folder. -Please refer to [Mapbox Maps SDK for macos](mapbox-gl-native-ios/platform/macos/) for detailed instructions. \ No newline at end of file +This produces a `Mapbox.framework` in the `platform/ios/build/macos/pkg/` folder. +Please refer to [Mapbox Maps SDK for macos](platform/ios/platform/macos/) for detailed instructions. \ No newline at end of file diff --git a/mapbox-gl-native/appveyor.yml b/appveyor.yml similarity index 100% rename from mapbox-gl-native/appveyor.yml rename to appveyor.yml diff --git a/mapbox-gl-native/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt similarity index 100% rename from mapbox-gl-native/benchmark/CMakeLists.txt rename to benchmark/CMakeLists.txt diff --git a/mapbox-gl-native/benchmark/android/README.md b/benchmark/android/README.md similarity index 100% rename from mapbox-gl-native/benchmark/android/README.md rename to benchmark/android/README.md diff --git a/mapbox-gl-native/benchmark/android/app/build.gradle b/benchmark/android/app/build.gradle similarity index 100% rename from mapbox-gl-native/benchmark/android/app/build.gradle rename to benchmark/android/app/build.gradle diff --git a/mapbox-gl-native/benchmark/android/app/src/androidTest/java/android/app/NativeActivityTest.java b/benchmark/android/app/src/androidTest/java/android/app/NativeActivityTest.java similarity index 100% rename from mapbox-gl-native/benchmark/android/app/src/androidTest/java/android/app/NativeActivityTest.java rename to benchmark/android/app/src/androidTest/java/android/app/NativeActivityTest.java diff --git a/mapbox-gl-native/benchmark/android/app/src/androidTest/java/android/app/TestState.java b/benchmark/android/app/src/androidTest/java/android/app/TestState.java similarity index 100% rename from mapbox-gl-native/benchmark/android/app/src/androidTest/java/android/app/TestState.java rename to benchmark/android/app/src/androidTest/java/android/app/TestState.java diff --git a/mapbox-gl-native/benchmark/android/app/src/main/AndroidManifest.xml b/benchmark/android/app/src/main/AndroidManifest.xml similarity index 100% rename from mapbox-gl-native/benchmark/android/app/src/main/AndroidManifest.xml rename to benchmark/android/app/src/main/AndroidManifest.xml diff --git a/mapbox-gl-native/benchmark/android/app/src/main/assets/to_zip.txt b/benchmark/android/app/src/main/assets/to_zip.txt similarity index 100% rename from mapbox-gl-native/benchmark/android/app/src/main/assets/to_zip.txt rename to benchmark/android/app/src/main/assets/to_zip.txt diff --git a/mapbox-gl-native/benchmark/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/benchmark/android/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from mapbox-gl-native/benchmark/android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to benchmark/android/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/mapbox-gl-native/benchmark/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/benchmark/android/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from mapbox-gl-native/benchmark/android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to benchmark/android/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/mapbox-gl-native/benchmark/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/benchmark/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from mapbox-gl-native/benchmark/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to benchmark/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/mapbox-gl-native/benchmark/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/benchmark/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from mapbox-gl-native/benchmark/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to benchmark/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/mapbox-gl-native/benchmark/android/app/src/main/res/values/strings.xml b/benchmark/android/app/src/main/res/values/strings.xml similarity index 100% rename from mapbox-gl-native/benchmark/android/app/src/main/res/values/strings.xml rename to benchmark/android/app/src/main/res/values/strings.xml diff --git a/mapbox-gl-native/benchmark/android/build.gradle b/benchmark/android/build.gradle similarity index 100% rename from mapbox-gl-native/benchmark/android/build.gradle rename to benchmark/android/build.gradle diff --git a/mapbox-gl-native/benchmark/android/gradle.properties b/benchmark/android/gradle.properties similarity index 100% rename from mapbox-gl-native/benchmark/android/gradle.properties rename to benchmark/android/gradle.properties diff --git a/mapbox-gl-native/benchmark/android/gradle/wrapper/gradle-wrapper.jar b/benchmark/android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from mapbox-gl-native/benchmark/android/gradle/wrapper/gradle-wrapper.jar rename to benchmark/android/gradle/wrapper/gradle-wrapper.jar diff --git a/mapbox-gl-native/benchmark/android/gradle/wrapper/gradle-wrapper.properties b/benchmark/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from mapbox-gl-native/benchmark/android/gradle/wrapper/gradle-wrapper.properties rename to benchmark/android/gradle/wrapper/gradle-wrapper.properties diff --git a/mapbox-gl-native/benchmark/android/gradlew b/benchmark/android/gradlew similarity index 100% rename from mapbox-gl-native/benchmark/android/gradlew rename to benchmark/android/gradlew diff --git a/mapbox-gl-native/benchmark/android/gradlew.bat b/benchmark/android/gradlew.bat similarity index 100% rename from mapbox-gl-native/benchmark/android/gradlew.bat rename to benchmark/android/gradlew.bat diff --git a/mapbox-gl-native/benchmark/android/settings.gradle b/benchmark/android/settings.gradle similarity index 100% rename from mapbox-gl-native/benchmark/android/settings.gradle rename to benchmark/android/settings.gradle diff --git a/mapbox-gl-native/benchmark/api/query.benchmark.cpp b/benchmark/api/query.benchmark.cpp similarity index 100% rename from mapbox-gl-native/benchmark/api/query.benchmark.cpp rename to benchmark/api/query.benchmark.cpp diff --git a/mapbox-gl-native/benchmark/api/render.benchmark.cpp b/benchmark/api/render.benchmark.cpp similarity index 100% rename from mapbox-gl-native/benchmark/api/render.benchmark.cpp rename to benchmark/api/render.benchmark.cpp diff --git a/mapbox-gl-native/benchmark/fixtures/api/cache.db b/benchmark/fixtures/api/cache.db similarity index 100% rename from mapbox-gl-native/benchmark/fixtures/api/cache.db rename to benchmark/fixtures/api/cache.db diff --git a/mapbox-gl-native/benchmark/fixtures/api/default_marker.png b/benchmark/fixtures/api/default_marker.png similarity index 100% rename from mapbox-gl-native/benchmark/fixtures/api/default_marker.png rename to benchmark/fixtures/api/default_marker.png diff --git a/mapbox-gl-native/benchmark/fixtures/api/style.json b/benchmark/fixtures/api/style.json similarity index 100% rename from mapbox-gl-native/benchmark/fixtures/api/style.json rename to benchmark/fixtures/api/style.json diff --git a/mapbox-gl-native/benchmark/fixtures/api/style_formatted_labels.json b/benchmark/fixtures/api/style_formatted_labels.json similarity index 100% rename from mapbox-gl-native/benchmark/fixtures/api/style_formatted_labels.json rename to benchmark/fixtures/api/style_formatted_labels.json diff --git a/mapbox-gl-native/benchmark/function/camera_function.benchmark.cpp b/benchmark/function/camera_function.benchmark.cpp similarity index 100% rename from mapbox-gl-native/benchmark/function/camera_function.benchmark.cpp rename to benchmark/function/camera_function.benchmark.cpp diff --git a/mapbox-gl-native/benchmark/function/composite_function.benchmark.cpp b/benchmark/function/composite_function.benchmark.cpp similarity index 100% rename from mapbox-gl-native/benchmark/function/composite_function.benchmark.cpp rename to benchmark/function/composite_function.benchmark.cpp diff --git a/mapbox-gl-native/benchmark/function/source_function.benchmark.cpp b/benchmark/function/source_function.benchmark.cpp similarity index 100% rename from mapbox-gl-native/benchmark/function/source_function.benchmark.cpp rename to benchmark/function/source_function.benchmark.cpp diff --git a/mapbox-gl-native/benchmark/include/mbgl/benchmark.hpp b/benchmark/include/mbgl/benchmark.hpp similarity index 100% rename from mapbox-gl-native/benchmark/include/mbgl/benchmark.hpp rename to benchmark/include/mbgl/benchmark.hpp diff --git a/mapbox-gl-native/benchmark/ios/BenchmarkApp_iphoneos13.2-arm64e-debug.xctestrun b/benchmark/ios/BenchmarkApp_iphoneos13.2-arm64e-debug.xctestrun similarity index 100% rename from mapbox-gl-native/benchmark/ios/BenchmarkApp_iphoneos13.2-arm64e-debug.xctestrun rename to benchmark/ios/BenchmarkApp_iphoneos13.2-arm64e-debug.xctestrun diff --git a/mapbox-gl-native/benchmark/ios/BenchmarkApp_iphoneos13.2-arm64e-release.xctestrun b/benchmark/ios/BenchmarkApp_iphoneos13.2-arm64e-release.xctestrun similarity index 100% rename from mapbox-gl-native/benchmark/ios/BenchmarkApp_iphoneos13.2-arm64e-release.xctestrun rename to benchmark/ios/BenchmarkApp_iphoneos13.2-arm64e-release.xctestrun diff --git a/mapbox-gl-native/benchmark/ios/Info.plist b/benchmark/ios/Info.plist similarity index 100% rename from mapbox-gl-native/benchmark/ios/Info.plist rename to benchmark/ios/Info.plist diff --git a/mapbox-gl-native/benchmark/ios/README.md b/benchmark/ios/README.md similarity index 100% rename from mapbox-gl-native/benchmark/ios/README.md rename to benchmark/ios/README.md diff --git a/mapbox-gl-native/benchmark/ios/codesigning/BenchmarkApp.app.xcent.template b/benchmark/ios/codesigning/BenchmarkApp.app.xcent.template similarity index 100% rename from mapbox-gl-native/benchmark/ios/codesigning/BenchmarkApp.app.xcent.template rename to benchmark/ios/codesigning/BenchmarkApp.app.xcent.template diff --git a/mapbox-gl-native/benchmark/ios/codesigning/BenchmarkAppTests.xctest.xcent.template b/benchmark/ios/codesigning/BenchmarkAppTests.xctest.xcent.template similarity index 100% rename from mapbox-gl-native/benchmark/ios/codesigning/BenchmarkAppTests.xctest.xcent.template rename to benchmark/ios/codesigning/BenchmarkAppTests.xctest.xcent.template diff --git a/mapbox-gl-native/benchmark/ios/codesigning/XCTAutomationSupport.framework.xcent.template b/benchmark/ios/codesigning/XCTAutomationSupport.framework.xcent.template similarity index 100% rename from mapbox-gl-native/benchmark/ios/codesigning/XCTAutomationSupport.framework.xcent.template rename to benchmark/ios/codesigning/XCTAutomationSupport.framework.xcent.template diff --git a/mapbox-gl-native/benchmark/ios/codesigning/XCTest.framework.xcent.template b/benchmark/ios/codesigning/XCTest.framework.xcent.template similarity index 100% rename from mapbox-gl-native/benchmark/ios/codesigning/XCTest.framework.xcent.template rename to benchmark/ios/codesigning/XCTest.framework.xcent.template diff --git a/mapbox-gl-native/benchmark/ios/codesigning/codesign_all.sh b/benchmark/ios/codesigning/codesign_all.sh similarity index 100% rename from mapbox-gl-native/benchmark/ios/codesigning/codesign_all.sh rename to benchmark/ios/codesigning/codesign_all.sh diff --git a/mapbox-gl-native/benchmark/ios/codesigning/generate-entitlements.swift b/benchmark/ios/codesigning/generate-entitlements.swift similarity index 100% rename from mapbox-gl-native/benchmark/ios/codesigning/generate-entitlements.swift rename to benchmark/ios/codesigning/generate-entitlements.swift diff --git a/mapbox-gl-native/benchmark/ios/codesigning/libXCTestSwiftSupport.dylib.xcent.template b/benchmark/ios/codesigning/libXCTestSwiftSupport.dylib.xcent.template similarity index 100% rename from mapbox-gl-native/benchmark/ios/codesigning/libXCTestSwiftSupport.dylib.xcent.template rename to benchmark/ios/codesigning/libXCTestSwiftSupport.dylib.xcent.template diff --git a/mapbox-gl-native/benchmark/ios/fastlane/Appfile b/benchmark/ios/fastlane/Appfile similarity index 100% rename from mapbox-gl-native/benchmark/ios/fastlane/Appfile rename to benchmark/ios/fastlane/Appfile diff --git a/mapbox-gl-native/benchmark/ios/fastlane/Matchfile b/benchmark/ios/fastlane/Matchfile similarity index 100% rename from mapbox-gl-native/benchmark/ios/fastlane/Matchfile rename to benchmark/ios/fastlane/Matchfile diff --git a/mapbox-gl-native/benchmark/ios/iosTestRunner.h b/benchmark/ios/iosTestRunner.h similarity index 100% rename from mapbox-gl-native/benchmark/ios/iosTestRunner.h rename to benchmark/ios/iosTestRunner.h diff --git a/mapbox-gl-native/benchmark/ios/ios_test_runner.cpp b/benchmark/ios/ios_test_runner.cpp similarity index 100% rename from mapbox-gl-native/benchmark/ios/ios_test_runner.cpp rename to benchmark/ios/ios_test_runner.cpp diff --git a/mapbox-gl-native/benchmark/ios/tests/Info.plist b/benchmark/ios/tests/Info.plist similarity index 100% rename from mapbox-gl-native/benchmark/ios/tests/Info.plist rename to benchmark/ios/tests/Info.plist diff --git a/mapbox-gl-native/benchmark/parse/filter.benchmark.cpp b/benchmark/parse/filter.benchmark.cpp similarity index 100% rename from mapbox-gl-native/benchmark/parse/filter.benchmark.cpp rename to benchmark/parse/filter.benchmark.cpp diff --git a/mapbox-gl-native/benchmark/parse/tile_mask.benchmark.cpp b/benchmark/parse/tile_mask.benchmark.cpp similarity index 100% rename from mapbox-gl-native/benchmark/parse/tile_mask.benchmark.cpp rename to benchmark/parse/tile_mask.benchmark.cpp diff --git a/mapbox-gl-native/benchmark/parse/vector_tile.benchmark.cpp b/benchmark/parse/vector_tile.benchmark.cpp similarity index 100% rename from mapbox-gl-native/benchmark/parse/vector_tile.benchmark.cpp rename to benchmark/parse/vector_tile.benchmark.cpp diff --git a/mapbox-gl-native/benchmark/src/mbgl/benchmark/benchmark.cpp b/benchmark/src/mbgl/benchmark/benchmark.cpp similarity index 100% rename from mapbox-gl-native/benchmark/src/mbgl/benchmark/benchmark.cpp rename to benchmark/src/mbgl/benchmark/benchmark.cpp diff --git a/mapbox-gl-native/benchmark/src/mbgl/benchmark/stub_geometry_tile_feature.hpp b/benchmark/src/mbgl/benchmark/stub_geometry_tile_feature.hpp similarity index 100% rename from mapbox-gl-native/benchmark/src/mbgl/benchmark/stub_geometry_tile_feature.hpp rename to benchmark/src/mbgl/benchmark/stub_geometry_tile_feature.hpp diff --git a/mapbox-gl-native/benchmark/storage/offline_database.benchmark.cpp b/benchmark/storage/offline_database.benchmark.cpp similarity index 100% rename from mapbox-gl-native/benchmark/storage/offline_database.benchmark.cpp rename to benchmark/storage/offline_database.benchmark.cpp diff --git a/mapbox-gl-native/benchmark/util/dtoa.benchmark.cpp b/benchmark/util/dtoa.benchmark.cpp similarity index 100% rename from mapbox-gl-native/benchmark/util/dtoa.benchmark.cpp rename to benchmark/util/dtoa.benchmark.cpp diff --git a/mapbox-gl-native/benchmark/util/tilecover.benchmark.cpp b/benchmark/util/tilecover.benchmark.cpp similarity index 100% rename from mapbox-gl-native/benchmark/util/tilecover.benchmark.cpp rename to benchmark/util/tilecover.benchmark.cpp diff --git a/mapbox-gl-native/bin/CMakeLists.txt b/bin/CMakeLists.txt similarity index 100% rename from mapbox-gl-native/bin/CMakeLists.txt rename to bin/CMakeLists.txt diff --git a/mapbox-gl-native/bin/cache.cpp b/bin/cache.cpp similarity index 100% rename from mapbox-gl-native/bin/cache.cpp rename to bin/cache.cpp diff --git a/mapbox-gl-native/bin/offline.cpp b/bin/offline.cpp similarity index 100% rename from mapbox-gl-native/bin/offline.cpp rename to bin/offline.cpp diff --git a/mapbox-gl-native/bin/offline.sh b/bin/offline.sh similarity index 100% rename from mapbox-gl-native/bin/offline.sh rename to bin/offline.sh diff --git a/mapbox-gl-native/bin/render.cpp b/bin/render.cpp similarity index 100% rename from mapbox-gl-native/bin/render.cpp rename to bin/render.cpp diff --git a/mapbox-gl-native/circle.yml b/circle.yml similarity index 100% rename from mapbox-gl-native/circle.yml rename to circle.yml diff --git a/mapbox-gl-native-ios/cloudformation/ci.template.js b/cloudformation/ci.template.js similarity index 100% rename from mapbox-gl-native-ios/cloudformation/ci.template.js rename to cloudformation/ci.template.js diff --git a/mapbox-gl-native/codecov.yml b/codecov.yml similarity index 100% rename from mapbox-gl-native/codecov.yml rename to codecov.yml diff --git a/mapbox-gl-native/expression-test/CMakeLists.txt b/expression-test/CMakeLists.txt similarity index 100% rename from mapbox-gl-native/expression-test/CMakeLists.txt rename to expression-test/CMakeLists.txt diff --git a/mapbox-gl-native/expression-test/expression_test_logger.cpp b/expression-test/expression_test_logger.cpp similarity index 100% rename from mapbox-gl-native/expression-test/expression_test_logger.cpp rename to expression-test/expression_test_logger.cpp diff --git a/mapbox-gl-native/expression-test/expression_test_logger.hpp b/expression-test/expression_test_logger.hpp similarity index 100% rename from mapbox-gl-native/expression-test/expression_test_logger.hpp rename to expression-test/expression_test_logger.hpp diff --git a/mapbox-gl-native/expression-test/expression_test_parser.cpp b/expression-test/expression_test_parser.cpp similarity index 100% rename from mapbox-gl-native/expression-test/expression_test_parser.cpp rename to expression-test/expression_test_parser.cpp diff --git a/mapbox-gl-native/expression-test/expression_test_parser.hpp b/expression-test/expression_test_parser.hpp similarity index 100% rename from mapbox-gl-native/expression-test/expression_test_parser.hpp rename to expression-test/expression_test_parser.hpp diff --git a/mapbox-gl-native/expression-test/expression_test_runner.cpp b/expression-test/expression_test_runner.cpp similarity index 100% rename from mapbox-gl-native/expression-test/expression_test_runner.cpp rename to expression-test/expression_test_runner.cpp diff --git a/mapbox-gl-native/expression-test/expression_test_runner.hpp b/expression-test/expression_test_runner.hpp similarity index 100% rename from mapbox-gl-native/expression-test/expression_test_runner.hpp rename to expression-test/expression_test_runner.hpp diff --git a/mapbox-gl-native/expression-test/filesystem.hpp b/expression-test/filesystem.hpp similarity index 100% rename from mapbox-gl-native/expression-test/filesystem.hpp rename to expression-test/filesystem.hpp diff --git a/mapbox-gl-native/expression-test/main.cpp b/expression-test/main.cpp similarity index 100% rename from mapbox-gl-native/expression-test/main.cpp rename to expression-test/main.cpp diff --git a/mapbox-gl-native/expression-test/test_runner_common.cpp b/expression-test/test_runner_common.cpp similarity index 100% rename from mapbox-gl-native/expression-test/test_runner_common.cpp rename to expression-test/test_runner_common.cpp diff --git a/mapbox-gl-native/expression-test/test_runner_common.hpp b/expression-test/test_runner_common.hpp similarity index 100% rename from mapbox-gl-native/expression-test/test_runner_common.hpp rename to expression-test/test_runner_common.hpp diff --git a/mapbox-gl-native/include/mbgl/actor/actor.hpp b/include/mbgl/actor/actor.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/actor/actor.hpp rename to include/mbgl/actor/actor.hpp diff --git a/mapbox-gl-native/include/mbgl/actor/actor_ref.hpp b/include/mbgl/actor/actor_ref.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/actor/actor_ref.hpp rename to include/mbgl/actor/actor_ref.hpp diff --git a/mapbox-gl-native/include/mbgl/actor/aspiring_actor.hpp b/include/mbgl/actor/aspiring_actor.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/actor/aspiring_actor.hpp rename to include/mbgl/actor/aspiring_actor.hpp diff --git a/mapbox-gl-native/include/mbgl/actor/established_actor.hpp b/include/mbgl/actor/established_actor.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/actor/established_actor.hpp rename to include/mbgl/actor/established_actor.hpp diff --git a/mapbox-gl-native/include/mbgl/actor/mailbox.hpp b/include/mbgl/actor/mailbox.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/actor/mailbox.hpp rename to include/mbgl/actor/mailbox.hpp diff --git a/mapbox-gl-native/include/mbgl/actor/message.hpp b/include/mbgl/actor/message.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/actor/message.hpp rename to include/mbgl/actor/message.hpp diff --git a/mapbox-gl-native/include/mbgl/actor/scheduler.hpp b/include/mbgl/actor/scheduler.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/actor/scheduler.hpp rename to include/mbgl/actor/scheduler.hpp diff --git a/mapbox-gl-native/include/mbgl/annotation/annotation.hpp b/include/mbgl/annotation/annotation.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/annotation/annotation.hpp rename to include/mbgl/annotation/annotation.hpp diff --git a/mapbox-gl-native/include/mbgl/gfx/backend.hpp b/include/mbgl/gfx/backend.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/gfx/backend.hpp rename to include/mbgl/gfx/backend.hpp diff --git a/mapbox-gl-native/include/mbgl/gfx/backend_scope.hpp b/include/mbgl/gfx/backend_scope.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/gfx/backend_scope.hpp rename to include/mbgl/gfx/backend_scope.hpp diff --git a/mapbox-gl-native/include/mbgl/gfx/renderable.hpp b/include/mbgl/gfx/renderable.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/gfx/renderable.hpp rename to include/mbgl/gfx/renderable.hpp diff --git a/mapbox-gl-native/include/mbgl/gfx/renderer_backend.hpp b/include/mbgl/gfx/renderer_backend.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/gfx/renderer_backend.hpp rename to include/mbgl/gfx/renderer_backend.hpp diff --git a/mapbox-gl-native/include/mbgl/gfx/rendering_stats.hpp b/include/mbgl/gfx/rendering_stats.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/gfx/rendering_stats.hpp rename to include/mbgl/gfx/rendering_stats.hpp diff --git a/mapbox-gl-native/include/mbgl/gl/custom_layer.hpp b/include/mbgl/gl/custom_layer.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/gl/custom_layer.hpp rename to include/mbgl/gl/custom_layer.hpp diff --git a/mapbox-gl-native/include/mbgl/gl/custom_layer_factory.hpp b/include/mbgl/gl/custom_layer_factory.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/gl/custom_layer_factory.hpp rename to include/mbgl/gl/custom_layer_factory.hpp diff --git a/mapbox-gl-native/include/mbgl/gl/renderable_resource.hpp b/include/mbgl/gl/renderable_resource.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/gl/renderable_resource.hpp rename to include/mbgl/gl/renderable_resource.hpp diff --git a/mapbox-gl-native/include/mbgl/gl/renderer_backend.hpp b/include/mbgl/gl/renderer_backend.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/gl/renderer_backend.hpp rename to include/mbgl/gl/renderer_backend.hpp diff --git a/mapbox-gl-native/include/mbgl/i18n/collator.hpp b/include/mbgl/i18n/collator.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/i18n/collator.hpp rename to include/mbgl/i18n/collator.hpp diff --git a/mapbox-gl-native/include/mbgl/i18n/number_format.hpp b/include/mbgl/i18n/number_format.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/i18n/number_format.hpp rename to include/mbgl/i18n/number_format.hpp diff --git a/mapbox-gl-native/include/mbgl/layermanager/background_layer_factory.hpp b/include/mbgl/layermanager/background_layer_factory.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/layermanager/background_layer_factory.hpp rename to include/mbgl/layermanager/background_layer_factory.hpp diff --git a/mapbox-gl-native/include/mbgl/layermanager/circle_layer_factory.hpp b/include/mbgl/layermanager/circle_layer_factory.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/layermanager/circle_layer_factory.hpp rename to include/mbgl/layermanager/circle_layer_factory.hpp diff --git a/mapbox-gl-native/include/mbgl/layermanager/fill_extrusion_layer_factory.hpp b/include/mbgl/layermanager/fill_extrusion_layer_factory.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/layermanager/fill_extrusion_layer_factory.hpp rename to include/mbgl/layermanager/fill_extrusion_layer_factory.hpp diff --git a/mapbox-gl-native/include/mbgl/layermanager/fill_layer_factory.hpp b/include/mbgl/layermanager/fill_layer_factory.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/layermanager/fill_layer_factory.hpp rename to include/mbgl/layermanager/fill_layer_factory.hpp diff --git a/mapbox-gl-native/include/mbgl/layermanager/heatmap_layer_factory.hpp b/include/mbgl/layermanager/heatmap_layer_factory.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/layermanager/heatmap_layer_factory.hpp rename to include/mbgl/layermanager/heatmap_layer_factory.hpp diff --git a/mapbox-gl-native/include/mbgl/layermanager/hillshade_layer_factory.hpp b/include/mbgl/layermanager/hillshade_layer_factory.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/layermanager/hillshade_layer_factory.hpp rename to include/mbgl/layermanager/hillshade_layer_factory.hpp diff --git a/mapbox-gl-native/include/mbgl/layermanager/layer_factory.hpp b/include/mbgl/layermanager/layer_factory.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/layermanager/layer_factory.hpp rename to include/mbgl/layermanager/layer_factory.hpp diff --git a/mapbox-gl-native/include/mbgl/layermanager/layer_manager.hpp b/include/mbgl/layermanager/layer_manager.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/layermanager/layer_manager.hpp rename to include/mbgl/layermanager/layer_manager.hpp diff --git a/mapbox-gl-native/include/mbgl/layermanager/line_layer_factory.hpp b/include/mbgl/layermanager/line_layer_factory.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/layermanager/line_layer_factory.hpp rename to include/mbgl/layermanager/line_layer_factory.hpp diff --git a/mapbox-gl-native/include/mbgl/layermanager/location_indicator_layer_factory.hpp b/include/mbgl/layermanager/location_indicator_layer_factory.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/layermanager/location_indicator_layer_factory.hpp rename to include/mbgl/layermanager/location_indicator_layer_factory.hpp diff --git a/mapbox-gl-native/include/mbgl/layermanager/raster_layer_factory.hpp b/include/mbgl/layermanager/raster_layer_factory.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/layermanager/raster_layer_factory.hpp rename to include/mbgl/layermanager/raster_layer_factory.hpp diff --git a/mapbox-gl-native/include/mbgl/layermanager/symbol_layer_factory.hpp b/include/mbgl/layermanager/symbol_layer_factory.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/layermanager/symbol_layer_factory.hpp rename to include/mbgl/layermanager/symbol_layer_factory.hpp diff --git a/mapbox-gl-native/include/mbgl/map/bound_options.hpp b/include/mbgl/map/bound_options.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/map/bound_options.hpp rename to include/mbgl/map/bound_options.hpp diff --git a/mapbox-gl-native/include/mbgl/map/camera.hpp b/include/mbgl/map/camera.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/map/camera.hpp rename to include/mbgl/map/camera.hpp diff --git a/mapbox-gl-native/include/mbgl/map/change.hpp b/include/mbgl/map/change.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/map/change.hpp rename to include/mbgl/map/change.hpp diff --git a/mapbox-gl-native/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/map/map.hpp rename to include/mbgl/map/map.hpp diff --git a/mapbox-gl-native/include/mbgl/map/map_observer.hpp b/include/mbgl/map/map_observer.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/map/map_observer.hpp rename to include/mbgl/map/map_observer.hpp diff --git a/mapbox-gl-native/include/mbgl/map/map_options.hpp b/include/mbgl/map/map_options.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/map/map_options.hpp rename to include/mbgl/map/map_options.hpp diff --git a/mapbox-gl-native/include/mbgl/map/mode.hpp b/include/mbgl/map/mode.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/map/mode.hpp rename to include/mbgl/map/mode.hpp diff --git a/mapbox-gl-native/include/mbgl/map/projection_mode.hpp b/include/mbgl/map/projection_mode.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/map/projection_mode.hpp rename to include/mbgl/map/projection_mode.hpp diff --git a/mapbox-gl-native/include/mbgl/math/clamp.hpp b/include/mbgl/math/clamp.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/math/clamp.hpp rename to include/mbgl/math/clamp.hpp diff --git a/mapbox-gl-native/include/mbgl/math/log2.hpp b/include/mbgl/math/log2.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/math/log2.hpp rename to include/mbgl/math/log2.hpp diff --git a/mapbox-gl-native/include/mbgl/math/minmax.hpp b/include/mbgl/math/minmax.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/math/minmax.hpp rename to include/mbgl/math/minmax.hpp diff --git a/mapbox-gl-native/include/mbgl/math/wrap.hpp b/include/mbgl/math/wrap.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/math/wrap.hpp rename to include/mbgl/math/wrap.hpp diff --git a/mapbox-gl-native/include/mbgl/platform/gl_functions.hpp b/include/mbgl/platform/gl_functions.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/platform/gl_functions.hpp rename to include/mbgl/platform/gl_functions.hpp diff --git a/mapbox-gl-native/include/mbgl/platform/settings.hpp b/include/mbgl/platform/settings.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/platform/settings.hpp rename to include/mbgl/platform/settings.hpp diff --git a/mapbox-gl-native/include/mbgl/platform/thread.hpp b/include/mbgl/platform/thread.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/platform/thread.hpp rename to include/mbgl/platform/thread.hpp diff --git a/mapbox-gl-native/include/mbgl/platform/time.hpp b/include/mbgl/platform/time.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/platform/time.hpp rename to include/mbgl/platform/time.hpp diff --git a/mapbox-gl-native/include/mbgl/renderer/query.hpp b/include/mbgl/renderer/query.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/renderer/query.hpp rename to include/mbgl/renderer/query.hpp diff --git a/mapbox-gl-native/include/mbgl/renderer/renderer.hpp b/include/mbgl/renderer/renderer.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/renderer/renderer.hpp rename to include/mbgl/renderer/renderer.hpp diff --git a/mapbox-gl-native/include/mbgl/renderer/renderer_frontend.hpp b/include/mbgl/renderer/renderer_frontend.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/renderer/renderer_frontend.hpp rename to include/mbgl/renderer/renderer_frontend.hpp diff --git a/mapbox-gl-native/include/mbgl/renderer/renderer_observer.hpp b/include/mbgl/renderer/renderer_observer.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/renderer/renderer_observer.hpp rename to include/mbgl/renderer/renderer_observer.hpp diff --git a/mapbox-gl-native/include/mbgl/renderer/renderer_state.hpp b/include/mbgl/renderer/renderer_state.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/renderer/renderer_state.hpp rename to include/mbgl/renderer/renderer_state.hpp diff --git a/mapbox-gl-native/include/mbgl/storage/database_file_source.hpp b/include/mbgl/storage/database_file_source.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/storage/database_file_source.hpp rename to include/mbgl/storage/database_file_source.hpp diff --git a/mapbox-gl-native/include/mbgl/storage/file_source.hpp b/include/mbgl/storage/file_source.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/storage/file_source.hpp rename to include/mbgl/storage/file_source.hpp diff --git a/mapbox-gl-native/include/mbgl/storage/file_source_manager.hpp b/include/mbgl/storage/file_source_manager.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/storage/file_source_manager.hpp rename to include/mbgl/storage/file_source_manager.hpp diff --git a/mapbox-gl-native/include/mbgl/storage/network_status.hpp b/include/mbgl/storage/network_status.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/storage/network_status.hpp rename to include/mbgl/storage/network_status.hpp diff --git a/mapbox-gl-native/include/mbgl/storage/offline.hpp b/include/mbgl/storage/offline.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/storage/offline.hpp rename to include/mbgl/storage/offline.hpp diff --git a/mapbox-gl-native/include/mbgl/storage/online_file_source.hpp b/include/mbgl/storage/online_file_source.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/storage/online_file_source.hpp rename to include/mbgl/storage/online_file_source.hpp diff --git a/mapbox-gl-native/include/mbgl/storage/resource.hpp b/include/mbgl/storage/resource.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/storage/resource.hpp rename to include/mbgl/storage/resource.hpp diff --git a/mapbox-gl-native/include/mbgl/storage/resource_options.hpp b/include/mbgl/storage/resource_options.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/storage/resource_options.hpp rename to include/mbgl/storage/resource_options.hpp diff --git a/mapbox-gl-native/include/mbgl/storage/resource_transform.hpp b/include/mbgl/storage/resource_transform.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/storage/resource_transform.hpp rename to include/mbgl/storage/resource_transform.hpp diff --git a/mapbox-gl-native/include/mbgl/storage/response.hpp b/include/mbgl/storage/response.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/storage/response.hpp rename to include/mbgl/storage/response.hpp diff --git a/mapbox-gl-native/include/mbgl/style/color_ramp_property_value.hpp b/include/mbgl/style/color_ramp_property_value.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/color_ramp_property_value.hpp rename to include/mbgl/style/color_ramp_property_value.hpp diff --git a/mapbox-gl-native/include/mbgl/style/conversion.hpp b/include/mbgl/style/conversion.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/conversion.hpp rename to include/mbgl/style/conversion.hpp diff --git a/mapbox-gl-native/include/mbgl/style/conversion/color_ramp_property_value.hpp b/include/mbgl/style/conversion/color_ramp_property_value.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/conversion/color_ramp_property_value.hpp rename to include/mbgl/style/conversion/color_ramp_property_value.hpp diff --git a/mapbox-gl-native/include/mbgl/style/conversion/constant.hpp b/include/mbgl/style/conversion/constant.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/conversion/constant.hpp rename to include/mbgl/style/conversion/constant.hpp diff --git a/mapbox-gl-native/include/mbgl/style/conversion/coordinate.hpp b/include/mbgl/style/conversion/coordinate.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/conversion/coordinate.hpp rename to include/mbgl/style/conversion/coordinate.hpp diff --git a/mapbox-gl-native/include/mbgl/style/conversion/custom_geometry_source_options.hpp b/include/mbgl/style/conversion/custom_geometry_source_options.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/conversion/custom_geometry_source_options.hpp rename to include/mbgl/style/conversion/custom_geometry_source_options.hpp diff --git a/mapbox-gl-native/include/mbgl/style/conversion/filter.hpp b/include/mbgl/style/conversion/filter.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/conversion/filter.hpp rename to include/mbgl/style/conversion/filter.hpp diff --git a/mapbox-gl-native/include/mbgl/style/conversion/function.hpp b/include/mbgl/style/conversion/function.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/conversion/function.hpp rename to include/mbgl/style/conversion/function.hpp diff --git a/mapbox-gl-native/include/mbgl/style/conversion/geojson.hpp b/include/mbgl/style/conversion/geojson.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/conversion/geojson.hpp rename to include/mbgl/style/conversion/geojson.hpp diff --git a/mapbox-gl-native/include/mbgl/style/conversion/geojson_options.hpp b/include/mbgl/style/conversion/geojson_options.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/conversion/geojson_options.hpp rename to include/mbgl/style/conversion/geojson_options.hpp diff --git a/mapbox-gl-native/include/mbgl/style/conversion/get_json_type.hpp b/include/mbgl/style/conversion/get_json_type.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/conversion/get_json_type.hpp rename to include/mbgl/style/conversion/get_json_type.hpp diff --git a/mapbox-gl-native/include/mbgl/style/conversion/layer.hpp b/include/mbgl/style/conversion/layer.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/conversion/layer.hpp rename to include/mbgl/style/conversion/layer.hpp diff --git a/mapbox-gl-native/include/mbgl/style/conversion/light.hpp b/include/mbgl/style/conversion/light.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/conversion/light.hpp rename to include/mbgl/style/conversion/light.hpp diff --git a/mapbox-gl-native/include/mbgl/style/conversion/position.hpp b/include/mbgl/style/conversion/position.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/conversion/position.hpp rename to include/mbgl/style/conversion/position.hpp diff --git a/mapbox-gl-native/include/mbgl/style/conversion/property_value.hpp b/include/mbgl/style/conversion/property_value.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/conversion/property_value.hpp rename to include/mbgl/style/conversion/property_value.hpp diff --git a/mapbox-gl-native/include/mbgl/style/conversion/rotation.hpp b/include/mbgl/style/conversion/rotation.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/conversion/rotation.hpp rename to include/mbgl/style/conversion/rotation.hpp diff --git a/mapbox-gl-native/include/mbgl/style/conversion/source.hpp b/include/mbgl/style/conversion/source.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/conversion/source.hpp rename to include/mbgl/style/conversion/source.hpp diff --git a/mapbox-gl-native/include/mbgl/style/conversion/tileset.hpp b/include/mbgl/style/conversion/tileset.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/conversion/tileset.hpp rename to include/mbgl/style/conversion/tileset.hpp diff --git a/mapbox-gl-native/include/mbgl/style/conversion/transition_options.hpp b/include/mbgl/style/conversion/transition_options.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/conversion/transition_options.hpp rename to include/mbgl/style/conversion/transition_options.hpp diff --git a/mapbox-gl-native/include/mbgl/style/conversion_impl.hpp b/include/mbgl/style/conversion_impl.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/conversion_impl.hpp rename to include/mbgl/style/conversion_impl.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/assertion.hpp b/include/mbgl/style/expression/assertion.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/assertion.hpp rename to include/mbgl/style/expression/assertion.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/at.hpp b/include/mbgl/style/expression/at.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/at.hpp rename to include/mbgl/style/expression/at.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/boolean_operator.hpp b/include/mbgl/style/expression/boolean_operator.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/boolean_operator.hpp rename to include/mbgl/style/expression/boolean_operator.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/case.hpp b/include/mbgl/style/expression/case.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/case.hpp rename to include/mbgl/style/expression/case.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/check_subtype.hpp b/include/mbgl/style/expression/check_subtype.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/check_subtype.hpp rename to include/mbgl/style/expression/check_subtype.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/coalesce.hpp b/include/mbgl/style/expression/coalesce.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/coalesce.hpp rename to include/mbgl/style/expression/coalesce.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/coercion.hpp b/include/mbgl/style/expression/coercion.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/coercion.hpp rename to include/mbgl/style/expression/coercion.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/collator.hpp b/include/mbgl/style/expression/collator.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/collator.hpp rename to include/mbgl/style/expression/collator.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/collator_expression.hpp b/include/mbgl/style/expression/collator_expression.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/collator_expression.hpp rename to include/mbgl/style/expression/collator_expression.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/comparison.hpp b/include/mbgl/style/expression/comparison.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/comparison.hpp rename to include/mbgl/style/expression/comparison.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/compound_expression.hpp b/include/mbgl/style/expression/compound_expression.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/compound_expression.hpp rename to include/mbgl/style/expression/compound_expression.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/distance.hpp b/include/mbgl/style/expression/distance.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/distance.hpp rename to include/mbgl/style/expression/distance.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/dsl.hpp b/include/mbgl/style/expression/dsl.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/dsl.hpp rename to include/mbgl/style/expression/dsl.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/error.hpp b/include/mbgl/style/expression/error.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/error.hpp rename to include/mbgl/style/expression/error.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/expression.hpp b/include/mbgl/style/expression/expression.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/expression.hpp rename to include/mbgl/style/expression/expression.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/find_zoom_curve.hpp b/include/mbgl/style/expression/find_zoom_curve.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/find_zoom_curve.hpp rename to include/mbgl/style/expression/find_zoom_curve.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/format_expression.hpp b/include/mbgl/style/expression/format_expression.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/format_expression.hpp rename to include/mbgl/style/expression/format_expression.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/format_section_override.hpp b/include/mbgl/style/expression/format_section_override.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/format_section_override.hpp rename to include/mbgl/style/expression/format_section_override.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/formatted.hpp b/include/mbgl/style/expression/formatted.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/formatted.hpp rename to include/mbgl/style/expression/formatted.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/get_covering_stops.hpp b/include/mbgl/style/expression/get_covering_stops.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/get_covering_stops.hpp rename to include/mbgl/style/expression/get_covering_stops.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/image.hpp b/include/mbgl/style/expression/image.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/image.hpp rename to include/mbgl/style/expression/image.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/image_expression.hpp b/include/mbgl/style/expression/image_expression.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/image_expression.hpp rename to include/mbgl/style/expression/image_expression.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/in.hpp b/include/mbgl/style/expression/in.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/in.hpp rename to include/mbgl/style/expression/in.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/interpolate.hpp b/include/mbgl/style/expression/interpolate.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/interpolate.hpp rename to include/mbgl/style/expression/interpolate.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/interpolator.hpp b/include/mbgl/style/expression/interpolator.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/interpolator.hpp rename to include/mbgl/style/expression/interpolator.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/is_constant.hpp b/include/mbgl/style/expression/is_constant.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/is_constant.hpp rename to include/mbgl/style/expression/is_constant.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/is_expression.hpp b/include/mbgl/style/expression/is_expression.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/is_expression.hpp rename to include/mbgl/style/expression/is_expression.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/length.hpp b/include/mbgl/style/expression/length.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/length.hpp rename to include/mbgl/style/expression/length.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/let.hpp b/include/mbgl/style/expression/let.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/let.hpp rename to include/mbgl/style/expression/let.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/literal.hpp b/include/mbgl/style/expression/literal.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/literal.hpp rename to include/mbgl/style/expression/literal.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/match.hpp b/include/mbgl/style/expression/match.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/match.hpp rename to include/mbgl/style/expression/match.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/number_format.hpp b/include/mbgl/style/expression/number_format.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/number_format.hpp rename to include/mbgl/style/expression/number_format.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/parsing_context.hpp b/include/mbgl/style/expression/parsing_context.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/parsing_context.hpp rename to include/mbgl/style/expression/parsing_context.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/step.hpp b/include/mbgl/style/expression/step.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/step.hpp rename to include/mbgl/style/expression/step.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/type.hpp b/include/mbgl/style/expression/type.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/type.hpp rename to include/mbgl/style/expression/type.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/value.hpp b/include/mbgl/style/expression/value.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/value.hpp rename to include/mbgl/style/expression/value.hpp diff --git a/mapbox-gl-native/include/mbgl/style/expression/within.hpp b/include/mbgl/style/expression/within.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/expression/within.hpp rename to include/mbgl/style/expression/within.hpp diff --git a/mapbox-gl-native/include/mbgl/style/filter.hpp b/include/mbgl/style/filter.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/filter.hpp rename to include/mbgl/style/filter.hpp diff --git a/mapbox-gl-native/include/mbgl/style/image.hpp b/include/mbgl/style/image.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/image.hpp rename to include/mbgl/style/image.hpp diff --git a/mapbox-gl-native/include/mbgl/style/layer.hpp b/include/mbgl/style/layer.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/layer.hpp rename to include/mbgl/style/layer.hpp diff --git a/mapbox-gl-native/include/mbgl/style/layer_properties.hpp b/include/mbgl/style/layer_properties.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/layer_properties.hpp rename to include/mbgl/style/layer_properties.hpp diff --git a/mapbox-gl-native/include/mbgl/style/layers/background_layer.hpp b/include/mbgl/style/layers/background_layer.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/layers/background_layer.hpp rename to include/mbgl/style/layers/background_layer.hpp diff --git a/mapbox-gl-native/include/mbgl/style/layers/circle_layer.hpp b/include/mbgl/style/layers/circle_layer.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/layers/circle_layer.hpp rename to include/mbgl/style/layers/circle_layer.hpp diff --git a/mapbox-gl-native/include/mbgl/style/layers/fill_extrusion_layer.hpp b/include/mbgl/style/layers/fill_extrusion_layer.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/layers/fill_extrusion_layer.hpp rename to include/mbgl/style/layers/fill_extrusion_layer.hpp diff --git a/mapbox-gl-native/include/mbgl/style/layers/fill_layer.hpp b/include/mbgl/style/layers/fill_layer.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/layers/fill_layer.hpp rename to include/mbgl/style/layers/fill_layer.hpp diff --git a/mapbox-gl-native/include/mbgl/style/layers/heatmap_layer.hpp b/include/mbgl/style/layers/heatmap_layer.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/layers/heatmap_layer.hpp rename to include/mbgl/style/layers/heatmap_layer.hpp diff --git a/mapbox-gl-native/include/mbgl/style/layers/hillshade_layer.hpp b/include/mbgl/style/layers/hillshade_layer.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/layers/hillshade_layer.hpp rename to include/mbgl/style/layers/hillshade_layer.hpp diff --git a/mapbox-gl-native/include/mbgl/style/layers/layer.hpp.ejs b/include/mbgl/style/layers/layer.hpp.ejs similarity index 100% rename from mapbox-gl-native/include/mbgl/style/layers/layer.hpp.ejs rename to include/mbgl/style/layers/layer.hpp.ejs diff --git a/mapbox-gl-native/include/mbgl/style/layers/line_layer.hpp b/include/mbgl/style/layers/line_layer.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/layers/line_layer.hpp rename to include/mbgl/style/layers/line_layer.hpp diff --git a/mapbox-gl-native/include/mbgl/style/layers/location_indicator_layer.hpp b/include/mbgl/style/layers/location_indicator_layer.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/layers/location_indicator_layer.hpp rename to include/mbgl/style/layers/location_indicator_layer.hpp diff --git a/mapbox-gl-native/include/mbgl/style/layers/raster_layer.hpp b/include/mbgl/style/layers/raster_layer.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/layers/raster_layer.hpp rename to include/mbgl/style/layers/raster_layer.hpp diff --git a/mapbox-gl-native/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/layers/symbol_layer.hpp rename to include/mbgl/style/layers/symbol_layer.hpp diff --git a/mapbox-gl-native/include/mbgl/style/light.hpp b/include/mbgl/style/light.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/light.hpp rename to include/mbgl/style/light.hpp diff --git a/mapbox-gl-native/include/mbgl/style/light.hpp.ejs b/include/mbgl/style/light.hpp.ejs similarity index 100% rename from mapbox-gl-native/include/mbgl/style/light.hpp.ejs rename to include/mbgl/style/light.hpp.ejs diff --git a/mapbox-gl-native/include/mbgl/style/position.hpp b/include/mbgl/style/position.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/position.hpp rename to include/mbgl/style/position.hpp diff --git a/mapbox-gl-native/include/mbgl/style/property_expression.hpp b/include/mbgl/style/property_expression.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/property_expression.hpp rename to include/mbgl/style/property_expression.hpp diff --git a/mapbox-gl-native/include/mbgl/style/property_value.hpp b/include/mbgl/style/property_value.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/property_value.hpp rename to include/mbgl/style/property_value.hpp diff --git a/mapbox-gl-native/include/mbgl/style/rotation.hpp b/include/mbgl/style/rotation.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/rotation.hpp rename to include/mbgl/style/rotation.hpp diff --git a/mapbox-gl-native/include/mbgl/style/source.hpp b/include/mbgl/style/source.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/source.hpp rename to include/mbgl/style/source.hpp diff --git a/mapbox-gl-native/include/mbgl/style/sources/custom_geometry_source.hpp b/include/mbgl/style/sources/custom_geometry_source.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/sources/custom_geometry_source.hpp rename to include/mbgl/style/sources/custom_geometry_source.hpp diff --git a/mapbox-gl-native/include/mbgl/style/sources/geojson_source.hpp b/include/mbgl/style/sources/geojson_source.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/sources/geojson_source.hpp rename to include/mbgl/style/sources/geojson_source.hpp diff --git a/mapbox-gl-native/include/mbgl/style/sources/image_source.hpp b/include/mbgl/style/sources/image_source.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/sources/image_source.hpp rename to include/mbgl/style/sources/image_source.hpp diff --git a/mapbox-gl-native/include/mbgl/style/sources/raster_dem_source.hpp b/include/mbgl/style/sources/raster_dem_source.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/sources/raster_dem_source.hpp rename to include/mbgl/style/sources/raster_dem_source.hpp diff --git a/mapbox-gl-native/include/mbgl/style/sources/raster_source.hpp b/include/mbgl/style/sources/raster_source.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/sources/raster_source.hpp rename to include/mbgl/style/sources/raster_source.hpp diff --git a/mapbox-gl-native/include/mbgl/style/sources/vector_source.hpp b/include/mbgl/style/sources/vector_source.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/sources/vector_source.hpp rename to include/mbgl/style/sources/vector_source.hpp diff --git a/mapbox-gl-native/include/mbgl/style/style.hpp b/include/mbgl/style/style.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/style.hpp rename to include/mbgl/style/style.hpp diff --git a/mapbox-gl-native/include/mbgl/style/style_property.hpp b/include/mbgl/style/style_property.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/style_property.hpp rename to include/mbgl/style/style_property.hpp diff --git a/mapbox-gl-native/include/mbgl/style/transition_options.hpp b/include/mbgl/style/transition_options.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/transition_options.hpp rename to include/mbgl/style/transition_options.hpp diff --git a/mapbox-gl-native/include/mbgl/style/types.hpp b/include/mbgl/style/types.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/types.hpp rename to include/mbgl/style/types.hpp diff --git a/mapbox-gl-native/include/mbgl/style/undefined.hpp b/include/mbgl/style/undefined.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/style/undefined.hpp rename to include/mbgl/style/undefined.hpp diff --git a/mapbox-gl-native/include/mbgl/tile/tile_id.hpp b/include/mbgl/tile/tile_id.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/tile/tile_id.hpp rename to include/mbgl/tile/tile_id.hpp diff --git a/mapbox-gl-native/include/mbgl/tile/tile_necessity.hpp b/include/mbgl/tile/tile_necessity.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/tile/tile_necessity.hpp rename to include/mbgl/tile/tile_necessity.hpp diff --git a/mapbox-gl-native/include/mbgl/util/async_request.hpp b/include/mbgl/util/async_request.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/async_request.hpp rename to include/mbgl/util/async_request.hpp diff --git a/mapbox-gl-native/include/mbgl/util/async_task.hpp b/include/mbgl/util/async_task.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/async_task.hpp rename to include/mbgl/util/async_task.hpp diff --git a/mapbox-gl-native/include/mbgl/util/bitmask_operations.hpp b/include/mbgl/util/bitmask_operations.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/bitmask_operations.hpp rename to include/mbgl/util/bitmask_operations.hpp diff --git a/mapbox-gl-native/include/mbgl/util/char_array_buffer.hpp b/include/mbgl/util/char_array_buffer.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/char_array_buffer.hpp rename to include/mbgl/util/char_array_buffer.hpp diff --git a/mapbox-gl-native/include/mbgl/util/chrono.hpp b/include/mbgl/util/chrono.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/chrono.hpp rename to include/mbgl/util/chrono.hpp diff --git a/mapbox-gl-native/include/mbgl/util/color.hpp b/include/mbgl/util/color.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/color.hpp rename to include/mbgl/util/color.hpp diff --git a/mapbox-gl-native/include/mbgl/util/compression.hpp b/include/mbgl/util/compression.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/compression.hpp rename to include/mbgl/util/compression.hpp diff --git a/mapbox-gl-native/include/mbgl/util/constants.hpp b/include/mbgl/util/constants.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/constants.hpp rename to include/mbgl/util/constants.hpp diff --git a/mapbox-gl-native/include/mbgl/util/convert.hpp b/include/mbgl/util/convert.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/convert.hpp rename to include/mbgl/util/convert.hpp diff --git a/mapbox-gl-native/include/mbgl/util/default_styles.hpp b/include/mbgl/util/default_styles.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/default_styles.hpp rename to include/mbgl/util/default_styles.hpp diff --git a/mapbox-gl-native/include/mbgl/util/enum.hpp b/include/mbgl/util/enum.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/enum.hpp rename to include/mbgl/util/enum.hpp diff --git a/mapbox-gl-native/include/mbgl/util/event.hpp b/include/mbgl/util/event.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/event.hpp rename to include/mbgl/util/event.hpp diff --git a/mapbox-gl-native/include/mbgl/util/exception.hpp b/include/mbgl/util/exception.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/exception.hpp rename to include/mbgl/util/exception.hpp diff --git a/mapbox-gl-native/include/mbgl/util/expected.hpp b/include/mbgl/util/expected.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/expected.hpp rename to include/mbgl/util/expected.hpp diff --git a/mapbox-gl-native/include/mbgl/util/feature.hpp b/include/mbgl/util/feature.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/feature.hpp rename to include/mbgl/util/feature.hpp diff --git a/mapbox-gl-native/include/mbgl/util/font_stack.hpp b/include/mbgl/util/font_stack.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/font_stack.hpp rename to include/mbgl/util/font_stack.hpp diff --git a/mapbox-gl-native/include/mbgl/util/geo.hpp b/include/mbgl/util/geo.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/geo.hpp rename to include/mbgl/util/geo.hpp diff --git a/mapbox-gl-native/include/mbgl/util/geojson.hpp b/include/mbgl/util/geojson.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/geojson.hpp rename to include/mbgl/util/geojson.hpp diff --git a/mapbox-gl-native/include/mbgl/util/geometry.hpp b/include/mbgl/util/geometry.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/geometry.hpp rename to include/mbgl/util/geometry.hpp diff --git a/mapbox-gl-native/include/mbgl/util/ignore.hpp b/include/mbgl/util/ignore.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/ignore.hpp rename to include/mbgl/util/ignore.hpp diff --git a/mapbox-gl-native/include/mbgl/util/image.hpp b/include/mbgl/util/image.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/image.hpp rename to include/mbgl/util/image.hpp diff --git a/mapbox-gl-native/include/mbgl/util/immutable.hpp b/include/mbgl/util/immutable.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/immutable.hpp rename to include/mbgl/util/immutable.hpp diff --git a/mapbox-gl-native/include/mbgl/util/indexed_tuple.hpp b/include/mbgl/util/indexed_tuple.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/indexed_tuple.hpp rename to include/mbgl/util/indexed_tuple.hpp diff --git a/mapbox-gl-native/include/mbgl/util/interpolate.hpp b/include/mbgl/util/interpolate.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/interpolate.hpp rename to include/mbgl/util/interpolate.hpp diff --git a/mapbox-gl-native/include/mbgl/util/logging.hpp b/include/mbgl/util/logging.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/logging.hpp rename to include/mbgl/util/logging.hpp diff --git a/mapbox-gl-native/include/mbgl/util/monotonic_timer.hpp b/include/mbgl/util/monotonic_timer.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/monotonic_timer.hpp rename to include/mbgl/util/monotonic_timer.hpp diff --git a/mapbox-gl-native/include/mbgl/util/noncopyable.hpp b/include/mbgl/util/noncopyable.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/noncopyable.hpp rename to include/mbgl/util/noncopyable.hpp diff --git a/mapbox-gl-native/include/mbgl/util/optional.hpp b/include/mbgl/util/optional.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/optional.hpp rename to include/mbgl/util/optional.hpp diff --git a/mapbox-gl-native/include/mbgl/util/pass_types.hpp b/include/mbgl/util/pass_types.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/pass_types.hpp rename to include/mbgl/util/pass_types.hpp diff --git a/mapbox-gl-native/include/mbgl/util/platform.hpp b/include/mbgl/util/platform.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/platform.hpp rename to include/mbgl/util/platform.hpp diff --git a/mapbox-gl-native/include/mbgl/util/premultiply.hpp b/include/mbgl/util/premultiply.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/premultiply.hpp rename to include/mbgl/util/premultiply.hpp diff --git a/mapbox-gl-native/include/mbgl/util/projection.hpp b/include/mbgl/util/projection.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/projection.hpp rename to include/mbgl/util/projection.hpp diff --git a/mapbox-gl-native/include/mbgl/util/range.hpp b/include/mbgl/util/range.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/range.hpp rename to include/mbgl/util/range.hpp diff --git a/mapbox-gl-native/include/mbgl/util/run_loop.hpp b/include/mbgl/util/run_loop.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/run_loop.hpp rename to include/mbgl/util/run_loop.hpp diff --git a/mapbox-gl-native/include/mbgl/util/size.hpp b/include/mbgl/util/size.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/size.hpp rename to include/mbgl/util/size.hpp diff --git a/mapbox-gl-native/include/mbgl/util/string.hpp b/include/mbgl/util/string.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/string.hpp rename to include/mbgl/util/string.hpp diff --git a/mapbox-gl-native/include/mbgl/util/thread.hpp b/include/mbgl/util/thread.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/thread.hpp rename to include/mbgl/util/thread.hpp diff --git a/mapbox-gl-native/include/mbgl/util/tileset.hpp b/include/mbgl/util/tileset.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/tileset.hpp rename to include/mbgl/util/tileset.hpp diff --git a/mapbox-gl-native/include/mbgl/util/timer.hpp b/include/mbgl/util/timer.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/timer.hpp rename to include/mbgl/util/timer.hpp diff --git a/mapbox-gl-native/include/mbgl/util/traits.hpp b/include/mbgl/util/traits.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/traits.hpp rename to include/mbgl/util/traits.hpp diff --git a/mapbox-gl-native/include/mbgl/util/type_list.hpp b/include/mbgl/util/type_list.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/type_list.hpp rename to include/mbgl/util/type_list.hpp diff --git a/mapbox-gl-native/include/mbgl/util/unitbezier.hpp b/include/mbgl/util/unitbezier.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/unitbezier.hpp rename to include/mbgl/util/unitbezier.hpp diff --git a/mapbox-gl-native/include/mbgl/util/util.hpp b/include/mbgl/util/util.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/util.hpp rename to include/mbgl/util/util.hpp diff --git a/mapbox-gl-native/include/mbgl/util/variant.hpp b/include/mbgl/util/variant.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/variant.hpp rename to include/mbgl/util/variant.hpp diff --git a/mapbox-gl-native/include/mbgl/util/vectors.hpp b/include/mbgl/util/vectors.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/vectors.hpp rename to include/mbgl/util/vectors.hpp diff --git a/mapbox-gl-native/include/mbgl/util/work_request.hpp b/include/mbgl/util/work_request.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/work_request.hpp rename to include/mbgl/util/work_request.hpp diff --git a/mapbox-gl-native/include/mbgl/util/work_task.hpp b/include/mbgl/util/work_task.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/work_task.hpp rename to include/mbgl/util/work_task.hpp diff --git a/mapbox-gl-native/include/mbgl/util/work_task_impl.hpp b/include/mbgl/util/work_task_impl.hpp similarity index 100% rename from mapbox-gl-native/include/mbgl/util/work_task_impl.hpp rename to include/mbgl/util/work_task_impl.hpp diff --git a/mapbox-gl-js b/mapbox-gl-js index df8982c45..fe03b706f 160000 --- a/mapbox-gl-js +++ b/mapbox-gl-js @@ -1 +1 @@ -Subproject commit df8982c45b52120dc2d0818d438ef89c3734e3a2 +Subproject commit fe03b706ff6fbda2ff4796bbf581aa667c6fbc7d diff --git a/mapbox-gl-native-android/.editorconfig b/mapbox-gl-native-android/.editorconfig deleted file mode 100644 index 8a6c90a0d..000000000 --- a/mapbox-gl-native-android/.editorconfig +++ /dev/null @@ -1,4 +0,0 @@ -[*.{kt,kts}] -indent_size=2 -insert_final_newline=false -disabled_rules=no-wildcard-imports \ No newline at end of file diff --git a/mapbox-gl-native-android/.github/PULL_REQUEST_TEMPLATE.md b/mapbox-gl-native-android/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index f3681d858..000000000 --- a/mapbox-gl-native-android/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,10 +0,0 @@ -`Replace text with suggested changelog entry for this PR or add the 'skip changelog' label.` - - - - - - - diff --git a/mapbox-gl-native-android/.gitignore b/mapbox-gl-native-android/.gitignore deleted file mode 100644 index 9362f201a..000000000 --- a/mapbox-gl-native-android/.gitignore +++ /dev/null @@ -1,35 +0,0 @@ -# Gradle files -.gradle/ - -# IntelliJ files -.idea/ -*.iml - -# Build files -build/ -.externalNativeBuild -**/.cxx -*.so -*.apk - -# Local settings -local.properties -gradle/configuration.gradle - -# Token file -MapboxGLAndroidSDKTestApp/src/main/res/values/developer-config.xml - -# Capture files -captures/ - -# Generated test cases -MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/gen/ - -# Generated list files from code generation -/scripts/generate-style-code.list - -# Input files for running render tests -MapboxGLAndroidSDKTestApp/src/main/assets/integration/ - -# Node modules -node_modules \ No newline at end of file diff --git a/mapbox-gl-native-android/.gitmodules b/mapbox-gl-native-android/.gitmodules deleted file mode 100644 index 7a8ecb57a..000000000 --- a/mapbox-gl-native-android/.gitmodules +++ /dev/null @@ -1,12 +0,0 @@ -[submodule "vendor/mapbox-gl-native"] - path = vendor/mapbox-gl-native - url = https://github.com/mapbox/mapbox-gl-native.git -[submodule "vendor/mapbox-events-android"] - path = vendor/mapbox-events-android - url = https://github.com/mapbox/mapbox-events-android.git -[submodule "vendor/mapbox-java"] - path = vendor/mapbox-java - url = https://github.com/mapbox/mapbox-java.git -[submodule "vendor/mapbox-gestures-android"] - path = vendor/mapbox-gestures-android - url = https://github.com/mapbox/mapbox-gestures-android.git diff --git a/mapbox-gl-native-android/vendor/mapbox-events-android b/mapbox-gl-native-android/vendor/mapbox-events-android deleted file mode 160000 index 8ee3e93c3..000000000 --- a/mapbox-gl-native-android/vendor/mapbox-events-android +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8ee3e93c3bcfc07af3fb2f778b804590eda2c61f diff --git a/mapbox-gl-native-android/vendor/mapbox-gestures-android b/mapbox-gl-native-android/vendor/mapbox-gestures-android deleted file mode 160000 index 6fc34d91f..000000000 --- a/mapbox-gl-native-android/vendor/mapbox-gestures-android +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6fc34d91fc8d8758c51830127c49223624d446aa diff --git a/mapbox-gl-native-android/vendor/mapbox-java b/mapbox-gl-native-android/vendor/mapbox-java deleted file mode 160000 index 71f3a6a75..000000000 --- a/mapbox-gl-native-android/vendor/mapbox-java +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 71f3a6a75d8d2afa606fb8118f6bbbc7151215b3 diff --git a/mapbox-gl-native-ios/.github/stale.yml b/mapbox-gl-native-ios/.github/stale.yml deleted file mode 100644 index 6f5511017..000000000 --- a/mapbox-gl-native-ios/.github/stale.yml +++ /dev/null @@ -1,28 +0,0 @@ -# Configuration for probot-stale - https://github.com/probot/stale - -exemptProjects: true -exemptMilestones: true - -staleLabel: archived - -limitPerRun: 1 - -# SEMVER-MAJOR - @tobrun -exemptLabels: - - SEMVER-MAJOR - -pulls: - daysUntilStale: 60 - daysUntilClose: -1 - markComment: false - closeComment: > - This pull request has been automatically detected as stale because it has not had - recent activity and will be archived. Thank you for your contributions. - -issues: - daysUntilStale: 180 - daysUntilClose: -1 - markComment: false - closeComment: > - This issue has been automatically detected as stale because it has not had - recent activity and will be archived. Thank you for your contributions. diff --git a/mapbox-gl-native-ios/.gitmodules b/mapbox-gl-native-ios/.gitmodules deleted file mode 100644 index 54b6d3317..000000000 --- a/mapbox-gl-native-ios/.gitmodules +++ /dev/null @@ -1,9 +0,0 @@ -[submodule "platform/ios/vendor/mapbox-events-ios"] - path = platform/ios/vendor/mapbox-events-ios - url = https://github.com/mapbox/mapbox-events-ios.git -[submodule "platform/darwin/docs/theme"] - path = platform/darwin/docs/theme - url = https://github.com/mapbox/jazzy-theme.git -[submodule "vendor/mapbox-gl-native"] - path = vendor/mapbox-gl-native - url = https://github.com/mapbox/mapbox-gl-native.git diff --git a/mapbox-gl-native-ios/platform/darwin/docs/theme b/mapbox-gl-native-ios/platform/darwin/docs/theme deleted file mode 160000 index 75b9170a8..000000000 --- a/mapbox-gl-native-ios/platform/darwin/docs/theme +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 75b9170a8b9f85d64f94e3083f8204edce10302c diff --git a/mapbox-gl-native-ios/platform/ios/vendor/mapbox-events-ios b/mapbox-gl-native-ios/platform/ios/vendor/mapbox-events-ios deleted file mode 160000 index 5c955a030..000000000 --- a/mapbox-gl-native-ios/platform/ios/vendor/mapbox-events-ios +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5c955a030d0dad8b55c89a33d8502c49f001f72f diff --git a/mapbox-gl-native/.clang-format b/mapbox-gl-native/.clang-format deleted file mode 100644 index 956884c1b..000000000 --- a/mapbox-gl-native/.clang-format +++ /dev/null @@ -1,11 +0,0 @@ ---- -Language: Cpp -BasedOnStyle: Google -AccessModifierOffset: -4 -AllowShortFunctionsOnASingleLine: Inline -BinPackArguments: false -BinPackParameters: false -ColumnLimit: 120 -IndentWidth: 4 -SpacesBeforeTrailingComments: 1 -... diff --git a/mapbox-gl-native/.clang-tidy b/mapbox-gl-native/.clang-tidy deleted file mode 100644 index 2b9756a07..000000000 --- a/mapbox-gl-native/.clang-tidy +++ /dev/null @@ -1,42 +0,0 @@ -Checks: > - -*, - android-*, - boost-*, - bugprone-*, - clang-analyzer-core* - clang-analyzer-cplusplus*, - clang-analyzer-deadcode*, - clang-analyzer-optin.cplusplus*, - clang-analyzer-optin.performance.Padding, - clang-analyzer-security*, - clang-diagnostic-*, - google-*, - misc-*, - modernize-*, - performance-*, - portability-*, - readability-*, - -bugprone-macro-parentheses, - -bugprone-narrowing-conversions, - -google-build-using-namespace, - -google-explicit-constructor, - -google-readability-braces-around-statements, - -google-readability-todo, - -google-runtime-int, - -google-runtime-references, - -misc-non-private-member-variables-in-classes, - -modernize-avoid-c-arrays, - -readability-braces-around-statements, - -readability-else-after-return, - -readability-implicit-bool-conversion, - -readability-magic-numbers, - -readability-named-parameter, - -readability-uppercase-literal-suffix - -WarningsAsErrors: '*' -HeaderFilterRegex: '.*' -FormatStyle: file - -CheckOptions: - - key: performance-unnecessary-value-param.AllowedTypes - value: 'exception_ptr' diff --git a/mapbox-gl-native/.cmake-format b/mapbox-gl-native/.cmake-format deleted file mode 100644 index 4ca1e0f0b..000000000 --- a/mapbox-gl-native/.cmake-format +++ /dev/null @@ -1,103 +0,0 @@ - -# -------------------------- -# General Formatting Options -# -------------------------- -# How wide to allow formatted cmake files -line_width = 140 - -# How many spaces to tab for indent -tab_size = 4 - -# If arglists are longer than this, break them always -max_subargs_per_line = 3 - -# If true, separate flow control names from their parentheses with a space -separate_ctrl_name_with_space = False - -# If true, separate function names from parentheses with a space -separate_fn_name_with_space = False - -# If a statement is wrapped to more than one line, than dangle the closing -# parenthesis on it's own line -dangle_parens = True - -# If the statement spelling length (including space and parenthesis is larger -# than the tab width by more than this amoung, then force reject un-nested -# layouts. -max_prefix_chars = 2 - -# If a candidate layout is wrapped horizontally but it exceeds this many lines, -# then reject the layout. -max_lines_hwrap = 8 - -# What style line endings to use in the output. -line_ending = u'unix' - -# Format command names consistently as 'lower' or 'upper' case -command_case = u'canonical' - -# Format keywords consistently as 'lower' or 'upper' case -keyword_case = u'unchanged' - -# Specify structure for custom cmake functions -additional_commands = { - "add_node_module": { - "kwargs": { - "INSTALL_PATH": "*", - "NAN_VERSION": "*", - "EXCLUDE_NODE_ABIS": "*" - } - }, - "target_compile_definitions": { - "kwargs": { - "PRIVATE": "*", - "PUBLIC": "*" - } - }, - "set_target_properties": { - "kwargs": { - "PROPERTIES": { - "kwargs": { - "INTERFACE_MAPBOX_NAME": "*", - "INTERFACE_MAPBOX_URL": "*", - "INTERFACE_MAPBOX_AUTHOR": "*", - "INTERFACE_MAPBOX_LICENSE": "*" - } - } - } - }, - "target_sources": { - "kwargs": { - "INTERFACE": "*", - "PRIVATE": "*", - "PUBLIC": "*" - } - } -} - -# A list of command names which should always be wrapped -always_wrap = [ - "add_executable", - "add_library", - "set_source_files_properties", - "target_compile_definitions", - "target_include_directories", - "target_link_libraries", - "target_sources" -] - -# Specify the order of wrapping algorithms during successive reflow attempts -algorithm_order = [0, 1, 2, 3, 4] - -# If true, the argument lists which are known to be sortable will be sorted -# lexicographicall -enable_sort = True - -# If true, the parsers may infer whether or not an argument list is sortable -# (without annotation). -autosort = True - -# If a comment line starts with at least this many consecutive hash characters, -# then don't lstrip() them off. This allows for lazy hash rulers where the first -# hash char is not separated by space -hashruler_min_length = 10 diff --git a/mapbox-gl-native/.github/CODEOWNERS b/mapbox-gl-native/.github/CODEOWNERS deleted file mode 100644 index 66baad21d..000000000 --- a/mapbox-gl-native/.github/CODEOWNERS +++ /dev/null @@ -1,6 +0,0 @@ -* @mapbox/gl-native - -# Apple -/platform/ios/ @mapbox/maps-ios-reviewers -/platform/macos/ @mapbox/maps-ios-reviewers -/platform/darwin/ @mapbox/maps-ios-reviewers diff --git a/mapbox-gl-native/.github/ISSUE_TEMPLATE/darwin.md b/mapbox-gl-native/.github/ISSUE_TEMPLATE/darwin.md deleted file mode 100644 index ab8e77aac..000000000 --- a/mapbox-gl-native/.github/ISSUE_TEMPLATE/darwin.md +++ /dev/null @@ -1,34 +0,0 @@ ---- -name: iOS or macOS -about: Mapbox Maps SDK for iOS or macOS -labels: "status: triage" ---- - - -### Steps to reproduce - - 1. - 2. - 3. - -### Expected behavior - - - -### Actual behavior - - - -### Configuration - -**Mapbox SDK versions:** -**iOS/macOS versions:** -**Device/simulator models:** -**Xcode version:** diff --git a/mapbox-gl-native/.github/ISSUE_TEMPLATE/other.md b/mapbox-gl-native/.github/ISSUE_TEMPLATE/other.md deleted file mode 100644 index 2e4aed2e1..000000000 --- a/mapbox-gl-native/.github/ISSUE_TEMPLATE/other.md +++ /dev/null @@ -1,30 +0,0 @@ ---- -name: Other -about: CI or other non-platform specific issues -labels: "status: triage" ---- - - -**Platform:** -**Mapbox SDK version:** - -### Steps to trigger behavior - - 1. - 2. - 3. - -### Expected behavior - -### Actual behavior diff --git a/mapbox-gl-native/.github/PULL_REQUEST_TEMPLATE.md b/mapbox-gl-native/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index 6c3ae9685..000000000 --- a/mapbox-gl-native/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,11 +0,0 @@ -## Launch Checklist - - - - - [ ] briefly describe the changes in this PR - - [ ] include before/after visuals or gifs if this PR includes visual changes - - [ ] write tests for all new functionality - - [ ] document any changes to public APIs - - [ ] tagged `@mapbox/maps-android @mapbox/maps-ios @mapbox/core-sdk` if this PR adds or updates a public API - - [ ] tagged `@mapbox/gl-js` if this PR includes shader changes or needs a js port - - [ ] apply `needs changelog` label if a changelog is needed (remove label when added) diff --git a/mapbox-gl-native/.github/stale.yml b/mapbox-gl-native/.github/stale.yml deleted file mode 100644 index 6f5511017..000000000 --- a/mapbox-gl-native/.github/stale.yml +++ /dev/null @@ -1,28 +0,0 @@ -# Configuration for probot-stale - https://github.com/probot/stale - -exemptProjects: true -exemptMilestones: true - -staleLabel: archived - -limitPerRun: 1 - -# SEMVER-MAJOR - @tobrun -exemptLabels: - - SEMVER-MAJOR - -pulls: - daysUntilStale: 60 - daysUntilClose: -1 - markComment: false - closeComment: > - This pull request has been automatically detected as stale because it has not had - recent activity and will be archived. Thank you for your contributions. - -issues: - daysUntilStale: 180 - daysUntilClose: -1 - markComment: false - closeComment: > - This issue has been automatically detected as stale because it has not had - recent activity and will be archived. Thank you for your contributions. diff --git a/mapbox-gl-native/.gitignore b/mapbox-gl-native/.gitignore deleted file mode 100644 index b12fb8a38..000000000 --- a/mapbox-gl-native/.gitignore +++ /dev/null @@ -1,67 +0,0 @@ -.DS_Store -.transifexrc -*.pyc -*.gcno -*.gcda -*~ -**/actual.png -**/diff.png -offline.db -new_offline.db -xcuserdata -/platform/node/test/actual -/platform/node/test/diff -/mason_packages -/build -/next/build -/lib -/test/node_modules -/test/fixtures/*/*_actual.* -/test/fixtures/api/1.png -/test/fixtures/api/2.png -/test/fixtures/offline_database/offline.db -/test/fixtures/offline_database/offline.db-* -/test/output -/node_modules -/platform/ios/benchmark/assets/glyphs/DIN* -/platform/ios/benchmark/assets/tiles/mapbox.mapbox-terrain-v2,mapbox.mapbox-streets-v6 -/platform/darwin/developer.xcconfig -/platform/macos/macos.xcworkspace/xcshareddata/macos.xcscmblueprint -/platform/ios/ios.xcworkspace/xcshareddata/ios.xcscmblueprint -/documentation -test/fixtures/api/assets.zip -test/fixtures/storage/assets.zip -/.circle-week -/vendor/.cache -buck-out -.buckd - -# Generated metrics results -metrics/*.html - -# Android RenderTestRunner -render-test/android/.* -render-test/android/app/build/ -render-test/android/app/src/main/assets/data.zip -render-test/android/local.properties -render-test/android/app/.* -render-test/android/package.json -render-test/android/app/app.iml -render-test/android/android.iml - -# IOS RenderTestRunner -render-test/ios/codesigning/*.xcent -render-test/ios/fastlane/README.md -test-data/ - -# Generated file from npm/yarn -package-lock.json - -# Visual Studio Code -.vscode -mapbox-gl-native.code-workspace - -# Generated list files from code generation -/scripts/generate-file-lists.list -/scripts/generate-shaders.list -/scripts/generate-style-code.list diff --git a/mapbox-gl-native/.gitmodules b/mapbox-gl-native/.gitmodules deleted file mode 100644 index 2c286a1b2..000000000 --- a/mapbox-gl-native/.gitmodules +++ /dev/null @@ -1,51 +0,0 @@ -[submodule "mapbox-gl-js"] - path = mapbox-gl-js - url = https://github.com/mapbox/mapbox-gl-js.git -[submodule "vendor/nunicode"] - path = vendor/nunicode - url = https://bitbucket.org/alekseyt/nunicode.git -[submodule "vendor/earcut.hpp"] - path = vendor/earcut.hpp - url = https://github.com/mapbox/earcut.hpp.git -[submodule "vendor/polylabel"] - path = vendor/polylabel - url = https://github.com/mapbox/polylabel.git -[submodule "vendor/protozero"] - path = vendor/protozero - url = https://github.com/mapbox/protozero.git -[submodule "vendor/vector-tile"] - path = vendor/vector-tile - url = https://github.com/mapbox/vector-tile.git -[submodule "vendor/wagyu"] - path = vendor/wagyu - url = https://github.com/mapbox/wagyu.git -[submodule "vendor/unique_resource"] - path = vendor/unique_resource - url = https://github.com/okdshin/unique_resource.git -[submodule "vendor/icu"] - path = vendor/icu - url = https://github.com/unicode-org/icu.git -[submodule "vendor/boost"] - path = vendor/boost - url = https://github.com/mapbox/mapbox-gl-native-boost.git -[submodule "vendor/benchmark"] - path = vendor/benchmark - url = https://github.com/google/benchmark.git -[submodule "vendor/eternal"] - path = vendor/eternal - url = https://github.com/mapbox/eternal.git -[submodule "vendor/mapbox-base"] - path = vendor/mapbox-base - url = https://github.com/mapbox/mapbox-base.git -[submodule "vendor/googletest"] - path = vendor/googletest - url = https://github.com/google/googletest.git -[submodule "vendor/zip-archive"] - path = vendor/zip-archive - url = https://github.com/ZipArchive/ZipArchive.git -[submodule "vendor/cpp-httplib"] - path = vendor/cpp-httplib - url = https://github.com/yhirose/cpp-httplib.git -[submodule "vendor/mapbox-gl-native-curl"] - path = vendor/mapbox-gl-native-curl - url = https://github.com/mapbox/mapbox-gl-native-curl.git diff --git a/mapbox-gl-native/.npmignore b/mapbox-gl-native/.npmignore deleted file mode 100644 index d2490da83..000000000 --- a/mapbox-gl-native/.npmignore +++ /dev/null @@ -1,32 +0,0 @@ -Makefile -CmakeLists.txt -*yml -build -cmake -misc -.* -*tgz -benchmark -expression-test -cloudformation -bin -vendor -include -mason_packages -mapbox-gl-js -test -lib -next -src -scripts -render-test -platform/android -platform/darwin -platform/default -platform/glfw -platform/ios -platform/linux -platform/macos -platform/qt -platform/node/symbol-list -platform/node/version-script \ No newline at end of file diff --git a/mapbox-gl-native/.topissuesrc b/mapbox-gl-native/.topissuesrc deleted file mode 100644 index c16804cd2..000000000 --- a/mapbox-gl-native/.topissuesrc +++ /dev/null @@ -1,17 +0,0 @@ -{ - "labels": { - "release blocker": 25, - "beta blocker": 20, - "crash": 5, - "build": 5, - "bug": 2 - }, - "reactions": { - "+1": 1, - "-1": -1, - "laugh": 1, - "hooray": 1, - "confused": 1, - "heart": 1 - } -} diff --git a/mapbox-gl-native/.tx/config b/mapbox-gl-native/.tx/config deleted file mode 100644 index bccf1fd92..000000000 --- a/mapbox-gl-native/.tx/config +++ /dev/null @@ -1,45 +0,0 @@ -[main] -host = https://www.transifex.com -minimum_perc = 80 - -[mapbox-gl-native.foundationstrings-darwin] -file_filter = platform/darwin/resources/.lproj/Foundation.strings -lang_map = pt_BR: pt-BR, pt_PT: pt-PT, zh_CN: zh-Hans, zh_TW: zh-Hant -source_file = platform/darwin/resources/Base.lproj/Foundation.strings -source_lang = en -type = STRINGS - -[mapbox-gl-native.foundationstringsdict-darwin] -file_filter = platform/darwin/resources/.lproj/Foundation.stringsdict -lang_map = pt_BR: pt-BR, pt_PT: pt-PT, zh_CN: zh-Hans, zh_TW: zh-Hant -source_file = platform/darwin/resources/en.lproj/Foundation.stringsdict -source_lang = en -type = STRINGSDICT - -[mapbox-gl-native.localizablestrings-ios] -file_filter = platform/ios/resources/.lproj/Localizable.strings -lang_map = pt_BR: pt-BR, pt_PT: pt-PT, zh_CN: zh-Hans, zh_TW: zh-Hant -source_file = platform/ios/resources/Base.lproj/Localizable.strings -source_lang = en -type = STRINGS - -[mapbox-gl-native.localizablestringsdict-ios] -file_filter = platform/ios/resources/.lproj/Localizable.stringsdict -lang_map = pt_BR: pt-BR, pt_PT: pt-PT, zh_CN: zh-Hans, zh_TW: zh-Hant -source_file = platform/ios/resources/en.lproj/Localizable.stringsdict -source_lang = en -type = STRINGSDICT - -[mapbox-gl-native.localizablestrings-macos] -file_filter = platform/macos/sdk/.lproj/Localizable.strings -lang_map = pt_BR: pt-BR, pt_PT: pt-PT, zh_CN: zh-Hans, zh_TW: zh-Hant -source_file = platform/macos/sdk/Base.lproj/Localizable.strings -source_lang = en -type = STRINGS - -[mapbox-gl-native.rootstrings-ios] -file_filter = platform/ios/app/Settings.bundle/.lproj/Root.strings -lang_map = pt_BR: pt-BR, pt_PT: pt-PT, zh_CN: zh-Hans, zh_TW: zh-Hant -source_file = platform/ios/app/Settings.bundle/Base.lproj/Root.strings -source_lang = en -type = STRINGS diff --git a/mapbox-gl-native/.ycm_extra_conf.py b/mapbox-gl-native/.ycm_extra_conf.py deleted file mode 100644 index 63616a1e9..000000000 --- a/mapbox-gl-native/.ycm_extra_conf.py +++ /dev/null @@ -1,128 +0,0 @@ -# Version of .ycm_extra_conf.py sample file adapted -# for the Mapbox GL Native project. -# -# This file is NOT licensed under the GPLv3, which is the license for the rest -# of YouCompleteMe. -# -# Here's the license text for this file: -# -# This is free and unencumbered software released into the public domain. -# -# Anyone is free to copy, modify, publish, use, compile, sell, or -# distribute this software, either in source code form or as a compiled -# binary, for any purpose, commercial or non-commercial, and by any -# means. -# -# In jurisdictions that recognize copyright laws, the author or authors -# of this software dedicate any and all copyright interest in the -# software to the public domain. We make this dedication for the benefit -# of the public at large and to the detriment of our heirs and -# successors. We intend this dedication to be an overt act of -# relinquishment in perpetuity of all present and future rights to this -# software under copyright law. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -# IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR -# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -# OTHER DEALINGS IN THE SOFTWARE. -# -# For more information, please refer to - -import os -import subprocess -import string -import ycm_core - -compilation_database_folders = [ - 'build/linux-x86_64/Debug', - 'build/qt-linux-x86_64/Debug', - 'build/qt4-linux-x86_64/Debug', - 'build/macos/compdb/Debug', -] - -subprocess.call(['make compdb'], shell=True) - -for folder in compilation_database_folders: - if os.path.exists( folder ): - database = ycm_core.CompilationDatabase( folder ) - -SOURCE_EXTENSIONS = [ '.cpp', '.cxx', '.cc', '.c', '.m', '.mm' ] - - -def DirectoryOfThisScript(): - return os.path.dirname( os.path.abspath( __file__ ) ) - - -def MakeRelativePathsInFlagsAbsolute( flags, working_directory ): - if not working_directory: - return list( flags ) - new_flags = [] - make_next_absolute = False - path_flags = [ '-isystem', '-I', '-iquote', '--sysroot=' ] - for flag in flags: - new_flag = flag - - if make_next_absolute: - make_next_absolute = False - if not flag.startswith( '/' ): - new_flag = os.path.join( working_directory, flag ) - - for path_flag in path_flags: - if flag == path_flag: - make_next_absolute = True - break - - if flag.startswith( path_flag ): - path = flag[ len( path_flag ): ] - new_flag = path_flag + os.path.join( working_directory, path ) - break - - if new_flag: - new_flags.append( new_flag ) - return new_flags - - -def IsHeaderFile( filename ): - extension = os.path.splitext( filename )[ 1 ] - return extension in [ '.h', '.hxx', '.hpp', '.hh' ] - - -def GetCompilationInfoForFile( filename ): - # The compilation_commands.json file generated by CMake does not have entries - # for header files. So we do our best by asking the db for flags for a - # corresponding source file, if any. If one exists, the flags for that file - # should be good enough. - if IsHeaderFile( filename ): - basename = os.path.splitext( filename )[ 0 ] - for extension in SOURCE_EXTENSIONS: - replacement_file = basename + extension - if os.path.exists( replacement_file ): - compilation_info = database.GetCompilationInfoForFile( - replacement_file ) - if compilation_info.compiler_flags_: - return compilation_info - return None - return database.GetCompilationInfoForFile( filename ) - - -def FlagsForFile( filename, **kwargs ): - if not database: - return None - - # Bear in mind that compilation_info.compiler_flags_ does NOT return a - # python list, but a "list-like" StringVec object - compilation_info = GetCompilationInfoForFile( filename ) - if not compilation_info: - return None - - final_flags = MakeRelativePathsInFlagsAbsolute( - compilation_info.compiler_flags_, - compilation_info.compiler_working_dir_ ) - - return { - 'flags': final_flags, - 'do_cache': True - } diff --git a/mapbox-gl-native/README.md b/mapbox-gl-native/README.md deleted file mode 100644 index ab256f46a..000000000 --- a/mapbox-gl-native/README.md +++ /dev/null @@ -1,34 +0,0 @@ -# Mapbox GL Native - -[![Circle CI build status](https://circleci.com/gh/mapbox/mapbox-gl-native.svg?style=shield)](https://circleci.com/gh/mapbox/workflows/mapbox-gl-native/tree/master) [![Coverage Status](https://codecov.io/gh/mapbox/mapbox-gl-native/branch/master/graph/badge.svg)](https://codecov.io/gh/mapbox/mapbox-gl-native) - -A C++ library that powers customizable vector maps in native applications on multiple platforms by taking stylesheets that conform to the [Mapbox Style Specification](https://docs.mapbox.com/mapbox-gl-js/style-spec/), applying them to vector tiles that conform to the [Mapbox Vector Tile Specification](https://github.com/mapbox/vector-tile-spec/), and rendering them using OpenGL or Metal. - -To embed interactive maps into a native application using a platform-specific language, install the Mapbox Maps SDK: - -* [Mapbox Maps SDK for Android](https://github.com/mapbox/mapbox-gl-native-android/) (Java, Kotlin) -* [Mapbox Maps SDK for iOS](https://github.com/mapbox/mapbox-gl-native-ios/blob/master/platform/ios/) (Objective-C, Swift, Interface Builder) -* [Mapbox Maps SDK for macOS](https://github.com/mapbox/mapbox-gl-native-ios/tree/master/platform/macos/) (Objective-C, Swift, Interface Builder, AppleScript) - -[Mapbox GL JS](https://github.com/mapbox/mapbox-gl-js) is the WebGL-based counterpart to Mapbox GL Native that is designed for use on the Web. - -## [Developing](DEVELOPING.md) - -We use [CMake](https://cmake.org/cmake/help/latest/) to build Mapbox GL Native -for various platforms, including Linux, Android, iOS, macOS and Windows. The -following command, executed from the root of this repository tree, will build -Mapbox GL Native targeting your host architecture given that you have all the -dependencies installed and run the example app. - -``` -$ git submodule update --init --recursive -$ cmake . -B build -$ cmake --build build -$ MAPBOX_ACCESS_TOKEN=my_access_token_here ./build/platform/glfw/mbgl-glfw -``` - -## License - -Mapbox GL Native is licensed under the [2-Clause BSD license](LICENSE.md). The licenses of its dependencies are tracked via [FOSSA](https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fmapbox%2Fmapbox-gl-native): - -[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fmapbox%2Fmapbox-gl-native.svg?type=large)](https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fmapbox%2Fmapbox-gl-native) diff --git a/mapbox-gl-native/mapbox-gl-js b/mapbox-gl-native/mapbox-gl-js deleted file mode 160000 index fe03b706f..000000000 --- a/mapbox-gl-native/mapbox-gl-js +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fe03b706ff6fbda2ff4796bbf581aa667c6fbc7d diff --git a/mapbox-gl-native/platform/android/CHANGELOG.md b/mapbox-gl-native/platform/android/CHANGELOG.md deleted file mode 100644 index b9a7a05ac..000000000 --- a/mapbox-gl-native/platform/android/CHANGELOG.md +++ /dev/null @@ -1,1850 +0,0 @@ -# Changelog for the Mapbox Maps SDK for Android -Mapbox welcomes participation and contributions from everyone. If you'd like to do so please see the [`Contributing Guide`](https://github.com/mapbox/mapbox-gl-native/blob/master/CONTRIBUTING.md) first to get started. - -## Notice -**Work on the Mapbox Maps SDK for Android is now happening at https://github.com/mapbox/mapbox-gl-native-android.** -Please see the README at https://github.com/mapbox/mapbox-gl-native-android for the most up-to-date information on the Maps SDK for Android. - -## master -- Added support for [image expression](https://docs.mapbox.com/mapbox-gl-js/style-spec/#expressions-types-image) in core library. Runtime APIs for image expression will be implemented separately. [#15877](https://github.com/mapbox/mapbox-gl-native/pull/15877) -- Make network requests for expired resources lower priority than requests for new resources. ([#15950](https://github.com/mapbox/mapbox-gl-native/pull/15950)) - -### Bug fixes - - Fixed the rendering bug caused by redundant pending requests for already requested images [#15864](https://github.com/mapbox/mapbox-gl-native/pull/15864) - - Fixed Geo JSON source flickering on style transition [#15907](https://github.com/mapbox/mapbox-gl-native/pull/15907) - - Fixed flickering caused by unnecessary removing and re-adding of the render sources when the order of their corresponding style objects was changed in the updated style [#15941](https://github.com/mapbox/mapbox-gl-native/pull/15941) - -### Performance improvements - - Enable incremental vacuum for the offline database in order to make data removal requests faster and to avoid the excessive disk space usage (creating a backup file on VACUUM call) [#15837](https://github.com/mapbox/mapbox-gl-native/pull/15837) - - Convert GeoJSON features to tiles in a background thread and thus unblock the UI thread on updating the GeoJsonSource [#15871](https://github.com/mapbox/mapbox-gl-native/pull/15871) - - Convert GeoJSON features to tiles for the loaded source description in a background thread and thus unblock the UI thread [#15885](https://github.com/mapbox/mapbox-gl-native/pull/15885) - -### Features -- Introduce `OfflineManager#packDatabase` and `OfflineRegion#deleteAndSkipPackDatabase` API in order to decouple offline storage vacuum and delete region operations and thus to gain performance benefits e.g. when several regions should be deleted in a row [#15899](https://github.com/mapbox/mapbox-gl-native/pull/15899) - -## 8.5.0-alpha.2 - October 10, 2019 -[Changes](https://github.com/mapbox/mapbox-gl-native/compare/android-v8.5.0-alpha.1...android-v8.5.0-alpha.2) since [Mapbox Maps SDK for Android v8.5.0-alpha.1](https://github.com/mapbox/mapbox-gl-native/releases/tag/android-v8.5.0-alpha.1): - -### Features - - Expose pre-fetching zoom delta, allows to granular control the delta on which we prefetch tiles [#15769](https://github.com/mapbox/mapbox-gl-native/pull/15769) - -### Performance improvements - - Improved rendering performance for the styles with multiple sources [#15756](https://github.com/mapbox/mapbox-gl-native/pull/15756) - -### Bug fixes - - Fixed runtime exceptions that occurred when a manually built camera object without padding was serialized. [#15788](https://github.com/mapbox/mapbox-gl-native/pull/15788) - - Keep Mapbox when obfuscating code with proguard [#15762](https://github.com/mapbox/mapbox-gl-native/pull/15762) - -## 8.5.0-alpha.1 - October 3, 2019 -[Changes](https://github.com/mapbox/mapbox-gl-native/compare/android-v8.4.0...android-v8.5.0-alpha.1) since [Mapbox Maps SDK for Android v8.4.0](https://github.com/mapbox/mapbox-gl-native/releases/tag/android-v8.4.0): -### Bug fixes - - Suppress network requests for expired tiles update, if these tiles are invisible. [#15741](https://github.com/mapbox/mapbox-gl-native/pull/15741) - - Fixed opacity interpolation for composition expressions [#15738](https://github.com/mapbox/mapbox-gl-native/pull/15738) - - Fixed an issue where `Projection#getMetersPerPixelAtLatitude` returned a value incorrectly divided by the pixel ratio. This also fixes an issue where `LocationComponent` accuracy circle's radius was artificially increased. [#15742](https://github.com/mapbox/mapbox-gl-native/pull/15742) - - Coalesce requests to the client for the same missing image [#15778](https://github.com/mapbox/mapbox-gl-native/pull/15778) - -## 8.4.0 - September 25, 2019 -[Changes](https://github.com/mapbox/mapbox-gl-native/compare/android-v8.4.0-beta.1...android-v8.4.0) since [Mapbox Maps SDK for Android v8.4.0-beta.1](https://github.com/mapbox/mapbox-gl-native/releases/tag/android-v8.4.0-beta.1): - -### Bug fixes - - Fixing a crash when `CameraPosition` padding is set when using `MapSnapshotter`. [#15699](https://github.com/mapbox/mapbox-gl-native/pull/15699) - -### Other Changes - - Bumped Java SDK dependency to stable 4.9.0 [#15700](https://github.com/mapbox/mapbox-gl-native/pull/15700) - - Migrate map feedback to GL JS–powered feedback form [#15623](https://github.com/mapbox/mapbox-gl-native/pull/15623) - -## 8.4.0-beta.1 - September 19, 2019 -[Changes](https://github.com/mapbox/mapbox-gl-native/compare/android-v8.4.0-alpha.2...android-v8.4.0-beta.1) since [Mapbox Maps SDK for Android v8.4.0-alpha.2](https://github.com/mapbox/mapbox-gl-native/releases/tag/android-v8.4.0-alpha.2): - -### Bug fixes - - Fixed an issue that `maxzoom` in style `Sources` option was ignored when URL resource is provided. It may cause problems such as extra tiles downloading at higher zoom level than `maxzoom`, or problems that wrong setting of `overscaledZ` in `OverscaledTileID` that will be passed to `SymbolLayout`, leading wrong rendering appearance. [#15581](https://github.com/mapbox/mapbox-gl-native/pull/15581) - - Fixed constant repainting for the sources with invisible layers, caused by `RenderSource::hasFadingTiles()` returning `true` all the time. [#15600](https://github.com/mapbox/mapbox-gl-native/pull/15600) - - Fixed an issue that caused the state of CompassView not up to date when `UiSettings.setCompassEnabled()` is set to true. [#15606](https://github.com/mapbox/mapbox-gl-native/pull/15606) - - Ignore location tracking mode based animations when the camera is transitioning. [#15641](https://github.com/mapbox/mapbox-gl-native/pull/15641) - - Fixed MapSnapshotter so that `MapSnapshotter.withApiBaseUri` works again. [#15642](https://github.com/mapbox/mapbox-gl-native/pull/15642) - - Fixed an assertion hit caused by possibility of adding a layer to an incompatible source. [#15644](https://github.com/mapbox/mapbox-gl-native/pull/15644) - -## 8.3.2 - September 19, 2019 -[Changes](https://github.com/mapbox/mapbox-gl-native/compare/android-v8.3.1...android-v8.3.2) since [Mapbox Maps SDK for Android v8.3.1](https://github.com/mapbox/mapbox-gl-native/releases/tag/android-v8.3.1): - -### Bug fixes - - Fixed an issue of integer overflow when converting `tileCoordinates` to `LatLon`, which caused issues such as `queryRenderedFeatures` and `querySourceFeatures` returning incorrect coordinates at zoom levels 20 and higher. [#15560](https://github.com/mapbox/mapbox-gl-native/pull/15560) - -## 8.3.1 - September 18, 2019 -[Changes](https://github.com/mapbox/mapbox-gl-native/compare/android-v8.3.0...android-v8.3.1) since [Mapbox Maps SDK for Android v8.3.0](https://github.com/mapbox/mapbox-gl-native/releases/tag/android-v8.3.0): - -### Bug fixes - - Updated earcut.hpp submodule file [#15660](https://github.com/mapbox/mapbox-gl-native/pull/15660) - - Fixed a wrong variable assignment of `MapSnapshotter.Options.withApiBaseUri`. [#15642](https://github.com/mapbox/mapbox-gl-native/pull/15642) - -## 8.4.0-alpha.2 - September 11, 2019 -[Changes](https://github.com/mapbox/mapbox-gl-native/compare/android-v8.4.0-alpha.1...android-v8.4.0-alpha.2) since [Mapbox Maps SDK for Android v8.4.0-alpha.1](https://github.com/mapbox/mapbox-gl-native/releases/tag/android-v8.4.0-alpha.1): - -### Performance improvements - - Newly loaded labels appear faster on the screen. [#15308](https://github.com/mapbox/mapbox-gl-native/pull/15308) - -### Bug fixes - - Fixed an issue of integer overflow when converting `tileCoordinates` to `LatLon`, which caused issues such as `queryRenderedFeatures` and `querySourceFeatures` returning incorrect coordinates at zoom levels 20 and higher. [#15560](https://github.com/mapbox/mapbox-gl-native/pull/15560) - -### Other Changes - - Bumped Java SDK dependency to 4.9.0-alpha.1 [#15570](https://github.com/mapbox/mapbox-gl-native/pull/15570) - -## 8.4.0-alpha.1 - September 4, 2019 -[Changes](https://github.com/mapbox/mapbox-gl-native/compare/android-v8.3.0...android-v8.4.0-alpha.1) since [Mapbox Maps SDK for Android v8.3.0](https://github.com/mapbox/mapbox-gl-native/releases/tag/android-v8.3.0): - -### Features - - Introduce `clusterProperties` option for aggregated cluster properties. [#15425](https://github.com/mapbox/mapbox-gl-native/pull/15425) - - Expose the `CameraPosition#padding` field and associated utility camera position builders. This gives a choice to set a persisting map padding immediately during a transition instead of setting it lazily `MapboxMap#setPadding`, which required scheduling additional transition to be applied. This also deprecates `MapboxMap#setPadding` as there should be no need for a lazy padding setter. [#15444](https://github.com/mapbox/mapbox-gl-native/pull/15444) - - Add number-format expression that allows to format a number to a string, with configurations as minimal/maximal fraction and locale/currency. [#15424](https://github.com/mapbox/mapbox-gl-native/pull/15424) - - Enable using of `text-offset` option together with `text-variable-anchor` (if `text-radial-offset` option is not provided). If used with `text-variable-anchor`, input values will be taken as absolute values. Offsets along the x- and y-axis will be applied automatically based on the anchor position. [#15542](https://github.com/mapbox/mapbox-gl-native/pull/15542) - -### Bug fixes -- Fixed a rendering issue of `collisionBox` when `text-translate` or `icon-translate` is enabled. [#15467](https://github.com/mapbox/mapbox-gl-native/pull/15467) -- Fixed unnecessary layers blink when the same components are re-added after the style reload [#15513](https://github.com/mapbox/mapbox-gl-native/pull/15513) -- Fixed an issue in JNI marshaling code that converted a float to long that produced invalid expressions [#15557](https://github.com/mapbox/mapbox-gl-native/pull/15557) -- Call callback onFinish() immediately when trying to move camera to current position [#15558](https://github.com/mapbox/mapbox-gl-native/pull/15558) - -### Performance improvements - - Mark used offline region resources in batches. [#15521](https://github.com/mapbox/mapbox-gl-native/pull/15521) - -### Other Changes -- JNI binding refactor [#15462](https://github.com/mapbox/mapbox-gl-native/pull/15462) -- Javadoc changes to clarify OfflineManager methods [#15519](https://github.com/mapbox/mapbox-gl-native/pull/15519) - -## 8.3.0 - August 28, 2019 -[Changes](https://github.com/mapbox/mapbox-gl-native/compare/android-v8.3.0-beta.1...android-v8.3.0) since [Mapbox Maps SDK for Android v8.3.0-beta.1](https://github.com/mapbox/mapbox-gl-native/releases/tag/android-v8.3.0-beta.1): - -This release changes how offline tile requests are billed — they are now billed on a pay-as-you-go basis and all developers are able raise the offline tile limit for their users. Offline requests were previously exempt from monthly active user (MAU) billing and increasing the offline per-user tile limit to more than 6,000 tiles required the purchase of an enterprise license. By upgrading to this release, you are opting into the changes outlined in [this blog post](https://blog.mapbox.com/offline-maps-for-all-bb0fc51827be) and [#15380](https://github.com/mapbox/mapbox-gl-native/pull/15380). - -### Features - - Allow ability to pass a string array resource into `localIdeographFontFamily` for enabling/disabling the feature and specifying fallback fonts. [#15488](https://github.com/mapbox/mapbox-gl-native/pull/15488) - -### Bug fixes - - Fixed a rendering issue caused by all icons being treated as SDFs if an SDF and non-SDF icon were in the same layer. [#15456](https://github.com/mapbox/mapbox-gl-native/pull/15456) - - Fixed an issue where changing location's render mode when the`LocationComponent` is disable wouldn't invalidate the foreground icon when it's back enabled. [#15507](https://github.com/mapbox/mapbox-gl-native/pull/15507) - -## 8.2.2 - August 23, 2019 -[Changes](https://github.com/mapbox/mapbox-gl-native/compare/android-v8.2.1...android-v8.2.2) since [Mapbox Maps SDK for Android v8.2.1](https://github.com/mapbox/mapbox-gl-native/releases/tag/android-v8.2.1): - -### Bug fixes - - Fixed a possible crash that could be caused by invoking the wrong layer implementation casting function. [#15398](https://github.com/mapbox/mapbox-gl-native/pull/15398) - - Fixed use of objects after moving, potentially causing crashes. [#15408](https://github.com/mapbox/mapbox-gl-native/pull/1540) - - Fixed a wrong calculation of visibility in high pitch scenarios which might've led to tiles in the viewport not being rendered. [#15461](https://github.com/mapbox/mapbox-gl-native/pull/15461) - -### Other Changes - - Do not invalidate the camera immediately when map padding is set. Reverts a change introduced in the `v8.2.0`. [#15437](https://github.com/mapbox/mapbox-gl-native/pull/15437) - -## 8.3.0-beta.1 - August 22, 2019 -[Changes](https://github.com/mapbox/mapbox-gl-native/compare/android-v8.3.0-alpha.3...android-v8.3.0-beta.1) since [Mapbox Maps SDK for Android v8.3.0-alpha.3](https://github.com/mapbox/mapbox-gl-native/releases/tag/android-v8.3.0-alpha.3): - -### Bug fixes - - Fixed a bug where glyphs generated through the LocalGlyphRasterizer interface were changing fonts during some zoom changes. [#15407](https://github.com/mapbox/mapbox-gl-native/pull/15407) - - Fixed use of objects after moving, potentially causing crashes. [#15408](https://github.com/mapbox/mapbox-gl-native/pull/15408) - - Fixed a possible crash that could be caused by invoking the wrong layer implementation casting function [#15398](https://github.com/mapbox/mapbox-gl-native/pull/15398). - - Font lookup on pre lollipop devices failed, provide default font list instead [#15410](https://github.com/mapbox/mapbox-gl-native/pull/15410). - - Fixed rendering and collision detection issues with using `text-variable-anchor` and `icon-text-fit` properties on the same layer [#15367](https://github.com/mapbox/mapbox-gl-native/pull/15367). - - Fixed a bug where quick-scale was registered during a move gesture that followed a double-tap. Bumped gestures library to `v0.5.1`. [#15427](https://github.com/mapbox/mapbox-gl-native/pull/15427) - - Fixed symbol overlap when zooming out quickly. [#15416](https://github.com/mapbox/mapbox-gl-native/pull/15416) - -### Other Changes - - Do not invalidate the camera immediately when map padding is set. Reverts a change introduced in the `v8.2.0`. [#15437](https://github.com/mapbox/mapbox-gl-native/pull/15437) - -### Docs - - Add javadoc to OnStyleImageMissingListener indicating the required synchronous addition images, document workaround [#15418](https://github.com/mapbox/mapbox-gl-native/pull/15418) - -## 8.3.0-alpha.3 - August 15, 2019 -[Changes](https://github.com/mapbox/mapbox-gl-native/compare/android-v8.3.0-alpha.2...android-v8.3.0-alpha.3) since [Mapbox Maps SDK for Android v8.3.0-alpha.2](https://github.com/mapbox/mapbox-gl-native/releases/tag/android-v8.3.0-alpha.2): - -### Gestures handling - - Bumped gestures library version to v0.5.0 which replaces the compat gesture detector with a custom scale gesture detector implementation. This is a softly breaking change because the underlying scale gesture detector reference has been removed. This brings a set of improvements to gestures without removing any functionality from the previous implementation. [#15136](https://github.com/mapbox/mapbox-gl-native/pull/15136) - - Improved scale and rotate gestures by refining sensitivity thresholds and animation velocity. [#15136](https://github.com/mapbox/mapbox-gl-native/pull/15136) - - Improved quick-zoom gestures by making zoom changes linear. Quick-zoom scale changes are now executed based on y-axis delta changes. [#15386](https://github.com/mapbox/mapbox-gl-native/pull/15386) - -### Features - - Introduced the text-writing-mode layout property for symbol layers. This property allows labels to be placed horizontally or vertically. The property accepts an array of enumeration values from a ( horizontal | vertical ) set. [#14932](https://github.com/mapbox/mapbox-gl-native/pull/14932) - - Added support for fallback fonts in `localIdeographFontFamily`. [#15255](https://github.com/mapbox/mapbox-gl-native/pull/15255) - -### Bug fixes - - Fixed an issue where it was possible to set the map’s content insets then tilt the map enough to see the horizon, causing performance issues [#15195](https://github.com/mapbox/mapbox-gl-native/pull/15195) - - Allow loading of a map without a style URI or style JSON [#15293](https://github.com/mapbox/mapbox-gl-native/pull/15293) - - Fixed an issue where animated camera transitions zoomed in or out too dramatically [#15281](https://github.com/mapbox/mapbox-gl-native/pull/15281) - - Enable variable label placement when `text-allow-overlap` property is set to true [#15354](https://github.com/mapbox/mapbox-gl-native/pull/15354) - -## 8.3.0-alpha.2 - August 7, 2019 -[Changes](https://github.com/mapbox/mapbox-gl-native/compare/android-v8.3.0-alpha.1...android-v8.3.0-alpha.2) since [Mapbox Maps SDK for Android v8.3.0-alpha.1](https://github.com/mapbox/mapbox-gl-native/releases/tag/android-v8.3.0-alpha.1): - -### Bug fixes - - Load a style without an URI or JSON [#15293](https://github.com/mapbox/mapbox-gl-native/pull/15293) - - Do not try to wake up the RunLoop if a wake is already pending. Fixes offline downloads that could freeze after resuming. [#15330](https://github.com/mapbox/mapbox-gl-native/pull/15330) - -## 8.0.2 - July 31, 2019 -[Changes](https://github.com/mapbox/mapbox-gl-native/compare/android-v8.0.1...android-v8.0.2) since [Mapbox Maps SDK for Android v8.0.1](https://github.com/mapbox/mapbox-gl-native/releases/tag/android-v8.0.1): - -### Bug fixes - - Fixed rendering layers after fill-extrusion regression caused by optimization of fill-extrusion rendering [#15065](https://github.com/mapbox/mapbox-gl-native/pull/15065) - - Fixed a map update bug caused by the render tiles and the render passes getting unsynchronized [#15092](https://github.com/mapbox/mapbox-gl-native/pull/15092) - - Fixed a custom geometry source bug caused by using the outdated tiles after style update [#15112](https://github.com/mapbox/mapbox-gl-native/pull/15112) - - Ensure location shadow's gradient radius is greater than 0 [#15099](https://github.com/mapbox/mapbox-gl-native/pull/15099) - -## 7.4.1 - July 31, 2019 -[Changes](https://github.com/mapbox/mapbox-gl-native/compare/android-v7.4.0...android-v7.4.1) since [Mapbox Maps SDK for Android v7.4.0](https://github.com/mapbox/mapbox-gl-native/releases/tag/android-v7.4.0): - -### Bug fixes - - Fixed a map update bug caused by the render tiles and the render passes getting unsynchronized [#15092](https://github.com/mapbox/mapbox-gl-native/pull/15092) - - Ensure location shadow's gradient radius is greater than 0 [#15099](https://github.com/mapbox/mapbox-gl-native/pull/15099) - - Fixed a custom geometry source bug caused by using the outdated tiles after style update [#15112](https://github.com/mapbox/mapbox-gl-native/pull/15112) - -## 8.3.0-alpha.1 - July 31, 2019 -[Changes](https://github.com/mapbox/mapbox-gl-native/compare/android-v8.2.0...android-v8.3.0-alpha.1) since [Mapbox Maps SDK for Android v8.2.0](https://github.com/mapbox/mapbox-gl-native/releases/tag/android-v8.2.0): - -### Features - - Do not include CJK ideographs in the offline packs by default. This decreases overall offline download size but changes appearance by a default set local glyph generation [#14269](https://github.com/mapbox/mapbox-gl-native/pull/14269) - - Update target SDK to 28, update support library and fix gradle warnings [#15135](https://github.com/mapbox/mapbox-gl-native/pull/15135) - - Introduce VertexVector::extend() and use it in placement code [#15194](https://github.com/mapbox/mapbox-gl-native/pull/15194) - -### Bug fixes - - Save location animation timestamp only when fed. Fixes an issue where external camera updates impacted location animation duration[#15265](https://github.com/mapbox/mapbox-gl-native/pull/15265) - - Fixed flickering on style change for the same tile set [#15127](https://github.com/mapbox/mapbox-gl-native/pull/15127) - - Fix location render/camera modes being reinitialized even when the new mode is the same [#15266](https://github.com/mapbox/mapbox-gl-native/pull/15266) - - Ensure default local ideographs font family is not overwrote. Fix a bug that prevented local CJK glyphs generation. The local generation is now enabled by default and the font family used for generation is set to "sans-serif. [#15253](https://github.com/mapbox/mapbox-gl-native/pull/15253) - - Fix int overflow issue in GridIndex [#15245](https://github.com/mapbox/mapbox-gl-native/pull/15245) - - Align gesture animation reason for onCameraMoveStarted [#15218](https://github.com/mapbox/mapbox-gl-native/pull/15218) - - Remove layers first when clearing the style, fixes unnecessary log dumps [#15191](https://github.com/mapbox/mapbox-gl-native/pull/15191) - - Remove unused field from icon buffer [#15189](https://github.com/mapbox/mapbox-gl-native/pull/15189) - -### Performance improvements - - Release quad data after vertex buffers are created [#15189](https://github.com/mapbox/mapbox-gl-native/pull/15189) - - Decrease size of SymbolBucket [#15178](https://github.com/mapbox/mapbox-gl-native/pull/15178) - - Avoid geometry collections copying [#15201](https://github.com/mapbox/mapbox-gl-native/pull/15201) - -## 8.2.1 - July 31, 2019 -[Changes](https://github.com/mapbox/mapbox-gl-native/compare/android-v8.2.0...android-v8.2.1) since [Mapbox Maps SDK for Android v8.2.0](https://github.com/mapbox/mapbox-gl-native/releases/tag/android-v8.2.0): - -### Bug fixes - - Save location animation timestamp only when fed [#15265](https://github.com/mapbox/mapbox-gl-native/pull/15265) - -## 8.1.1 - July 26, 2019 -[Changes](https://github.com/mapbox/mapbox-gl-native/compare/android-v8.1.0...android-v8.1.1) since [Mapbox Maps SDK for Android v8.1.0](https://github.com/mapbox/mapbox-gl-native/releases/tag/android-v8.1.0): - -### Bug fixes - - Fixed rendering layers after fill-extrusion regression caused by optimization of fill-extrusion rendering [#15065](https://github.com/mapbox/mapbox-gl-native/pull/15065) - - Fixed a map update bug caused by the render tiles and the render passes getting unsynchronized [#15092](https://github.com/mapbox/mapbox-gl-native/pull/15092) - - Fixed collision with content insets [#15130](https://github.com/mapbox/mapbox-gl-native/pull/15130) - - Fixed a custom geometry source bug caused by using the outdated tiles after style update [#15112](https://github.com/mapbox/mapbox-gl-native/pull/15112) - - Allow map panning after quick zoom is disabled but a phantom gesture is executed [#15093](https://github.com/mapbox/mapbox-gl-native/pull/15093) - - Ensure location shadow's gradient radius is greater than 0 [#15099](https://github.com/mapbox/mapbox-gl-native/pull/15099) - - Ensure that move detector is enabled if double-tap is interrupted [#15103](https://github.com/mapbox/mapbox-gl-native/pull/15103) - -## 8.2.0 - July 24, 2019 -[Changes](https://github.com/mapbox/mapbox-gl-native/compare/android-v8.2.0-beta.1...android-v8.2.0) since [Mapbox Maps SDK for Android v8.2.0-beta.1](https://github.com/mapbox/mapbox-gl-native/releases/tag/android-v8.2.0-beta.1): - -### Bug fixes - - Fix rendering of layers that are on top of fill-extrusion layers [#15065](https://github.com/mapbox/mapbox-gl-native/pull/15065) - -## 8.2.0-beta.1 - July 18, 2019 -[Changes](https://github.com/mapbox/mapbox-gl-native/compare/android-v8.2.0-alpha.3...android-v8.2.0-beta.1) since [Mapbox Maps SDK for Android v8.2.0-alpha.3](https://github.com/mapbox/mapbox-gl-native/releases/tag/android-v8.2.0-alpha.3): - -### Bug fixes - - Fix `CustomGeometrySource` bug caused by usage of outdated tiles after a style update [#15112](https://github.com/mapbox/mapbox-gl-native/pull/15112) - - Fix bug where previous anchors set in `text-variable-anchor` were still preferred after anchor options were reset [#15129](https://github.com/mapbox/mapbox-gl-native/pull/15129) - - Fix issue where annotations could not be selected due to a regression in content insets [#15130](https://github.com/mapbox/mapbox-gl-native/pull/15130) - -## 8.2.0-alpha.3 - July 11, 2019 -[Changes](https://github.com/mapbox/mapbox-gl-native/compare/android-v8.2.0-alpha.2...android-v8.2.0-alpha.3) since [Mapbox Maps SDK for Android v8.2.0-alpha.2](https://github.com/mapbox/mapbox-gl-native/releases/tag/android-v8.2.0-alpha.2): - -### Bug fixes - - Fix map update bug caused by render tiles and render passes becoming unsynchronized [#15092](https://github.com/mapbox/mapbox-gl-native/pull/15092) - - Fix fill-extrusion layers always rendered above other layers [#15065](https://github.com/mapbox/mapbox-gl-native/pull/15065) - - Fix a bug where map panning would be blocked after a quick zoom gesture was attempted when quick zoom is set to be ignored by `UiSettings` preferences [#15093](https://github.com/mapbox/mapbox-gl-native/pull/15093) - - Fix a bug where map panning would be blocked if double-tap is interrupted [#15103](https://github.com/mapbox/mapbox-gl-native/pull/15103) - -### Minor features and improvements - - Improve performance of queryRenderedFeatures by removing unnecessary iterations over vectors and unneeded layers [#14930](https://github.com/mapbox/mapbox-gl-native/pull/14930) - - Decrease the minimum pixel distance between the current camera position and the target required to interpolate during camera animation [#15073](https://github.com/mapbox/mapbox-gl-native/pull/15073) - - Introduce `MapboxMapOptions` facility creation method [#15069](https://github.com/mapbox/mapbox-gl-native/pull/15069) - - Throw configuration exception when accessing Mapbox services with an invalid token [#15081](https://github.com/mapbox/mapbox-gl-native/pull/15081) - - Allow setting a null access token in the runtime [#15081](https://github.com/mapbox/mapbox-gl-native/pull/15081) - - Ensure location shadow's gradient radius is greater than 0 [#15099](https://github.com/mapbox/mapbox-gl-native/pull/15099) - -### Other Changes - - Update okhttp to latest stable version that support pre lollipop (`3.12.3`) [#15087](https://github.com/mapbox/mapbox-gl-native/pull/15087) - - Fix up "match" expressions docs with stop arguments [#15102](https://github.com/mapbox/mapbox-gl-native/pull/15102) - -## 8.2.0-alpha.2 - July 3, 2019 -[Changes](https://github.com/mapbox/mapbox-gl-native/compare/android-v8.2.0-alpha.1...android-v8.2.0-alpha.2) since [Mapbox Maps SDK for Android v8.2.0-alpha.1](https://github.com/mapbox/mapbox-gl-native/releases/tag/android-v8.2.0-alpha.1): - -### Major features - - Cache management API [#14962](https://github.com/mapbox/mapbox-gl-native/pull/14962) - -### Bug fixes - - Fix style change transition regression caused by delayed setting of the updated layer properties [#15016](https://github.com/mapbox/mapbox-gl-native/pull/15016) - -### Minor features and improvements - - Include Hiragana and Katakana glyph ranges to LocalGlyphRasterizer [#15009](https://github.com/mapbox/mapbox-gl-native/pull/15009) - -### Other Changes - - Update CI image with NDK r20 [#15005](https://github.com/mapbox/mapbox-gl-native/pull/15005) - -## 8.2.0-alpha.1 - June 26, 2019 -[Changes](https://github.com/mapbox/mapbox-gl-native/compare/android-v8.1.0...android-v8.2.0-alpha.1) since [Mapbox Maps SDK for Android v8.1.0](https://github.com/mapbox/mapbox-gl-native/releases/tag/android-v8.1.0): - -### Bug fixes - - Fix `queryRenderedFeatues` bug caused by incorrect sort feature index calculation [#14884](https://github.com/mapbox/mapbox-gl-native/pull/14884) - - Fix performance regression by switching back to a more compact line attributes layout [#14851](https://github.com/mapbox/mapbox-gl-native/pull/14851) - - Fix a bug that restricted camera viewport after camera bounds were reset [#14882](https://github.com/mapbox/mapbox-gl-native/pull/14882) - - Fix a bug that ignored floating point values during core to platform color conversion [#14954](https://github.com/mapbox/mapbox-gl-native/pull/14954) - - Implemented asymmetric center of perspective: fixed an issue that caused the focal point to be always based on the view's horizontal center when setting [MapboxMap setPadding](https://docs.mapbox.com/android/api/map-sdk/8.0.0/com/mapbox/mapboxsdk/maps/MapboxMap.html#setPadding-int-int-int-int-). [#14664](https://github.com/mapbox/mapbox-gl-native/pull/14664) - -### Minor features and improvements - - Allow null updates to GeoJsonSource [#14898](https://github.com/mapbox/mapbox-gl-native/pull/14898) - -### Other Changes - - Add resource usage to HttpRequest, add offline query flag to HttpRequest [#14837](https://github.com/mapbox/mapbox-gl-native/pull/14837) - -## 8.1.0 - June 20, 2019 - -### Bugs - - Accept floating numbers during core->platform color conversion [#14954](https://github.com/mapbox/mapbox-gl-native/pull/14954) - - Ensure to re-enable move when quickzoom finishes [#14965](https://github.com/mapbox/mapbox-gl-native/pull/14965) - -### Features - - Limit concurrent request for Android 4.4 and below to 10 [#14971](https://github.com/mapbox/mapbox-gl-native/pull/14971) - -_Note about #14971:_ This pr makes an adjustment as a precautionary measure towards a rare bug that was discovered via instrumented unit tests on Android 4.4 (aka KitKat). This bug isn’t tied to a code change in the Mapbox Maps SDK for Android. Rather, the root cause is on the Android OS (and how it interacts with OkHttp). - -The Maps SDK doesn’t directly communicate with this system library that the bug originates from, but goes through an external dependency that handles the http communication for the Maps SDK. Capturing from the upstream repository that the code path to this system library isn’t thread safe in Android 4.4 and can result in the native crash above. The only way to fix this issue is by upgrading the end-user device to Android 5.0 or higher which isn’t possible if the device manufacturer hasn’t released an update for it. - -Please see https://github.com/square/okhttp/issues/2679 for more information. - -## 8.1.0-beta.1 - June 13, 2019 - -### Bugs - - Fix compilation warning with updated clang [#14865](https://github.com/mapbox/mapbox-gl-native/pull/14865) - - Fix reset behavior for setLatLngBoundsForCameraTarget [#14882](https://github.com/mapbox/mapbox-gl-native/pull/14882) - -### Features - - Add resource usage to HttpRequest, add offline query param [#14837](https://github.com/mapbox/mapbox-gl-native/pull/14837) - -## 8.0.1 - June 11, 2019 - -### Bugs - - Reset the native renderer only when the GL thread exits [#14841](https://github.com/mapbox/mapbox-gl-native/pull/14841) - - Change library loader from Relinker to SoLoader [#14890](https://github.com/mapbox/mapbox-gl-native/pull/14890) - -## 8.1.0-alpha.2 - June 6, 2019 - -### Bugs - - Copy features array before passing them to core [#14804](https://github.com/mapbox/mapbox-gl-native/pull/14804) - - Improve test stability [#14853](https://github.com/mapbox/mapbox-gl-native/pull/14853) - -### Features - - Rename URL API to URI [#14836](https://github.com/mapbox/mapbox-gl-native/pull/14836) - -### Build - - Bumping Android telemetry to 4.5.1 [#14874](https://github.com/mapbox/mapbox-gl-native/pull/14874) - -### Docs - - Add external links to javadoc generation, fix warnings [#14792](https://github.com/mapbox/mapbox-gl-native/pull/14792) - -## 8.1.0-alpha.1 - June 3, 2019 - -### Bugs - - Return color string values in the [0-255] range [#14233](https://github.com/mapbox/mapbox-gl-native/pull/14233) - - Resume file source to complete resources cache path change [#14546](https://github.com/mapbox/mapbox-gl-native/pull/14546) - - Remove binary shader support [#14707](https://github.com/mapbox/mapbox-gl-native/pull/14707) - - Deprecate MapboxMapOptions empty constructor [#14748](https://github.com/mapbox/mapbox-gl-native/pull/14748) - - -### Features - - Break location camera tracking when a developer invoked animation starts [#14745](https://github.com/mapbox/mapbox-gl-native/pull/14745) - - Use URI instead of URL to enable asset loading [#14750](https://github.com/mapbox/mapbox-gl-native/pull/14750) - - Option to change the zoom rate. Decrease the default zoom rate by 35% [#14774](https://github.com/mapbox/mapbox-gl-native/pull/14774) - - Provide API to control eviction of cached images [#14610](https://github.com/mapbox/mapbox-gl-native/pull/14610) - - Android specific thread pool that keeps threads attached to JVM [#14450](https://github.com/mapbox/mapbox-gl-native/pull/14450) - - Asymmetric viewport when edge insets are specified [#14664](https://github.com/mapbox/mapbox-gl-native/pull/14664) - -### Build - - Update maven publishing script to enable aar packaging [#14778](https://github.com/mapbox/mapbox-gl-native/pull/14778) - - Do not try to package duplicate files in the publication [#14822](https://github.com/mapbox/mapbox-gl-native/pull/14822) - -### Docs - - Document that elevation(0) turns off the location shadow [#14723](https://github.com/mapbox/mapbox-gl-native/pull/14723) - -## 8.0.0 - May 22, 2019 - - This release improves the method for counting monthly active users. By upgrading to this release, you are opting into the changes outlined [in this blog post](https://www.mapbox.com/52219). [#14404](https://github.com/mapbox/mapbox-gl-native/pull/14404) - -## 6.8.2 - May 17, 2019 - -### Bugs - - Avoid binary shader load race condition with using multiple maps, disable binary shaders [#14298](https://github.com/mapbox/mapbox-gl-native/pull/14298) - -## 7.5.0-beta.1 - May 17, 2019 - -### Features - - Option to provide custom values for location camera transition [#14606](https://github.com/mapbox/mapbox-gl-native/pull/14606) - -### Bugs - - Expose trackingGesturesManagement attribute [#14659](https://github.com/mapbox/mapbox-gl-native/pull/14659) - - Harden onLowMemory call, use atomic boolean for thread safe management of the render surface [#14622](https://github.com/mapbox/mapbox-gl-native/pull/14622) - - Normalize previous rotation values of the location animator [#14626](https://github.com/mapbox/mapbox-gl-native/pull/14626) - -### Performance - - Remove telemetry gesture event handling code [#14627](https://github.com/mapbox/mapbox-gl-native/pull/14627) - -### Localisation - - Pull in Polish translation and updates to Czech and Hungarian [#14679](https://github.com/mapbox/mapbox-gl-native/pull/14679) - -### Docs - - Add javadoc to highlight incompatible onIdle event with snapshot api [#14621](https://github.com/mapbox/mapbox-gl-native/pull/14621) - -## 7.4.0 - May 15, 2019 -### Features - - Revert SKU token logic [#14594](https://github.com/mapbox/mapbox-gl-native/pull/14594) - -### Bugs - - Keep strong references to the FileSource/OfflineManager operations callbacks [#14601](https://github.com/mapbox/mapbox-gl-native/pull/14601) - - Failed sprite requests do not block tiles rendering [#14605](https://github.com/mapbox/mapbox-gl-native/pull/14605) - - Remove missing image log [#14600](https://github.com/mapbox/mapbox-gl-native/pull/14600) - -## 7.5.0-alpha.2 - May 8, 2019 -### Bugs - - Keep shared_ptr to thread pool in CustomGeometrySource [#14562](https://github.com/mapbox/mapbox-gl-native/pull/14562) - - Changed placement order of symbols to match the viewport-y order when the `PropertyValue#symbolZOrder` is set to `SYMBOL_Z_ORDER_VIEWPORT_Y`, improving collision detection and rendering of symbol layers when icons are allowed to overlap but not text. [#14486](https://github.com/mapbox/mapbox-gl-native/pull/14486) - -## 7.5.0-alpha.1 - May 2, 2019 -### Bugs - - Use same OfflineRegion#isComplete logic as core [#14500](https://github.com/mapbox/mapbox-gl-native/pull/14500) - - Add toString, hashcode and equals to OfflineRegionError [#14499](https://github.com/mapbox/mapbox-gl-native/pull/14499) - -### Features - - Add "layer-above" option to the LocationComponent [#14497](https://github.com/mapbox/mapbox-gl-native/pull/14497) - -### Build - - Update mapbox java sdk to v4.7.0 [#14480](https://github.com/mapbox/mapbox-gl-native/pull/14480) - - Update gestures library to v0.4.2 [#14524](https://github.com/mapbox/mapbox-gl-native/pull/14524) - -### Docs - - Clear up LocationComponent's z-index positioning docs [#14497](https://github.com/mapbox/mapbox-gl-native/pull/14497) - -## 7.4.0-beta.3 - May 2, 2019 -### Features -- Less strict rules for adding render layers to sources [#14540](https://github.com/mapbox/mapbox-gl-native/pull/14540) -- Store type of renderable segment when sorting symbols by key [#14517](https://github.com/mapbox/mapbox-gl-native/pull/14517) - -### Build - - Bump gestures library to v0.4.2 [#14524](https://github.com/mapbox/mapbox-gl-native/pull/14524) - -## 7.4.0-beta.2 - April 23, 2019 -### Features - - Enable/Disable SKU token handling [#14476](https://github.com/mapbox/mapbox-gl-native/pull/14476) - -## 7.4.0-beta.1 - April 19, 2019 -### Bugs - - Order render items properly across several sources [#14408](https://github.com/mapbox/mapbox-gl-native/pull/14408) - - Ignore equal offline region's download state updates [#14399](https://github.com/mapbox/mapbox-gl-native/pull/14399) - - Activate the ConnectivityReceiver when starting the download [#14397](https://github.com/mapbox/mapbox-gl-native/pull/14397) - -### Features - - Port symbol-sort-key symbol layout property [#14386](https://github.com/mapbox/mapbox-gl-native/pull/14386) - - Add style image missing binding integration [#14320](https://github.com/mapbox/mapbox-gl-native/pull/14320) - - Allow snapshot generation without overlain view content [#14413](https://github.com/mapbox/mapbox-gl-native/pull/14413) - - Introduce AccountsManager to support SKU tokens in API requests [#14404](https://github.com/mapbox/mapbox-gl-native/pull/14404) - - Add MapEventFactory [#14309](https://github.com/mapbox/mapbox-gl-native/pull/14309) - - Only perform thread checking in debug builds [#14293](https://github.com/mapbox/mapbox-gl-native/pull/14293) - -### Build - - Bump gestures library to v0.4.1 [#14435](https://github.com/mapbox/mapbox-gl-native/pull/14435) - - Update mapbox java sdk to v4.6.0 [#14424](https://github.com/mapbox/mapbox-gl-native/pull/14424) - - Bump telemetry to 4.4.1 [#14309](https://github.com/mapbox/mapbox-gl-native/pull/14309) - - Program against NativeMap [#14412](https://github.com/mapbox/mapbox-gl-native/pull/14412) - -## 7.3.2 - April 17, 2019 -## Bugs - - Unify has surface state handling, allow querying after map resume [#14426](https://github.com/mapbox/mapbox-gl-native/pull/14426) - -## 7.3.1 - April 12, 2019 -## Bugs - - Harden renderer invocation when Activity is resumed [#14395](https://github.com/mapbox/mapbox-gl-native/pull/14395) - - Check for Mapbox#INSTANCE when initializing the MapView [#14366](https://github.com/mapbox/mapbox-gl-native/pull/14366) - - Disable binary programs shaders [#14298](https://github.com/mapbox/mapbox-gl-native/pull/14298) - -## 7.4.0-alpha.2 - April 10, 2019 -### Bugs - - Check for Mapbox#INSTANCE when initializing the MapView [#14366](https://github.com/mapbox/mapbox-gl-native/pull/14366) - - Clear previous style loaded listener when setting a new style[#14338](https://github.com/mapbox/mapbox-gl-native/pull/14338) - -### Features - - Allow resetting a custom OkHttp client to the default impl [#14349](https://github.com/mapbox/mapbox-gl-native/pull/14349) - - Expose LocationComponentConstants class [#14333](https://github.com/mapbox/mapbox-gl-native/pull/14333) - -### Build - - Fix build with mismatching glShaderSource signature[#14339](https://github.com/mapbox/mapbox-gl-native/pull/14339) - -## 7.4.0-alpha.1 - April 3, 2019 - -### Bugs - - Clean up location permissions annotation [#14311](https://github.com/mapbox/mapbox-gl-native/pull/14311) - - Clear camera callbacks' message queue when the map is destroyed [#14292](https://github.com/mapbox/mapbox-gl-native/pull/14292) - - Use a valid gestures focal point when resetting a manager [#14284](https://github.com/mapbox/mapbox-gl-native/pull/14284) - - Disable move gesture detector foreseeing the quickzoom [#14268](https://github.com/mapbox/mapbox-gl-native/pull/14268) - - Remove request render from MapboxMap#onStart [#14245](https://github.com/mapbox/mapbox-gl-native/pull/14245) - - Use TurfMeasurement#distance in LatLng#distanceTo [#14220](https://github.com/mapbox/mapbox-gl-native/pull/14220) - -### Features - - Add pixel dimension annotation to public UiSettings methods [#14281](https://github.com/mapbox/mapbox-gl-native/pull/14281) - - Add #toString override for formatted sections [#14247](https://github.com/mapbox/mapbox-gl-native/pull/14247) - - Harden fetching camera for bounds when padding is excessive [#14221](https://github.com/mapbox/mapbox-gl-native/pull/14221) - - Traverse expression tree when checking for property overrides [#14259](https://github.com/mapbox/mapbox-gl-native/pull/14259) - - Variable label placement [#14184](https://github.com/mapbox/mapbox-gl-native/pull/14184) - -### Build - - Disable binary programs until we fix [#14294]((https://github.com/mapbox/mapbox-gl-native/pull/14298) - - Disable leak canary during instrumentation tests [#14296](https://github.com/mapbox/mapbox-gl-native/pull/14296) - - Remove Android v7 support library [#14265](https://github.com/mapbox/mapbox-gl-native/pull/14265) - -## 7.3.0 - March 28, 2019 - -### Bugs - - Fix MapView reuse issues [#14127](https://github.com/mapbox/mapbox-gl-native/pull/14127) - - Don't call OnSurfaceCreated from the main thread [#14244](https://github.com/mapbox/mapbox-gl-native/pull/14244) - -## 7.3.0-beta.1 - March 20, 2019 - -### Features - - Expose "text-color" option for formatted sections [#14128](https://github.com/mapbox/mapbox-gl-native/pull/14128) - - Expose LocationComponent's layer IDs [#14155](https://github.com/mapbox/mapbox-gl-native/pull/14155) - -### Bugs - - Cache location layer IDs in a set instead of a list [#14141](https://github.com/mapbox/mapbox-gl-native/pull/14141) - - Clear the style object when the map is destroyed [#14171](https://github.com/mapbox/mapbox-gl-native/pull/14171) - - Cache source/layer only when successfully added [#14171](https://github.com/mapbox/mapbox-gl-native/pull/14171) - -### Build - - Bump telemetry version to 4.3.0 [#14140](https://github.com/mapbox/mapbox-gl-native/pull/14140) - -## 7.3.0-alpha.2 - March 13, 2019 - -### Features -- Option to change path of the resources cache db [#13947](https://github.com/mapbox/mapbox-gl-native/pull/13947) -- Throw an exception if the component is accessed before the activation [#14068](https://github.com/mapbox/mapbox-gl-native/pull/14068) -- Add Galician localization [#14095](https://github.com/mapbox/mapbox-gl-native/pull/14095) - -### Bugs -- Set a blank style when an empty builder is provided [#14085](https://github.com/mapbox/mapbox-gl-native/pull/14085) -- Fix quick-zoom + double-tap gestures combo regression [#14084](https://github.com/mapbox/mapbox-gl-native/pull/14084) -- Explicitly declare MapboxIssueRegistry's lint version [#14086](https://github.com/mapbox/mapbox-gl-native/pull/14086) - -### Build -- Publish SNAPSHOTs to oss.jfrog.org [#14067](https://github.com/mapbox/mapbox-gl-native/pull/14067) - -## 7.3.0-alpha.1 - March 7, 2019 - -### Features -- Make ReLinker default library loader [#13974](https://github.com/mapbox/mapbox-gl-native/pull/13974) -- Add plural style builder methods [#14012](https://github.com/mapbox/mapbox-gl-native/pull/14012) -- Adding areAllGesturesEnabled() boolean retreival method to UiSettings class [#14022](https://github.com/mapbox/mapbox-gl-native/pull/14022) -- Adding builder pattern for LocationComponent activation [#13941](https://github.com/mapbox/mapbox-gl-native/pull/13941) -- Get vector drawables using AppCompatResources and set them programmatically [#14058](https://github.com/mapbox/mapbox-gl-native/pull/14058) - -### Bugs -- LatLngBounds: Fix constrain when crossing antimeridian [#13958](https://github.com/mapbox/mapbox-gl-native/pull/13958) -- Verify no native method is called when saving state [#13980](https://github.com/mapbox/mapbox-gl-native/pull/13980) -- Clear fragment's onMapReady callbacks as part of OnDestroy, not OnDestroyView [#14035](https://github.com/mapbox/mapbox-gl-native/pull/14035) -- Fix dialog fragment setup, add regression test [#14036](https://github.com/mapbox/mapbox-gl-native/pull/14036) -- Remove unused dem memory [#13550](https://github.com/mapbox/mapbox-gl-native/pull/13550) - -### Build -- Adding Bintray Gradle plugin for artifact publishing [#13999](https://github.com/mapbox/mapbox-gl-native/pull/13999) - -## 7.2.0 - February 27, 2019 - -### Bugs -- fix surface creation after app backgrounding for surfaceview[#13976](https://github.com/mapbox/mapbox-gl-native/pull/13976) - -## 7.2.0-beta.1 - February 21, 2019 - -### Bugs -- Keep location component's layers hidden when new style with the "layer-below" option is applied[#13936](https://github.com/mapbox/mapbox-gl-native/pull/13936) - -### Features -- Set localIdeographFontFamily default to sans-serif[#13925](https://github.com/mapbox/mapbox-gl-native/pull/13925) - -## 7.2.0-alpha.2 - February 14, 2019 - -### Bugs -- Invalidate the camera position when gesture finishes[#13920](https://github.com/mapbox/mapbox-gl-native/pull/13920) -- Hook into surface holder to cleanup renderer on the right thread before the surface is destroyed [#13926](https://github.com/mapbox/mapbox-gl-native/pull/13926) -- Fix deadlock in http request on hitting tile limit[#13858](https://github.com/mapbox/mapbox-gl-native/pull/13858) - -## 7.2.0-alpha.1 - February 7, 2019 - -### Build -- Update downstream circle-ci job name [#13872](https://github.com/mapbox/mapbox-gl-native/pull/13872) -- Prioritize running benchmarks when building master [#13801](https://github.com/mapbox/mapbox-gl-native/pull/13801) -- Revert modules vendorization and keep submodules only [#13806](https://github.com/mapbox/mapbox-gl-native/pull/13806) -- Run vendor submodule check [#13816](https://github.com/mapbox/mapbox-gl-native/pull/13816) -- Fetch tags during nitpick, bump gestures library to v0.4.0 [#13847](https://github.com/mapbox/mapbox-gl-native/pull/13847) - -### Bugs -- Test app fixes 7.1.0 QA [#13773](https://github.com/mapbox/mapbox-gl-native/pull/13773) -- Remove deprecated javacompile, resolve AS 3.3.0 warning on deprecation [#13777](https://github.com/mapbox/mapbox-gl-native/pull/13777) -- Update project readme with buck source file ignore configuration [#13788](https://github.com/mapbox/mapbox-gl-native/pull/13788) -- Fix LocationEngine's annotation [#13792](https://github.com/mapbox/mapbox-gl-native/pull/13792) -- Fix core-only layer creation [#13798](https://github.com/mapbox/mapbox-gl-native/pull/13798) -- Remove faulty cast to uint64_t, explict casting for cluster API [#13888](https://github.com/mapbox/mapbox-gl-native/pull/13888) - -### Features -- Separate quick zoom gesture option [#13791](https://github.com/mapbox/mapbox-gl-native/pull/13791) -- Location animators memory and CPU optimizations [#13678](https://github.com/mapbox/mapbox-gl-native/pull/13678) -- Added performance event [#13795](https://github.com/mapbox/mapbox-gl-native/pull/13795) -- Adding new variation of LocationComponent#activateLocationComponent [#13829](https://github.com/mapbox/mapbox-gl-native/pull/13829) -- Expose symbol placement transition duration option [#13868](https://github.com/mapbox/mapbox-gl-native/pull/13868) -- Add experimental pointer [#13889](https://github.com/mapbox/mapbox-gl-native/pull/13889) - -## 7.1.2 - February 7, 2019 - -### Bugs - - Fix layer not rendering correctly when property value's negative [#13888](https://github.com/mapbox/mapbox-gl-native/pull/13888) - -## 7.1.1 - February 1, 2019 - -### Bugs - - Fix a crash caused by the missing `Timber` dependency [#13847](https://github.com/mapbox/mapbox-gl-native/pull/13847) - -## 7.1.0 - January 30, 2019 - -### Build - - Revert Android vendorization, add submodule pinning [#13815](https://github.com/mapbox/mapbox-gl-native/pull/13815) - -## 7.1.0-beta.1 - January 23, 2019 - -### Bugs - - Ignore unused C++ arguments for all build environments [#13774](https://github.com/mapbox/mapbox-gl-native/pull/13774) - - Import gesture detector dimens using the correct package structure [#13750](https://github.com/mapbox/mapbox-gl-native/pull/13750) - - Restore location layer visibility with new "layer-below" [#13771](https://github.com/mapbox/mapbox-gl-native/pull/13771) - - Rename required TransitionOptions field [#13769](https://github.com/mapbox/mapbox-gl-native/pull/13769) - -### Build - - Ignore unused C++ arguments for all build environments [#13774](https://github.com/mapbox/mapbox-gl-native/pull/13774) - - Update to NDK 19, migrate STL experimental/optional [#13049](https://github.com/mapbox/mapbox-gl-native/pull/13049) - -## 7.1.0-alpha.3 - January 21, 2019 - -### Features - - Add library loading to peer objects [#13758](https://github.com/mapbox/mapbox-gl-native/pull/13758) - - Remove tile sorting from the clip and mask algorithms [#13756](https://github.com/mapbox/mapbox-gl-native/pull/13756) - - Ability to disable any layer using pre-processing flags [#13717](https://github.com/mapbox/mapbox-gl-native/pull/13717) - - Make library loader load the native library once [#13748](https://github.com/mapbox/mapbox-gl-native/pull/13748) - - Allow offline and snapshotter to be disabled [#13730](https://github.com/mapbox/mapbox-gl-native/pull/13730) - - Sorted render tiles for TilePyramid [#13739](https://github.com/mapbox/mapbox-gl-native/pull/13739) - -### Bugs - - Adjust maven pom file with vendorized libraries versions [#13765](https://github.com/mapbox/mapbox-gl-native/pull/13765) - - Update attribution feedback URL in code and tests [#13710](https://github.com/mapbox/mapbox-gl-native/pull/13710) - - Re-apply location components "layer-below" when changed [#13749](https://github.com/mapbox/mapbox-gl-native/pull/13749) - - Avoid leaking CompassView context through animator [#13743](https://github.com/mapbox/mapbox-gl-native/pull/13743) - - Allow resetting fps listener [#13733](https://github.com/mapbox/mapbox-gl-native/pull/13733) - -## 7.1.0-alpha.2 - January 16, 2019 - - Do not invoke #onCancel when animation is scheduled from #onFinish block [#13737](https://github.com/mapbox/mapbox-gl-native/pull/13737) - - Updated licenses after Android vendorization [#13738](https://github.com/mapbox/mapbox-gl-native/pull/13738) - - Use QueryFeatureExtension to query the map for supercluster v0.3.0 properties, add api for getLeaves, getChildren and getNextExpansionZoom [#13631](https://github.com/mapbox/mapbox-gl-native/pull/13631) - - Restore correct Snapshot attribution, make attribution parser backwards compatible [#13732](https://github.com/mapbox/mapbox-gl-native/pull/13732) - - Vendorize Android Mapbox dependencies [#13712](https://github.com/mapbox/mapbox-gl-native/pull/13712) - - Introduce NativeMap abstraction, remove static code block removal utility [#13681](https://github.com/mapbox/mapbox-gl-native/pull/13681) - - Notify requests about network reachability in priority order [#13721](https://github.com/mapbox/mapbox-gl-native/pull/13721) - - SymbolBucket, use single map for paint properties data [#13724](https://github.com/mapbox/mapbox-gl-native/pull/13724) - - Avoid NullPointerException when quickly closing activity for attribution click handling [#13723](https://github.com/mapbox/mapbox-gl-native/pull/13723) - - Return constexpr strings from functions to avoid ODR compile failures [#13720](https://github.com/mapbox/mapbox-gl-native/pull/13720) - - Split layer type specific code in mbgl::Programs [#13577](https://github.com/mapbox/mapbox-gl-native/pull/13577) - - Shader program must always match bucket in render symbol layer [#13667](https://github.com/mapbox/mapbox-gl-native/pull/13667) - - Implement Google benchmark runner for Android platform [#13628](https://github.com/mapbox/mapbox-gl-native/pull/13628) - - Avoid leaking attribution dialog when hosting context is stopped [#13673](https://github.com/mapbox/mapbox-gl-native/pull/13673) - - Android test runner for core unit tests [#13617](https://github.com/mapbox/mapbox-gl-native/pull/13617) - - Throw IllegalStateException when when setting an maximum fps while the mapRenderer isn't created yet [#13706](https://github.com/mapbox/mapbox-gl-native/pull/13706) - - Lift Parceable interface to OfflineRegionDefinition [#13688](https://github.com/mapbox/mapbox-gl-native/pull/13688) - - Espresso test rework [#13576](https://github.com/mapbox/mapbox-gl-native/pull/13576) - - -## 7.0.1 - January 11, 2019 - - Experimental setMaximumFps configuration on MapView [#13498](https://github.com/mapbox/mapbox-gl-native/pull/13498) - -## 7.1.0-alpha.1 - January 9, 2019 - - Add a Buck build and BUCK file for Android [#13584](https://github.com/mapbox/mapbox-gl-native/pull/13584) - - Instrumented unit tests, add map tests, refactor generated layer tests [#13443](https://github.com/mapbox/mapbox-gl-native/pull/13443) - - Add setMaximumFps configuration on MapView [#13498](https://github.com/mapbox/mapbox-gl-native/pull/13498) - - Fix deduping rings in quering [#11984](https://github.com/mapbox/mapbox-gl-native/pull/11984) - - Updated script detection for Unicode 11 [#13651](https://github.com/mapbox/mapbox-gl-native/pull/13651) - - Drop layer type and remaining usages [#13624](https://github.com/mapbox/mapbox-gl-native/pull/13624) - - Save debug cache state vs map state [#13638](https://github.com/mapbox/mapbox-gl-native/pull/13638) - - Add "localIdeographs" option to OfflineRegionDefinition [#13607](https://github.com/mapbox/mapbox-gl-native/pull/13607) - - Remove timber in favor of logger [#13625](https://github.com/mapbox/mapbox-gl-native/pull/13625) - -## 7.0.0 - January 7, 2019 - - Update core styles based on the streets-v8 source. This results in breaking changes for any code that references internal layers and sources of the style [#13615](https://github.com/mapbox/mapbox-gl-native/pull/13615) - - Cancel camera transitions only when set CameraMode is not None [#13662](https://github.com/mapbox/mapbox-gl-native/pull/13662) - - Fix location interval workaround initialization [#13670](https://github.com/mapbox/mapbox-gl-native/pull/13670) - -## 7.0.0-beta.2 - December 21, 2018 - - Mapbox services sdk version bump to 4.3.0 [#13610](https://github.com/mapbox/mapbox-gl-native/pull/13610) - - Added Style object parameter mention to LocationComponent methods [#13597](https://github.com/mapbox/mapbox-gl-native/pull/13597) - - Clean up remaining deprecated methods for 7.0.0 [#13613](https://github.com/mapbox/mapbox-gl-native/pull/13613) - - Dismiss the foreground color only when the style is loaded [#13582](https://github.com/mapbox/mapbox-gl-native/pull/13582) - - Location update fastest interval workaround[#13592](https://github.com/mapbox/mapbox-gl-native/pull/13592) - - CameraMode transition animation and result listeners[#13523](https://github.com/mapbox/mapbox-gl-native/pull/13523) - - Validate if weakreference is still valid [#13555](https://github.com/mapbox/mapbox-gl-native/pull/13555) - -## 6.8.1 - December 21, 2018 - - Telemetry bump to 3.5.7 [#13645](https://github.com/mapbox/mapbox-gl-native/pull/13645) - - Revert core styles back to streets-v7 source [#13648](https://github.com/mapbox/mapbox-gl-native/pull/13648) - -## 6.8.0 - December 19, 2018 - - Update core styles based on the streets-v8 source. This results in breaking changes for any code that references internal layers and sources of the style [#13615](https://github.com/mapbox/mapbox-gl-native/pull/13615) - - Fixed compass update time not getting updated [#13569](https://github.com/mapbox/mapbox-gl-native/pull/13569) - - Register compass sensor listener only if necessary [#13573](https://github.com/mapbox/mapbox-gl-native/pull/13573) - - Immediate location animation based on map's projection [#13545](https://github.com/mapbox/mapbox-gl-native/pull/13545) - - Option to disable smooth animation of compass and accuracy values [#13574](https://github.com/mapbox/mapbox-gl-native/pull/13574) - - Add onDidBecomeIdle to Map events [#13513](https://github.com/mapbox/mapbox-gl-native/pull/13513) - - Expose setAccessToken on Mapbox.java [#13397](https://github.com/mapbox/mapbox-gl-native/pull/13397) - - Expose endpoint change option for snapshotter [#13508](https://github.com/mapbox/mapbox-gl-native/pull/13508) - - Use locale sensitive DecimalFormat for color alpha conversion [#13393](https://github.com/mapbox/mapbox-gl-native/pull/13393) - - Enabled RecyclerView integration [#13132](https://github.com/mapbox/mapbox-gl-native/pull/13132) - -## 7.0.0-beta.1 - December 12, 2018 - - Style builder and Style.java [#13484](https://github.com/mapbox/mapbox-gl-native/pull/13484) - - LatLng bounds cannot be wrapped [#13419](https://github.com/mapbox/mapbox-gl-native/pull/13419) - - Expose endpoint change option for snapshotter [#13508](https://github.com/mapbox/mapbox-gl-native/pull/13508) - - Formatted "text-field" property setter [#13358](https://github.com/mapbox/mapbox-gl-native/pull/13358) - - Expose setAccesToken on Mapbox.java [#13397](https://github.com/mapbox/mapbox-gl-native/pull/13397) - - Immediately notify core about forced connectivity state [#13485](https://github.com/mapbox/mapbox-gl-native/pull/13485) - - Handle transition duration of 0ms for symbols [#13535](https://github.com/mapbox/mapbox-gl-native/pull/13535) - - Returning boolean when removing sources and layers [#13428](https://github.com/mapbox/mapbox-gl-native/pull/13428) - - Telemetry v4.1.1 bump [#13499](https://github.com/mapbox/mapbox-gl-native/pull/13499) - - mapbox-java 4.2.0 bump [#13507](https://github.com/mapbox/mapbox-gl-native/pull/13507) - -## 7.0.0-alpha.3 - November 30, 2018 - - Add `fill-extrusion-vertical-gradient` fill paint property [#13463](https://github.com/mapbox/mapbox-gl-native/pull/13463) - - Don't cancel core transitions on MotionEvent#ACTION_CANCEL [#13465](https://github.com/mapbox/mapbox-gl-native/pull/13465) - - Require context in AttributionParser.Options [#13444](https://github.com/mapbox/mapbox-gl-native/pull/13444) - - Deprecated annotations package [#13468](https://github.com/mapbox/mapbox-gl-native/pull/13468) - - Send turnstile event while create MapSnapshotter instance [#13475](https://github.com/mapbox/mapbox-gl-native/pull/13475) - - Remove default zoom level restrictions when activating the location component [#13425](https://github.com/mapbox/mapbox-gl-native/pull/13425) - -## 6.7.2 - November 30, 2018 - - Telemetry v3.5.6 [#13486](https://github.com/mapbox/mapbox-gl-native/pull/13486) - - Add "localIdeographFontFamily" setting to MapSnapshotter to reduce font data usage while snapshotting CJK maps [#13427](https://github.com/mapbox/mapbox-gl-native/pull/13427) - - Send turnstile event while creating MapSnapshotter instance [#13475](https://github.com/mapbox/mapbox-gl-native/pull/13475) - -## 7.0.0-alpha.2 - November 21, 2018 - - Add overlay example with custom drawing using paint and canvas [#13431](https://github.com/mapbox/mapbox-gl-native/pull/13431) - - Use --info argument to show details during test run [#13415](https://github.com/mapbox/mapbox-gl-native/pull/13415) - - Add specific name logging in failure scenarios of PropertyValue [#13409](https://github.com/mapbox/mapbox-gl-native/pull/13409) - - Fixed constant layer filter [#13406](https://github.com/mapbox/mapbox-gl-native/pull/13406) - - Update map feedback URL [#13396](https://github.com/mapbox/mapbox-gl-native/pull/13396) - - Use locale sensitive DecimalFormat for color alpha conversion [#13393](https://github.com/mapbox/mapbox-gl-native/pull/13393) - - Fixed `{prefix}` in tile resource URLs [#13429](https://github.com/mapbox/mapbox-gl-native/pull/13429) - -## 6.7.1 - November 16, 2018 - - Telemetry v3.5.4 [#13330](https://github.com/mapbox/mapbox-gl-native/pull/13330) - -## 7.0.0-alpha.1 - November 14, 2018 - - Added Nullable and NonNull annotations [#13274](https://github.com/mapbox/mapbox-gl-native/pull/13274) - - Catch and re-throw throwables thrown inside map state callbacks [#13351](https://github.com/mapbox/mapbox-gl-native/pull/13351) - - Removed deprecated code and notices [#13244](https://github.com/mapbox/mapbox-gl-native/pull/13244) - - Update to mapbox java services 4.1.0 [#13357](https://github.com/mapbox/mapbox-gl-native/pull/13357) - - Removed deprecated color conversion from PropertyFactory [#13337](https://github.com/mapbox/mapbox-gl-native/pull/13337) - - Removed deprecated OnMapChange interface and implementation [#13240](https://github.com/mapbox/mapbox-gl-native/pull/13240) - - Cleanup isDismissible flag [#13197](https://github.com/mapbox/mapbox-gl-native/pull/13179) - - Removed java 8 language features [#13193](https://github.com/mapbox/mapbox-gl-native/pull/13193) - - Removed ZoomButtonsController support [#13198](https://github.com/mapbox/mapbox-gl-native/pull/13198) - - Changed CustomGeometrySource() signature to be Kotlin friendly [#13178](https://github.com/mapbox/mapbox-gl-native/pull/13178) - - Removed ILatLng and IProjectedMeteres [#13176](https://github.com/mapbox/mapbox-gl-native/pull/13176) - - Option to consume map clicks, consuming location clicks [#13205](https://github.com/mapbox/mapbox-gl-native/pull/13205) - - Consolidated OfflineRegionDefinitions [#13180](https://github.com/mapbox/mapbox-gl-native/pull/13180) - - Added scrollBy() to MapboxMap, depricated CameraUpdate.scrollBy() [#13223](https://github.com/mapbox/mapbox-gl-native/pull/13223) - - Improved CustomGeometrySource constructor typing [#13200](https://github.com/mapbox/mapbox-gl-native/pull/13200) - - Removed deprecated MarkerView[#13194](https://github.com/mapbox/mapbox-gl-native/pull/13194) - - Annotate onMapReady with @NonNull [#13307](https://github.com/mapbox/mapbox-gl-native/pull/13307) - -## 6.6.7 - November 8, 2018 - - Telemetry v3.5.4 [#13330](https://github.com/mapbox/mapbox-gl-native/pull/13330) - -## 6.6.6 - November 8, 2018 - - This release should be skipped in favor of the `v6.6.7`. - -## 6.7.0 - November 7, 2018 - - Handle null getMapAsync invocations, deliver onMapReady only once [#13301](https://github.com/mapbox/mapbox-gl-native/pull/13301) - - Verify if `text-field` is not null before performing compatibility operations [#13294](https://github.com/mapbox/mapbox-gl-native/pull/13294) - - Log Java exception and fail silently instead of throwing a native exception in the map state callbacks[#13294](https://github.com/mapbox/mapbox-gl-native/pull/13294) - - Reintroduce OnMapChange invocation [#13289](https://github.com/mapbox/mapbox-gl-native/pull/13289) - - Null-check nativeMapView in case it's destroyed [#13281](https://github.com/mapbox/mapbox-gl-native/pull/13281) - -## 6.6.5 - November 2, 2018 - - Telemetry v3.5.2 [#13258](https://github.com/mapbox/mapbox-gl-native/pull/13258) - -## 6.6.4 - November 1, 2018 - - Fix crash with non AppCompatActivities [#13222](https://github.com/mapbox/mapbox-gl-native/pull/13222) - - Telemetry bump 3.5.1 [#13204](https://github.com/mapbox/mapbox-gl-native/pull/13204) - - Gestures library 0.3.0 [#13234](https://github.com/mapbox/mapbox-gl-native/pull/13234) - -## 6.7.0-beta.1 - October 31, 2018 - - Remove map initialised check [#13224](https://github.com/mapbox/mapbox-gl-native/pull/13224) - - Upgrade GeoJSONVT to v6.6.2 [#13231](https://github.com/mapbox/mapbox-gl-native/pull/13231) - - Deliver OnMapReady at end of initialisation block [#13220](https://github.com/mapbox/mapbox-gl-native/pull/13220) - - Rework MapCallback to execute in correct order [#13203](https://github.com/mapbox/mapbox-gl-native/pull/13203) - - Deprecate map zoom button controller [#13197](https://github.com/mapbox/mapbox-gl-native/pull/13197) - - RenderState API [#13170](https://github.com/mapbox/mapbox-gl-native/pull/13170) - - Avoid wrapping longitude values at dateline [#13006](https://github.com/mapbox/mapbox-gl-native/pull/13006) - -## 6.7.0-alpha.2 - October 24, 2018 - - Format expression support [#12985](https://github.com/mapbox/mapbox-gl-native/pull/12985) - - Remove view tree observer [#13133](https://github.com/mapbox/mapbox-gl-native/pull/13133) - - Revert infer nullity [#13147](https://github.com/mapbox/mapbox-gl-native/pull/13147) - - Add priorities to requests [#13019](https://github.com/mapbox/mapbox-gl-native/pull/13019) - - Avoid using and [#13135](https://github.com/mapbox/mapbox-gl-native/pull/13135) - - Introduce mgbl::RenderState [#13123](https://github.com/mapbox/mapbox-gl-native/pull/13123) - - Ensure queryRenderedFeatures accounts for icon-rotate [#13105](https://github.com/mapbox/mapbox-gl-native/pull/13105) - - Add 'putResourceForURL' for pre-warming ambient cache [#13119](https://github.com/mapbox/mapbox-gl-native/pull/13119) - -## 6.6.2/6.6.3 - October 24, 2018 - - Remove requirement on vectorDrawables.useSupportLibrary [#13168](https://github.com/mapbox/mapbox-gl-native/pull/13168) - - File source deactivate called before callbacks [#13146](https://github.com/mapbox/mapbox-gl-native/pull/13168) - -## 6.7.0-alpha.1 - October 17, 2018 - - Core format expression integration [#12624](https://github.com/mapbox/mapbox-gl-native/pull/12624) - - Remove obsolete catch block in getLayerAs [#13091](https://github.com/mapbox/mapbox-gl-native/pull/13091) - - Include Mapbox SDK Services proguard configuration [#13103](https://github.com/mapbox/mapbox-gl-native/pull/13103) - - Avoid printing exception for valid code path when loading FileSource [#13102](https://github.com/mapbox/mapbox-gl-native/pull/13102) - - Add equals, hashcode and toString to camera update types [#13089](https://github.com/mapbox/mapbox-gl-native/pull/13089) - - Infer nullity, optimise codebase for consumption by kotlin [#13071](https://github.com/mapbox/mapbox-gl-native/pull/13071) - - Replace OnMapchange with specific callbacks [#13050](https://github.com/mapbox/mapbox-gl-native/pull/13050) - - Offline region creation telemetry event [#12544](https://github.com/mapbox/mapbox-gl-native/pull/12544) - -## 6.6.1 - October 17, 2018 - - Use appcompat resource configuration for vector drawables [#13114](https://github.com/mapbox/mapbox-gl-native/pull/13114) - - Reverse order of prioritising shape vs marker click handling [#13059](https://github.com/mapbox/mapbox-gl-native/pull/13059) - -## 6.6.0 - October 11, 2018 - - Fixed an issue where fill and line layers would occasionally flicker on zoom [#12982](https://github.com/mapbox/mapbox-gl-native/pull/12982) - -## 6.6.0-beta.1 - October 3, 2018 - - Add configuration to change the animation duration multiplier when tracking location [#13011](https://github.com/mapbox/mapbox-gl-native/pull/13011) - - Move camera and puck immediately when starting to track and displacement is big [#13013](https://github.com/mapbox/mapbox-gl-native/pull/13013) - -## 6.6.0-alpha.2 - September 26, 2018 - - Expose offline database merge API [#12860](https://github.com/mapbox/mapbox-gl-native/pull/12860) - - Remove unnecessary camera callbacks loops [#12973](https://github.com/mapbox/mapbox-gl-native/pull/12973) - - Fix an issue where `OnCameraMoveListener#onCameraMove` would not get invoked while using `LocationComponent` [#12932](https://github.com/mapbox/mapbox-gl-native/pull/12932) - - Try not to re-draw tiles when coming back from background [#12844](https://github.com/mapbox/mapbox-gl-native/pull/12844) - - Proguard config revision [#12929](https://github.com/mapbox/mapbox-gl-native/pull/12929) - - Improve compatibility of offline packs between devices [#12933](https://github.com/mapbox/mapbox-gl-native/pull/12933) - - Update telemetry dependency to 3.2.1 [#12974](https://github.com/mapbox/mapbox-gl-native/pull/12974) - - Fix an issue where some tiles weren't rendered correctly when no internet connectivity was available [#12931](https://github.com/mapbox/mapbox-gl-native/pull/12931) - -## 6.6.0-alpha.1 - September 19, 2018 - - Merge LocationLayerPlugin to the Maps SDK [#12786](https://github.com/mapbox/mapbox-gl-native/pull/12786) - - Add `symbol-z-order` symbol layout property to style spec [#12783](https://github.com/mapbox/mapbox-gl-native/pull/12783) - - Add "crossSourceCollisions" map option [#12842](https://github.com/mapbox/mapbox-gl-native/pull/12842) - - "is-supported-script" expression support [#12845](https://github.com/mapbox/mapbox-gl-native/pull/12845) - - Update isEmulator check [#12832](https://github.com/mapbox/mapbox-gl-native/pull/12832) - - Prevent crash when expression evaluates to default, no pattern [#12896](https://github.com/mapbox/mapbox-gl-native/pull/12896) - - Fixed bugs in coercion expression operators ("to-array" applied to empty arrays, "to-color" applied to colors, and "to-number" applied to null) [#12864](https://github.com/mapbox/mapbox-gl-native/pull/12864) - - Update proguard config to not warn about AutoValue [#12920](https://github.com/mapbox/mapbox-gl-native/pull/12920) - - Remove nunicode from android binding [#12497](https://github.com/mapbox/mapbox-gl-native/pull/12497) - - Correct LatLngBounds exception message [#12816](https://github.com/mapbox/mapbox-gl-native/pull/12816) - -## 6.5.0 - September 11, 2018 - - Fixed a cubic-bezier interpolation bug. [#12812](https://github.com/mapbox/mapbox-gl-native/issues/12812) - - Fixed an issue that could cause "allow-overlap" symbols to fade in during pan operations instead of always showing. [#12683](https://github.com/mapbox/mapbox-gl-native/issues/12683) - -## 6.5.0-beta.1 - September 5, 2018 - - Retain shared thread pool reference [#12811](https://github.com/mapbox/mapbox-gl-native/pull/12811) - - MapStrictMode configuration [#12817](https://github.com/mapbox/mapbox-gl-native/pull/12817) - - Provide correct expression integration for newly created properties [#12809](https://github.com/mapbox/mapbox-gl-native/pull/12809) - - Get source id for supported layer types [#12801](https://github.com/mapbox/mapbox-gl-native/pull/12801) - - Check if map is destroyed before saving state in a fragment [#12804](https://github.com/mapbox/mapbox-gl-native/pull/12804) - - Bump leak canary to 1.6.1 [#12767](https://github.com/mapbox/mapbox-gl-native/pull/12767) - - Add quotes to string representation of string literal [#12768](https://github.com/mapbox/mapbox-gl-native/pull/12768) - - Make improve this map translatable [#12785](https://github.com/mapbox/mapbox-gl-native/pull/12785) - - Add Keep annotation to abstract components [#12796](https://github.com/mapbox/mapbox-gl-native/pull/12796) - - Gradle tools 3.1.4 [#12795](https://github.com/mapbox/mapbox-gl-native/pull/12795) - - Explicitly remove local references [#12774](https://github.com/mapbox/mapbox-gl-native/pull/12774) - - Add more languages to tx config file [#12719](https://github.com/mapbox/mapbox-gl-native/pull/12719) - - Add support for feature expressions in `line-pattern`, `fill-pattern`, and `fill-extrusion-pattern` properties. [#12284](https://github.com/mapbox/mapbox-gl-native/pull/12284) - -## 6.5.0-alpha.2 - August 29, 2018 - - Keep arbitrary region fields and constructor of OfflineGeometryRegionDefinition while obfuscating [#12734](https://github.com/mapbox/mapbox-gl-native/pull/12734) - - Modularise the SDK [#12468](https://github.com/mapbox/mapbox-gl-native/pull/12468) - - Invalidate InfoWindow's y offset when content is set [#12715](https://github.com/mapbox/mapbox-gl-native/pull/12715) - - Synchronize and coalesce requests targeting the same TileID in the CustomGeometrySource [#12509](https://github.com/mapbox/mapbox-gl-native/pull/12509) - - Line gradient support [#12575](https://github.com/mapbox/mapbox-gl-native/pull/12575) - -## 6.5.0-alpha.1 - August 22, 2018 - - Don't default-show text/icons that depend on the placement of a paired icon/text [#12483](https://github.com/mapbox/mapbox-gl-native/issues/12483) - - Fix symbol querying for markers near tile boundaries at high zoom. ([#12472](https://github.com/mapbox/mapbox-gl-native/issues/12472)) - - Hide peer constructors [#12639](https://github.com/mapbox/mapbox-gl-native/pull/12639) - - Shutting down thread pool of the CustomGeometrySource when the source is destroyed [#12517](https://github.com/mapbox/mapbox-gl-native/pull/12517) - - Harden offline database [#12224](https://github.com/mapbox/mapbox-gl-native/pull/12224) - - Obtain paths to file directories on a worker thread [#12657](https://github.com/mapbox/mapbox-gl-native/pull/12657) - - Arbitrary offline region shapes [#11447](https://github.com/mapbox/mapbox-gl-native/pull/11447) - - Make AndroidRendererFrontend to request render once per event loop [#12586](https://github.com/mapbox/mapbox-gl-native/issues/12586) - - Converting GeoJsonSource features asynchronously [#12580](https://github.com/mapbox/mapbox-gl-native/pull/12580) - - StyleJson configuration on MapboxMapOptions [#12664](https://github.com/mapbox/mapbox-gl-native/pull/12664) - - Update MapInitializer for OfflineRegionDefinition [#12686](https://github.com/mapbox/mapbox-gl-native/pull/12686) - - Offline symbol render example using AssetFileSource [#12676](https://github.com/mapbox/mapbox-gl-native/pull/12676) - - Added Chinese translations [#12696](https://github.com/mapbox/mapbox-gl-native/pull/12696) - - Collator and resolved-locale expressions [#12688](https://github.com/mapbox/mapbox-gl-native/pull/12688) - - Update telemetry user-agent [#12706](https://github.com/mapbox/mapbox-gl-native/pull/12706) - - Replace hardcoded telemetry settings string with resources [#12707](https://github.com/mapbox/mapbox-gl-native/pull/12707) - - Update GeoJsonOptions javadoc [#12709](https://github.com/mapbox/mapbox-gl-native/pull/12709) - -## 6.4.0 - August 15, 2018 - - Use unconverted bearing value for LatLngBounds calculation [#12616](https://github.com/mapbox/mapbox-gl-native/pull/12616) - - Store release so files with debugging information [#12628](https://github.com/mapbox/mapbox-gl-native/pull/12628) - - Close a security vulnerability introduced in v6.2.0 that would potentially allow the owner of a style to compromise apps loading that style. - -## 6.4.0-beta.1 - August 9, 2018 - - Don't prefetch tiles for geojson sources [#12529](https://github.com/mapbox/mapbox-gl-native/pull/12529) - - Enable LTO in release builds [#12546](https://github.com/mapbox/mapbox-gl-native/pull/12546) - - Update Java Services to v3.4.0 [#12564](https://github.com/mapbox/mapbox-gl-native/pull/12564) - - Telemetry bump to 3.1.5 [#12589](https://github.com/mapbox/mapbox-gl-native/pull/12589) - -## 6.4.0-alpha.2 - August 1, 2018 - - Compress shader source code [#12477](https://github.com/mapbox/mapbox-gl-native/pull/12477) - - Add minimal touch target to marker click detection [#12482](https://github.com/mapbox/mapbox-gl-native/pull/12482) - - Improve resulting APK size by using @Keep annotation [#12490](https://github.com/mapbox/mapbox-gl-native/pull/12490) - - Reuse Bitmap, Paint & Canvas instances in LocalGlyphRasterizer [#12488](https://github.com/mapbox/mapbox-gl-native/pull/12488) - - Remove black surface during map start up [#12377](https://github.com/mapbox/mapbox-gl-native/pull/12377) - - Corrected VisibleRegion on rotated map [#12255](https://github.com/mapbox/mapbox-gl-native/pull/12255) - - Tweak conversions to reduce binary size [#12511](https://github.com/mapbox/mapbox-gl-native/pull/12511) - -## 6.4.0-alpha.1 - July 25, 2018 - - Validate if gesture detector is able to handle gesture [#12375](https://github.com/mapbox/mapbox-gl-native/pull/12375) - - Add a convenience method to check whether the map is in a destroyed state, MapView#isDestroyed [#12373](https://github.com/mapbox/mapbox-gl-native/pull/12373) - - Add GeoJSON regression tests for java method look up from JNI [#12354](https://github.com/mapbox/mapbox-gl-native/pull/12354) - - Bump kotlin, timber and okhttp dependencies [#12393](https://github.com/mapbox/mapbox-gl-native/pull/12393) - - Harden map events creation [#12405](https://github.com/mapbox/mapbox-gl-native/pull/12405) - - Fix possibly race on undefined behavior [#12408](https://github.com/mapbox/mapbox-gl-native/pull/12408) - - Option to request the visible region restricted by the content padding [#12407](https://github.com/mapbox/mapbox-gl-native/pull/12407) - - Expose getMap [#12444](https://github.com/mapbox/mapbox-gl-native/pull/12444) - - Correct access token validation [#12458](https://github.com/mapbox/mapbox-gl-native/pull/12458) - - Port `symbol-placement: line-center` to native [#12337](https://github.com/mapbox/mapbox-gl-native/pull/12337) - - Token string syntax (`"{token}"`) in `SymbolLayer` `textField` and `iconImage` property values is now correctly converted to the appropriate expression equivalent. ([#11659](https://github.com/mapbox/mapbox-gl-native/issues/11659)) - - Fixed a crash when switching between two styles having layers with the same identifier but different layer types. ([#12432](https://github.com/mapbox/mapbox-gl-native/issues/12432)) - -## 6.3.0 - July 18, 2018 - - Harden map events creation [#12406](https://github.com/mapbox/mapbox-gl-native/pull/12406) - -## 6.3.0-beta.1 - July 11, 2018 - - Fix JNI lookup of FeatureCollection, add regression test [#12344](https://github.com/mapbox/mapbox-gl-native/pull/12344) - - Added draggable marker example activity, add kotlin support to test app [@12326](https://github.com/mapbox/mapbox-gl-native/pull/12326) - - Telemetry bump to v3.1.4 [#12349](https://github.com/mapbox/mapbox-gl-native/pull/12349) - - Remove unnecessary memory use when collision debug mode is not enabled ([#12294](https://github.com/mapbox/mapbox-gl-native/issues/12294)) - -## 6.3.0-alpha.2 - July 5, 2018 - - Add LatLngForScreenCoordinate to MapSnapshotter API, This allows to convert a LatLng value to the x,y position on the MapSnasphot image [#12221](https://github.com/mapbox/mapbox-gl-native/pull/12221) - - Expose multiple getCameraFor equivalent methods to convert a geometry or a bounds to a camera position with taking in account padding, tilt and bearing [#12290](https://github.com/mapbox/mapbox-gl-native/pull/12290) - - Avoid race condition when calling getMapAsync from a non-UI thread when running instrumentation tests [#12308](https://github.com/mapbox/mapbox-gl-native/pull/12308) - -## 6.2.1 - June 27, 2018 - - Backport range alpha values from 0 to 1 with int color conversion [#12235](https://github.com/mapbox/mapbox-gl-native/pull/12235) - -## 6.3.0-alpha.1 - June 27, 2018 - - Range alpha values from 0 to 1 with int color conversion [#12210](https://github.com/mapbox/mapbox-gl-native/pull/12210) - - Remove reflection lookup for MarkerViewAdapter intialisation [#12218](https://github.com/mapbox/mapbox-gl-native/pull/12218) - - GeoJSON clustering expressions logic change [#12211](https://github.com/mapbox/mapbox-gl-native/pull/12211) - - Add SDF support, allow template images to be tinted [#12181](https://github.com/mapbox/mapbox-gl-native/pull/12181) - - Add android licenses tool, update licenses [#12153](https://github.com/mapbox/mapbox-gl-native/pull/12153) - -## 6.2.0 - June 20, 2018 - - Remove support for Fabric [#12126](https://github.com/mapbox/mapbox-gl-native/pull/12126) - - Dispatch camera start callback only when actually moving [#12172](https://github.com/mapbox/mapbox-gl-native/pull/12172) - -## 6.2.0-beta.3 - June 15, 2018 - - Always commit symbol placement [#12076](https://github.com/mapbox/mapbox-gl-native/pull/12076) - - Ceil map dimensions [#12116](https://github.com/mapbox/mapbox-gl-native/pull/12116) - - Fix match stop conversion [#12128](https://github.com/mapbox/mapbox-gl-native/pull/12128) - - Telemetry bump to v3.1.3 [#12156](https://github.com/mapbox/mapbox-gl-native/pull/12156) - -## 6.2.0-beta.2 - June 7, 2018 - - Ensure that camera is invalidated before generating telemetry event [#12042](https://github.com/mapbox/mapbox-gl-native/pull/12042) - - Offline download batches [#11284](https://github.com/mapbox/mapbox-gl-native/pull/11284) - - Parse Fragment's xml attributes [#12078](https://github.com/mapbox/mapbox-gl-native/pull/12078) - -## 6.2.0-beta.1 - May 31, 2018 - - Bump mapbox-java to 3.2.0 [#12036](https://github.com/mapbox/mapbox-gl-native/pull/12036) - - Optional camera position for map snapshotter [#12028](https://github.com/mapbox/mapbox-gl-native/pull/12029) - - Expose enableOnUserRequest and disableOnUserRequest on Telemetry [#12024](https://github.com/mapbox/mapbox-gl-native/pull/12024) - - Add style json setter/getter to map snapshotter [#12031](https://github.com/mapbox/mapbox-gl-native/pull/12031) - - Fix literal wrapping in comparison expressions [#12022](https://github.com/mapbox/mapbox-gl-native/pull/12022) - - Null check access token in filesource initializer [#12023](https://github.com/mapbox/mapbox-gl-native/pull/12023) - - Allow literal expression property arguments [#12018](https://github.com/mapbox/mapbox-gl-native/pull/12018) - - Raw expression support [#12007](https://github.com/mapbox/mapbox-gl-native/pull/12007) - -## 6.2.0-alpha.2 - May 25, 2018 - - UI Thread checking [#12000](https://github.com/mapbox/mapbox-gl-native/pull/12000) - - Don't force having an Mapbox access token [#12001](https://github.com/mapbox/mapbox-gl-native/pull/12001) - - Unknown tokens in URLs are now preserved, rather than replaced with an empty string [#11787](https://github.com/mapbox/mapbox-gl-native/issues/11787) - - Update onMapChange Listener javadoc [#11972](https://github.com/mapbox/mapbox-gl-native/pull/11972) - - Set Tile loaded/rendered instead of marking tile as optional [#11985](https://github.com/mapbox/mapbox-gl-native/pull/11985) - - Wrap glGetString in `MBGL_CHECK_ERROR` too [#11106](https://github.com/mapbox/mapbox-gl-native/pull/11106) - - Accept constant expression in non-dds properties [#11960](https://github.com/mapbox/mapbox-gl-native/pull/11960) - - Style JSON configuration in Snapshotter [#11976](https://github.com/mapbox/mapbox-gl-native/pull/11976) - - Remove mips and armeabi as supported ABI, update to NDK 17 [#11458](https://github.com/mapbox/mapbox-gl-native/pull/11458) - - Re-assign ids when lng jumps to avoid flicker [#11938](https://github.com/mapbox/mapbox-gl-native/pull/11938) - - Change modifier MapView#initialize to allow subclassing [#11969](https://github.com/mapbox/mapbox-gl-native/pull/11969) - - Avoid symbol flickering when longitude is wrapped [#11938](https://github.com/mapbox/mapbox-gl-native/pull/11938) - - Fix hang when parsing very large angles for hue in hsl colors [#11968](https://github.com/mapbox/mapbox-gl-native/pull/11968) - - Clamp TileJSON.bounds latitudes to [-90, 90] [#11964](https://github.com/mapbox/mapbox-gl-native/pull/11964) - - Align URL token replacement with GL-JS [#11953](https://github.com/mapbox/mapbox-gl-native/pull/11953) - - Align match behaviour [#11935](https://github.com/mapbox/mapbox-gl-native/pull/11935) - -## 6.1.3 - May 23, 2018 - - Circle querying fixes [#11571](https://github.com/mapbox/mapbox-gl-native/pull/11571) - - Global symbol query [#11742](https://github.com/mapbox/mapbox-gl-native/pull/11742) - - Change MapView#initialize modifier to allow overriding [#11969](https://github.com/mapbox/mapbox-gl-native/pull/11969) - - Update telemetry to 3.1.2 [#11987](https://github.com/mapbox/mapbox-gl-native/pull/11987) - -## 6.1.2 - May 18, 2018 - - Update telemetry to 3.1.1 [#11942](https://github.com/mapbox/mapbox-gl-native/pull/11942) - -## 6.2.0-alpha.1 - May 17, 2018 - - `"to-string"` expression operator converts `null` to empty string rather than to `"null"` [#11904](https://github.com/mapbox/mapbox-gl-native/pull/11904) - - Expose MapView#setOfflineRegion [#1922](https://github.com/mapbox/mapbox-gl-native/pull/11922) - - Add nullability annotations to public API for kotlin language integration [#11925](https://github.com/mapbox/mapbox-gl-native/pull/11925) - - Expose MapView created callbacks on MapFragment and SupportMapFragment [#11934](https://github.com/mapbox/mapbox-gl-native/pull/11934) - - Update mapbox-java to 3.1.0 [#11916](https://github.com/mapbox/mapbox-gl-native/pull/11916) - -## 6.1.1 - May 7, 2018 - - Update telemetry to 3.1.0 [#11855](https://github.com/mapbox/mapbox-gl-native/pull/11855) - -## 6.1.0 - May 4, 2018 - - Unwrap LatLngBounds during JNI conversion [#11807](https://github.com/mapbox/mapbox-gl-native/pull/11807) - - Check if renderer is not destroyed before delivering snapshot [#11800](https://github.com/mapbox/mapbox-gl-native/pull/11800) - - Null-check source before removing [#11789](https://github.com/mapbox/mapbox-gl-native/pull/11789) - - Flutter support: promote pixel-ratio to public API NativeMapView [#11772](https://github.com/mapbox/mapbox-gl-native/pull/11772) - - Unwrap LatLngBounds for the shortest path when requesting camera [#11759](https://github.com/mapbox/mapbox-gl-native/pull/11759) - - Flutter support: integrate view callback abstraction [#11706](https://github.com/mapbox/mapbox-gl-native/pull/11706) - - Match expression doc tweaks [#11691](https://github.com/mapbox/mapbox-gl-native/pull/11691) - - Improve stop javadoc to include interpolate [#11677](https://github.com/mapbox/mapbox-gl-native/pull/11677) - - Reduce per-frame render CPU time [#11811](https://github.com/mapbox/mapbox-gl-native/issues/11811) - - Add Korean localization [#11792](https://github.com/mapbox/mapbox-gl-native/pull/11792) - - Add Danish localization; update Hungarian, Russian, Swedish translations [#11136](https://github.com/mapbox/mapbox-gl-native/pull/11136) - -## 5.5.3 - May 4, 2018 - - Check if renderer is not destroyed before delivering snapshot [#11800](https://github.com/mapbox/mapbox-gl-native/pull/11800) - -## 6.0.1 - April 17, 2018 - - Bump telemetry version to 3.0.2 [#11710](https://github.com/mapbox/mapbox-gl-native/pull/11710) - -## 6.0.0 - April 17, 2018 - - Bump telemetry version to 3.0.1 [#11700](https://github.com/mapbox/mapbox-gl-native/pull/11700) - - Update layer when changing its min/max zoom [#11687](https://github.com/mapbox/mapbox-gl-native/pull/11687) - -## 6.0.0-beta.7 - April 12, 2018 - - Add abs, round, floor, ceil expression operators [#11653](https://github.com/mapbox/mapbox-gl-native/pull/11653) - - LatLngBounds correct center calculation [#11650](https://github.com/mapbox/mapbox-gl-native/pull/11650) - - Bump telemetry to 3.0.0 final [#11658](https://github.com/mapbox/mapbox-gl-native/pull/11658) - - Correctly calculate LatLngBounds [#11647](https://github.com/mapbox/mapbox-gl-native/pull/11647) - - Add convenience step expression [#11641](https://github.com/mapbox/mapbox-gl-native/pull/11641) - - Add javadoc examples for Android [#11540](https://github.com/mapbox/mapbox-gl-native/pull/11540) - - Add paused state to map renderer, don't render snapshots after onPause [#11358](https://github.com/mapbox/mapbox-gl-native/pull/11358) - - Rework internal expression conversion [#11490](https://github.com/mapbox/mapbox-gl-native/pull/11490) - - Fixed gesture event listeners javadoc [#11630](https://github.com/mapbox/mapbox-gl-native/pull/11630) - - Add delete local reference on jni strings [#11608](https://github.com/mapbox/mapbox-gl-native/pull/11608) - - Release local references early [#11599](https://github.com/mapbox/mapbox-gl-native/pull/11599) - - Re-bind uniform locations after re-linking program [#11618](https://github.com/mapbox/mapbox-gl-native/pull/11618) - - Bump mapbox-sdk-services to 3.0.1 [#11593](https://github.com/mapbox/mapbox-gl-native/pull/11593) - -## 5.5.2 - April 10, 2018 - - Correct animation scale point [#11643](https://github.com/mapbox/mapbox-gl-native/pull/11643) - - Re-bind uniform locations after re-linking program [#11583](https://github.com/mapbox/mapbox-gl-native/pull/11583) - - Invalidate camera position before delivering onMapReady [#11585](https://github.com/mapbox/mapbox-gl-native/pull/11585) - - Null java peer callback [#11358](https://github.com/mapbox/mapbox-gl-native/pull/11358) - - Add missing delete local reference [#11608](https://github.com/mapbox/mapbox-gl-native/pull/11608) - - Release local refs [#11599](https://github.com/mapbox/mapbox-gl-native/pull/11599) - -## 6.0.0-beta.6 - April 4, 2018 - - Fix race condition crash for heavily modified annotations [#11551](https://github.com/mapbox/mapbox-gl-native/pull/11551) - - Throw exception when converting PropertyValue with an expression [#11572](https://github.com/mapbox/mapbox-gl-native/pull/11572) - - Invalidate camera position before delivering onMapReady [#11585](https://github.com/mapbox/mapbox-gl-native/pull/11585) - - Rework logical condition convenience expressions [#11555](https://github.com/mapbox/mapbox-gl-native/pull/11555) - - Telemetry library version update to 3.0.0-beta.4 [#11590](https://github.com/mapbox/mapbox-gl-native/pull/11590) - -## 6.0.0-beta.5 - March 27, 2018 - - Avoid flashing on pitched overzoomed tiles [#11488](https://github.com/mapbox/mapbox-gl-native/pull/11488) - - Literal array conversion of primitive arrays [#11500](https://github.com/mapbox/mapbox-gl-native/pull/11500) - - Make default output from step more descriptive [#11501](https://github.com/mapbox/mapbox-gl-native/pull/11501) - - Expose public Telemetry API [#11503](https://github.com/mapbox/mapbox-gl-native/pull/11503) - - Convert Android int colors with to-color expression [#11506](https://github.com/mapbox/mapbox-gl-native/pull/11506) - - Prevent default style reload when string style json was set [#11520](https://github.com/mapbox/mapbox-gl-native/pull/11520) - - String, number and bool Expressions with multiple values [#11512](https://github.com/mapbox/mapbox-gl-native/pull/11512) - - Telemetry library 3.0.0-beta.3 [#11534](https://github.com/mapbox/mapbox-gl-native/pull/11534) - - Gestures library v0.2.0 [#11535](https://github.com/mapbox/mapbox-gl-native/pull/11535) - -## 5.5.1 - March 26, 2018 - - Verify optional access of FileSource deactivation [#11480](https://github.com/mapbox/mapbox-gl-native/pull/11480) - - Prevent default style loading when style json was set [#11519](https://github.com/mapbox/mapbox-gl-native/pull/11519) - - Delete local reference when convering Image.java [#11350](https://github.com/mapbox/mapbox-gl-native/pull/11350) - - Use float for pixel ratio when creating a snapshotter [#11367](https://github.com/mapbox/mapbox-gl-native/pull/11367) - - Validate if width and height aren't 0 when creating a snapshot [#11364](https://github.com/mapbox/mapbox-gl-native/pull/11364) - - Null check body of http request [#11413](https://github.com/mapbox/mapbox-gl-native/pull/11413) - - Clamp TileJSON bounds [#11425](https://github.com/mapbox/mapbox-gl-native/pull/11425) - -## 6.0.0-beta.4 - March 20, 2018 - - Gesture library 0.1.0 stable [#11483](https://github.com/mapbox/mapbox-gl-native/pull/11483) - - Filters with expressions [#11429](https://github.com/mapbox/mapbox-gl-native/pull/11429) - - Telemetry 3.0.0-beta.2 [#11474](https://github.com/mapbox/mapbox-gl-native/pull/11474) - - High level JNI conversion for geojson [#11471](https://github.com/mapbox/mapbox-gl-native/pull/11471) - - Update to MAS 3.0.0-beta.4 [#11468](https://github.com/mapbox/mapbox-gl-native/pull/11468) - - Support for expression literal on arrays [#11457](https://github.com/mapbox/mapbox-gl-native/pull/11457) - - Fix telemetry integration for two finger tap gesture [#11460](https://github.com/mapbox/mapbox-gl-native/pull/11460) - - Revisit proguard configuration [#11434](https://github.com/mapbox/mapbox-gl-native/pull/11434) - - Expressions accessor support [#11352](https://github.com/mapbox/mapbox-gl-native/pull/11352) - - Calculate camera's LatLng for bounds without map padding [#11410](https://github.com/mapbox/mapbox-gl-native/pull/11410) - - Check for null on http body request [#11413](https://github.com/mapbox/mapbox-gl-native/pull/11413) - - Expose more gesture settings [#11407](https://github.com/mapbox/mapbox-gl-native/pull/11407) - - Revert java 8 language support [#11398](https://github.com/mapbox/mapbox-gl-native/pull/11398) - - Update to MAS 3.0.0-beta.3 [#11373](https://github.com/mapbox/mapbox-gl-native/pull/11373) - - Rework match expression to style specification syntax [#11388](https://github.com/mapbox/mapbox-gl-native/pull/11388) - - Update javadoc configuration for Gradle 4.4 [#11384](https://github.com/mapbox/mapbox-gl-native/pull/11384) - - Rework zoomIn and zoomOut to use ValueAnimators [#11382](https://github.com/mapbox/mapbox-gl-native/pull/11382) - - Delete LocalRef when converting Image.java [#11350](https://github.com/mapbox/mapbox-gl-native/pull/11350) - - Use float for pixelratio when creating a snapshotter [#11367](https://github.com/mapbox/mapbox-gl-native/pull/11367) - - Validate width/height when creating a snapshot [#11364](https://github.com/mapbox/mapbox-gl-native/pull/11364) - -## 6.0.0-beta.3 - March 2, 2018 - - Added missing local reference deletes [#11243](https://github.com/mapbox/mapbox-gl-native/pull/11243), [#11272](https://github.com/mapbox/mapbox-gl-native/pull/11272) - - Remove obsolete camera api [#11201](https://github.com/mapbox/mapbox-gl-native/pull/11201) - - Fix UTF-8 encoding, add missing package-info.java files [#11261](https://github.com/mapbox/mapbox-gl-native/pull/11261) - - Rework expression api [#11210](https://github.com/mapbox/mapbox-gl-native/pull/11210) - - LatLngBounds fixes [#11333](https://github.com/mapbox/mapbox-gl-native/pull/11333), [#11307](https://github.com/mapbox/mapbox-gl-native/pull/11307), [#11308](https://github.com/mapbox/mapbox-gl-native/pull/11308), [#11309](https://github.com/mapbox/mapbox-gl-native/pull/11309), [#11226](https://github.com/mapbox/mapbox-gl-native/pull/11226) - - New gestures library [#11221](https://github.com/mapbox/mapbox-gl-native/pull/11221) - - Expose ImageSource coordinates setter [#11262](https://github.com/mapbox/mapbox-gl-native/pull/11262) - - Add heatmap color property [#11220](https://github.com/mapbox/mapbox-gl-native/pull/11220) - - Add support for mapzen terrarium raster-dem encoding [#11339](https://github.com/mapbox/mapbox-gl-native/pull/11339) - -## 5.5.0 - March 1, 2018 - - TileJSON Bounds allows values inclusive of world extents [#11178](https://github.com/mapbox/mapbox-gl-native/pull/11178) - - LatLngBounds returned by VisibleRegion when map is rotated [#11226](https://github.com/mapbox/mapbox-gl-native/pull/11226) - - Custom Layer fixes & black list VAO on mali t720 [#11239](https://github.com/mapbox/mapbox-gl-native/pull/11239) - - Check if Activity isn't finishing before showing dialog [#11244](https://github.com/mapbox/mapbox-gl-native/pull/11244) - - Decouple MapPadding from overlain views [#11258](https://github.com/mapbox/mapbox-gl-native/pull/11258) - - Don't disable zoom button controller zooming with gesture disabled zoom [#11259](https://github.com/mapbox/mapbox-gl-native/pull/11259) - - Expose ImageSource coordinates setter [#11262](https://github.com/mapbox/mapbox-gl-native/pull/11262) - - Add missing DeleteLocalRefs [#11272](https://github.com/mapbox/mapbox-gl-native/pull/11272) - - Continue loading style even if we mutate it [#11294](https://github.com/mapbox/mapbox-gl-native/pull/11294) - - Update telemetry version for OkHttp [#11338](https://github.com/mapbox/mapbox-gl-native/pull/11338) - -## 6.0.0-beta.2 - February 13, 2018 - - Deprecate LocationEngine [#11185](https://github.com/mapbox/mapbox-gl-native/pull/11185) - - Remove LOST from SDK [11186](https://github.com/mapbox/mapbox-gl-native/pull/11186) - - Transparent surface configuration on TextureView [#11065](https://github.com/mapbox/mapbox-gl-native/pull/11065) - - Constrained setLatLng documentation, expose setLatLngZoom method [#11184](https://github.com/mapbox/mapbox-gl-native/pull/11184) - - Integration of new events library [#10999](https://github.com/mapbox/mapbox-gl-native/pull/10999) - - AddImage performance improvement [#11111](https://github.com/mapbox/mapbox-gl-native/pull/11111) - - Migrate MAS to 3.0.0, refactor GeoJson integration [#11149](https://github.com/mapbox/mapbox-gl-native/pull/11149) - - Remove @jar and @aar dependency suffixes [#11161](https://github.com/mapbox/mapbox-gl-native/pull/11161) - -## 5.4.1 - February 9, 2018 - - Don't recreate TextureView surface as part of view resizing, solves OOM crashes [#11148](https://github.com/mapbox/mapbox-gl-native/pull/11148) - - Don't invoke OnLowMemory before map is ready, solves startup crash on low memory devices [#11109](https://github.com/mapbox/mapbox-gl-native/pull/11109) - - Programmatically create GLSurfaceView, solves fragment bug [#11124](https://github.com/mapbox/mapbox-gl-native/pull/11124) - - Proguard config for optional location provider, solves obfuscation warnings [#11127](https://github.com/mapbox/mapbox-gl-native/pull/11127) - - MapView weak reference in global layout listener, solves memory leak [#11128](https://github.com/mapbox/mapbox-gl-native/pull/11128) - -## 5.4.0 - January 30, 2018 - - Blacklist Adreno 2xx GPU for VAO support [#11047](https://github.com/mapbox/mapbox-gl-native/pull/11047) - - Bearing tracking mode GPS_NORTH_FACING [#11095](https://github.com/mapbox/mapbox-gl-native/pull/11095) - - Disable logging for missing location permissions when location is disabled [#11084](https://github.com/mapbox/mapbox-gl-native/pull/11084) - - Create offline handler using the main thread looper [#11021](https://github.com/mapbox/mapbox-gl-native/pull/11021) - -## 6.0.0-beta.1 - January 26, 2018 - - Binding integration for expressions [#10654](https://github.com/mapbox/mapbox-gl-native/pull/10654) - - CustomGeometrySource [#9983](https://github.com/mapbox/mapbox-gl-native/pull/9983) - - HillshadeLayer and RasterDemSource [#11031](https://github.com/mapbox/mapbox-gl-native/pull/11031) - - Revisit marker placement for snapshot [#11029](https://github.com/mapbox/mapbox-gl-native/pull/11029) - - SafeVarargs annotation for expressions [#11027](https://github.com/mapbox/mapbox-gl-native/pull/11027) - - Expression#toString [#11024](https://github.com/mapbox/mapbox-gl-native/pull/11024) - - Rename initRenderSurface to onSurfaceCreated [#11023](https://github.com/mapbox/mapbox-gl-native/pull/11023) - - Expose attribution manager as public API [#10942](https://github.com/mapbox/mapbox-gl-native/pull/10942) - - Replace Mapzen vector source example with Mapillary [#10931](https://github.com/mapbox/mapbox-gl-native/pull/10931) - - Add Hebrew localization [#10967](https://github.com/mapbox/mapbox-gl-native/pull/10967) - - Cleanup gradle configuration files [#10903](https://github.com/mapbox/mapbox-gl-native/pull/10903) - - Send double tap event only once [#10855](https://github.com/mapbox/mapbox-gl-native/pull/10855) - - Parameter validation for LatLngBounds#from [#10831](https://github.com/mapbox/mapbox-gl-native/pull/10831) - - Replace JSON parsing [#10815](https://github.com/mapbox/mapbox-gl-native/pull/10815) - - Orientation change regression test [#10814](https://github.com/mapbox/mapbox-gl-native/pull/10814) - - Max & min LatLng constants [#10780](https://github.com/mapbox/mapbox-gl-native/pull/10780) - - LatLng#wrap return new instance of LatLng [#10769](https://github.com/mapbox/mapbox-gl-native/pull/10769) - - Custom library loader [#10733](https://github.com/mapbox/mapbox-gl-native/pull/10733) - - Inconsistent parameters for LatLngBounds.union [#10728](https://github.com/mapbox/mapbox-gl-native/pull/10728) - - Gradle 4.1 / AS 3.0 [#10549](https://github.com/mapbox/mapbox-gl-native/pull/10549) - -## 5.3.2 - January 22, 2018 - - Validate surface creation before destroying [#10890](https://github.com/mapbox/mapbox-gl-native/pull/10890) - - Add filesource activation ot OfflineRegion [#10904](https://github.com/mapbox/mapbox-gl-native/pull/10904) - - Save configuration of UiSettings [#10908](https://github.com/mapbox/mapbox-gl-native/pull/10908) - - Do not overwrite user-set focal point [#10910](https://github.com/mapbox/mapbox-gl-native/pull/10910) - - Camera callbacks for velocity animated movements [#10925](https://github.com/mapbox/mapbox-gl-native/pull/10925) - - Allow changing the used OkHttpClient [#10948](https://github.com/mapbox/mapbox-gl-native/pull/10948) - - Validate zoom level before creating telemetry event [#10959](https://github.com/mapbox/mapbox-gl-native/pull/10959) - - Handle null call instances in HttpRequest [#10987](https://github.com/mapbox/mapbox-gl-native/pull/10987) - -## 5.3.1 - January 10, 2018 - - Blacklist binary program loading for Vivante GC4000 GPUs [#10862](https://github.com/mapbox/mapbox-gl-native/pull/10862) - - Support Genymotion [#10841](https://github.com/mapbox/mapbox-gl-native/pull/10841) - - Getting bitmap from drawable fix [#10763](https://github.com/mapbox/mapbox-gl-native/pull/10763) - - Use US locale when converting between int color and RGBA string [#10810](https://github.com/mapbox/mapbox-gl-native/pull/10810) - - Harden map destruction [#10811](https://github.com/mapbox/mapbox-gl-native/pull/10811) - - RTL support [#10828](https://github.com/mapbox/mapbox-gl-native/pull/10828) - - Allow configuring Http url logging when a request fails [#10830](https://github.com/mapbox/mapbox-gl-native/pull/10830) - - Don't send double tap event multiple times for telemetry [#10854](https://github.com/mapbox/mapbox-gl-native/pull/10854) - - Fix code generation [#10856](https://github.com/mapbox/mapbox-gl-native/pull/10856) - - Use the correct cancelable callback after posting cancel [#10871](https://github.com/mapbox/mapbox-gl-native/pull/10871) - -## 5.3.0 - December 20, 2017 - - Add support for TinySDF [#10706](https://github.com/mapbox/mapbox-gl-native/pull/10706) - - Save restore MyLocationViewSettings [#10746](https://github.com/mapbox/mapbox-gl-native/pull/10746) - - Post animation callback invocation [#10664](https://github.com/mapbox/mapbox-gl-native/pull/10664) - - Allow configuring Http logging [#10681](https://github.com/mapbox/mapbox-gl-native/pull/10681) - - Fix reverse scale gesture [#10688](https://github.com/mapbox/mapbox-gl-native/pull/10688) - - Update offline region metadata documentation [#10693](https://github.com/mapbox/mapbox-gl-native/pull/10693) - - Post camera listener invocation [#10690](https://github.com/mapbox/mapbox-gl-native/pull/10690) - - Activate filesource for offline region creation [#10718](https://github.com/mapbox/mapbox-gl-native/pull/10718) - - Update Spanish/Vietnamese translations [#10740](https://github.com/mapbox/mapbox-gl-native/pull/10740) - - Update instrumented make target [#10724](https://github.com/mapbox/mapbox-gl-native/pull/10724) - - Remove black flash on start for fragments [#10717](https://github.com/mapbox/mapbox-gl-native/pull/10717) - - CompassView decode crash [#10717](https://github.com/mapbox/mapbox-gl-native/pull/10717) - - Android SDK renaming [#10609](https://github.com/mapbox/mapbox-gl-native/pull/10609) - - Map touch listener based lists [#10749](https://github.com/mapbox/mapbox-gl-native/pull/10749) - -## 5.2.1 - December 6, 2017 - - Close race condition in RunLoop [#10537](https://github.com/mapbox/mapbox-gl-native/pull/10537) - - OkHttp 3.9.1 [#10515](https://github.com/mapbox/mapbox-gl-native/pull/10515) - - Attribution anchor point fix [#10558](https://github.com/mapbox/mapbox-gl-native/pull/10558) - - Pre API 19 VerifyError [#10579](https://github.com/mapbox/mapbox-gl-native/pull/10579) - - Set larger Http request limit [#10567](https://github.com/mapbox/mapbox-gl-native/pull/10567) - - Remove jar generation from maven publish [#10625](https://github.com/mapbox/mapbox-gl-native/pull/10625) - - Enable Map Rendering when paused for multiple window support [#10509](https://github.com/mapbox/mapbox-gl-native/pull/10509) - - Activate FileSource when listing offline regions [#10531](https://github.com/mapbox/mapbox-gl-native/pull/10531) - - Harden MarkerView integration by checking for null bitmap [#10532](https://github.com/mapbox/mapbox-gl-native/pull/10532) - - Use concurrent lists for camera change listeners [#10542](https://github.com/mapbox/mapbox-gl-native/pull/10542) - - Handle destroy activity as part of theme switching [#10589](https://github.com/mapbox/mapbox-gl-native/pull/10589) - - add FileSource activation/deactivation to MapSnapshotter [#10556](https://github.com/mapbox/mapbox-gl-native/pull/10556) - -## 5.2.0 - November 17, 2017 - -- Monkey crashes [#10472](https://github.com/mapbox/mapbox-gl-native/pull/10472) - -## 5.2.0-beta.5 - November 14, 2017 - -- MapSnapshot attribution [#10362](https://github.com/mapbox/mapbox-gl-native/pull/10362) -- Downgrade min sdk to 14 [#10355](https://github.com/mapbox/mapbox-gl-native/pull/10355) -- Harden deselection mechanism for markers [#10403](https://github.com/mapbox/mapbox-gl-native/pull/10403) -- Cherry picks to agua [#10442](https://github.com/mapbox/mapbox-gl-native/pull/10442) -- Rework test activity gen script setup [#10365](https://github.com/mapbox/mapbox-gl-native/pull/10365) -- Fix broken android unit tests, update test make target to SDK [#10387](https://github.com/mapbox/mapbox-gl-native/pull/10387) -- Check for null value when calling mapboxMap.clear [#10388](https://github.com/mapbox/mapbox-gl-native/pull/10388) - -## 5.2.0-beta.4 - November 3, 2017 - -- Revert adding mapbox-android-core dependency (#10354) [#10380](https://github.com/mapbox/mapbox-gl-native/pull/10380) -- Asynchronous TextureView [#10370](https://github.com/mapbox/mapbox-gl-native/pull/10370) -- Workaround OkHttp bug on Android O [10366](https://github.com/mapbox/mapbox-gl-native/pull/10366) -- Revisit logo resize [10553](https://github.com/mapbox/mapbox-gl-native/pull/10353) -- Logo resize for MapSnapshotter [#10312](https://github.com/mapbox/mapbox-gl-native/pull/10312) -- Make location provider optional [#10354](https://github.com/mapbox/mapbox-gl-native/pull/10354) -- Check for positive animation value [#10348](https://github.com/mapbox/mapbox-gl-native/pull/10348) -- Fix IAE of ease/animate [#10338](https://github.com/mapbox/mapbox-gl-native/pull/10338) -- Run full test suite on CI [#10333](https://github.com/mapbox/mapbox-gl-native/pull/10333) -- Make sure camera position gets updated in onFinish() callback after camera.move [#10324](https://github.com/mapbox/mapbox-gl-native/pull/10324) -- throw IAE in animate() and easeCamera() when duration <= 0 [#10321](https://github.com/mapbox/mapbox-gl-native/pull/10321) -- Don't save state if map hasn't been initialised [#10320](https://github.com/mapbox/mapbox-gl-native/pull/10320) -- Make map snapshot optional [#10310](https://github.com/mapbox/mapbox-gl-native/pull/10310) -- Synchronise locationlastions with Transifex [#10309](https://github.com/mapbox/mapbox-gl-native/pull/10309) -- MapboxMap#addImages [#10281](https://github.com/mapbox/mapbox-gl-native/pull/10281) -- Move shape annotation click handling to core [#10267](https://github.com/mapbox/mapbox-gl-native/pull/10267) -- Map snapshotter additions [#10163](https://github.com/mapbox/mapbox-gl-native/pull/10163) -- Add velocity to gestures / port animations to SDK animators [#10202](https://github.com/mapbox/mapbox-gl-native/pull/10202) -- Don't save state if map hasn't been initialised [#10320](https://github.com/mapbox/mapbox-gl-native/pull/10320) -- android.hardware.location.gps feature should not be required [#10347](https://github.com/mapbox/mapbox-gl-native/pull/10347) - -## 5.2.0-beta.3 - October 26, 2017 - -- Reorganize dependencies [#10268](https://github.com/mapbox/mapbox-gl-native/pull/10268) -- Blacklist VAO usage on adreno 3xx [#10291](https://github.com/mapbox/mapbox-gl-native/pull/10291) -- On stop null check [#10259](https://github.com/mapbox/mapbox-gl-native/pull/10259) - -## 5.2.0-beta.2 - October 19, 2017 - -- Wire up MapZoomButtonController with camera change events [#10221](https://github.com/mapbox/mapbox-gl-native/pull/10221) -- Execute callbacks only when not idle [#10220](https://github.com/mapbox/mapbox-gl-native/pull/10220) -- Cleanup unused gradle plugins [#10211](https://github.com/mapbox/mapbox-gl-native/pull/10211) -- add FileSource pause/resume [#9977](https://github.com/mapbox/mapbox-gl-native/pull/9977) -- add make target for ndk-stack [#10185](https://github.com/mapbox/mapbox-gl-native/pull/10185) -- Add interpolator examples [#10067](https://github.com/mapbox/mapbox-gl-native/pull/10067) -- Add an UnsatisfiedLinkError safeguard [#10180](https://github.com/mapbox/mapbox-gl-native/pull/10180) -- Hold off handling hover events untill map has been created [#10142](https://github.com/mapbox/mapbox-gl-native/pull/10142) -- Added `MapboxMap.getCameraForGeometry()` to get a camera with zoom level and center coordinate computed to fit a shape [#10107](https://github.com/mapbox/mapbox-gl-native/pull/10107) -- Fine tune gesture zoom & rotation [#10134](https://github.com/mapbox/mapbox-gl-native/pull/10134) - -## 5.2.0-beta.1 - October 6, 2017 - -- Allow multiple listeners for camera events, deprecate old API [#10141](https://github.com/mapbox/mapbox-gl-native/pull/10141) -- Update symbol layer example with location [#10092](https://github.com/mapbox/mapbox-gl-native/pull/10092) -- Make OfflineTilePyramidRegionDefinition parceable [#10080](https://github.com/mapbox/mapbox-gl-native/pull/10080) -- Fix 5.2.0-SNAPSHOT CI build failing [#10079](https://github.com/mapbox/mapbox-gl-native/pull/10079) -- Deprecate MarkerView [#9782](https://github.com/mapbox/mapbox-gl-native/pull/9782) -- Hide overlain views on initalisation [#10068](https://github.com/mapbox/mapbox-gl-native/pull/10068) -- API for platform side animations [#10001](https://github.com/mapbox/mapbox-gl-native/pull/10001) -- Android asynchronous rendering [#9576](https://github.com/mapbox/mapbox-gl-native/pull/9576) -- Set error handler when starting snapshotter [#10035](https://github.com/mapbox/mapbox-gl-native/pull/10035) -- Hook camera events into compass [#10019](https://github.com/mapbox/mapbox-gl-native/pull/10019) -- Testapp cleanup [#10006](https://github.com/mapbox/mapbox-gl-native/pull/10006) -- Update zoom function example with selected state [#9987](https://github.com/mapbox/mapbox-gl-native/pull/9987) -- Add style inspection to debug activity [#9773](https://github.com/mapbox/mapbox-gl-native/pull/9773) -- Bump external dependencies [#9972](https://github.com/mapbox/mapbox-gl-native/pull/9972) -- Don't recycle bitmap for icon reuse. [#9966](https://github.com/mapbox/mapbox-gl-native/pull/9966) -- Android snapshotter [#9748](https://github.com/mapbox/mapbox-gl-native/pull/9748) -- Revert #9764 [#9851](https://github.com/mapbox/mapbox-gl-native/pull/9851) -- Update docs replacing Bitrise mentions with CircleCI [#9515](https://github.com/mapbox/mapbox-gl-native/pull/9515) -- Style image accessor [#9763](https://github.com/mapbox/mapbox-gl-native/pull/9763) -- Update readme with checkstyle and ndk-stack [#9788](https://github.com/mapbox/mapbox-gl-native/pull/9788) -- make android-check [#9787](https://github.com/mapbox/mapbox-gl-native/pull/9787) -- Deprecate MyLocationView in favor of LocationLayer plugin [#9771](https://github.com/mapbox/mapbox-gl-native/pull/9771) -- Increase firebase timeout for CI testing [#9774](https://github.com/mapbox/mapbox-gl-native/pull/9774) -- Restore max zoom to 25.5 [#9765](https://github.com/mapbox/mapbox-gl-native/pull/9765) -- Update example of camera zoom function on a symbol layer. [#9743](https://github.com/mapbox/mapbox-gl-native/pull/9743) -- Optimise icon management [#9643](https://github.com/mapbox/mapbox-gl-native/pull/9643) -- Expose setStyleJson and getStyleJson [#9714](https://github.com/mapbox/mapbox-gl-native/pull/9714) -- update LatLngBounds activity with BottomSheet interaction [#9736](https://github.com/mapbox/mapbox-gl-native/pull/9736) -- post updating InfoWindow update for InfoWindowAdapter [#9716](https://github.com/mapbox/mapbox-gl-native/pull/9716) -- Annotate MapboxMap class with UiThread [#9712](https://github.com/mapbox/mapbox-gl-native/pull/9712) -- Move ZoomButtonController creation to view initalisation [#9587](https://github.com/mapbox/mapbox-gl-native/pull/9587) -- Solve lint issues, reduce baseline [#9627](https://github.com/mapbox/mapbox-gl-native/pull/9627) -- Remove wear module from project [#9618](https://github.com/mapbox/mapbox-gl-native/pull/9618) -- Add zMediaOverlay configuration + bottom sheet integration [#9592](https://github.com/mapbox/mapbox-gl-native/pull/9592) -- Forward getMapAsync to map for fragment [#9621](https://github.com/mapbox/mapbox-gl-native/pull/9621) -- Make target for dumping system gfx information [#9616](https://github.com/mapbox/mapbox-gl-native/pull/9616) -- Make target documentation [#9617](https://github.com/mapbox/mapbox-gl-native/pull/9617) -- onGlobalLayout hook for map creation [#9607](https://github.com/mapbox/mapbox-gl-native/pull/9607) -- Custom viewpager for horizontal swiping [#9601](https://github.com/mapbox/mapbox-gl-native/pull/9601) -- Disable program caching on Adreno 3xx, 4xx, and 5xx GPUs due to known bugs [#9574](https://github.com/mapbox/mapbox-gl-native/pull/9574) -- Avoid creating InfoWindow iterator if no InfoWindows are shown [#9477](https://github.com/mapbox/mapbox-gl-native/pull/9477) -- Rewire map initialisation [#9462](https://github.com/mapbox/mapbox-gl-native/pull/9462) -- Trying to update non-existent polyline fix [#9544](https://github.com/mapbox/mapbox-gl-native/pull/9544) -- Location accuracy threshold [#9472](https://github.com/mapbox/mapbox-gl-native/pull/9472) -- Rewire gesture handling and telemetry event push [#9494](https://github.com/mapbox/mapbox-gl-native/pull/9494) -- run style instrumentation tests on CI [#9353](https://github.com/mapbox/mapbox-gl-native/pull/9353) -- Fix javadoc comment for public setOfflineMapboxTileCountLimit method [#9454](https://github.com/mapbox/mapbox-gl-native/pull/9454) -- add Map change & visibility test activities [#9425](https://github.com/mapbox/mapbox-gl-native/pull/9425) -- build release package once during ci build [#9351](https://github.com/mapbox/mapbox-gl-native/pull/9351) -- Add support for ImageSource [#9110](https://github.com/mapbox/mapbox-gl-native/pull/9110) -- Increased the default maximum zoom level from 20 to 22. [#9835](https://github.com/mapbox/mapbox-gl-native/pull/9835) - -## 5.1.5 - October 31, 2017 - -* Remove obsolete terminate context/display calls [#10162](https://github.com/mapbox/mapbox-gl-native/pull/10162) -* Determine need for clip ID based on actual layers/tiles [#10216](https://github.com/mapbox/mapbox-gl-native/pull/10216) -* Correctly alter sprite URLs [#10217](https://github.com/mapbox/mapbox-gl-native/pull/10217) -* Russian and Ukrainian localizations [#9945](https://github.com/mapbox/mapbox-gl-native/pull/9945) - -## 5.1.4 - September 25, 2017 - -* Update translations [#10033](https://github.com/mapbox/mapbox-gl-native/pull/10033) & [#9945](https://github.com/mapbox/mapbox-gl-native/pull/9945) -* Continue rendering tiles despite erros [#10012](https://github.com/mapbox/mapbox-gl-native/pull/10012) -* Fix layer z-fighting [#9942](https://github.com/mapbox/mapbox-gl-native/pull/9942) -* Align line vertex to 4-byte boundary [#9943](https://github.com/mapbox/mapbox-gl-native/pull/9943) -* Bump proguard config for OkHttp [#9970](https://github.com/mapbox/mapbox-gl-native/pull/9970) -* Remove database on schema downgrade [#9837](https://github.com/mapbox/mapbox-gl-native/pull/9837) -* Disable rotation gesture when pinch zooming [#10026](https://github.com/mapbox/mapbox-gl-native/pull/10026) -* Do not check if connection is local request [#9968](https://github.com/mapbox/mapbox-gl-native/pull/9968) -* Harden offline region deletion [#9967](https://github.com/mapbox/mapbox-gl-native/pull/9967) -* Clear out mapCallback's OnMapReadyListeners on destroy [#9957](https://github.com/mapbox/mapbox-gl-native/pull/9957) -* Avoid adding duplicate points to bounds [#9955](https://github.com/mapbox/mapbox-gl-native/pull/9955) -* Download is complete fix [#9913](https://github.com/mapbox/mapbox-gl-native/pull/9913) -* MAS 2.2.3 [#9901](https://github.com/mapbox/mapbox-gl-native/pull/9901) -* Russian and Ukrainian localizations [#9945](https://github.com/mapbox/mapbox-gl-native/pull/9945) - -## 5.1.3 - August 18, 2017 - -* Use separate attribute component for line normals [#9753](https://github.com/mapbox/mapbox-gl-native/pull/9753) -* Track state of initial overlain views margins [#9391](https://github.com/mapbox/mapbox-gl-native/pull/9391) -* Compability for Samsung devices forcing 3-4 array vector length [#9746](https://github.com/mapbox/mapbox-gl-native/pull/9746) -* Smallest LatLngBounds when visible region crosses dateline [#9747](https://github.com/mapbox/mapbox-gl-native/pull/9747) -* Readd ProjectMeters [#9766](https://github.com/mapbox/mapbox-gl-native/pull/9766) -* Enable location change animation of MyLocationView by default [#9779](https://github.com/mapbox/mapbox-gl-native/pull/9779) -* Avoid IndexOutOfBoundsException when destroying map object [#9789](https://github.com/mapbox/mapbox-gl-native/pull/9789) -* MAS 2.2.1 [#9796](https://github.com/mapbox/mapbox-gl-native/pull/9796) - -## 5.1.2 - August 2, 2017 - -* Disable program caching on Ardreno GPU 3xx, 4xx and 5xx [#9625](https://github.com/mapbox/mapbox-gl-native/pull/9625) -* GeoJSON proguard issue [#9577](https://github.com/mapbox/mapbox-gl-native/pull/9577) -* Harden click events of shape annotations [#9585](https://github.com/mapbox/mapbox-gl-native/pull/9585) -* Validate Marker before opening InfoWindow [#9586](https://github.com/mapbox/mapbox-gl-native/pull/9586) -* Fix added to map check [#9602](https://github.com/mapbox/mapbox-gl-native/pull/9602) -* Don't query shape annotations if none were added [#9606](https://github.com/mapbox/mapbox-gl-native/pull/9606) -* Fix compass direction [#9632](https://github.com/mapbox/mapbox-gl-native/pull/9632) -* Remove preview image integration [#9657](https://github.com/mapbox/mapbox-gl-native/pull/9657) -* Try/catch initialization of telemetry [#9658](https://github.com/mapbox/mapbox-gl-native/pull/9658) -* Fix typo OnCameraMoveStartedListener [#9664](https://github.com/mapbox/mapbox-gl-native/pull/9664) -* Bump MAS dependency to 5.2.0 [#9671](https://github.com/mapbox/mapbox-gl-native/pull/9671) - -## 5.1.1 - July 21, 2017 - -* Rework attribution binding [#9433](https://github.com/mapbox/mapbox-gl-native/pull/9433) -* BackendScope changes [#9538](https://github.com/mapbox/mapbox-gl-native/pull/9538) -* Invisible MarkerView performance fix [#9420](https://github.com/mapbox/mapbox-gl-native/pull/9420) -* Polyline/Polygon click listeners [#9443](https://github.com/mapbox/mapbox-gl-native/pull/9443) -* Hit test Marker/MarkerViews [#9424](https://github.com/mapbox/mapbox-gl-native/pull/9424) -* Fine tune fling gesture [#9532](https://github.com/mapbox/mapbox-gl-native/pull/9532) -* Bump OkHttp 3.8.0, Android 7.x crashes [#9522](https://github.com/mapbox/mapbox-gl-native/pull/9522) -* MyLocationView tint fix [#9410](https://github.com/mapbox/mapbox-gl-native/pull/9410) -* VisibleRegion logic [#9428](https://github.com/mapbox/mapbox-gl-native/pull/9428) -* Validate motion event [#9434](https://github.com/mapbox/mapbox-gl-native/pull/9434) -* Add French localization [#9545](https://github.com/mapbox/mapbox-gl-native/pull/9545) -* Fix public.xml [#9525](https://github.com/mapbox/mapbox-gl-native/pull/9525/files) -* Manage InfoWindow selection in AnnotationManager [#9567](https://github.com/mapbox/mapbox-gl-native/pull/9567) -* Increase touch target size [#9565](https://github.com/mapbox/mapbox-gl-native/pull/9565) -* Work around Adreno 2xx GPU bugs [#9573](https://github.com/mapbox/mapbox-gl-native/pull/9573) - -## 5.1.0 - June 30, 2017 - -* Update to MAS 2.1.3 [#9402](https://github.com/mapbox/mapbox-gl-native/pull/9402) -* Downgrade LOST to v1.1.1 [#9394](https://github.com/mapbox/mapbox-gl-native/pull/9394) -* OnCameraIdle hook into quickzoom gesture [#9339](https://github.com/mapbox/mapbox-gl-native/pull/9339) -* LatLngBounds conversion regression, add test [#9324](https://github.com/mapbox/mapbox-gl-native/pull/9324) - -## 5.1.0-beta.5 - June 21, 2017 - -* Update MAS dependency to 2.1.2 [#9311](https://github.com/mapbox/mapbox-gl-native/pull/9311) -* Update LOST dependency to 3.0.1 [#9302](https://github.com/mapbox/mapbox-gl-native/pull/9302) -* Fix Pulse example Parcelable creator [#9283](https://github.com/mapbox/mapbox-gl-native/pull/9283) -* Custom marker view anchoring [#9282](https://github.com/mapbox/mapbox-gl-native/pull/9282) -* Update Activity test generation [#9276](https://github.com/mapbox/mapbox-gl-native/pull/9276) -* Validate camera position before transforming [#9275](https://github.com/mapbox/mapbox-gl-native/pull/9275) -* Revisit javadoc [#9266](https://github.com/mapbox/mapbox-gl-native/pull/9266) -* Build with NDK 15 [#9263](https://github.com/mapbox/mapbox-gl-native/pull/9263) -* Snapshot with view content [#9263](https://github.com/mapbox/mapbox-gl-native/pull/9263) -* Update source changed javadoc [#9243](https://github.com/mapbox/mapbox-gl-native/pull/9243) -* Run tests on UI-thread [#9198](https://github.com/mapbox/mapbox-gl-native/pull/9198) -* Fix trackball on worker thread [#9305](https://github.com/mapbox/mapbox-gl-native/pull/9305) - -## 5.1.0-beta.4 - June 9, 2017 - -* Option to disable location change animation [#9210](https://github.com/mapbox/mapbox-gl-native/pull/9210) -* Invalidating MyLocationView bearing when not following [#9212](https://github.com/mapbox/mapbox-gl-native/pull/9212) -* Remove upgrade runtime exceptions [#9191](https://github.com/mapbox/mapbox-gl-native/pull/9191) -* Check source usage before removal [#9129](https://github.com/mapbox/mapbox-gl-native/pull/9129) -* Fix tracking mode + camera race condition [#9133](https://github.com/mapbox/mapbox-gl-native/pull/9133) -* Harden orientation changes [#9128](https://github.com/mapbox/mapbox-gl-native/pull/9128) -* Infinite location animation updates [#9194](https://github.com/mapbox/mapbox-gl-native/pull/9194) -* Invoke callback with valid fling gestures [#9192](https://github.com/mapbox/mapbox-gl-native/pull/9192) -* Keep location tracking after screen rotation [#9187](https://github.com/mapbox/mapbox-gl-native/pull/9187) -* Update components with camera values when animating [#9174](https://github.com/mapbox/mapbox-gl-native/pull/9174) -* Validate if gestures should execute [#9173](https://github.com/mapbox/mapbox-gl-native/pull/9173) -* Custom location source and LOST integration [#9142](https://github.com/mapbox/mapbox-gl-native/pull/9142) - -## 5.1.0-beta.3 - May 26, 2017 - -* Add binding support for Light [#9013](https://github.com/mapbox/mapbox-gl-native/pull/9013) -* Update attribution with new Mapbox wordmark [#8774](https://github.com/mapbox/mapbox-gl-native/pull/8774) -* LatLngBounds bearing default value [#9102](https://github.com/mapbox/mapbox-gl-native/pull/9102) -* Stop location updates when toggling MyLocationView [#9099](https://github.com/mapbox/mapbox-gl-native/pull/9099) -* Horizontally rotated in snapshot [#9083](https://github.com/mapbox/mapbox-gl-native/pull/9083) -* Disable letter spacing for Arabic text [#9071](https://github.com/mapbox/mapbox-gl-native/pull/9071) -* Correct bearing conversion when animating the map [#9050](https://github.com/mapbox/mapbox-gl-native/pull/9050) -* Don't leak selected markers when removing [#9047](https://github.com/mapbox/mapbox-gl-native/pull/9047) -* Bump tools and support lib version [#9046](https://github.com/mapbox/mapbox-gl-native/pull/9046) -* MarkerView deselect events with OnMarkerViewClickListener [#9047](https://github.com/mapbox/mapbox-gl-native/pull/9047) -* LOST update to v3.0.0 [#9112](https://github.com/mapbox/mapbox-gl-native/pull/9112) -* Convert dp to pixels for meters per pixel at latitude [#9048](https://github.com/mapbox/mapbox-gl-native/pull/9048) - -## 5.1.0-beta.2 - May 12, 2017 - -5.1.0-beta.2 builds further on 5.1.0-beta.1 and adds: - -* When a layer is added, reload its source's tiles [#8963](https://github.com/mapbox/mapbox-gl-native/pull/8963) -* Update release script to support CircleCI builds [#8950](https://github.com/mapbox/mapbox-gl-native/pull/8950) -* URL getter on Sources [#8959](https://github.com/mapbox/mapbox-gl-native/pull/8959) -* Build SNAPSHOT from release branch CI configuration [#8958](https://github.com/mapbox/mapbox-gl-native/pull/8958) -* Fix UI test filter in Makefile [#8960](https://github.com/mapbox/mapbox-gl-native/pull/8960) -* Bump & fixup dependencies [#8921](https://github.com/mapbox/mapbox-gl-native/pull/8921) -* Ignore already deleted region [#8920](https://github.com/mapbox/mapbox-gl-native/pull/8920) -* Keep offline observer when timeout occurs [#8919](https://github.com/mapbox/mapbox-gl-native/pull/8919) -* Show error message when no browser installed [#8920](https://github.com/mapbox/mapbox-gl-native/pull/8920) -* Reset observers of removed Sources and Layers [#8900](https://github.com/mapbox/mapbox-gl-native/pull/8900) -* Only build custom layer .so for debug builds [#8885](https://github.com/mapbox/mapbox-gl-native/pull/8885) -* Update localizations [#8883](https://github.com/mapbox/mapbox-gl-native/pull/8883) -* Reset observers of removed Sources and Layers [#8862](https://github.com/mapbox/mapbox-gl-native/pull/8862) -* Remove force style cascade [#8866](https://github.com/mapbox/mapbox-gl-native/pull/8866) -* Update proguard config [#8944](https://github.com/mapbox/mapbox-gl-native/pull/8944) -* Update LOST to 2.3.0-SNAPSHOT [#8872](https://github.com/mapbox/mapbox-gl-native/pull/8872) -* Update logo [#8774](https://github.com/mapbox/mapbox-gl-native/pull/8774) -* Camera change listener v2.0 [#8644](https://github.com/mapbox/mapbox-gl-native/pull/8644) -* Allow filesource url transform reset [#8957](https://github.com/mapbox/mapbox-gl-native/pull/8957) - -## 5.1.0-beta.1 - May 2, 2017 - -5.1.0-beta.1 builds further on 5.0.2 and adds: - -* Support for FillExtrusionLayer [#8431](https://github.com/mapbox/mapbox-gl-native/pull/8431) -* Limit Viewport [#8622](https://github.com/mapbox/mapbox-gl-native/pull/8622) -* Transition Properties for Layer attributes [#8509](https://github.com/mapbox/mapbox-gl-native/pull/8509) -* Style wide transition duration and transition offset in milliseconds [#8576](https://github.com/mapbox/mapbox-gl-native/pull/8576) -* Transifex integration, Catalan & Dutch translations [#8556](https://github.com/mapbox/mapbox-gl-native/pull/8556) -* LatLngBounds includes with another bounds [#8517](https://github.com/mapbox/mapbox-gl-native/pull/8517) -* LatLngBounds includes takes in account LatLng on the edges (cfr. core) [#8517](https://github.com/mapbox/mapbox-gl-native/pull/8517) -* LatLngBounds facility getters/setters for LatLnbg on the edges of the bounds [#8517](https://github.com/mapbox/mapbox-gl-native/pull/8517) -* Expose world bounds in LatLngBounds [#8517](https://github.com/mapbox/mapbox-gl-native/pull/8517) -* OfflineRegion are validated if the bounds is found in the world bounds, else onError will be invoked [#8517](https://github.com/mapbox/mapbox-gl-native/pull/8517) -* Polygon holes [#8557](https://github.com/mapbox/mapbox-gl-native/pull/8557) and [#8722](https://github.com/mapbox/mapbox-gl-native/pull/8722) -* Custom location source [#8710](https://github.com/mapbox/mapbox-gl-native/pull/8710) -* Expose source layer identifier [#8709](https://github.com/mapbox/mapbox-gl-native/pull/8709) -* Ensure surface is created after display and context [#8759](https://github.com/mapbox/mapbox-gl-native/pull/8759) -* Harden telemetry event dispatch [#8767](https://github.com/mapbox/mapbox-gl-native/pull/8767) -* Move LatLngBounds calculation for CameraUpdateFactory to core [#8765](https://github.com/mapbox/mapbox-gl-native/pull/8765) -* Spanish, Lithuanian, and Vietnamese localizations [#8852](https://github.com/mapbox/mapbox-gl-native/pull/8852) -* Warning when updating a non-added annotation [#8832](https://github.com/mapbox/mapbox-gl-native/pull/8832) -* Share location source between components [#8825](https://github.com/mapbox/mapbox-gl-native/pull/8825) -* Test application runtime permissions for pre lollipop devices [#8823](https://github.com/mapbox/mapbox-gl-native/pull/8823) -* Do not call OnMarkerClick listener twice [#8804](https://github.com/mapbox/mapbox-gl-native/pull/8804) -* Rework instrumentation tests [#8793](https://github.com/mapbox/mapbox-gl-native/pull/8793) -* Set first render flag to false when destroying the surface [#8739](https://github.com/mapbox/mapbox-gl-native/pull/8739) -* Post resetting tracking settings to avoid race condition reset [#8738](https://github.com/mapbox/mapbox-gl-native/pull/8738) -* Expose Source Layer identifier [#8709](https://github.com/mapbox/mapbox-gl-native/pull/8709) -* Derived source attribution [#8630](https://github.com/mapbox/mapbox-gl-native/pull/8630) -* Consistent use of duration unit [#8578](https://github.com/mapbox/mapbox-gl-native/pull/8578) -* Swedish localization [#8883](https://github.com/mapbox/mapbox-gl-native/pull/8883) -* Streets v10, Outdoors v10, Satellite Streets v10, Traffic Day v2, Traffic Night v2 [#6301](https://github.com/mapbox/mapbox-gl-native/pull/6301) - -## 5.0.2 - April 3, 2017 - -5.0.2 is a patch release that contains the following changes: - -* Binary shader caching [#8604](https://github.com/mapbox/mapbox-gl-native/pull/8604) -* Fix resource transform callback [#8582](https://github.com/mapbox/mapbox-gl-native/pull/8582) -* Restore onTouch behaviour to 4.x version [#8585](https://github.com/mapbox/mapbox-gl-native/pull/8585) -* Restore anchoring after updating MarkerView Icon [#8519](https://github.com/mapbox/mapbox-gl-native/pull/8519) - -## 5.0.1 - March 22nd, 2017 - -5.0.1 is a patch release that addresses a shader precision issue that created a rendering problem on some devices. - -* Use `highp` for color attributes [#8385](https://github.com/mapbox/mapbox-gl-native/issues/8385) - -## 5.0.0 - March 17th, 2017 - -5.0.0 final release contains: - -* Support for data-driven styles [#7752](https://github.com/mapbox/mapbox-gl-native/pull/7752) -* Additional APIs to manage runtime styling layers [#8195](https://github.com/mapbox/mapbox-gl-native/pull/8195) -* Allow query all features in sources (`querySourceFeatures`) [#5792](https://github.com/mapbox/mapbox-gl-native/issues/5792) -* Improve accessibility TalkBack support by including content description in views [#8230](https://github.com/mapbox/mapbox-gl-native/pull/8230) -* Consistent double tap zoom acceleration [#7514](https://github.com/mapbox/mapbox-gl-native/issues/7514) -* Allow zooming/scaling to use `AnimationOptions` [#8181](https://github.com/mapbox/mapbox-gl-native/pull/8181) -* Cleanup inconsistencies `float` vs `double` [#4445](https://github.com/mapbox/mapbox-gl-native/issues/4445) -* Add `mapbox_` prefix to attributes [#6482](https://github.com/mapbox/mapbox-gl-native/issues/6482) -* Update LOST to 2.x [#6573](https://github.com/mapbox/mapbox-gl-native/issues/6537) -* MAS submodules (`geojson`, `telemetry`) are now smaller to reduce the overall method count [#7642](https://github.com/mapbox/mapbox-gl-native/pull/7642) -* Telemetry Service is now include automatically via Manifest merge to simplify set up [#8338](https://github.com/mapbox/mapbox-gl-native/pull/8338) -* Support for Android Nougat [#5910](5910-move-listener-logic-for-nougat) - - Move location listening logic to `onStart`/`onStop` activity lifecylce methods -* Removal of `accessToken` on `MapView` and `MapboxMap` [#5621](https://github.com/mapbox/mapbox-gl-native/issues/5621) -* Introduction of new make targets [#5940](https://github.com/mapbox/mapbox-gl-native/issues/5940) - - Targets for testing, running and using external tools directly from the command line -* Cleanup Gradle files [#6009](https://github.com/mapbox/mapbox-gl-native/issues/6009) - - Introducing single purpose `.gradle` files -* Checkstyle integration [#7442](https://github.com/mapbox/mapbox-gl-native/pull/7442) -* Transform refactor [#6532](https://github.com/mapbox/mapbox-gl-native/issues/6532) - - All camera related code is moved to a dedicated transform class cfr. core architecture -* Encapsulate gestures [#6557](https://github.com/mapbox/mapbox-gl-native/issues/6557) - - All gesture event code is encapsulated in `MapGestureDetector` - - All key event code is encapsulated in `MapKeyListener` -* Transparent background for `MyLocationView` [#7116](https://github.com/mapbox/mapbox-gl-native/issues/7116) -* Correctly scale accuracy circle for `MyLocationView` [#8255](https://github.com/mapbox/mapbox-gl-native/pull/8255) -* Update documentation on generate sanity tests [#7147](https://github.com/mapbox/mapbox-gl-native/issues/7147) -* Update documentation on style templates [#7157](https://github.com/mapbox/mapbox-gl-native/issues/7157) -* Fix `NullPointerException` during save instance state [#7157](https://github.com/mapbox/mapbox-gl-native/issues/7157) -* Move management style to core [#7275](https://github.com/mapbox/mapbox-gl-native/issues/7275) -* Fix `OnCameraChange` not called for the final position of animation bug [#7350](https://github.com/mapbox/mapbox-gl-native/issues/7350) -* `MapboxAccountManager` refactor [#6534](https://github.com/mapbox/mapbox-gl-native/issues/6534) - - Consolidating the location where tokens are set - - Rename to reflect the increased responsibilities introduced in prior releases -* AnnotationManager refactor [#6067](https://github.com/mapbox/mapbox-gl-native/issues/6067) - - Extracting all business logic related to annotations into a separate class cfr. to core and the iOS codebase -* Gesture handling improvements: - - Fix missing call to `onFling` when while pinch zooming [#7666](https://github.com/mapbox/mapbox-gl-native/issues/7666) - - Round tap-zoom gestures to nearest integer [#8027](https://github.com/mapbox/mapbox-gl-native/pull/8027) -* Support for style-wide transition animation duration and delay [#6779](https://github.com/mapbox/mapbox-gl-native/issues/6779) -* Allow callback parameter for style setting [#8262](https://github.com/mapbox/mapbox-gl-native/issues/8262) -* Support for all animated camera changes to configure dismissing tracking modes [#7854](https://github.com/mapbox/mapbox-gl-native/issues/7854) -* Avoid disabling location tracking on all gestures [#7878](https://github.com/mapbox/mapbox-gl-native/issues/7878) -* `LatLng` objects produced by the SDK are wrapped by default [#4522](https://github.com/mapbox/mapbox-gl-native/issues/4522) -* Proguard update for new SDK packages [#8437](https://github.com/mapbox/mapbox-gl-native/pull/8437) -* Javadoc cleanup [#8438](https://github.com/mapbox/mapbox-gl-native/pull/8438) -* MarkerViewClickListener and MapClickListener called simultaneously [#8447](https://github.com/mapbox/mapbox-gl-native/pull/8447) -* Fix LOST v2.0.0 integration [#8445](https://github.com/mapbox/mapbox-gl-native/pull/8445) -* Crash with OnMapChangeListener [#8380](https://github.com/mapbox/mapbox-gl-native/pull/8380) -* Feature query crash [#8374](https://github.com/mapbox/mapbox-gl-native/pull/8374) -* flyTo fix [#8302](https://github.com/mapbox/mapbox-gl-native/pull/8302) -* Don't dispatch MarkerView motion event up to MapView [#8447](https://github.com/mapbox/mapbox-gl-native/pull/8447) - -## 5.0.0-beta.3 - March 10th, 2017 - -5.0.0-beta.3 focuses on addressing stability issues and bug fixes. It also includes: - -* Allow query all features in sources (`querySourceFeatures`) [#5792](https://github.com/mapbox/mapbox-gl-native/issues/5792) -* Improve accessibility TalkBack support by including content description in views [#8230](https://github.com/mapbox/mapbox-gl-native/pull/8230) -* Allow zooming/scaling to use `AnimationOptions` [#8181](https://github.com/mapbox/mapbox-gl-native/pull/8181) -* Telemetry Service is now include automatically via Manifest merge to simplify set up [#8338](https://github.com/mapbox/mapbox-gl-native/pull/8338) -* Correctly scale accuracy circle for `MyLocationView` [#8255](https://github.com/mapbox/mapbox-gl-native/pull/8255) -* Round tap-zoom gestures to nearest integer [#8027](https://github.com/mapbox/mapbox-gl-native/pull/8027) -* Allow callback parameter for style setting [#8262](https://github.com/mapbox/mapbox-gl-native/issues/8262) -* Avoid disabling location tracking on all gestures [#7878](https://github.com/mapbox/mapbox-gl-native/issues/7878) - -## 5.0.0-beta.2 - March 1st, 2017 - -5.0.0-beta.2 focuses on addressing stability issues and bug fixes. It also includes: - -* Data-driven styling for `{text,icon}-{color,opacity,halo-color,halo-blur,halo-width}` [#7939](https://github.com/mapbox/mapbox-gl-native/pull/7939) -* Additional APIs to manage runtime styling layers [#8195](https://github.com/mapbox/mapbox-gl-native/pull/8195) - -## 5.0.0-beta.1 - February 14th, 2017 - -* Support for data-driven styles [#7752](https://github.com/mapbox/mapbox-gl-native/pull/7752) -* Consistent double tap zoom acceleration [#7514](https://github.com/mapbox/mapbox-gl-native/issues/7514) -* Cleanup inconsistencies `float` vs `double` [#4445](https://github.com/mapbox/mapbox-gl-native/issues/4445) -* Add `mapbox_` prefix to attributes [#6482](https://github.com/mapbox/mapbox-gl-native/issues/6482) -* Update LOST to 2.0.0 [#6573](https://github.com/mapbox/mapbox-gl-native/issues/6537) -* MAS submodules (geojson, telemetry) are now smaller to reduce the overall method count [#7642](https://github.com/mapbox/mapbox-gl-native/pull/7642) -* Support for Android Nougat [#5910](5910-move-listener-logic-for-nougat) - - Move location listening logic to onStart/onStop Activity lifecylce methods -* Removal of `accessToken` on `MapView` and `MapboxMap` [#5621](https://github.com/mapbox/mapbox-gl-native/issues/5621) -* Introduction of new make targets [#5940](https://github.com/mapbox/mapbox-gl-native/issues/5940) - - Targets for testing, running and using external tools directly from the command line -* Cleanup Gradle files [#6009](https://github.com/mapbox/mapbox-gl-native/issues/6009) - - Introducing single purpose `.gradle` files -* Checkstyle integration [#7442](https://github.com/mapbox/mapbox-gl-native/pull/7442) -* Transform refactor [#6532](https://github.com/mapbox/mapbox-gl-native/issues/6532) - - All camera related code is moved to a dedicated transform class cfr. core architecture -* Encapsulate Gestures [#6557](https://github.com/mapbox/mapbox-gl-native/issues/6557) - - All gesture event code is encapsulated in `MapGestureDetector` - - All key event code is encapsulated in `MapKeyListener` -* Transparent background for `MyLocationView` [#7116](https://github.com/mapbox/mapbox-gl-native/issues/7116) -* Update documentation on generate sanity tests [#7147](https://github.com/mapbox/mapbox-gl-native/issues/7147) -* Update documentation on style templates [#7157](https://github.com/mapbox/mapbox-gl-native/issues/7157) -* `NullPointerException` during save instance state [#7157](https://github.com/mapbox/mapbox-gl-native/issues/7157) -* Move management style to core [#7275](https://github.com/mapbox/mapbox-gl-native/issues/7275) -* `OnCameraChange` not called for the final position of animation bug [#7350](https://github.com/mapbox/mapbox-gl-native/issues/7350) -* `MapboxAccountManager` refactor [#6534](https://github.com/mapbox/mapbox-gl-native/issues/6534) - - Consolidating the location where tokens are set - - Rename to reflect the increased responsibilities introduced in prior releases -* AnnotationManager refactor [#6067](https://github.com/mapbox/mapbox-gl-native/issues/6067) - - Extracting all business logic related to annotations into a separate class cfr. to core and the iOS codebase -* Gesture handling bugs - - Avoid calls to onFling when while pinch zooming [#7666](https://github.com/mapbox/mapbox-gl-native/issues/7666) -* Support for style-wide transition animation duration and delay [#6779](https://github.com/mapbox/mapbox-gl-native/issues/6779) -* Support for all animated camera changes to configure dismissing tracking modes [#7854](https://github.com/mapbox/mapbox-gl-native/issues/7854) -* `LatLng` objects produced by the SDK are wrapped by default for [compatibility](https://developers.google.com/android/reference/com/google/android/gms/maps/model/LatLng) with the Google Maps API on Android [#4522](https://github.com/mapbox/mapbox-gl-native/issues/4522) - -## 4.2.2 - January 27, 2017 - -Mapbox Android 4.2.2 builds further on v4.2.1 and resolves: -* OnFling gesture improvements - - Improve fling by calculating animation time based on velocity [#7676](https://github.com/mapbox/mapbox-gl-native/pull/7676) - - Avoid triggering a fling after a scale gesture [#7675](https://github.com/mapbox/mapbox-gl-native/issues/7675) -* Deselect marker on infowindow click [#7784](https://github.com/mapbox/mapbox-gl-native/issues/7784) -* Update build tools to Bitrise supported one [#7729](https://github.com/mapbox/mapbox-gl-native/issues/7729) -* Removal of redudant log statements in native_map_view.cpp [#7801](https://github.com/mapbox/mapbox-gl-native/issues/7801) -* Invalidate markersviews when updating their position [#7794](https://github.com/mapbox/mapbox-gl-native/issues/7794) -* Avoid clustering unclusterable GeoJSON [#7633](https://github.com/mapbox/mapbox-gl-native/pull/7633) -* Prevent null pointer exceptions when receiving connecitivy change events [#6858](https://github.com/mapbox/mapbox-gl-native/issues/6858) - -## 4.2.1 - December 22, 2016 - -Mapbox Android 4.2.1 is a bugfix release build on top of 4.2.0 and resolves: - -* Gesture handling bugs - - Reverse fling when tilted [#7383](https://github.com/mapbox/mapbox-gl-native/pull/7383) - - Rotation is hard trigger [#7299](https://github.com/mapbox/mapbox-gl-native/pull/7299) -* Null pointer exception on TrackingSettings [#7505](https://github.com/mapbox/mapbox-gl-native/pull/7505) -* Patches to our CI integration [#7363](https://github.com/mapbox/mapbox-gl-native/pull/7363) & [#7385](https://github.com/mapbox/mapbox-gl-native/pull/7385) -* Screen density is now correctly applied for attributes [#7327](https://github.com/mapbox/mapbox-gl-native/pull/7327) -* Usage of LocalBroadCastReceiver [#7511](https://github.com/mapbox/mapbox-gl-native/pull/7511) - -## 4.2.0 - December 14, 2016 - -Mapbox Android 4.2.0 contains all 4.2.0-beta.5 changes and adds: - -* Adds additional documentation to APIs -* Resolved issue with marker views occasionally not showing up until a gesture was performed on map [#7239](https://github.com/mapbox/mapbox-gl-native/pull/7239) -* Added horizontal accuracy to location events [#7237](https://github.com/mapbox/mapbox-gl-native/pull/7237) -* Resolved issue with changing visibility of a layer [#7242](https://github.com/mapbox/mapbox-gl-native/pull/7242) -* Proguard improvement and fixes - -## 4.2.0-beta.5 - October 25, 2016 - -Mapbox Android 4.2.0-beta.5 adds no new features, only bug fixes. - -## 4.2.0-beta.4 - October 25, 2016 - -Mapbox Android 4.2.0-beta.4 contains all 4.2.0-beta.3 changes and adds: - -* Query rendered features by source [#6516](https://github.com/mapbox/mapbox-gl-native/issues/6516) -* Decreased logging for release builds [#6787](https://github.com/mapbox/mapbox-gl-native/pull/6787) -* setConnected method to manually set a connected flag [#6618](https://github.com/mapbox/mapbox-gl-native/pull/6618) - -## 4.2.0-beta.3 - September 21, 2016 - -Mapbox Android 4.2.0-beta.3 contains all 4.2.0-beta.2 changes and adds: - -* Configurable API endpoint [#6309](https://github.com/mapbox/mapbox-gl-native/pull/6309) -* Adjusted logging level for failed OkHttp requests [6356](https://github.com/mapbox/mapbox-gl-native/issues/6356) -* Offline improvements: - - Fix SQLite crashes by reverting WAL journal mode [#6320](https://github.com/mapbox/mapbox-gl-native/pull/6320) - -## 4.2.0-beta.2 - August 25, 2016 - -Mapbox Android 4.2.0-beta.2 contains all 4.2.0-beta.1 changes and adds: - -* Query rendered features [#5869](https://github.com/mapbox/mapbox-gl-native/issues/5869) -* Clustering [#5852](https://github.com/mapbox/mapbox-gl-native/issues/5852) -* Integrated support for [Mapbox Android Services](https://www.mapbox.com/android-sdk/#mapbox_android_services) -* Offline improvements: - - Enable external storage to host the tiles database [#5589](https://github.com/mapbox/mapbox-gl-native/issues/5589) - - Stop delivering status updates when offline download is canceled [#5538](https://github.com/mapbox/mapbox-gl-native/issues/5538) - - Update SQLite schema with WAL journal mode and normal sync [#5796](https://github.com/mapbox/mapbox-gl-native/pull/5796) - - Check for network connectivity before requesting resources [#6123](https://github.com/mapbox/mapbox-gl-native/pull/6123) - -## 4.2.0-beta.1 - August 6, 2016 - -Mapbox Android 4.2.0 introduces the Runtime Style API and improves performance. - -* Runtime Style API ([#5610](https://github.com/mapbox/mapbox-gl-native/issues/5610)) -* Earcut ([#2444](https://github.com/mapbox/mapbox-gl-native/pull/2444)) -* Map view rendered with `SurfaceView` for improved performance [#5000](https://github.com/mapbox/mapbox-gl-native/issues/5000) - -## 4.1.1 - July 19, 2016 - -Mapbox Android 4.1.1 is a patch release and is recommended to upgrade to it as soon as possible. - -* Default Styles Caching Crash ([#5722](https://github.com/mapbox/mapbox-gl-native/issues/5722)) - -## 4.1.0 - June 29, 2016 - -Mapbox Android 4.1.0 builds off our ambitious 4.0.0 version with 3 major new features being released. - -* View Based Annotations ([#3276](https://github.com/mapbox/mapbox-gl-native/issues/3276)) -* UserLocationView Refactor ([#4396](https://github.com/mapbox/mapbox-gl-native/issues/4396)) -* MapboxAccountManager ([#5004](https://github.com/mapbox/mapbox-gl-native/issues/5004)) - -## 4.1.0-beta.3 - June 20, 2016 - -* New samples: - * [Location picker](https://github.com/mapbox/mapbox-gl-native/pull/5391) - * [Animate and rotate multiple markers](https://github.com/mapbox/mapbox-gl-native/issues/5299) - * [Scaling marker activity](https://github.com/mapbox/mapbox-gl-native/issues/5409) -* Marker improvements: - * [Expose MarkerView alpha](https://github.com/mapbox/mapbox-gl-native/pull/5329) - * [Icon should be optional for MarkerView](https://github.com/mapbox/mapbox-gl-native/pull/5328) - * [Expose an API to enable selection/deselection of markers on a map tap](https://github.com/mapbox/mapbox-gl-native/pull/5312) - * [Bring selected MarkerView to the front](https://github.com/mapbox/mapbox-gl-native/pull/5294) -* [Make gesture focal point configurable](https://github.com/mapbox/mapbox-gl-native/pull/5332) - -## 4.1.0-beta.2 - June 8, 2016 - -* Dynamically Update InfoWindow ([#5237](https://github.com/mapbox/mapbox-gl-native/issues/5237)) -* armeabi ABI Work On armv7 Devices ([#3985](https://github.com/mapbox/mapbox-gl-native/issues/3985)) -* Remove Adapter Requirement For MarkerView ([#5214](https://github.com/mapbox/mapbox-gl-native/issues/5214)) -* Always Current Version Style URL Constants ([#5193](https://github.com/mapbox/mapbox-gl-native/issues/5193)) -* Random NullPointerException On Telemetry ([#5186](https://github.com/mapbox/mapbox-gl-native/issues/5186)) - -## 4.1.0-beta.1 - May 26, 2016 - -Mapbox Android 4.1.0 builds off our ambitious 4.0.0 version with 3 major new features being released. To help us produce the highest quality SDK possible we're releasing an official Beta release first so that everyone has time to explore it and help hardened it before the official 4.1.0 Final Release. - -* View Based Annotations ([#3276](https://github.com/mapbox/mapbox-gl-native/issues/3276)) -* UserLocationView Refactor ([#4396](https://github.com/mapbox/mapbox-gl-native/issues/4396)) -* MapboxAccountManager ([#5004](https://github.com/mapbox/mapbox-gl-native/issues/5004)) - -## 4.0.1 - May 12, 2016 - -Mapbox Android 4.0.1 is a patch release to make this bug fix available sooner. - -* MapboxMap.removeAnnotations() doesn't remove markers ([#4553](https://github.com/mapbox/mapbox-gl-native/issues/4553)) - -## 4.0.0 - March 30, 2016 - -Mapbox Android 4.0.0 contains the following 3 major new features. - -* MapboxMap API Change ([#3145](https://github.com/mapbox/mapbox-gl-native/issues/3145)) -* Offline Maps ([#3891](https://github.com/mapbox/mapbox-gl-native/issues/3891)) -* Telemetry ([#2421](https://github.com/mapbox/mapbox-gl-native/issues/2421)) - -## 4.0.0-rc.1 - March 25, 2016 - -* Default Value Bug Fix for MapboxMapOptions ([#4398](https://github.com/mapbox/mapbox-gl-native/issues/4398)) -* NullPointerException When Scrolling ([#4424](https://github.com/mapbox/mapbox-gl-native/issues/4424)) -* Platform Specific CHANGELOGS ([#4432](https://github.com/mapbox/mapbox-gl-native/issues/4432)) -* Introduce LatLng.wrap() ([#4475](https://github.com/mapbox/mapbox-gl-native/issues/4475)) - -## 4.0.0-beta.2 - March 21, 2016 - -* arm64 ABI Support ([#3128](https://github.com/mapbox/mapbox-gl-native/issues/3128)) -* Unify Offline And Cache Databases ([#4362](https://github.com/mapbox/mapbox-gl-native/issues/4362)) -* Offline Database Vacuuming ([#4342](https://github.com/mapbox/mapbox-gl-native/pull/4342)) -* Telemetry User Agent Fix ([#4328](https://github.com/mapbox/mapbox-gl-native/issues/4328)) -* OnCameraChange Bug Fix ([#4327](https://github.com/mapbox/mapbox-gl-native/issues/4327)) -* OnCameraChangeListener vs getCameraPosition ([#4326](https://github.com/mapbox/mapbox-gl-native/issues/4326)) - -## 4.0.0-beta.1 - March 15, 2016 - -Mapbox Android 4.0.0 is the most ambitious Android release to date with 3 major new features being released. To help us produce the highest quality SDK possible we're releasing an official Beta release first so that everyone has time to explore it and help hardened it before the official 4.0.0 Final Release. - -* MapboxMap API Change ([#3145](https://github.com/mapbox/mapbox-gl-native/issues/3145)) -* Offline Maps ([#3891](https://github.com/mapbox/mapbox-gl-native/issues/3891)) -* Telemetry ([#2421](https://github.com/mapbox/mapbox-gl-native/issues/2421)) - -## 3.2.0 - January 28, 2016 - -* Fixed crash caused by annotation image with non-integer width or height ([#3031](https://github.com/mapbox/mapbox-gl-native/issues/3031)) -* Tracking Mode Reverses Bearing Fix ([#3664](https://github.com/mapbox/mapbox-gl-native/issues/3664)) -* GPS Extra Rotation Fix ([#3661](https://github.com/mapbox/mapbox-gl-native/issues/3661)) -* Added new methods for getting and setting the min and max zoom levels: `getMinZoom`, `setMinZoom`, `getMaxZoom`, `setMaxZoom`. ([#509](https://github.com/mapbox/mapbox-gl-native/issues/509)) - -## 3.1.0 - January 20, 2016 - -* Camera API Callback Improvements ([#3412](https://github.com/mapbox/mapbox-gl-native/issues/3412)) -* Coordinate Deprecated For LatLng ([#3309](https://github.com/mapbox/mapbox-gl-native/issues/3309)) -* Responsive User Dot Location Tracking ([#2049](https://github.com/mapbox/mapbox-gl-native/issues/2049)) - -## 3.0.0 - December 21, 2015 - -* Added Camera API ([#3244](https://github.com/mapbox/mapbox-gl-native/issues/3244)) -* Custom Layer Support ([#3248](https://github.com/mapbox/mapbox-gl-native/issues/3348)) -* Reverse Tilt Gesutre Detection ([#3245](https://github.com/mapbox/mapbox-gl-native/issues/3245)) -* Decoupled Location Provider ([#2954](https://github.com/mapbox/mapbox-gl-native/issues/2954)) - -## 2.3.0 - December 4, 2015 - -* Added Tilt / Pitch Support ([#2805](https://github.com/mapbox/mapbox-gl-native/issues/2805)) -* Keep InfoWindow Open When Panning ([#3121](https://github.com/mapbox/mapbox-gl-native/issues/3121)) -* Concurrent Multiple Open InfoWindows ([#3115](https://github.com/mapbox/mapbox-gl-native/issues/3115)) -* OkHttp Replace curl ([#2856](https://github.com/mapbox/mapbox-gl-native/issues/2856)) -* GPS and Compass Customization Support ([#2858](https://github.com/mapbox/mapbox-gl-native/issues/2858)) - -## 2.2.0 - October 28, 2015 - -- New User Dot location graphics ([#2732](https://github.com/mapbox/mapbox-gl-native/issues/2732)) -- Custom Drawable Markers ([#2744](https://github.com/mapbox/mapbox-gl-native/issues/2744)) -- `MapView.setOnInfoWindowClickListener()` support ([#2448](https://github.com/mapbox/mapbox-gl-native/issues/2448)) -- Completed Annotations API ([#1716](https://github.com/mapbox/mapbox-gl-native/issues/1716)) -- Satellite Streets Style ([#2739](https://github.com/mapbox/mapbox-gl-native/issues/2739)) -- **RESOLVED** Black Screen On Ice Cream Sandwich and Jelly Bean devices ([#2802](https://github.com/mapbox/mapbox-gl-native/issues/2802)) - -## 2.1.0 - October 21, 2015 - -- Initial Android release. diff --git a/mapbox-gl-native/platform/android/README.md b/mapbox-gl-native/platform/android/README.md deleted file mode 100644 index ff6386d39..000000000 --- a/mapbox-gl-native/platform/android/README.md +++ /dev/null @@ -1,124 +0,0 @@ -## Update - -**Work on the Mapbox Maps SDK for Android is now happening at https://github.com/mapbox/mapbox-gl-native-android. See https://github.com/mapbox/mapbox-gl-native/issues/15971 for more information.** - -The following information is retained for historical purposes but is no longer receiving updates. We make no guarantees about its accuracy. - -# [Mapbox Maps SDK for Android](https://www.mapbox.com/android-sdk/) - -[![Circle CI build status](https://circleci.com/gh/mapbox/mapbox-gl-native.svg?style=shield)](https://circleci.com/gh/mapbox/workflows/mapbox-gl-native/tree/master) - -[![](https://www.mapbox.com/android-docs/assets/overview-map-sdk-322-9abe118316efb5910b6101e222a2e57c.png)](https://docs.mapbox.com/android/maps/overview/) - -The Mapbox Maps SDK for Android is a library based on [Mapbox GL Native](../../README.md) for embedding interactive map views with scalable, customizable vector maps onto Android devices. - -## Getting Started - -This particular README is for people who are interested in working on and improving the Maps SDK for Android. If you're looking for more general information and instructions on the Maps SDK: - -Visit [https://docs.mapbox.com/android/maps/overview](https://docs.mapbox.com/android/maps/overview/) to see current documentation on the Maps SDK for Android. - -Visit [https://docs.mapbox.com/android/api/map-sdk](https://docs.mapbox.com/android/api/map-sdk/) to view the Maps SDK's current API reference Javadoc files. - -See [the Mapbox website's Android install flow](https://www.mapbox.com/install/android/) to install and use the Mapbox Maps SDK for Android in an application. - -### Setup environment - -These instructions are for developers interested in making code-level contributions to the SDK itself. If you instead want to use the SDK in your app, see above. - -#### Getting the source - -Clone the git repository - -```bash -git clone git@github.com:mapbox/mapbox-gl-native.git && cd mapbox-gl-native -``` - -#### Installing dependencies - -These dependencies are required for all operating systems and all platform targets. - -- Latest stable [Android Studio](https://developer.android.com/studio/index.html) -- Update the Mapbox Maps SDK for Android with the latest - - Android SDK Build-Tools - - Android Platform-Tools - - Android SDK Tools - - CMake - - NDK - - LLDB -- Modern C++ compiler that supports `-std=c++14`\* - - clang++ 3.5 or later or - - g++-4.9 or later -- [Node.js](https://nodejs.org/) - - make sure [npm](https://www.npmjs.com) is installed as well -- [ccache](https://ccache.samba.org/) (optional) - -**Note**: We partially support C++14 because GCC 4.9 does not fully implement the -final draft of the C++14 standard. More information in [DEVELOPING.md](../../DEVELOPING.md). - -**Note**: On macOS you can install clang with installing the [Apple command line developer tools](https://developer.apple.com/download/). - -### Opening the project - -#### macOS - -Execute the following command in this repository's root folder to generate the required build files and open the project with Android Studio: - -``` -make aproj -``` - -#### linux - -run `make android-configuration` in the root folder of the project and open the Android Studio project in `/platform/android`. - -If you are using Arch Linux, install [ncurses5-compat-libs](https://aur.archlinux.org/packages/ncurses5-compat-libs). - -### Project configuration - -#### Setup Checkstyle - -Mapbox uses specific IDE settings related to code and check style. -See [checkstyle guide](https://github.com/mapbox/mapbox-gl-native/wiki/Setting-up-Mapbox-checkstyle) for configuration details. - -#### Resolving duplicate file entries -With buck build support, Android Studio can complain about duplicate source files. To remove this warning, open `MapboxGLAndroidSDK.iml` find the list of `excludeFolder` entries and add `` line. - -##### Setting Mapbox Access Token - -_The test application (used for development purposes) uses Mapbox vector tiles, which require a Mapbox account and API access token. Obtain a free access token on the [Mapbox account page](https://www.mapbox.com/studio/account/tokens/)._ - -With the first gradle invocation, gradle will take the value of the `MAPBOX_ACCESS_TOKEN` environment variable and save it to `MapboxGLAndroidSDKTestApp/src/main/res/values/developer-config.xml`. If the environment variable wasn't set, you can edit `developer-config.xml` manually and add your access token to the `mapbox_access_token` resource. - -### Running project - -Run the configuration for the `MapboxGLAndroidSDKTestApp` module and select a device or emulator to deploy on. Based on the selected device, the c++ code will be compiled for the related processor architecture. You can see the project compiling in the `View > Tool Windows > Gradle Console`. - -More information about building and distributing this project in [DISTRIBUTE.md](https://github.com/mapbox/mapbox-gl-native/blob/master/platform/android/DISTRIBUTE.md). - -### Additional resources - -#### Using the SDK snapshot - -Instead of using the latest stable release of the Maps SDK for Android, you can use a "snapshot" or the beta version if there is one available. Our snapshots are built every time a Github pull request adds code to this repository's `master` branch. If you'd like to use a snapshot build, your Android project's gradle file should have -SNAPSHOT appended to the SDK version number. For example, the `7.3.0-SNAPSHOT` would look like: - -```java -// Mapbox SDK dependency -implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:7.3.0-SNAPSHOT' -``` - -You also need to have the section below in your build.gradle root folder to be able to resolve the SNAPSHOT dependencies: -``` -allprojects { - repositories { - jcenter() - maven { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local/' } - } -} -``` - - -#### Symbolicating native crashes - -When hitting native crashes you can use ndk-stack to symbolicate crashes. -More information in [this](https://github.com/mapbox/mapbox-gl-native/wiki/Getting-line-numbers-from-an-Android-crash-with-ndk-stack) guide. diff --git a/mapbox-gl-native/platform/android/vendor/mapbox-events-android b/mapbox-gl-native/platform/android/vendor/mapbox-events-android deleted file mode 160000 index 1136b6025..000000000 --- a/mapbox-gl-native/platform/android/vendor/mapbox-events-android +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1136b6025252a20af7859b063887a6015bc057d2 diff --git a/mapbox-gl-native/platform/android/vendor/mapbox-gestures-android b/mapbox-gl-native/platform/android/vendor/mapbox-gestures-android deleted file mode 160000 index 6fc34d91f..000000000 --- a/mapbox-gl-native/platform/android/vendor/mapbox-gestures-android +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6fc34d91fc8d8758c51830127c49223624d446aa diff --git a/mapbox-gl-native/platform/android/vendor/mapbox-java b/mapbox-gl-native/platform/android/vendor/mapbox-java deleted file mode 160000 index e9215301f..000000000 --- a/mapbox-gl-native/platform/android/vendor/mapbox-java +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e9215301fa627f4c49b8372c3bb4c59707b13c95 diff --git a/mapbox-gl-native/platform/darwin/.gitignore b/mapbox-gl-native/platform/darwin/.gitignore deleted file mode 100644 index f4635b2c1..000000000 --- a/mapbox-gl-native/platform/darwin/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Generated list files from code generation -/scripts/generate-style-code.list -/scripts/update-examples.list diff --git a/mapbox-gl-native/platform/ios/CHANGELOG.md b/mapbox-gl-native/platform/ios/CHANGELOG.md deleted file mode 100644 index c0000f027..000000000 --- a/mapbox-gl-native/platform/ios/CHANGELOG.md +++ /dev/null @@ -1,3 +0,0 @@ -# Changelog for Mapbox Maps SDK for iOS - -The [Mapbox Maps SDK for iOS](https://docs.mapbox.com/ios/maps/) moved out of this repository [in late 2019](https://github.com/mapbox/mapbox-gl-native/issues/15971). The changelog is now located [in the mapbox-gl-native-ios repository](https://github.com/mapbox/mapbox-gl-native-ios/tree/master/platform/ios/CHANGELOG.md). diff --git a/mapbox-gl-native/platform/ios/DEVELOPING.md b/mapbox-gl-native/platform/ios/DEVELOPING.md deleted file mode 100644 index c22b89db7..000000000 --- a/mapbox-gl-native/platform/ios/DEVELOPING.md +++ /dev/null @@ -1,3 +0,0 @@ -# Contributing to the Mapbox Maps SDK for iOS - -The [Mapbox Maps SDK for iOS](https://docs.mapbox.com/ios/maps/) moved out of this repository [in late 2019](https://github.com/mapbox/mapbox-gl-native/issues/15971). To build the SDK from source or contribute to the SDK, see the instructions now located [in the mapbox-gl-native-ios repository](https://github.com/mapbox/mapbox-gl-native-ios/tree/master/platform/ios/DEVELOP.md). diff --git a/mapbox-gl-native/platform/ios/INSTALL.md b/mapbox-gl-native/platform/ios/INSTALL.md deleted file mode 100644 index d6810a08c..000000000 --- a/mapbox-gl-native/platform/ios/INSTALL.md +++ /dev/null @@ -1,3 +0,0 @@ -# Integrating custom builds of the Mapbox Maps SDK for iOS into your application - -The [Mapbox Maps SDK for iOS](https://docs.mapbox.com/ios/maps/) moved out of this repository [in late 2019](https://github.com/mapbox/mapbox-gl-native/issues/15971). To build a development version of the SDK for use in your own Cocoa Touch application, see the instructions now located [in the mapbox-gl-native-ios repository](https://github.com/mapbox/mapbox-gl-native-ios/tree/master/platform/ios/INSTALL.md). To use a production-ready version of the SDK, see the [Mapbox Maps SDK for iOS installation page](https://www.mapbox.com/install/ios/). diff --git a/mapbox-gl-native/platform/ios/README.md b/mapbox-gl-native/platform/ios/README.md deleted file mode 100644 index 15e5d6657..000000000 --- a/mapbox-gl-native/platform/ios/README.md +++ /dev/null @@ -1,3 +0,0 @@ -## iOS - -This folder contains build configuration files for the iOS distribution of Mapbox GL Native, which ultimately targets Cocoa Touch applications written in Objective-C, Swift, or Interface Builder via the [Mapbox Maps SDK for iOS](https://docs.mapbox.com/ios/maps/). The SDK was previously developed here in this repository but is now developed [in the separate mapbox-gl-native-ios repository](https://github.com/mapbox/mapbox-gl-native-ios/tree/master/platform/ios/) ([details](https://github.com/mapbox/mapbox-gl-native/issues/15971)). diff --git a/mapbox-gl-native/platform/ios/platform/darwin/docs/theme b/mapbox-gl-native/platform/ios/platform/darwin/docs/theme deleted file mode 160000 index 75b9170a8..000000000 --- a/mapbox-gl-native/platform/ios/platform/darwin/docs/theme +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 75b9170a8b9f85d64f94e3083f8204edce10302c diff --git a/mapbox-gl-native/platform/ios/platform/ios/vendor/mapbox-events-ios b/mapbox-gl-native/platform/ios/platform/ios/vendor/mapbox-events-ios deleted file mode 160000 index 889aaa721..000000000 --- a/mapbox-gl-native/platform/ios/platform/ios/vendor/mapbox-events-ios +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 889aaa7214b5f432cf566b83dfa89359c78c26a9 diff --git a/mapbox-gl-native/vendor/benchmark b/mapbox-gl-native/vendor/benchmark deleted file mode 160000 index 090faecb4..000000000 --- a/mapbox-gl-native/vendor/benchmark +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 090faecb454fbd6e6e17a75ef8146acb037118d4 diff --git a/mapbox-gl-native/vendor/boost b/mapbox-gl-native/vendor/boost deleted file mode 160000 index e822019d0..000000000 --- a/mapbox-gl-native/vendor/boost +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e822019d0f36fe43103cf4208d5cccea526a15be diff --git a/mapbox-gl-native/vendor/cpp-httplib b/mapbox-gl-native/vendor/cpp-httplib deleted file mode 160000 index b557ac932..000000000 --- a/mapbox-gl-native/vendor/cpp-httplib +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b557ac9328f3571edbb8efa25905b950f6654e9d diff --git a/mapbox-gl-native/vendor/earcut.hpp b/mapbox-gl-native/vendor/earcut.hpp deleted file mode 160000 index 0d0897a9d..000000000 --- a/mapbox-gl-native/vendor/earcut.hpp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0d0897a9dc462edf6396aedb335ddeb4aa302b78 diff --git a/mapbox-gl-native/vendor/eternal b/mapbox-gl-native/vendor/eternal deleted file mode 160000 index 8eee34761..000000000 --- a/mapbox-gl-native/vendor/eternal +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8eee3476198f99c2e2621b36f764a5a30bd71ab7 diff --git a/mapbox-gl-native/vendor/googletest b/mapbox-gl-native/vendor/googletest deleted file mode 160000 index 703bd9caa..000000000 --- a/mapbox-gl-native/vendor/googletest +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 703bd9caab50b139428cea1aaff9974ebee5742e diff --git a/mapbox-gl-native/vendor/mapbox-base b/mapbox-gl-native/vendor/mapbox-base deleted file mode 160000 index 3dbd294c0..000000000 --- a/mapbox-gl-native/vendor/mapbox-base +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3dbd294c036d51d65b3bb12c628c6867d8b7b072 diff --git a/mapbox-gl-native/vendor/mapbox-gl-native-curl b/mapbox-gl-native/vendor/mapbox-gl-native-curl deleted file mode 160000 index 674a741b1..000000000 --- a/mapbox-gl-native/vendor/mapbox-gl-native-curl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 674a741b1bfa6f7c6e8bb694ba0295365c8e2096 diff --git a/mapbox-gl-native/vendor/polylabel b/mapbox-gl-native/vendor/polylabel deleted file mode 160000 index 51f09d04c..000000000 --- a/mapbox-gl-native/vendor/polylabel +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 51f09d04c21e7b7faf94e2300ca1fe6e1f12fa7f diff --git a/mapbox-gl-native/vendor/protozero b/mapbox-gl-native/vendor/protozero deleted file mode 160000 index 951a8d0e0..000000000 --- a/mapbox-gl-native/vendor/protozero +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 951a8d0e03ea07ccc4064692434ef15ff2b973f9 diff --git a/mapbox-gl-native/vendor/unique_resource b/mapbox-gl-native/vendor/unique_resource deleted file mode 160000 index cba309e92..000000000 --- a/mapbox-gl-native/vendor/unique_resource +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cba309e92ec79a95be2aa5a324a688a06af8d40a diff --git a/mapbox-gl-native/vendor/vector-tile b/mapbox-gl-native/vendor/vector-tile deleted file mode 160000 index 5084dba54..000000000 --- a/mapbox-gl-native/vendor/vector-tile +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5084dba54d2245980ffeac27ecbe47d2dd73a9d3 diff --git a/mapbox-gl-native/vendor/wagyu b/mapbox-gl-native/vendor/wagyu deleted file mode 160000 index 0ff3b5f82..000000000 --- a/mapbox-gl-native/vendor/wagyu +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0ff3b5f82908af45f32266b8cb5f107c86147d87 diff --git a/mapbox-gl-native/vendor/zip-archive b/mapbox-gl-native/vendor/zip-archive deleted file mode 160000 index 44970effa..000000000 --- a/mapbox-gl-native/vendor/zip-archive +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 44970effad727e97a28a0b21e1f5a298949cb29a diff --git a/mapbox-gl-native/metrics/FIXME-linux-asan-style.json b/metrics/FIXME-linux-asan-style.json similarity index 100% rename from mapbox-gl-native/metrics/FIXME-linux-asan-style.json rename to metrics/FIXME-linux-asan-style.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner-metrics.json b/metrics/android-render-test-runner-metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner-metrics.json rename to metrics/android-render-test-runner-metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner-style.json b/metrics/android-render-test-runner-style.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner-style.json rename to metrics/android-render-test-runner-style.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/location_indicator/dateline/metrics.json b/metrics/android-render-test-runner/location_indicator/dateline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/location_indicator/dateline/metrics.json rename to metrics/android-render-test-runner/location_indicator/dateline/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/location_indicator/default/metrics.json b/metrics/android-render-test-runner/location_indicator/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/location_indicator/default/metrics.json rename to metrics/android-render-test-runner/location_indicator/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/location_indicator/no_radius_border/metrics.json b/metrics/android-render-test-runner/location_indicator/no_radius_border/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/location_indicator/no_radius_border/metrics.json rename to metrics/android-render-test-runner/location_indicator/no_radius_border/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/location_indicator/no_radius_fill/metrics.json b/metrics/android-render-test-runner/location_indicator/no_radius_fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/location_indicator/no_radius_fill/metrics.json rename to metrics/android-render-test-runner/location_indicator/no_radius_fill/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/location_indicator/no_textures/metrics.json b/metrics/android-render-test-runner/location_indicator/no_textures/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/location_indicator/no_textures/metrics.json rename to metrics/android-render-test-runner/location_indicator/no_textures/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/location_indicator/one_texture/metrics.json b/metrics/android-render-test-runner/location_indicator/one_texture/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/location_indicator/one_texture/metrics.json rename to metrics/android-render-test-runner/location_indicator/one_texture/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/location_indicator/rotated/metrics.json b/metrics/android-render-test-runner/location_indicator/rotated/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/location_indicator/rotated/metrics.json rename to metrics/android-render-test-runner/location_indicator/rotated/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/location_indicator/tilted/metrics.json b/metrics/android-render-test-runner/location_indicator/tilted/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/location_indicator/tilted/metrics.json rename to metrics/android-render-test-runner/location_indicator/tilted/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/location_indicator/tilted_texture_shift/metrics.json b/metrics/android-render-test-runner/location_indicator/tilted_texture_shift/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/location_indicator/tilted_texture_shift/metrics.json rename to metrics/android-render-test-runner/location_indicator/tilted_texture_shift/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/location_indicator/tilted_texture_shift_bottom_left/metrics.json b/metrics/android-render-test-runner/location_indicator/tilted_texture_shift_bottom_left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/location_indicator/tilted_texture_shift_bottom_left/metrics.json rename to metrics/android-render-test-runner/location_indicator/tilted_texture_shift_bottom_left/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/location_indicator/tilted_texture_shift_bottom_right/metrics.json b/metrics/android-render-test-runner/location_indicator/tilted_texture_shift_bottom_right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/location_indicator/tilted_texture_shift_bottom_right/metrics.json rename to metrics/android-render-test-runner/location_indicator/tilted_texture_shift_bottom_right/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/location_indicator/tilted_texture_shift_top_left/metrics.json b/metrics/android-render-test-runner/location_indicator/tilted_texture_shift_top_left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/location_indicator/tilted_texture_shift_top_left/metrics.json rename to metrics/android-render-test-runner/location_indicator/tilted_texture_shift_top_left/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/location_indicator/tilted_texture_shift_top_right/metrics.json b/metrics/android-render-test-runner/location_indicator/tilted_texture_shift_top_right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/location_indicator/tilted_texture_shift_top_right/metrics.json rename to metrics/android-render-test-runner/location_indicator/tilted_texture_shift_top_right/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/location_indicator/two_textures/metrics.json b/metrics/android-render-test-runner/location_indicator/two_textures/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/location_indicator/two_textures/metrics.json rename to metrics/android-render-test-runner/location_indicator/two_textures/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/background-color/colorSpace-lab/metrics.json b/metrics/android-render-test-runner/render-tests/background-color/colorSpace-lab/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/background-color/colorSpace-lab/metrics.json rename to metrics/android-render-test-runner/render-tests/background-color/colorSpace-lab/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/background-color/default/metrics.json b/metrics/android-render-test-runner/render-tests/background-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/background-color/default/metrics.json rename to metrics/android-render-test-runner/render-tests/background-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/background-color/function/metrics.json b/metrics/android-render-test-runner/render-tests/background-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/background-color/function/metrics.json rename to metrics/android-render-test-runner/render-tests/background-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/background-color/literal/metrics.json b/metrics/android-render-test-runner/render-tests/background-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/background-color/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/background-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/background-opacity/color/metrics.json b/metrics/android-render-test-runner/render-tests/background-opacity/color/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/background-opacity/color/metrics.json rename to metrics/android-render-test-runner/render-tests/background-opacity/color/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/background-opacity/image/metrics.json b/metrics/android-render-test-runner/render-tests/background-opacity/image/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/background-opacity/image/metrics.json rename to metrics/android-render-test-runner/render-tests/background-opacity/image/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/background-opacity/overlay/metrics.json b/metrics/android-render-test-runner/render-tests/background-opacity/overlay/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/background-opacity/overlay/metrics.json rename to metrics/android-render-test-runner/render-tests/background-opacity/overlay/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/background-pattern/@2x/metrics.json b/metrics/android-render-test-runner/render-tests/background-pattern/@2x/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/background-pattern/@2x/metrics.json rename to metrics/android-render-test-runner/render-tests/background-pattern/@2x/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/background-pattern/literal/metrics.json b/metrics/android-render-test-runner/render-tests/background-pattern/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/background-pattern/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/background-pattern/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/background-pattern/missing/metrics.json b/metrics/android-render-test-runner/render-tests/background-pattern/missing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/background-pattern/missing/metrics.json rename to metrics/android-render-test-runner/render-tests/background-pattern/missing/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/background-pattern/pitch/metrics.json b/metrics/android-render-test-runner/render-tests/background-pattern/pitch/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/background-pattern/pitch/metrics.json rename to metrics/android-render-test-runner/render-tests/background-pattern/pitch/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/background-pattern/rotated/metrics.json b/metrics/android-render-test-runner/render-tests/background-pattern/rotated/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/background-pattern/rotated/metrics.json rename to metrics/android-render-test-runner/render-tests/background-pattern/rotated/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/background-pattern/zoomed/metrics.json b/metrics/android-render-test-runner/render-tests/background-pattern/zoomed/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/background-pattern/zoomed/metrics.json rename to metrics/android-render-test-runner/render-tests/background-pattern/zoomed/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/background-visibility/none/metrics.json b/metrics/android-render-test-runner/render-tests/background-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/background-visibility/none/metrics.json rename to metrics/android-render-test-runner/render-tests/background-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/background-visibility/visible/metrics.json b/metrics/android-render-test-runner/render-tests/background-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/background-visibility/visible/metrics.json rename to metrics/android-render-test-runner/render-tests/background-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/basic-v9/z0-narrow-y/metrics.json b/metrics/android-render-test-runner/render-tests/basic-v9/z0-narrow-y/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/basic-v9/z0-narrow-y/metrics.json rename to metrics/android-render-test-runner/render-tests/basic-v9/z0-narrow-y/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/basic-v9/z0-wide-x/metrics.json b/metrics/android-render-test-runner/render-tests/basic-v9/z0-wide-x/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/basic-v9/z0-wide-x/metrics.json rename to metrics/android-render-test-runner/render-tests/basic-v9/z0-wide-x/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/basic-v9/z0/metrics.json b/metrics/android-render-test-runner/render-tests/basic-v9/z0/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/basic-v9/z0/metrics.json rename to metrics/android-render-test-runner/render-tests/basic-v9/z0/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/bright-v9/z0/metrics.json b/metrics/android-render-test-runner/render-tests/bright-v9/z0/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/bright-v9/z0/metrics.json rename to metrics/android-render-test-runner/render-tests/bright-v9/z0/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-blur/blending/metrics.json b/metrics/android-render-test-runner/render-tests/circle-blur/blending/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-blur/blending/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-blur/blending/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-blur/default/metrics.json b/metrics/android-render-test-runner/render-tests/circle-blur/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-blur/default/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-blur/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-blur/function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-blur/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-blur/function/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-blur/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-blur/literal-stroke/metrics.json b/metrics/android-render-test-runner/render-tests/circle-blur/literal-stroke/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-blur/literal-stroke/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-blur/literal-stroke/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-blur/literal/metrics.json b/metrics/android-render-test-runner/render-tests/circle-blur/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-blur/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-blur/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-blur/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-blur/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-blur/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-blur/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-blur/zoom-and-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-blur/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-blur/zoom-and-property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-blur/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-color/default/metrics.json b/metrics/android-render-test-runner/render-tests/circle-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-color/default/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-color/function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-color/function/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-color/literal/metrics.json b/metrics/android-render-test-runner/render-tests/circle-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-color/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-color/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-color/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-color/zoom-and-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-color/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-color/zoom-and-property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-color/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-geometry/linestring/metrics.json b/metrics/android-render-test-runner/render-tests/circle-geometry/linestring/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-geometry/linestring/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-geometry/linestring/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-geometry/multilinestring/metrics.json b/metrics/android-render-test-runner/render-tests/circle-geometry/multilinestring/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-geometry/multilinestring/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-geometry/multilinestring/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-geometry/multipoint/metrics.json b/metrics/android-render-test-runner/render-tests/circle-geometry/multipoint/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-geometry/multipoint/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-geometry/multipoint/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-geometry/multipolygon/metrics.json b/metrics/android-render-test-runner/render-tests/circle-geometry/multipolygon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-geometry/multipolygon/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-geometry/multipolygon/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-geometry/point/metrics.json b/metrics/android-render-test-runner/render-tests/circle-geometry/point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-geometry/point/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-geometry/point/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-geometry/polygon/metrics.json b/metrics/android-render-test-runner/render-tests/circle-geometry/polygon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-geometry/polygon/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-geometry/polygon/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-opacity/blending/metrics.json b/metrics/android-render-test-runner/render-tests/circle-opacity/blending/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-opacity/blending/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-opacity/blending/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-opacity/default/metrics.json b/metrics/android-render-test-runner/render-tests/circle-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-opacity/default/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-opacity/function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-opacity/function/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-opacity/literal/metrics.json b/metrics/android-render-test-runner/render-tests/circle-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-opacity/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-opacity/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-opacity/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-opacity/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-opacity/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-opacity/zoom-and-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-opacity/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-opacity/zoom-and-property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-opacity/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-pitch-alignment/map-scale-map/metrics.json b/metrics/android-render-test-runner/render-tests/circle-pitch-alignment/map-scale-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-pitch-alignment/map-scale-map/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-pitch-alignment/map-scale-map/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json b/metrics/android-render-test-runner/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json b/metrics/android-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json b/metrics/android-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-pitch-scale/default/metrics.json b/metrics/android-render-test-runner/render-tests/circle-pitch-scale/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-pitch-scale/default/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-pitch-scale/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-pitch-scale/map/metrics.json b/metrics/android-render-test-runner/render-tests/circle-pitch-scale/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-pitch-scale/map/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-pitch-scale/map/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-pitch-scale/viewport/metrics.json b/metrics/android-render-test-runner/render-tests/circle-pitch-scale/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-pitch-scale/viewport/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-pitch-scale/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-radius/antimeridian/metrics.json b/metrics/android-render-test-runner/render-tests/circle-radius/antimeridian/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-radius/antimeridian/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-radius/antimeridian/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-radius/default/metrics.json b/metrics/android-render-test-runner/render-tests/circle-radius/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-radius/default/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-radius/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-radius/function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-radius/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-radius/function/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-radius/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-radius/literal/metrics.json b/metrics/android-render-test-runner/render-tests/circle-radius/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-radius/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-radius/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-radius/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-radius/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-radius/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-radius/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-radius/zoom-and-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-radius/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-radius/zoom-and-property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-radius/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-sort-key/literal/metrics.json b/metrics/android-render-test-runner/render-tests/circle-sort-key/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-sort-key/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-sort-key/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-stroke-color/default/metrics.json b/metrics/android-render-test-runner/render-tests/circle-stroke-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-stroke-color/default/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-stroke-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-stroke-color/function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-stroke-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-stroke-color/function/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-stroke-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-stroke-color/literal/metrics.json b/metrics/android-render-test-runner/render-tests/circle-stroke-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-stroke-color/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-stroke-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-stroke-color/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-stroke-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-stroke-color/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-stroke-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-stroke-opacity/default/metrics.json b/metrics/android-render-test-runner/render-tests/circle-stroke-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-stroke-opacity/default/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-stroke-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-stroke-opacity/function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-stroke-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-stroke-opacity/function/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-stroke-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-stroke-opacity/literal/metrics.json b/metrics/android-render-test-runner/render-tests/circle-stroke-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-stroke-opacity/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-stroke-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-stroke-opacity/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-stroke-opacity/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-stroke-opacity/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-stroke-opacity/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-stroke-opacity/stroke-only/metrics.json b/metrics/android-render-test-runner/render-tests/circle-stroke-opacity/stroke-only/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-stroke-opacity/stroke-only/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-stroke-opacity/stroke-only/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-stroke-width/default/metrics.json b/metrics/android-render-test-runner/render-tests/circle-stroke-width/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-stroke-width/default/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-stroke-width/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-stroke-width/function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-stroke-width/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-stroke-width/function/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-stroke-width/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-stroke-width/literal/metrics.json b/metrics/android-render-test-runner/render-tests/circle-stroke-width/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-stroke-width/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-stroke-width/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-stroke-width/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-stroke-width/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-stroke-width/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-stroke-width/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-translate-anchor/map/metrics.json b/metrics/android-render-test-runner/render-tests/circle-translate-anchor/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-translate-anchor/map/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-translate-anchor/map/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-translate-anchor/viewport/metrics.json b/metrics/android-render-test-runner/render-tests/circle-translate-anchor/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-translate-anchor/viewport/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-translate-anchor/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-translate/default/metrics.json b/metrics/android-render-test-runner/render-tests/circle-translate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-translate/default/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-translate/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-translate/function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-translate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-translate/function/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-translate/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-translate/literal/metrics.json b/metrics/android-render-test-runner/render-tests/circle-translate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/circle-translate/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/circle-translate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-opaque--background-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-opaque--background-opaque/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/background-opaque--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-opaque--background-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-opaque--background-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/background-opaque--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-opaque--circle-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-opaque--circle-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/background-opaque--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-opaque--fill-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-opaque--fill-opaque/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/background-opaque--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-opaque--fill-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-opaque--fill-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/background-opaque--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-opaque--line-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-opaque--line-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/background-opaque--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-opaque--raster-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-opaque--raster-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/background-opaque--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-opaque--symbol-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-opaque--symbol-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/background-opaque--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-translucent--background-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-translucent--background-opaque/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/background-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-translucent--background-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-translucent--background-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/background-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-translucent--circle-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-translucent--circle-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/background-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-translucent--fill-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-translucent--fill-opaque/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/background-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-translucent--fill-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-translucent--fill-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/background-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-translucent--line-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-translucent--line-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/background-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-translucent--raster-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-translucent--raster-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/background-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-translucent--symbol-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/background-translucent--symbol-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/background-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--background-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--background-opaque/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/circle-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--background-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--background-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/circle-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--circle-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--circle-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/circle-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--fill-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--fill-opaque/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/circle-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--fill-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--fill-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/circle-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--line-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--line-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/circle-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--raster-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--raster-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/circle-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--background-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--background-opaque/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-opaque--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--background-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--background-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-opaque--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--circle-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--circle-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-opaque--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--fill-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--fill-opaque/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-opaque--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--fill-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--fill-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-opaque--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--line-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--line-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-opaque--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--raster-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--raster-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-opaque--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--background-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--background-opaque/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--background-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--background-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--circle-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--circle-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--fill-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--fill-opaque/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--fill-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--fill-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--line-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--line-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--raster-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--raster-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/line-translucent--background-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/line-translucent--background-opaque/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/line-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/line-translucent--background-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/line-translucent--background-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/line-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/line-translucent--circle-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/line-translucent--circle-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/line-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/line-translucent--fill-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/line-translucent--fill-opaque/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/line-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/line-translucent--fill-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/line-translucent--fill-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/line-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/line-translucent--line-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/line-translucent--line-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/line-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/line-translucent--raster-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/line-translucent--raster-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/line-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/line-translucent--symbol-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/line-translucent--symbol-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/line-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--background-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--background-opaque/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/raster-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--background-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--background-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/raster-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--circle-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--circle-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/raster-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--fill-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--fill-opaque/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/raster-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--fill-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--fill-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/raster-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--line-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--line-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/raster-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--raster-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--raster-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/raster-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--background-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--background-opaque/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--background-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--background-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--line-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--line-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/debug/collision-icon-text-line-translate/metrics.json b/metrics/android-render-test-runner/render-tests/debug/collision-icon-text-line-translate/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/debug/collision-icon-text-line-translate/metrics.json rename to metrics/android-render-test-runner/render-tests/debug/collision-icon-text-line-translate/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/debug/collision-icon-text-point-translate/metrics.json b/metrics/android-render-test-runner/render-tests/debug/collision-icon-text-point-translate/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/debug/collision-icon-text-point-translate/metrics.json rename to metrics/android-render-test-runner/render-tests/debug/collision-icon-text-point-translate/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/debug/collision-lines-overscaled/metrics.json b/metrics/android-render-test-runner/render-tests/debug/collision-lines-overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/debug/collision-lines-overscaled/metrics.json rename to metrics/android-render-test-runner/render-tests/debug/collision-lines-overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/debug/collision-lines-pitched/metrics.json b/metrics/android-render-test-runner/render-tests/debug/collision-lines-pitched/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/debug/collision-lines-pitched/metrics.json rename to metrics/android-render-test-runner/render-tests/debug/collision-lines-pitched/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/debug/collision-lines/metrics.json b/metrics/android-render-test-runner/render-tests/debug/collision-lines/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/debug/collision-lines/metrics.json rename to metrics/android-render-test-runner/render-tests/debug/collision-lines/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/debug/collision-overscaled/metrics.json b/metrics/android-render-test-runner/render-tests/debug/collision-overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/debug/collision-overscaled/metrics.json rename to metrics/android-render-test-runner/render-tests/debug/collision-overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/debug/collision-pitched-wrapped/metrics.json b/metrics/android-render-test-runner/render-tests/debug/collision-pitched-wrapped/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/debug/collision-pitched-wrapped/metrics.json rename to metrics/android-render-test-runner/render-tests/debug/collision-pitched-wrapped/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/debug/collision-pitched/metrics.json b/metrics/android-render-test-runner/render-tests/debug/collision-pitched/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/debug/collision-pitched/metrics.json rename to metrics/android-render-test-runner/render-tests/debug/collision-pitched/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/empty/empty/metrics.json b/metrics/android-render-test-runner/render-tests/empty/empty/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/empty/empty/metrics.json rename to metrics/android-render-test-runner/render-tests/empty/empty/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/extent/1024-fill/metrics.json b/metrics/android-render-test-runner/render-tests/extent/1024-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/extent/1024-fill/metrics.json rename to metrics/android-render-test-runner/render-tests/extent/1024-fill/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/extent/1024-line/metrics.json b/metrics/android-render-test-runner/render-tests/extent/1024-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/extent/1024-line/metrics.json rename to metrics/android-render-test-runner/render-tests/extent/1024-line/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/extent/1024-symbol/metrics.json b/metrics/android-render-test-runner/render-tests/extent/1024-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/extent/1024-symbol/metrics.json rename to metrics/android-render-test-runner/render-tests/extent/1024-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/feature-state/composite-expression/metrics.json b/metrics/android-render-test-runner/render-tests/feature-state/composite-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/feature-state/composite-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/feature-state/composite-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/feature-state/data-expression/metrics.json b/metrics/android-render-test-runner/render-tests/feature-state/data-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/feature-state/data-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/feature-state/data-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/feature-state/vector-source/metrics.json b/metrics/android-render-test-runner/render-tests/feature-state/vector-source/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/feature-state/vector-source/metrics.json rename to metrics/android-render-test-runner/render-tests/feature-state/vector-source/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-antialias/false/metrics.json b/metrics/android-render-test-runner/render-tests/fill-antialias/false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-antialias/false/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-antialias/false/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-color/default/metrics.json b/metrics/android-render-test-runner/render-tests/fill-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-color/default/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-color/function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-color/function/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-color/literal/metrics.json b/metrics/android-render-test-runner/render-tests/fill-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-color/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-color/multiply/metrics.json b/metrics/android-render-test-runner/render-tests/fill-color/multiply/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-color/multiply/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-color/multiply/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-color/opacity/metrics.json b/metrics/android-render-test-runner/render-tests/fill-color/opacity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-color/opacity/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-color/opacity/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-color/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-color/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-color/zoom-and-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-color/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-color/zoom-and-property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-color/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-base/default/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-base/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-base/default/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-extrusion-base/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-base/function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-base/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-base/function/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-extrusion-base/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-base/literal/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-base/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-base/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-extrusion-base/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-base/negative/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-base/negative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-base/negative/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-extrusion-base/negative/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-base/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-base/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-base/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-extrusion-base/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-color/default/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-color/default/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-extrusion-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-color/function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-color/function/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-extrusion-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-color/literal/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-color/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-extrusion-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-color/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-color/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-extrusion-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-height/default/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-height/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-height/default/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-extrusion-height/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-height/function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-height/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-height/function/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-extrusion-height/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-height/negative/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-height/negative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-height/negative/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-extrusion-height/negative/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-height/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-height/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-height/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-extrusion-height/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-multiple/multiple/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-multiple/multiple/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-multiple/multiple/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-extrusion-multiple/multiple/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-opacity/default/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-opacity/default/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-extrusion-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-opacity/function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-opacity/function/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-extrusion-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-opacity/literal/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-opacity/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-extrusion-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-pattern/missing/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-pattern/missing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-pattern/missing/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-extrusion-pattern/missing/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-translate-anchor/map/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-translate-anchor/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-translate-anchor/map/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-extrusion-translate-anchor/map/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-translate/default/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-translate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-translate/default/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-extrusion-translate/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-translate/function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-translate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-translate/function/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-extrusion-translate/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-translate/literal-opacity/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-translate/literal-opacity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-translate/literal-opacity/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-extrusion-translate/literal-opacity/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-translate/literal/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-translate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-translate/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-extrusion-translate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-vertical-gradient/default/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-vertical-gradient/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-vertical-gradient/default/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-extrusion-vertical-gradient/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-vertical-gradient/false/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-vertical-gradient/false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-extrusion-vertical-gradient/false/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-extrusion-vertical-gradient/false/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-opacity/default/metrics.json b/metrics/android-render-test-runner/render-tests/fill-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-opacity/default/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-opacity/function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-opacity/function/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-opacity/literal/metrics.json b/metrics/android-render-test-runner/render-tests/fill-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-opacity/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json b/metrics/android-render-test-runner/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-opacity/overlapping/metrics.json b/metrics/android-render-test-runner/render-tests/fill-opacity/overlapping/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-opacity/overlapping/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-opacity/overlapping/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-opacity/property-function-pattern/metrics.json b/metrics/android-render-test-runner/render-tests/fill-opacity/property-function-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-opacity/property-function-pattern/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-opacity/property-function-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-opacity/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-opacity/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-opacity/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-opacity/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-opacity/zoom-and-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-opacity/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-opacity/zoom-and-property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-opacity/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-outline-color/default/metrics.json b/metrics/android-render-test-runner/render-tests/fill-outline-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-outline-color/default/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-outline-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-outline-color/fill/metrics.json b/metrics/android-render-test-runner/render-tests/fill-outline-color/fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-outline-color/fill/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-outline-color/fill/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-outline-color/function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-outline-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-outline-color/function/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-outline-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-outline-color/literal/metrics.json b/metrics/android-render-test-runner/render-tests/fill-outline-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-outline-color/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-outline-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-outline-color/multiply/metrics.json b/metrics/android-render-test-runner/render-tests/fill-outline-color/multiply/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-outline-color/multiply/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-outline-color/multiply/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-outline-color/opacity/metrics.json b/metrics/android-render-test-runner/render-tests/fill-outline-color/opacity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-outline-color/opacity/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-outline-color/opacity/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-outline-color/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-outline-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-outline-color/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-outline-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-outline-color/zoom-and-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-outline-color/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-outline-color/zoom-and-property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-outline-color/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-pattern/@2x/metrics.json b/metrics/android-render-test-runner/render-tests/fill-pattern/@2x/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-pattern/@2x/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-pattern/@2x/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-pattern/case-data-expression/metrics.json b/metrics/android-render-test-runner/render-tests/fill-pattern/case-data-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-pattern/case-data-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-pattern/case-data-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-pattern/invalid-feature-expression/metrics.json b/metrics/android-render-test-runner/render-tests/fill-pattern/invalid-feature-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-pattern/invalid-feature-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-pattern/invalid-feature-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-pattern/missing/metrics.json b/metrics/android-render-test-runner/render-tests/fill-pattern/missing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-pattern/missing/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-pattern/missing/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-pattern/uneven-pattern/metrics.json b/metrics/android-render-test-runner/render-tests/fill-pattern/uneven-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-pattern/uneven-pattern/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-pattern/uneven-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json b/metrics/android-render-test-runner/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-sort-key/literal/metrics.json b/metrics/android-render-test-runner/render-tests/fill-sort-key/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-sort-key/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-sort-key/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-translate-anchor/map/metrics.json b/metrics/android-render-test-runner/render-tests/fill-translate-anchor/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-translate-anchor/map/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-translate-anchor/map/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-translate-anchor/viewport/metrics.json b/metrics/android-render-test-runner/render-tests/fill-translate-anchor/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-translate-anchor/viewport/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-translate-anchor/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-translate/default/metrics.json b/metrics/android-render-test-runner/render-tests/fill-translate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-translate/default/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-translate/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-translate/function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-translate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-translate/function/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-translate/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-translate/literal/metrics.json b/metrics/android-render-test-runner/render-tests/fill-translate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-translate/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-translate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-visibility/none/metrics.json b/metrics/android-render-test-runner/render-tests/fill-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-visibility/none/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-visibility/visible/metrics.json b/metrics/android-render-test-runner/render-tests/fill-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/fill-visibility/visible/metrics.json rename to metrics/android-render-test-runner/render-tests/fill-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/filter/equality/metrics.json b/metrics/android-render-test-runner/render-tests/filter/equality/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/filter/equality/metrics.json rename to metrics/android-render-test-runner/render-tests/filter/equality/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/filter/in/metrics.json b/metrics/android-render-test-runner/render-tests/filter/in/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/filter/in/metrics.json rename to metrics/android-render-test-runner/render-tests/filter/in/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/filter/legacy-equality/metrics.json b/metrics/android-render-test-runner/render-tests/filter/legacy-equality/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/filter/legacy-equality/metrics.json rename to metrics/android-render-test-runner/render-tests/filter/legacy-equality/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/filter/none/metrics.json b/metrics/android-render-test-runner/render-tests/filter/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/filter/none/metrics.json rename to metrics/android-render-test-runner/render-tests/filter/none/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/clustered-properties/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/clustered-properties/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/clustered-properties/metrics.json rename to metrics/android-render-test-runner/render-tests/geojson/clustered-properties/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/clustered/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/clustered/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/clustered/metrics.json rename to metrics/android-render-test-runner/render-tests/geojson/clustered/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/external-feature/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/external-feature/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/external-feature/metrics.json rename to metrics/android-render-test-runner/render-tests/geojson/external-feature/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/external-invalid/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/external-invalid/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/external-invalid/metrics.json rename to metrics/android-render-test-runner/render-tests/geojson/external-invalid/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/external-linestring/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/external-linestring/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/external-linestring/metrics.json rename to metrics/android-render-test-runner/render-tests/geojson/external-linestring/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/external-malformed/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/external-malformed/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/external-malformed/metrics.json rename to metrics/android-render-test-runner/render-tests/geojson/external-malformed/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/inconsistent-winding-order/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/inconsistent-winding-order/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/inconsistent-winding-order/metrics.json rename to metrics/android-render-test-runner/render-tests/geojson/inconsistent-winding-order/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/inline-feature/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/inline-feature/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/inline-feature/metrics.json rename to metrics/android-render-test-runner/render-tests/geojson/inline-feature/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/inline-invalid/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/inline-invalid/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/inline-invalid/metrics.json rename to metrics/android-render-test-runner/render-tests/geojson/inline-invalid/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/inline-linestring-circle/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/inline-linestring-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/inline-linestring-circle/metrics.json rename to metrics/android-render-test-runner/render-tests/geojson/inline-linestring-circle/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/inline-linestring-line/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/inline-linestring-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/inline-linestring-line/metrics.json rename to metrics/android-render-test-runner/render-tests/geojson/inline-linestring-line/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/inline-linestring-symbol/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/inline-linestring-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/inline-linestring-symbol/metrics.json rename to metrics/android-render-test-runner/render-tests/geojson/inline-linestring-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/inline-malformed/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/inline-malformed/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/inline-malformed/metrics.json rename to metrics/android-render-test-runner/render-tests/geojson/inline-malformed/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/inline-point-circle/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/inline-point-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/inline-point-circle/metrics.json rename to metrics/android-render-test-runner/render-tests/geojson/inline-point-circle/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/inline-point-fill/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/inline-point-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/inline-point-fill/metrics.json rename to metrics/android-render-test-runner/render-tests/geojson/inline-point-fill/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/inline-point-line/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/inline-point-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/inline-point-line/metrics.json rename to metrics/android-render-test-runner/render-tests/geojson/inline-point-line/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/inline-point-symbol/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/inline-point-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/inline-point-symbol/metrics.json rename to metrics/android-render-test-runner/render-tests/geojson/inline-point-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/inline-polygon-circle/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/inline-polygon-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/inline-polygon-circle/metrics.json rename to metrics/android-render-test-runner/render-tests/geojson/inline-polygon-circle/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/inline-polygon-fill/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/inline-polygon-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/inline-polygon-fill/metrics.json rename to metrics/android-render-test-runner/render-tests/geojson/inline-polygon-fill/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/inline-polygon-line/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/inline-polygon-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/inline-polygon-line/metrics.json rename to metrics/android-render-test-runner/render-tests/geojson/inline-polygon-line/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/inline-polygon-symbol/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/inline-polygon-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/inline-polygon-symbol/metrics.json rename to metrics/android-render-test-runner/render-tests/geojson/inline-polygon-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/missing/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/missing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/missing/metrics.json rename to metrics/android-render-test-runner/render-tests/geojson/missing/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/reparse-overscaled/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/reparse-overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/geojson/reparse-overscaled/metrics.json rename to metrics/android-render-test-runner/render-tests/geojson/reparse-overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-color/default/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-color/default/metrics.json rename to metrics/android-render-test-runner/render-tests/heatmap-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-color/expression/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-color/expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-color/expression/metrics.json rename to metrics/android-render-test-runner/render-tests/heatmap-color/expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-intensity/default/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-intensity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-intensity/default/metrics.json rename to metrics/android-render-test-runner/render-tests/heatmap-intensity/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-intensity/function/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-intensity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-intensity/function/metrics.json rename to metrics/android-render-test-runner/render-tests/heatmap-intensity/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-intensity/literal/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-intensity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-intensity/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/heatmap-intensity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-opacity/default/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-opacity/default/metrics.json rename to metrics/android-render-test-runner/render-tests/heatmap-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-opacity/function/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-opacity/function/metrics.json rename to metrics/android-render-test-runner/render-tests/heatmap-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-opacity/literal/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-opacity/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/heatmap-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-radius/antimeridian/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-radius/antimeridian/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-radius/antimeridian/metrics.json rename to metrics/android-render-test-runner/render-tests/heatmap-radius/antimeridian/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-radius/data-expression/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-radius/data-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-radius/data-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/heatmap-radius/data-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-radius/default/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-radius/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-radius/default/metrics.json rename to metrics/android-render-test-runner/render-tests/heatmap-radius/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-radius/function/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-radius/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-radius/function/metrics.json rename to metrics/android-render-test-runner/render-tests/heatmap-radius/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-radius/literal/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-radius/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-radius/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/heatmap-radius/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-radius/pitch30/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-radius/pitch30/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-radius/pitch30/metrics.json rename to metrics/android-render-test-runner/render-tests/heatmap-radius/pitch30/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-weight/default/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-weight/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-weight/default/metrics.json rename to metrics/android-render-test-runner/render-tests/heatmap-weight/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-weight/identity-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-weight/identity-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-weight/identity-property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/heatmap-weight/identity-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-weight/literal/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-weight/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/heatmap-weight/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/heatmap-weight/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/hillshade-accent-color/default/metrics.json b/metrics/android-render-test-runner/render-tests/hillshade-accent-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/hillshade-accent-color/default/metrics.json rename to metrics/android-render-test-runner/render-tests/hillshade-accent-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/hillshade-accent-color/literal/metrics.json b/metrics/android-render-test-runner/render-tests/hillshade-accent-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/hillshade-accent-color/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/hillshade-accent-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/hillshade-accent-color/terrarium/metrics.json b/metrics/android-render-test-runner/render-tests/hillshade-accent-color/terrarium/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/hillshade-accent-color/terrarium/metrics.json rename to metrics/android-render-test-runner/render-tests/hillshade-accent-color/terrarium/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/hillshade-accent-color/zoom-function/metrics.json b/metrics/android-render-test-runner/render-tests/hillshade-accent-color/zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/hillshade-accent-color/zoom-function/metrics.json rename to metrics/android-render-test-runner/render-tests/hillshade-accent-color/zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/hillshade-highlight-color/default/metrics.json b/metrics/android-render-test-runner/render-tests/hillshade-highlight-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/hillshade-highlight-color/default/metrics.json rename to metrics/android-render-test-runner/render-tests/hillshade-highlight-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/hillshade-highlight-color/literal/metrics.json b/metrics/android-render-test-runner/render-tests/hillshade-highlight-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/hillshade-highlight-color/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/hillshade-highlight-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/hillshade-highlight-color/zoom-function/metrics.json b/metrics/android-render-test-runner/render-tests/hillshade-highlight-color/zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/hillshade-highlight-color/zoom-function/metrics.json rename to metrics/android-render-test-runner/render-tests/hillshade-highlight-color/zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/hillshade-shadow-color/default/metrics.json b/metrics/android-render-test-runner/render-tests/hillshade-shadow-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/hillshade-shadow-color/default/metrics.json rename to metrics/android-render-test-runner/render-tests/hillshade-shadow-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/hillshade-shadow-color/literal/metrics.json b/metrics/android-render-test-runner/render-tests/hillshade-shadow-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/hillshade-shadow-color/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/hillshade-shadow-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/hillshade-shadow-color/zoom-function/metrics.json b/metrics/android-render-test-runner/render-tests/hillshade-shadow-color/zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/hillshade-shadow-color/zoom-function/metrics.json rename to metrics/android-render-test-runner/render-tests/hillshade-shadow-color/zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-anchor/bottom-left/metrics.json b/metrics/android-render-test-runner/render-tests/icon-anchor/bottom-left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-anchor/bottom-left/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-anchor/bottom-left/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-anchor/bottom-right/metrics.json b/metrics/android-render-test-runner/render-tests/icon-anchor/bottom-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-anchor/bottom-right/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-anchor/bottom-right/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-anchor/bottom/metrics.json b/metrics/android-render-test-runner/render-tests/icon-anchor/bottom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-anchor/bottom/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-anchor/bottom/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-anchor/center/metrics.json b/metrics/android-render-test-runner/render-tests/icon-anchor/center/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-anchor/center/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-anchor/center/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-anchor/default/metrics.json b/metrics/android-render-test-runner/render-tests/icon-anchor/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-anchor/default/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-anchor/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-anchor/left/metrics.json b/metrics/android-render-test-runner/render-tests/icon-anchor/left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-anchor/left/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-anchor/left/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-anchor/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-anchor/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-anchor/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-anchor/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-anchor/right/metrics.json b/metrics/android-render-test-runner/render-tests/icon-anchor/right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-anchor/right/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-anchor/right/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-anchor/top-left/metrics.json b/metrics/android-render-test-runner/render-tests/icon-anchor/top-left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-anchor/top-left/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-anchor/top-left/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-anchor/top-right/metrics.json b/metrics/android-render-test-runner/render-tests/icon-anchor/top-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-anchor/top-right/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-anchor/top-right/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-anchor/top/metrics.json b/metrics/android-render-test-runner/render-tests/icon-anchor/top/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-anchor/top/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-anchor/top/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-color/default/metrics.json b/metrics/android-render-test-runner/render-tests/icon-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-color/default/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-color/function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-color/function/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-color/literal/metrics.json b/metrics/android-render-test-runner/render-tests/icon-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-color/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-color/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-color/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-halo-blur/default/metrics.json b/metrics/android-render-test-runner/render-tests/icon-halo-blur/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-halo-blur/default/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-halo-blur/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-halo-blur/function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-halo-blur/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-halo-blur/function/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-halo-blur/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-halo-blur/literal/metrics.json b/metrics/android-render-test-runner/render-tests/icon-halo-blur/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-halo-blur/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-halo-blur/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-halo-blur/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-halo-blur/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-halo-blur/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-halo-blur/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-halo-color/default/metrics.json b/metrics/android-render-test-runner/render-tests/icon-halo-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-halo-color/default/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-halo-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-halo-color/function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-halo-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-halo-color/function/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-halo-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-halo-color/literal/metrics.json b/metrics/android-render-test-runner/render-tests/icon-halo-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-halo-color/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-halo-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-halo-color/multiply/metrics.json b/metrics/android-render-test-runner/render-tests/icon-halo-color/multiply/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-halo-color/multiply/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-halo-color/multiply/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-halo-color/opacity/metrics.json b/metrics/android-render-test-runner/render-tests/icon-halo-color/opacity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-halo-color/opacity/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-halo-color/opacity/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-halo-color/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-halo-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-halo-color/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-halo-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-halo-color/transparent/metrics.json b/metrics/android-render-test-runner/render-tests/icon-halo-color/transparent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-halo-color/transparent/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-halo-color/transparent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-halo-width/default/metrics.json b/metrics/android-render-test-runner/render-tests/icon-halo-width/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-halo-width/default/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-halo-width/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-halo-width/function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-halo-width/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-halo-width/function/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-halo-width/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-halo-width/literal/metrics.json b/metrics/android-render-test-runner/render-tests/icon-halo-width/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-halo-width/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-halo-width/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-halo-width/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-halo-width/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-halo-width/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-halo-width/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json b/metrics/android-render-test-runner/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-image/image-expression/metrics.json b/metrics/android-render-test-runner/render-tests/icon-image/image-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-image/image-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-image/image-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-image/literal/metrics.json b/metrics/android-render-test-runner/render-tests/icon-image/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-image/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-image/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-image/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-image/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-image/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-image/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-image/stretchable-content/metrics.json b/metrics/android-render-test-runner/render-tests/icon-image/stretchable-content/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-image/stretchable-content/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-image/stretchable-content/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-image/stretchable/metrics.json b/metrics/android-render-test-runner/render-tests/icon-image/stretchable/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-image/stretchable/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-image/stretchable/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-image/token/metrics.json b/metrics/android-render-test-runner/render-tests/icon-image/token/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-image/token/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-image/token/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-no-cross-source-collision/default/metrics.json b/metrics/android-render-test-runner/render-tests/icon-no-cross-source-collision/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-no-cross-source-collision/default/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-no-cross-source-collision/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-offset/literal/metrics.json b/metrics/android-render-test-runner/render-tests/icon-offset/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-offset/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-offset/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-offset/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-offset/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-offset/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-offset/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-offset/zoom-and-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-offset/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-offset/zoom-and-property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-offset/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-opacity/default/metrics.json b/metrics/android-render-test-runner/render-tests/icon-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-opacity/default/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-opacity/function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-opacity/function/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-opacity/icon-only/metrics.json b/metrics/android-render-test-runner/render-tests/icon-opacity/icon-only/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-opacity/icon-only/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-opacity/icon-only/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-opacity/literal/metrics.json b/metrics/android-render-test-runner/render-tests/icon-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-opacity/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-opacity/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-opacity/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-opacity/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-opacity/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-opacity/text-and-icon/metrics.json b/metrics/android-render-test-runner/render-tests/icon-opacity/text-and-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-opacity/text-and-icon/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-opacity/text-and-icon/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-opacity/text-only/metrics.json b/metrics/android-render-test-runner/render-tests/icon-opacity/text-only/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-opacity/text-only/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-opacity/text-only/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json b/metrics/android-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json b/metrics/android-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json b/metrics/android-render-test-runner/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json b/metrics/android-render-test-runner/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json b/metrics/android-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json b/metrics/android-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-pixelratio-mismatch/default/metrics.json b/metrics/android-render-test-runner/render-tests/icon-pixelratio-mismatch/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-pixelratio-mismatch/default/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-pixelratio-mismatch/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-rotate/literal/metrics.json b/metrics/android-render-test-runner/render-tests/icon-rotate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-rotate/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-rotate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-rotate/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-rotate/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-rotate/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-rotate/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-rotate/with-offset/metrics.json b/metrics/android-render-test-runner/render-tests/icon-rotate/with-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-rotate/with-offset/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-rotate/with-offset/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json b/metrics/android-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json b/metrics/android-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json b/metrics/android-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json b/metrics/android-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json b/metrics/android-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json b/metrics/android-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-size/camera-function-high-base-plain/metrics.json b/metrics/android-render-test-runner/render-tests/icon-size/camera-function-high-base-plain/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-size/camera-function-high-base-plain/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-size/camera-function-high-base-plain/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-size/camera-function-high-base-sdf/metrics.json b/metrics/android-render-test-runner/render-tests/icon-size/camera-function-high-base-sdf/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-size/camera-function-high-base-sdf/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-size/camera-function-high-base-sdf/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-size/camera-function-plain/metrics.json b/metrics/android-render-test-runner/render-tests/icon-size/camera-function-plain/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-size/camera-function-plain/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-size/camera-function-plain/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-size/camera-function-sdf/metrics.json b/metrics/android-render-test-runner/render-tests/icon-size/camera-function-sdf/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-size/camera-function-sdf/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-size/camera-function-sdf/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-size/composite-function-plain/metrics.json b/metrics/android-render-test-runner/render-tests/icon-size/composite-function-plain/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-size/composite-function-plain/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-size/composite-function-plain/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-size/composite-function-sdf/metrics.json b/metrics/android-render-test-runner/render-tests/icon-size/composite-function-sdf/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-size/composite-function-sdf/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-size/composite-function-sdf/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-size/default/metrics.json b/metrics/android-render-test-runner/render-tests/icon-size/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-size/default/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-size/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-size/function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-size/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-size/function/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-size/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-size/literal/metrics.json b/metrics/android-render-test-runner/render-tests/icon-size/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-size/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-size/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-size/property-function-plain/metrics.json b/metrics/android-render-test-runner/render-tests/icon-size/property-function-plain/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-size/property-function-plain/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-size/property-function-plain/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-size/property-function-sdf/metrics.json b/metrics/android-render-test-runner/render-tests/icon-size/property-function-sdf/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-size/property-function-sdf/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-size/property-function-sdf/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/both-collision/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/both-collision/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/both-collision/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/both-collision/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/both-padding/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/both-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/both-padding/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/both-padding/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/both-text-anchor/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/both-text-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/both-text-anchor/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/both-text-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/both/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/both/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/both/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/both/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/enlargen-both-padding/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/enlargen-both-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/enlargen-both-padding/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/enlargen-both-padding/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/enlargen-both/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/enlargen-both/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/enlargen-both/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/enlargen-both/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/enlargen-height/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/enlargen-height/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/enlargen-height/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/enlargen-height/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/enlargen-width/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/enlargen-width/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/enlargen-width/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/enlargen-width/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/height-padding/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/height-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/height-padding/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/height-padding/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/height-text-anchor/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/height-text-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/height-text-anchor/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/height-text-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/height/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/height/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/height/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/height/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/none/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/none/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/none/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/placement-line/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/placement-line/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-three-part/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-three-part/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-three-part/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-three-part/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-two-part/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-two-part/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-two-part/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-two-part/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-underscale/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-underscale/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-underscale/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-underscale/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/text-variable-anchor/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/text-variable-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/text-variable-anchor/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/text-variable-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/width-padding/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/width-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/width-padding/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/width-padding/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/width-text-anchor/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/width-text-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/width-text-anchor/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/width-text-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/width/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/width/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-text-fit/width/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-text-fit/width/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-translate-anchor/map/metrics.json b/metrics/android-render-test-runner/render-tests/icon-translate-anchor/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-translate-anchor/map/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-translate-anchor/map/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-translate-anchor/viewport/metrics.json b/metrics/android-render-test-runner/render-tests/icon-translate-anchor/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-translate-anchor/viewport/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-translate-anchor/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-translate/default/metrics.json b/metrics/android-render-test-runner/render-tests/icon-translate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-translate/default/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-translate/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-translate/function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-translate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-translate/function/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-translate/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-translate/literal/metrics.json b/metrics/android-render-test-runner/render-tests/icon-translate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-translate/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-translate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-visibility/none/metrics.json b/metrics/android-render-test-runner/render-tests/icon-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-visibility/none/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-visibility/visible/metrics.json b/metrics/android-render-test-runner/render-tests/icon-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/icon-visibility/visible/metrics.json rename to metrics/android-render-test-runner/render-tests/icon-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/image/default/metrics.json b/metrics/android-render-test-runner/render-tests/image/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/image/default/metrics.json rename to metrics/android-render-test-runner/render-tests/image/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/image/pitched/metrics.json b/metrics/android-render-test-runner/render-tests/image/pitched/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/image/pitched/metrics.json rename to metrics/android-render-test-runner/render-tests/image/pitched/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/image/raster-brightness/metrics.json b/metrics/android-render-test-runner/render-tests/image/raster-brightness/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/image/raster-brightness/metrics.json rename to metrics/android-render-test-runner/render-tests/image/raster-brightness/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/image/raster-contrast/metrics.json b/metrics/android-render-test-runner/render-tests/image/raster-contrast/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/image/raster-contrast/metrics.json rename to metrics/android-render-test-runner/render-tests/image/raster-contrast/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/image/raster-hue-rotate/metrics.json b/metrics/android-render-test-runner/render-tests/image/raster-hue-rotate/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/image/raster-hue-rotate/metrics.json rename to metrics/android-render-test-runner/render-tests/image/raster-hue-rotate/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/image/raster-opacity/metrics.json b/metrics/android-render-test-runner/render-tests/image/raster-opacity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/image/raster-opacity/metrics.json rename to metrics/android-render-test-runner/render-tests/image/raster-opacity/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/image/raster-resampling/metrics.json b/metrics/android-render-test-runner/render-tests/image/raster-resampling/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/image/raster-resampling/metrics.json rename to metrics/android-render-test-runner/render-tests/image/raster-resampling/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/image/raster-saturation/metrics.json b/metrics/android-render-test-runner/render-tests/image/raster-saturation/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/image/raster-saturation/metrics.json rename to metrics/android-render-test-runner/render-tests/image/raster-saturation/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/image/raster-visibility/metrics.json b/metrics/android-render-test-runner/render-tests/image/raster-visibility/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/image/raster-visibility/metrics.json rename to metrics/android-render-test-runner/render-tests/image/raster-visibility/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/is-supported-script/filter/metrics.json b/metrics/android-render-test-runner/render-tests/is-supported-script/filter/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/is-supported-script/filter/metrics.json rename to metrics/android-render-test-runner/render-tests/is-supported-script/filter/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/is-supported-script/layout/metrics.json b/metrics/android-render-test-runner/render-tests/is-supported-script/layout/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/is-supported-script/layout/metrics.json rename to metrics/android-render-test-runner/render-tests/is-supported-script/layout/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-blur/default/metrics.json b/metrics/android-render-test-runner/render-tests/line-blur/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-blur/default/metrics.json rename to metrics/android-render-test-runner/render-tests/line-blur/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-blur/function/metrics.json b/metrics/android-render-test-runner/render-tests/line-blur/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-blur/function/metrics.json rename to metrics/android-render-test-runner/render-tests/line-blur/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-blur/literal/metrics.json b/metrics/android-render-test-runner/render-tests/line-blur/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-blur/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/line-blur/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-blur/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/line-blur/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-blur/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/line-blur/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-cap/butt/metrics.json b/metrics/android-render-test-runner/render-tests/line-cap/butt/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-cap/butt/metrics.json rename to metrics/android-render-test-runner/render-tests/line-cap/butt/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-cap/round/metrics.json b/metrics/android-render-test-runner/render-tests/line-cap/round/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-cap/round/metrics.json rename to metrics/android-render-test-runner/render-tests/line-cap/round/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-cap/square/metrics.json b/metrics/android-render-test-runner/render-tests/line-cap/square/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-cap/square/metrics.json rename to metrics/android-render-test-runner/render-tests/line-cap/square/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-color/default/metrics.json b/metrics/android-render-test-runner/render-tests/line-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-color/default/metrics.json rename to metrics/android-render-test-runner/render-tests/line-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-color/function/metrics.json b/metrics/android-render-test-runner/render-tests/line-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-color/function/metrics.json rename to metrics/android-render-test-runner/render-tests/line-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-color/literal/metrics.json b/metrics/android-render-test-runner/render-tests/line-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-color/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/line-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-color/property-function-identity/metrics.json b/metrics/android-render-test-runner/render-tests/line-color/property-function-identity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-color/property-function-identity/metrics.json rename to metrics/android-render-test-runner/render-tests/line-color/property-function-identity/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-color/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/line-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-color/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/line-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-dasharray/default/metrics.json b/metrics/android-render-test-runner/render-tests/line-dasharray/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-dasharray/default/metrics.json rename to metrics/android-render-test-runner/render-tests/line-dasharray/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-dasharray/fractional-zoom/metrics.json b/metrics/android-render-test-runner/render-tests/line-dasharray/fractional-zoom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-dasharray/fractional-zoom/metrics.json rename to metrics/android-render-test-runner/render-tests/line-dasharray/fractional-zoom/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-dasharray/function/line-width-composite-function/metrics.json b/metrics/android-render-test-runner/render-tests/line-dasharray/function/line-width-composite-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-dasharray/function/line-width-composite-function/metrics.json rename to metrics/android-render-test-runner/render-tests/line-dasharray/function/line-width-composite-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-dasharray/function/line-width-constant/metrics.json b/metrics/android-render-test-runner/render-tests/line-dasharray/function/line-width-constant/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-dasharray/function/line-width-constant/metrics.json rename to metrics/android-render-test-runner/render-tests/line-dasharray/function/line-width-constant/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-dasharray/function/line-width-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/line-dasharray/function/line-width-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-dasharray/function/line-width-property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/line-dasharray/function/line-width-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json b/metrics/android-render-test-runner/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json rename to metrics/android-render-test-runner/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-dasharray/literal/line-width-constant/metrics.json b/metrics/android-render-test-runner/render-tests/line-dasharray/literal/line-width-constant/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-dasharray/literal/line-width-constant/metrics.json rename to metrics/android-render-test-runner/render-tests/line-dasharray/literal/line-width-constant/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-dasharray/literal/line-width-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/line-dasharray/literal/line-width-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-dasharray/literal/line-width-property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/line-dasharray/literal/line-width-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json b/metrics/android-render-test-runner/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json rename to metrics/android-render-test-runner/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-dasharray/long-segment/metrics.json b/metrics/android-render-test-runner/render-tests/line-dasharray/long-segment/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-dasharray/long-segment/metrics.json rename to metrics/android-render-test-runner/render-tests/line-dasharray/long-segment/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-dasharray/overscaled/metrics.json b/metrics/android-render-test-runner/render-tests/line-dasharray/overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-dasharray/overscaled/metrics.json rename to metrics/android-render-test-runner/render-tests/line-dasharray/overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-dasharray/round/segments/metrics.json b/metrics/android-render-test-runner/render-tests/line-dasharray/round/segments/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-dasharray/round/segments/metrics.json rename to metrics/android-render-test-runner/render-tests/line-dasharray/round/segments/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-dasharray/round/zero-gap-width/metrics.json b/metrics/android-render-test-runner/render-tests/line-dasharray/round/zero-gap-width/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-dasharray/round/zero-gap-width/metrics.json rename to metrics/android-render-test-runner/render-tests/line-dasharray/round/zero-gap-width/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-dasharray/slant/metrics.json b/metrics/android-render-test-runner/render-tests/line-dasharray/slant/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-dasharray/slant/metrics.json rename to metrics/android-render-test-runner/render-tests/line-dasharray/slant/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-dasharray/zero-length-gap/metrics.json b/metrics/android-render-test-runner/render-tests/line-dasharray/zero-length-gap/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-dasharray/zero-length-gap/metrics.json rename to metrics/android-render-test-runner/render-tests/line-dasharray/zero-length-gap/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-dasharray/zoom-history/metrics.json b/metrics/android-render-test-runner/render-tests/line-dasharray/zoom-history/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-dasharray/zoom-history/metrics.json rename to metrics/android-render-test-runner/render-tests/line-dasharray/zoom-history/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-gap-width/default/metrics.json b/metrics/android-render-test-runner/render-tests/line-gap-width/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-gap-width/default/metrics.json rename to metrics/android-render-test-runner/render-tests/line-gap-width/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-gap-width/function/metrics.json b/metrics/android-render-test-runner/render-tests/line-gap-width/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-gap-width/function/metrics.json rename to metrics/android-render-test-runner/render-tests/line-gap-width/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-gap-width/literal/metrics.json b/metrics/android-render-test-runner/render-tests/line-gap-width/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-gap-width/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/line-gap-width/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-gap-width/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/line-gap-width/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-gap-width/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/line-gap-width/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-gradient/gradient-tile-boundaries/metrics.json b/metrics/android-render-test-runner/render-tests/line-gradient/gradient-tile-boundaries/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-gradient/gradient-tile-boundaries/metrics.json rename to metrics/android-render-test-runner/render-tests/line-gradient/gradient-tile-boundaries/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-gradient/gradient/metrics.json b/metrics/android-render-test-runner/render-tests/line-gradient/gradient/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-gradient/gradient/metrics.json rename to metrics/android-render-test-runner/render-tests/line-gradient/gradient/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-gradient/translucent/metrics.json b/metrics/android-render-test-runner/render-tests/line-gradient/translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-gradient/translucent/metrics.json rename to metrics/android-render-test-runner/render-tests/line-gradient/translucent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-join/bevel-transparent/metrics.json b/metrics/android-render-test-runner/render-tests/line-join/bevel-transparent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-join/bevel-transparent/metrics.json rename to metrics/android-render-test-runner/render-tests/line-join/bevel-transparent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-join/bevel/metrics.json b/metrics/android-render-test-runner/render-tests/line-join/bevel/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-join/bevel/metrics.json rename to metrics/android-render-test-runner/render-tests/line-join/bevel/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-join/default/metrics.json b/metrics/android-render-test-runner/render-tests/line-join/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-join/default/metrics.json rename to metrics/android-render-test-runner/render-tests/line-join/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-join/miter-transparent/metrics.json b/metrics/android-render-test-runner/render-tests/line-join/miter-transparent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-join/miter-transparent/metrics.json rename to metrics/android-render-test-runner/render-tests/line-join/miter-transparent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-join/miter/metrics.json b/metrics/android-render-test-runner/render-tests/line-join/miter/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-join/miter/metrics.json rename to metrics/android-render-test-runner/render-tests/line-join/miter/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-join/property-function-dasharray/metrics.json b/metrics/android-render-test-runner/render-tests/line-join/property-function-dasharray/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-join/property-function-dasharray/metrics.json rename to metrics/android-render-test-runner/render-tests/line-join/property-function-dasharray/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-join/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/line-join/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-join/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/line-join/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-join/round-transparent/metrics.json b/metrics/android-render-test-runner/render-tests/line-join/round-transparent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-join/round-transparent/metrics.json rename to metrics/android-render-test-runner/render-tests/line-join/round-transparent/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-join/round/metrics.json b/metrics/android-render-test-runner/render-tests/line-join/round/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-join/round/metrics.json rename to metrics/android-render-test-runner/render-tests/line-join/round/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-offset/default/metrics.json b/metrics/android-render-test-runner/render-tests/line-offset/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-offset/default/metrics.json rename to metrics/android-render-test-runner/render-tests/line-offset/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-offset/function/metrics.json b/metrics/android-render-test-runner/render-tests/line-offset/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-offset/function/metrics.json rename to metrics/android-render-test-runner/render-tests/line-offset/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-offset/literal-negative/metrics.json b/metrics/android-render-test-runner/render-tests/line-offset/literal-negative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-offset/literal-negative/metrics.json rename to metrics/android-render-test-runner/render-tests/line-offset/literal-negative/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-offset/literal/metrics.json b/metrics/android-render-test-runner/render-tests/line-offset/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-offset/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/line-offset/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-offset/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/line-offset/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-offset/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/line-offset/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-opacity/default/metrics.json b/metrics/android-render-test-runner/render-tests/line-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-opacity/default/metrics.json rename to metrics/android-render-test-runner/render-tests/line-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-opacity/function/metrics.json b/metrics/android-render-test-runner/render-tests/line-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-opacity/function/metrics.json rename to metrics/android-render-test-runner/render-tests/line-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-opacity/literal/metrics.json b/metrics/android-render-test-runner/render-tests/line-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-opacity/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/line-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-opacity/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/line-opacity/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-opacity/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/line-opacity/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-opacity/step-curve/metrics.json b/metrics/android-render-test-runner/render-tests/line-opacity/step-curve/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-opacity/step-curve/metrics.json rename to metrics/android-render-test-runner/render-tests/line-opacity/step-curve/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-pattern/@2x/metrics.json b/metrics/android-render-test-runner/render-tests/line-pattern/@2x/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-pattern/@2x/metrics.json rename to metrics/android-render-test-runner/render-tests/line-pattern/@2x/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-pattern/literal/metrics.json b/metrics/android-render-test-runner/render-tests/line-pattern/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-pattern/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/line-pattern/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-pattern/pitch/metrics.json b/metrics/android-render-test-runner/render-tests/line-pattern/pitch/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-pattern/pitch/metrics.json rename to metrics/android-render-test-runner/render-tests/line-pattern/pitch/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-pattern/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/line-pattern/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-pattern/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/line-pattern/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-pattern/step-curve/metrics.json b/metrics/android-render-test-runner/render-tests/line-pattern/step-curve/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-pattern/step-curve/metrics.json rename to metrics/android-render-test-runner/render-tests/line-pattern/step-curve/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-pattern/zoom-expression/metrics.json b/metrics/android-render-test-runner/render-tests/line-pattern/zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-pattern/zoom-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/line-pattern/zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-pitch/default/metrics.json b/metrics/android-render-test-runner/render-tests/line-pitch/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-pitch/default/metrics.json rename to metrics/android-render-test-runner/render-tests/line-pitch/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-pitch/pitch0/metrics.json b/metrics/android-render-test-runner/render-tests/line-pitch/pitch0/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-pitch/pitch0/metrics.json rename to metrics/android-render-test-runner/render-tests/line-pitch/pitch0/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-pitch/pitch15/metrics.json b/metrics/android-render-test-runner/render-tests/line-pitch/pitch15/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-pitch/pitch15/metrics.json rename to metrics/android-render-test-runner/render-tests/line-pitch/pitch15/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-pitch/pitch30/metrics.json b/metrics/android-render-test-runner/render-tests/line-pitch/pitch30/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-pitch/pitch30/metrics.json rename to metrics/android-render-test-runner/render-tests/line-pitch/pitch30/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-pitch/pitchAndBearing/metrics.json b/metrics/android-render-test-runner/render-tests/line-pitch/pitchAndBearing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-pitch/pitchAndBearing/metrics.json rename to metrics/android-render-test-runner/render-tests/line-pitch/pitchAndBearing/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-sort-key/literal/metrics.json b/metrics/android-render-test-runner/render-tests/line-sort-key/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-sort-key/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/line-sort-key/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-translate-anchor/map/metrics.json b/metrics/android-render-test-runner/render-tests/line-translate-anchor/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-translate-anchor/map/metrics.json rename to metrics/android-render-test-runner/render-tests/line-translate-anchor/map/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-translate-anchor/viewport/metrics.json b/metrics/android-render-test-runner/render-tests/line-translate-anchor/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-translate-anchor/viewport/metrics.json rename to metrics/android-render-test-runner/render-tests/line-translate-anchor/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-translate/default/metrics.json b/metrics/android-render-test-runner/render-tests/line-translate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-translate/default/metrics.json rename to metrics/android-render-test-runner/render-tests/line-translate/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-translate/function/metrics.json b/metrics/android-render-test-runner/render-tests/line-translate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-translate/function/metrics.json rename to metrics/android-render-test-runner/render-tests/line-translate/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-triangulation/default/metrics.json b/metrics/android-render-test-runner/render-tests/line-triangulation/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-triangulation/default/metrics.json rename to metrics/android-render-test-runner/render-tests/line-triangulation/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-triangulation/round/metrics.json b/metrics/android-render-test-runner/render-tests/line-triangulation/round/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-triangulation/round/metrics.json rename to metrics/android-render-test-runner/render-tests/line-triangulation/round/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-visibility/none/metrics.json b/metrics/android-render-test-runner/render-tests/line-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-visibility/none/metrics.json rename to metrics/android-render-test-runner/render-tests/line-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-visibility/visible/metrics.json b/metrics/android-render-test-runner/render-tests/line-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-visibility/visible/metrics.json rename to metrics/android-render-test-runner/render-tests/line-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-width/default/metrics.json b/metrics/android-render-test-runner/render-tests/line-width/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-width/default/metrics.json rename to metrics/android-render-test-runner/render-tests/line-width/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-width/function/metrics.json b/metrics/android-render-test-runner/render-tests/line-width/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-width/function/metrics.json rename to metrics/android-render-test-runner/render-tests/line-width/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-width/literal/metrics.json b/metrics/android-render-test-runner/render-tests/line-width/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-width/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/line-width/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-width/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/line-width/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-width/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/line-width/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-width/very-overscaled/metrics.json b/metrics/android-render-test-runner/render-tests/line-width/very-overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-width/very-overscaled/metrics.json rename to metrics/android-render-test-runner/render-tests/line-width/very-overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-width/zero-width-function/metrics.json b/metrics/android-render-test-runner/render-tests/line-width/zero-width-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-width/zero-width-function/metrics.json rename to metrics/android-render-test-runner/render-tests/line-width/zero-width-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-width/zero-width/metrics.json b/metrics/android-render-test-runner/render-tests/line-width/zero-width/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/line-width/zero-width/metrics.json rename to metrics/android-render-test-runner/render-tests/line-width/zero-width/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/linear-filter-opacity-edge/literal/metrics.json b/metrics/android-render-test-runner/render-tests/linear-filter-opacity-edge/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/linear-filter-opacity-edge/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/linear-filter-opacity-edge/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/map-mode/static/metrics.json b/metrics/android-render-test-runner/render-tests/map-mode/static/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/map-mode/static/metrics.json rename to metrics/android-render-test-runner/render-tests/map-mode/static/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/map-mode/tile-avoid-edges/metrics.json b/metrics/android-render-test-runner/render-tests/map-mode/tile-avoid-edges/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/map-mode/tile-avoid-edges/metrics.json rename to metrics/android-render-test-runner/render-tests/map-mode/tile-avoid-edges/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/map-mode/tile/metrics.json b/metrics/android-render-test-runner/render-tests/map-mode/tile/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/map-mode/tile/metrics.json rename to metrics/android-render-test-runner/render-tests/map-mode/tile/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/projection/axonometric-multiple/metrics.json b/metrics/android-render-test-runner/render-tests/projection/axonometric-multiple/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/projection/axonometric-multiple/metrics.json rename to metrics/android-render-test-runner/render-tests/projection/axonometric-multiple/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/projection/axonometric/metrics.json b/metrics/android-render-test-runner/render-tests/projection/axonometric/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/projection/axonometric/metrics.json rename to metrics/android-render-test-runner/render-tests/projection/axonometric/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/projection/perspective/metrics.json b/metrics/android-render-test-runner/render-tests/projection/perspective/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/projection/perspective/metrics.json rename to metrics/android-render-test-runner/render-tests/projection/perspective/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/projection/skew/metrics.json b/metrics/android-render-test-runner/render-tests/projection/skew/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/projection/skew/metrics.json rename to metrics/android-render-test-runner/render-tests/projection/skew/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-alpha/default/metrics.json b/metrics/android-render-test-runner/render-tests/raster-alpha/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-alpha/default/metrics.json rename to metrics/android-render-test-runner/render-tests/raster-alpha/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-brightness/default/metrics.json b/metrics/android-render-test-runner/render-tests/raster-brightness/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-brightness/default/metrics.json rename to metrics/android-render-test-runner/render-tests/raster-brightness/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-brightness/function/metrics.json b/metrics/android-render-test-runner/render-tests/raster-brightness/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-brightness/function/metrics.json rename to metrics/android-render-test-runner/render-tests/raster-brightness/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-brightness/literal/metrics.json b/metrics/android-render-test-runner/render-tests/raster-brightness/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-brightness/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/raster-brightness/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-contrast/default/metrics.json b/metrics/android-render-test-runner/render-tests/raster-contrast/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-contrast/default/metrics.json rename to metrics/android-render-test-runner/render-tests/raster-contrast/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-contrast/function/metrics.json b/metrics/android-render-test-runner/render-tests/raster-contrast/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-contrast/function/metrics.json rename to metrics/android-render-test-runner/render-tests/raster-contrast/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-contrast/literal/metrics.json b/metrics/android-render-test-runner/render-tests/raster-contrast/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-contrast/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/raster-contrast/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-extent/maxzoom/metrics.json b/metrics/android-render-test-runner/render-tests/raster-extent/maxzoom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-extent/maxzoom/metrics.json rename to metrics/android-render-test-runner/render-tests/raster-extent/maxzoom/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-extent/minzoom/metrics.json b/metrics/android-render-test-runner/render-tests/raster-extent/minzoom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-extent/minzoom/metrics.json rename to metrics/android-render-test-runner/render-tests/raster-extent/minzoom/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-hue-rotate/default/metrics.json b/metrics/android-render-test-runner/render-tests/raster-hue-rotate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-hue-rotate/default/metrics.json rename to metrics/android-render-test-runner/render-tests/raster-hue-rotate/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-hue-rotate/function/metrics.json b/metrics/android-render-test-runner/render-tests/raster-hue-rotate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-hue-rotate/function/metrics.json rename to metrics/android-render-test-runner/render-tests/raster-hue-rotate/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-hue-rotate/literal/metrics.json b/metrics/android-render-test-runner/render-tests/raster-hue-rotate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-hue-rotate/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/raster-hue-rotate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-loading/missing/metrics.json b/metrics/android-render-test-runner/render-tests/raster-loading/missing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-loading/missing/metrics.json rename to metrics/android-render-test-runner/render-tests/raster-loading/missing/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-masking/overlapping-vector/metrics.json b/metrics/android-render-test-runner/render-tests/raster-masking/overlapping-vector/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-masking/overlapping-vector/metrics.json rename to metrics/android-render-test-runner/render-tests/raster-masking/overlapping-vector/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-masking/overlapping/metrics.json b/metrics/android-render-test-runner/render-tests/raster-masking/overlapping/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-masking/overlapping/metrics.json rename to metrics/android-render-test-runner/render-tests/raster-masking/overlapping/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-opacity/default/metrics.json b/metrics/android-render-test-runner/render-tests/raster-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-opacity/default/metrics.json rename to metrics/android-render-test-runner/render-tests/raster-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-opacity/function/metrics.json b/metrics/android-render-test-runner/render-tests/raster-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-opacity/function/metrics.json rename to metrics/android-render-test-runner/render-tests/raster-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-opacity/literal/metrics.json b/metrics/android-render-test-runner/render-tests/raster-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-opacity/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/raster-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-resampling/default/metrics.json b/metrics/android-render-test-runner/render-tests/raster-resampling/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-resampling/default/metrics.json rename to metrics/android-render-test-runner/render-tests/raster-resampling/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-resampling/function/metrics.json b/metrics/android-render-test-runner/render-tests/raster-resampling/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-resampling/function/metrics.json rename to metrics/android-render-test-runner/render-tests/raster-resampling/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-resampling/literal/metrics.json b/metrics/android-render-test-runner/render-tests/raster-resampling/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-resampling/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/raster-resampling/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-rotation/0/metrics.json b/metrics/android-render-test-runner/render-tests/raster-rotation/0/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-rotation/0/metrics.json rename to metrics/android-render-test-runner/render-tests/raster-rotation/0/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-rotation/180/metrics.json b/metrics/android-render-test-runner/render-tests/raster-rotation/180/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-rotation/180/metrics.json rename to metrics/android-render-test-runner/render-tests/raster-rotation/180/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-rotation/270/metrics.json b/metrics/android-render-test-runner/render-tests/raster-rotation/270/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-rotation/270/metrics.json rename to metrics/android-render-test-runner/render-tests/raster-rotation/270/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-rotation/45/metrics.json b/metrics/android-render-test-runner/render-tests/raster-rotation/45/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-rotation/45/metrics.json rename to metrics/android-render-test-runner/render-tests/raster-rotation/45/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-rotation/90/metrics.json b/metrics/android-render-test-runner/render-tests/raster-rotation/90/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-rotation/90/metrics.json rename to metrics/android-render-test-runner/render-tests/raster-rotation/90/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-saturation/default/metrics.json b/metrics/android-render-test-runner/render-tests/raster-saturation/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-saturation/default/metrics.json rename to metrics/android-render-test-runner/render-tests/raster-saturation/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-saturation/function/metrics.json b/metrics/android-render-test-runner/render-tests/raster-saturation/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-saturation/function/metrics.json rename to metrics/android-render-test-runner/render-tests/raster-saturation/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-saturation/literal/metrics.json b/metrics/android-render-test-runner/render-tests/raster-saturation/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-saturation/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/raster-saturation/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-visibility/none/metrics.json b/metrics/android-render-test-runner/render-tests/raster-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-visibility/none/metrics.json rename to metrics/android-render-test-runner/render-tests/raster-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-visibility/visible/metrics.json b/metrics/android-render-test-runner/render-tests/raster-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/raster-visibility/visible/metrics.json rename to metrics/android-render-test-runner/render-tests/raster-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/real-world/nepal/metrics.json b/metrics/android-render-test-runner/render-tests/real-world/nepal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/real-world/nepal/metrics.json rename to metrics/android-render-test-runner/render-tests/real-world/nepal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/real-world/norway/metrics.json b/metrics/android-render-test-runner/render-tests/real-world/norway/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/real-world/norway/metrics.json rename to metrics/android-render-test-runner/render-tests/real-world/norway/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/real-world/uruguay/metrics.json b/metrics/android-render-test-runner/render-tests/real-world/uruguay/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/real-world/uruguay/metrics.json rename to metrics/android-render-test-runner/render-tests/real-world/uruguay/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2305/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2305/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2305/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2305/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2523/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2523/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2523/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2523/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2533/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2533/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2533/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2533/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2534/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2534/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2534/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2534/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2787/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2787/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2787/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2787/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2846/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2846/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2846/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2846/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2929/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2929/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2929/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2929/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3010/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3010/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3010/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3010/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3107/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3107/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3107/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3107/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3320/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3320/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3320/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3320/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3365/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3365/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3365/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3365/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3394/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3394/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3394/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3394/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3426/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3426/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3426/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3426/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3548/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3548/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3548/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3548/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3612/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3612/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3612/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3612/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3614/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3614/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3614/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3614/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3623/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3623/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3623/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3623/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3633/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3633/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3633/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3633/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3682/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3682/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3682/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3682/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3702/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3702/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3702/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3702/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3723/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3723/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3723/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3723/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3819/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3819/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3819/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3819/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3903/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3903/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3903/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3903/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3910/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3910/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3910/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3910/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3949/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3949/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3949/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3949/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4124/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4124/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4124/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4124/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4144/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4144/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4144/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4144/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4146/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4146/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4146/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4146/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4150/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4150/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4150/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4150/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4172/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4172/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4172/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4172/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4235/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4235/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4235/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4235/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4550/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4550/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4550/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4550/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4551/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4551/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4551/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4551/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4564/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4564/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4564/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4564/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4573/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4573/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4573/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4573/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4579/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4579/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4579/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4579/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4605/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4605/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4605/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4605/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4617/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4617/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4617/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4617/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4647/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4647/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4647/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4647/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4651/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4651/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4651/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4651/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4860/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4860/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4860/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4860/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4928/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4928/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4928/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4928/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5171/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5171/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5171/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5171/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5370/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5370/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5370/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5370/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5466/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5466/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5466/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5466/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5496/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5496/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5496/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5496/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5544/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5544/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5544/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5544/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5546/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5546/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5546/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5546/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5576/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5576/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5576/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5576/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5599/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5599/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5599/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5599/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5631/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5631/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5631/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5631/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5776/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5776/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5776/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5776/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5911/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5911/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5911/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5911/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5947/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5947/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5947/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5947/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5953/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5953/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5953/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5953/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5978/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5978/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5978/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5978/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6160/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6160/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6160/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6160/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6238/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6238/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6238/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6238/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6548/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6548/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6548/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6548/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6649/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6649/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6649/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6649/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6660/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6660/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6660/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6660/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6919/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6919/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6919/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6919/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#7032/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#7032/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#7032/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#7032/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#7172/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#7172/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#7172/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#7172/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#8273/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#8273/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#8273/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#8273/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#9009/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#9009/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#9009/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#9009/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#10849/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#10849/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#10849/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#10849/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#11451/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#11451/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#11451/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#11451/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#11729/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#11729/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#11729/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#11729/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#12812/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#12812/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#12812/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#12812/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#14402/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#14402/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#14402/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#14402/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#15139/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#15139/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#15139/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#15139/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#3292/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#3292/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#3292/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#3292/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#5648/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#5648/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#5648/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#5648/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#5701/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#5701/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#5701/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#5701/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#5754/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#5754/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#5754/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#5754/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#6063/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#6063/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#6063/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#6063/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#6233/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#6233/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#6233/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#6233/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#6820/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#6820/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#6820/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#6820/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#6903/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#6903/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#6903/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#6903/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#7241/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#7241/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#7241/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#7241/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#7572/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#7572/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#7572/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#7572/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#7714/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#7714/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#7714/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#7714/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#7792/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#7792/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#7792/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#7792/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8078/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8078/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8078/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8078/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8303/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8303/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8303/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8303/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8460/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8460/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8460/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8460/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8505/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8505/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8505/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8505/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8871/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8871/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8871/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8871/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8952/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8952/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8952/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8952/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#9406/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#9406/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#9406/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#9406/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#9557/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#9557/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#9557/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#9557/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#9792/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#9792/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#9792/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#9792/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#9900/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#9900/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#9900/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#9900/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#9979/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#9979/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#9979/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#9979/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-shaders#37/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-shaders#37/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-shaders#37/metrics.json rename to metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-shaders#37/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/remove-feature-state/composite-expression/metrics.json b/metrics/android-render-test-runner/render-tests/remove-feature-state/composite-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/remove-feature-state/composite-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/remove-feature-state/composite-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/remove-feature-state/data-expression/metrics.json b/metrics/android-render-test-runner/render-tests/remove-feature-state/data-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/remove-feature-state/data-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/remove-feature-state/data-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/remove-feature-state/vector-source/metrics.json b/metrics/android-render-test-runner/render-tests/remove-feature-state/vector-source/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/remove-feature-state/vector-source/metrics.json rename to metrics/android-render-test-runner/render-tests/remove-feature-state/vector-source/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/retina-raster/default/metrics.json b/metrics/android-render-test-runner/render-tests/retina-raster/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/retina-raster/default/metrics.json rename to metrics/android-render-test-runner/render-tests/retina-raster/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/filter-default-to-false/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/filter-default-to-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/filter-default-to-false/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/filter-default-to-false/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/filter-default-to-true/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/filter-default-to-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/filter-default-to-true/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/filter-default-to-true/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/filter-false-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/filter-false-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/filter-false-to-default/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/filter-false-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/filter-false-to-true/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/filter-false-to-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/filter-false-to-true/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/filter-false-to-true/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/filter-true-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/filter-true-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/filter-true-to-default/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/filter-true-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/filter-true-to-false/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/filter-true-to-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/filter-true-to-false/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/filter-true-to-false/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-alpha/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-alpha/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-alpha/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/image-add-alpha/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-nonsdf/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-nonsdf/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-nonsdf/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/image-add-nonsdf/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-sdf/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-sdf/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-sdf/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/image-add-sdf/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/image-remove/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/image-remove/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/image-remove/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/image-remove/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/image-update-icon/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/image-update-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/image-update-icon/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/image-update-icon/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-background/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-background/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-background/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-background/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-circle/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-circle/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-circle/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-fill/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-fill/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-fill/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-line/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-line/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-line/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-raster/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-raster/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-raster/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-raster/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-symbol/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-symbol/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-background/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-background/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-background/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-background/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-circle/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-circle/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-circle/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-fill/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-fill/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-fill/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-line/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-line/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-line/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-raster/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-raster/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-raster/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-raster/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-symbol/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-symbol/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-glyphs/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-glyphs/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-glyphs/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-glyphs/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-background/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-background/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-background/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-background/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-line/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-line/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-line/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-reorder/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-reorder/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-reorder/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-reorder/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-update/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-update/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-update/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-update/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-sprite/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-sprite/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-sprite/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-sprite/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/source-add-geojson-inline/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/source-add-geojson-inline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/source-add-geojson-inline/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/source-add-geojson-inline/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/source-add-geojson-url/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/source-add-geojson-url/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/source-add-geojson-url/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/source-add-geojson-url/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/source-add-raster-inline/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/source-add-raster-inline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/source-add-raster-inline/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/source-add-raster-inline/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/source-add-raster-url/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/source-add-raster-url/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/source-add-raster-url/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/source-add-raster-url/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/source-add-vector-inline/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/source-add-vector-inline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/source-add-vector-inline/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/source-add-vector-inline/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/source-add-vector-url/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/source-add-vector-url/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/source-add-vector-url/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/source-add-vector-url/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/visibility-default-to-none/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/visibility-default-to-none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/visibility-default-to-none/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/visibility-default-to-none/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/visibility-default-to-visible/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/visibility-default-to-visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/visibility-default-to-visible/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/visibility-default-to-visible/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/visibility-none-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/visibility-none-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/visibility-none-to-default/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/visibility-none-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/visibility-none-to-visible/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/visibility-none-to-visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/visibility-none-to-visible/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/visibility-none-to-visible/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/visibility-visible-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/visibility-visible-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/visibility-visible-to-default/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/visibility-visible-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/visibility-visible-to-none/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/visibility-visible-to-none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/runtime-styling/visibility-visible-to-none/metrics.json rename to metrics/android-render-test-runner/render-tests/runtime-styling/visibility-visible-to-none/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/satellite-v9/z0/metrics.json b/metrics/android-render-test-runner/render-tests/satellite-v9/z0/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/satellite-v9/z0/metrics.json rename to metrics/android-render-test-runner/render-tests/satellite-v9/z0/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/sparse-tileset/overdraw/metrics.json b/metrics/android-render-test-runner/render-tests/sparse-tileset/overdraw/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/sparse-tileset/overdraw/metrics.json rename to metrics/android-render-test-runner/render-tests/sparse-tileset/overdraw/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/sprites/1x-screen-1x-icon/metrics.json b/metrics/android-render-test-runner/render-tests/sprites/1x-screen-1x-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/sprites/1x-screen-1x-icon/metrics.json rename to metrics/android-render-test-runner/render-tests/sprites/1x-screen-1x-icon/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/sprites/1x-screen-1x-pattern/metrics.json b/metrics/android-render-test-runner/render-tests/sprites/1x-screen-1x-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/sprites/1x-screen-1x-pattern/metrics.json rename to metrics/android-render-test-runner/render-tests/sprites/1x-screen-1x-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/sprites/1x-screen-2x-icon/metrics.json b/metrics/android-render-test-runner/render-tests/sprites/1x-screen-2x-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/sprites/1x-screen-2x-icon/metrics.json rename to metrics/android-render-test-runner/render-tests/sprites/1x-screen-2x-icon/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/sprites/1x-screen-2x-pattern/metrics.json b/metrics/android-render-test-runner/render-tests/sprites/1x-screen-2x-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/sprites/1x-screen-2x-pattern/metrics.json rename to metrics/android-render-test-runner/render-tests/sprites/1x-screen-2x-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/sprites/2x-screen-1x-icon/metrics.json b/metrics/android-render-test-runner/render-tests/sprites/2x-screen-1x-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/sprites/2x-screen-1x-icon/metrics.json rename to metrics/android-render-test-runner/render-tests/sprites/2x-screen-1x-icon/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/sprites/2x-screen-1x-pattern/metrics.json b/metrics/android-render-test-runner/render-tests/sprites/2x-screen-1x-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/sprites/2x-screen-1x-pattern/metrics.json rename to metrics/android-render-test-runner/render-tests/sprites/2x-screen-1x-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/sprites/2x-screen-2x-icon/metrics.json b/metrics/android-render-test-runner/render-tests/sprites/2x-screen-2x-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/sprites/2x-screen-2x-icon/metrics.json rename to metrics/android-render-test-runner/render-tests/sprites/2x-screen-2x-icon/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/sprites/2x-screen-2x-pattern/metrics.json b/metrics/android-render-test-runner/render-tests/sprites/2x-screen-2x-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/sprites/2x-screen-2x-pattern/metrics.json rename to metrics/android-render-test-runner/render-tests/sprites/2x-screen-2x-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-geometry/linestring/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-geometry/linestring/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-geometry/linestring/metrics.json rename to metrics/android-render-test-runner/render-tests/symbol-geometry/linestring/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-geometry/multilinestring/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-geometry/multilinestring/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-geometry/multilinestring/metrics.json rename to metrics/android-render-test-runner/render-tests/symbol-geometry/multilinestring/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-geometry/multipoint/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-geometry/multipoint/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-geometry/multipoint/metrics.json rename to metrics/android-render-test-runner/render-tests/symbol-geometry/multipoint/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-geometry/multipolygon/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-geometry/multipolygon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-geometry/multipolygon/metrics.json rename to metrics/android-render-test-runner/render-tests/symbol-geometry/multipolygon/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-geometry/point/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-geometry/point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-geometry/point/metrics.json rename to metrics/android-render-test-runner/render-tests/symbol-geometry/point/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-geometry/polygon/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-geometry/polygon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-geometry/polygon/metrics.json rename to metrics/android-render-test-runner/render-tests/symbol-geometry/polygon/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-placement/line-center-buffer-tile-map-mode/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-placement/line-center-buffer-tile-map-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-placement/line-center-buffer-tile-map-mode/metrics.json rename to metrics/android-render-test-runner/render-tests/symbol-placement/line-center-buffer-tile-map-mode/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-placement/line-center-buffer/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-placement/line-center-buffer/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-placement/line-center-buffer/metrics.json rename to metrics/android-render-test-runner/render-tests/symbol-placement/line-center-buffer/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-placement/line-center-tile-map-mode/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-placement/line-center-tile-map-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-placement/line-center-tile-map-mode/metrics.json rename to metrics/android-render-test-runner/render-tests/symbol-placement/line-center-tile-map-mode/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-placement/line-center/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-placement/line-center/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-placement/line-center/metrics.json rename to metrics/android-render-test-runner/render-tests/symbol-placement/line-center/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-placement/line-overscaled/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-placement/line-overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-placement/line-overscaled/metrics.json rename to metrics/android-render-test-runner/render-tests/symbol-placement/line-overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-placement/line/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-placement/line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-placement/line/metrics.json rename to metrics/android-render-test-runner/render-tests/symbol-placement/line/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-placement/point-polygon/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-placement/point-polygon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-placement/point-polygon/metrics.json rename to metrics/android-render-test-runner/render-tests/symbol-placement/point-polygon/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-placement/point/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-placement/point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-placement/point/metrics.json rename to metrics/android-render-test-runner/render-tests/symbol-placement/point/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-sort-key/icon-expression/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-sort-key/icon-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-sort-key/icon-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/symbol-sort-key/icon-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-sort-key/placement-tile-boundary-left-then-right/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-sort-key/placement-tile-boundary-left-then-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-sort-key/placement-tile-boundary-left-then-right/metrics.json rename to metrics/android-render-test-runner/render-tests/symbol-sort-key/placement-tile-boundary-left-then-right/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-sort-key/text-expression/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-sort-key/text-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-sort-key/text-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/symbol-sort-key/text-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-sort-key/text-ignore-placement/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-sort-key/text-ignore-placement/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-sort-key/text-ignore-placement/metrics.json rename to metrics/android-render-test-runner/render-tests/symbol-sort-key/text-ignore-placement/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-sort-key/text-placement/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-sort-key/text-placement/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-sort-key/text-placement/metrics.json rename to metrics/android-render-test-runner/render-tests/symbol-sort-key/text-placement/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-spacing/line-close/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-spacing/line-close/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-spacing/line-close/metrics.json rename to metrics/android-render-test-runner/render-tests/symbol-spacing/line-close/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-spacing/line-far/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-spacing/line-far/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-spacing/line-far/metrics.json rename to metrics/android-render-test-runner/render-tests/symbol-spacing/line-far/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-spacing/line-overscaled/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-spacing/line-overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-spacing/line-overscaled/metrics.json rename to metrics/android-render-test-runner/render-tests/symbol-spacing/line-overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-spacing/point-close/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-spacing/point-close/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-spacing/point-close/metrics.json rename to metrics/android-render-test-runner/render-tests/symbol-spacing/point-close/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-spacing/point-far/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-spacing/point-far/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-spacing/point-far/metrics.json rename to metrics/android-render-test-runner/render-tests/symbol-spacing/point-far/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-visibility/none/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-visibility/none/metrics.json rename to metrics/android-render-test-runner/render-tests/symbol-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-visibility/visible/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-visibility/visible/metrics.json rename to metrics/android-render-test-runner/render-tests/symbol-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-z-order/default/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-z-order/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-z-order/default/metrics.json rename to metrics/android-render-test-runner/render-tests/symbol-z-order/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-z-order/disabled/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-z-order/disabled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-z-order/disabled/metrics.json rename to metrics/android-render-test-runner/render-tests/symbol-z-order/disabled/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-z-order/icon-with-text/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-z-order/icon-with-text/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-z-order/icon-with-text/metrics.json rename to metrics/android-render-test-runner/render-tests/symbol-z-order/icon-with-text/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-z-order/pitched/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-z-order/pitched/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-z-order/pitched/metrics.json rename to metrics/android-render-test-runner/render-tests/symbol-z-order/pitched/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-z-order/viewport-y/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-z-order/viewport-y/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/symbol-z-order/viewport-y/metrics.json rename to metrics/android-render-test-runner/render-tests/symbol-z-order/viewport-y/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-anchor/bottom-left/metrics.json b/metrics/android-render-test-runner/render-tests/text-anchor/bottom-left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-anchor/bottom-left/metrics.json rename to metrics/android-render-test-runner/render-tests/text-anchor/bottom-left/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-anchor/bottom-right/metrics.json b/metrics/android-render-test-runner/render-tests/text-anchor/bottom-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-anchor/bottom-right/metrics.json rename to metrics/android-render-test-runner/render-tests/text-anchor/bottom-right/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-anchor/bottom/metrics.json b/metrics/android-render-test-runner/render-tests/text-anchor/bottom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-anchor/bottom/metrics.json rename to metrics/android-render-test-runner/render-tests/text-anchor/bottom/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-anchor/center/metrics.json b/metrics/android-render-test-runner/render-tests/text-anchor/center/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-anchor/center/metrics.json rename to metrics/android-render-test-runner/render-tests/text-anchor/center/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-anchor/left/metrics.json b/metrics/android-render-test-runner/render-tests/text-anchor/left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-anchor/left/metrics.json rename to metrics/android-render-test-runner/render-tests/text-anchor/left/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-anchor/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-anchor/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-anchor/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/text-anchor/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-anchor/right/metrics.json b/metrics/android-render-test-runner/render-tests/text-anchor/right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-anchor/right/metrics.json rename to metrics/android-render-test-runner/render-tests/text-anchor/right/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-anchor/top-left/metrics.json b/metrics/android-render-test-runner/render-tests/text-anchor/top-left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-anchor/top-left/metrics.json rename to metrics/android-render-test-runner/render-tests/text-anchor/top-left/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-anchor/top-right/metrics.json b/metrics/android-render-test-runner/render-tests/text-anchor/top-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-anchor/top-right/metrics.json rename to metrics/android-render-test-runner/render-tests/text-anchor/top-right/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-anchor/top/metrics.json b/metrics/android-render-test-runner/render-tests/text-anchor/top/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-anchor/top/metrics.json rename to metrics/android-render-test-runner/render-tests/text-anchor/top/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-arabic/letter-spacing/metrics.json b/metrics/android-render-test-runner/render-tests/text-arabic/letter-spacing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-arabic/letter-spacing/metrics.json rename to metrics/android-render-test-runner/render-tests/text-arabic/letter-spacing/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-arabic/line-break-mixed/metrics.json b/metrics/android-render-test-runner/render-tests/text-arabic/line-break-mixed/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-arabic/line-break-mixed/metrics.json rename to metrics/android-render-test-runner/render-tests/text-arabic/line-break-mixed/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-arabic/line-break/metrics.json b/metrics/android-render-test-runner/render-tests/text-arabic/line-break/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-arabic/line-break/metrics.json rename to metrics/android-render-test-runner/render-tests/text-arabic/line-break/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-arabic/mixed-numeric/metrics.json b/metrics/android-render-test-runner/render-tests/text-arabic/mixed-numeric/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-arabic/mixed-numeric/metrics.json rename to metrics/android-render-test-runner/render-tests/text-arabic/mixed-numeric/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-arabic/multi-paragraph/metrics.json b/metrics/android-render-test-runner/render-tests/text-arabic/multi-paragraph/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-arabic/multi-paragraph/metrics.json rename to metrics/android-render-test-runner/render-tests/text-arabic/multi-paragraph/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-color/default/metrics.json b/metrics/android-render-test-runner/render-tests/text-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-color/default/metrics.json rename to metrics/android-render-test-runner/render-tests/text-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-color/function/metrics.json b/metrics/android-render-test-runner/render-tests/text-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-color/function/metrics.json rename to metrics/android-render-test-runner/render-tests/text-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-color/literal/metrics.json b/metrics/android-render-test-runner/render-tests/text-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-color/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/text-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-color/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-color/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/text-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-field/formatted-arabic/metrics.json b/metrics/android-render-test-runner/render-tests/text-field/formatted-arabic/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-field/formatted-arabic/metrics.json rename to metrics/android-render-test-runner/render-tests/text-field/formatted-arabic/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-field/formatted-images-constant-size/metrics.json b/metrics/android-render-test-runner/render-tests/text-field/formatted-images-constant-size/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-field/formatted-images-constant-size/metrics.json rename to metrics/android-render-test-runner/render-tests/text-field/formatted-images-constant-size/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-field/formatted-images-line/metrics.json b/metrics/android-render-test-runner/render-tests/text-field/formatted-images-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-field/formatted-images-line/metrics.json rename to metrics/android-render-test-runner/render-tests/text-field/formatted-images-line/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-field/formatted-images-multiline/metrics.json b/metrics/android-render-test-runner/render-tests/text-field/formatted-images-multiline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-field/formatted-images-multiline/metrics.json rename to metrics/android-render-test-runner/render-tests/text-field/formatted-images-multiline/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json b/metrics/android-render-test-runner/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json rename to metrics/android-render-test-runner/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-field/formatted-images-vertical/metrics.json b/metrics/android-render-test-runner/render-tests/text-field/formatted-images-vertical/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-field/formatted-images-vertical/metrics.json rename to metrics/android-render-test-runner/render-tests/text-field/formatted-images-vertical/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json b/metrics/android-render-test-runner/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json rename to metrics/android-render-test-runner/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-field/formatted-images/metrics.json b/metrics/android-render-test-runner/render-tests/text-field/formatted-images/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-field/formatted-images/metrics.json rename to metrics/android-render-test-runner/render-tests/text-field/formatted-images/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-field/formatted-line/metrics.json b/metrics/android-render-test-runner/render-tests/text-field/formatted-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-field/formatted-line/metrics.json rename to metrics/android-render-test-runner/render-tests/text-field/formatted-line/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json b/metrics/android-render-test-runner/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-field/formatted-text-color-overrides/metrics.json b/metrics/android-render-test-runner/render-tests/text-field/formatted-text-color-overrides/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-field/formatted-text-color-overrides/metrics.json rename to metrics/android-render-test-runner/render-tests/text-field/formatted-text-color-overrides/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-field/formatted-text-color/metrics.json b/metrics/android-render-test-runner/render-tests/text-field/formatted-text-color/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-field/formatted-text-color/metrics.json rename to metrics/android-render-test-runner/render-tests/text-field/formatted-text-color/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-field/formatted/metrics.json b/metrics/android-render-test-runner/render-tests/text-field/formatted/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-field/formatted/metrics.json rename to metrics/android-render-test-runner/render-tests/text-field/formatted/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-field/literal/metrics.json b/metrics/android-render-test-runner/render-tests/text-field/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-field/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/text-field/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-field/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-field/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-field/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/text-field/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-field/token/metrics.json b/metrics/android-render-test-runner/render-tests/text-field/token/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-field/token/metrics.json rename to metrics/android-render-test-runner/render-tests/text-field/token/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-font/camera-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-font/camera-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-font/camera-function/metrics.json rename to metrics/android-render-test-runner/render-tests/text-font/camera-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-font/chinese/metrics.json b/metrics/android-render-test-runner/render-tests/text-font/chinese/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-font/chinese/metrics.json rename to metrics/android-render-test-runner/render-tests/text-font/chinese/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-font/data-expression/metrics.json b/metrics/android-render-test-runner/render-tests/text-font/data-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-font/data-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/text-font/data-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-font/literal/metrics.json b/metrics/android-render-test-runner/render-tests/text-font/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-font/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/text-font/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-halo-blur/default/metrics.json b/metrics/android-render-test-runner/render-tests/text-halo-blur/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-halo-blur/default/metrics.json rename to metrics/android-render-test-runner/render-tests/text-halo-blur/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-halo-blur/function/metrics.json b/metrics/android-render-test-runner/render-tests/text-halo-blur/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-halo-blur/function/metrics.json rename to metrics/android-render-test-runner/render-tests/text-halo-blur/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-halo-blur/literal/metrics.json b/metrics/android-render-test-runner/render-tests/text-halo-blur/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-halo-blur/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/text-halo-blur/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-halo-blur/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-halo-blur/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-halo-blur/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/text-halo-blur/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-halo-color/default/metrics.json b/metrics/android-render-test-runner/render-tests/text-halo-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-halo-color/default/metrics.json rename to metrics/android-render-test-runner/render-tests/text-halo-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-halo-color/function/metrics.json b/metrics/android-render-test-runner/render-tests/text-halo-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-halo-color/function/metrics.json rename to metrics/android-render-test-runner/render-tests/text-halo-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-halo-color/literal/metrics.json b/metrics/android-render-test-runner/render-tests/text-halo-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-halo-color/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/text-halo-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-halo-color/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-halo-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-halo-color/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/text-halo-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-halo-width/default/metrics.json b/metrics/android-render-test-runner/render-tests/text-halo-width/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-halo-width/default/metrics.json rename to metrics/android-render-test-runner/render-tests/text-halo-width/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-halo-width/function/metrics.json b/metrics/android-render-test-runner/render-tests/text-halo-width/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-halo-width/function/metrics.json rename to metrics/android-render-test-runner/render-tests/text-halo-width/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-halo-width/literal/metrics.json b/metrics/android-render-test-runner/render-tests/text-halo-width/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-halo-width/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/text-halo-width/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-halo-width/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-halo-width/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-halo-width/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/text-halo-width/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-justify/auto/metrics.json b/metrics/android-render-test-runner/render-tests/text-justify/auto/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-justify/auto/metrics.json rename to metrics/android-render-test-runner/render-tests/text-justify/auto/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-justify/left/metrics.json b/metrics/android-render-test-runner/render-tests/text-justify/left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-justify/left/metrics.json rename to metrics/android-render-test-runner/render-tests/text-justify/left/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-justify/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-justify/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-justify/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/text-justify/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-justify/right/metrics.json b/metrics/android-render-test-runner/render-tests/text-justify/right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-justify/right/metrics.json rename to metrics/android-render-test-runner/render-tests/text-justify/right/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-false/metrics.json b/metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-false/metrics.json rename to metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-false/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-true-offset/metrics.json b/metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-true-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-true-offset/metrics.json rename to metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-true-offset/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json b/metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json rename to metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json b/metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json rename to metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json b/metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json rename to metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-true/metrics.json b/metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-true/metrics.json rename to metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-true/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json b/metrics/android-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json rename to metrics/android-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json b/metrics/android-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json rename to metrics/android-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json b/metrics/android-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json rename to metrics/android-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json b/metrics/android-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json rename to metrics/android-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-letter-spacing/function-close/metrics.json b/metrics/android-render-test-runner/render-tests/text-letter-spacing/function-close/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-letter-spacing/function-close/metrics.json rename to metrics/android-render-test-runner/render-tests/text-letter-spacing/function-close/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-letter-spacing/function-far/metrics.json b/metrics/android-render-test-runner/render-tests/text-letter-spacing/function-far/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-letter-spacing/function-far/metrics.json rename to metrics/android-render-test-runner/render-tests/text-letter-spacing/function-far/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-letter-spacing/literal/metrics.json b/metrics/android-render-test-runner/render-tests/text-letter-spacing/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-letter-spacing/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/text-letter-spacing/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-letter-spacing/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-letter-spacing/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-letter-spacing/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/text-letter-spacing/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-line-height/literal/metrics.json b/metrics/android-render-test-runner/render-tests/text-line-height/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-line-height/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/text-line-height/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-max-angle/line-center/metrics.json b/metrics/android-render-test-runner/render-tests/text-max-angle/line-center/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-max-angle/line-center/metrics.json rename to metrics/android-render-test-runner/render-tests/text-max-angle/line-center/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-max-angle/literal/metrics.json b/metrics/android-render-test-runner/render-tests/text-max-angle/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-max-angle/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/text-max-angle/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-max-width/force-double-newline/metrics.json b/metrics/android-render-test-runner/render-tests/text-max-width/force-double-newline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-max-width/force-double-newline/metrics.json rename to metrics/android-render-test-runner/render-tests/text-max-width/force-double-newline/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-max-width/force-newline/metrics.json b/metrics/android-render-test-runner/render-tests/text-max-width/force-newline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-max-width/force-newline/metrics.json rename to metrics/android-render-test-runner/render-tests/text-max-width/force-newline/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-max-width/ideographic-breaking/metrics.json b/metrics/android-render-test-runner/render-tests/text-max-width/ideographic-breaking/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-max-width/ideographic-breaking/metrics.json rename to metrics/android-render-test-runner/render-tests/text-max-width/ideographic-breaking/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json b/metrics/android-render-test-runner/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json rename to metrics/android-render-test-runner/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-max-width/literal/metrics.json b/metrics/android-render-test-runner/render-tests/text-max-width/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-max-width/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/text-max-width/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-max-width/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-max-width/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-max-width/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/text-max-width/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-max-width/zoom-and-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-max-width/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-max-width/zoom-and-property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/text-max-width/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-no-cross-source-collision/default/metrics.json b/metrics/android-render-test-runner/render-tests/text-no-cross-source-collision/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-no-cross-source-collision/default/metrics.json rename to metrics/android-render-test-runner/render-tests/text-no-cross-source-collision/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json rename to metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json rename to metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json rename to metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json rename to metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json rename to metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json rename to metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json rename to metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json rename to metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json rename to metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json rename to metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json rename to metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json rename to metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json rename to metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json rename to metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json rename to metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json rename to metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json rename to metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json rename to metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/text-offset/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-offset/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/text-offset/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-opacity/default/metrics.json b/metrics/android-render-test-runner/render-tests/text-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-opacity/default/metrics.json rename to metrics/android-render-test-runner/render-tests/text-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-opacity/function/metrics.json b/metrics/android-render-test-runner/render-tests/text-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-opacity/function/metrics.json rename to metrics/android-render-test-runner/render-tests/text-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-opacity/literal/metrics.json b/metrics/android-render-test-runner/render-tests/text-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-opacity/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/text-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-opacity/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-opacity/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-opacity/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/text-opacity/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json b/metrics/android-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json rename to metrics/android-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json b/metrics/android-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json rename to metrics/android-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json b/metrics/android-render-test-runner/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json rename to metrics/android-render-test-runner/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json b/metrics/android-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json rename to metrics/android-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json b/metrics/android-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json rename to metrics/android-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json b/metrics/android-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json rename to metrics/android-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json b/metrics/android-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json rename to metrics/android-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json b/metrics/android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json rename to metrics/android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json b/metrics/android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json rename to metrics/android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json b/metrics/android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json rename to metrics/android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-pitch-scaling/line-half/metrics.json b/metrics/android-render-test-runner/render-tests/text-pitch-scaling/line-half/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-pitch-scaling/line-half/metrics.json rename to metrics/android-render-test-runner/render-tests/text-pitch-scaling/line-half/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-radial-offset/basic/metrics.json b/metrics/android-render-test-runner/render-tests/text-radial-offset/basic/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-radial-offset/basic/metrics.json rename to metrics/android-render-test-runner/render-tests/text-radial-offset/basic/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-rotate/anchor-bottom/metrics.json b/metrics/android-render-test-runner/render-tests/text-rotate/anchor-bottom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-rotate/anchor-bottom/metrics.json rename to metrics/android-render-test-runner/render-tests/text-rotate/anchor-bottom/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-rotate/anchor-left/metrics.json b/metrics/android-render-test-runner/render-tests/text-rotate/anchor-left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-rotate/anchor-left/metrics.json rename to metrics/android-render-test-runner/render-tests/text-rotate/anchor-left/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-rotate/anchor-right/metrics.json b/metrics/android-render-test-runner/render-tests/text-rotate/anchor-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-rotate/anchor-right/metrics.json rename to metrics/android-render-test-runner/render-tests/text-rotate/anchor-right/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-rotate/anchor-top/metrics.json b/metrics/android-render-test-runner/render-tests/text-rotate/anchor-top/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-rotate/anchor-top/metrics.json rename to metrics/android-render-test-runner/render-tests/text-rotate/anchor-top/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-rotate/function/metrics.json b/metrics/android-render-test-runner/render-tests/text-rotate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-rotate/function/metrics.json rename to metrics/android-render-test-runner/render-tests/text-rotate/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-rotate/literal/metrics.json b/metrics/android-render-test-runner/render-tests/text-rotate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-rotate/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/text-rotate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-rotate/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-rotate/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-rotate/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/text-rotate/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-rotate/with-offset/metrics.json b/metrics/android-render-test-runner/render-tests/text-rotate/with-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-rotate/with-offset/metrics.json rename to metrics/android-render-test-runner/render-tests/text-rotate/with-offset/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json b/metrics/android-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json rename to metrics/android-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json b/metrics/android-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json rename to metrics/android-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json b/metrics/android-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json rename to metrics/android-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json b/metrics/android-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json rename to metrics/android-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json b/metrics/android-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json rename to metrics/android-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json b/metrics/android-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json rename to metrics/android-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-size/camera-function-high-base/metrics.json b/metrics/android-render-test-runner/render-tests/text-size/camera-function-high-base/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-size/camera-function-high-base/metrics.json rename to metrics/android-render-test-runner/render-tests/text-size/camera-function-high-base/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-size/camera-function-interval/metrics.json b/metrics/android-render-test-runner/render-tests/text-size/camera-function-interval/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-size/camera-function-interval/metrics.json rename to metrics/android-render-test-runner/render-tests/text-size/camera-function-interval/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-size/composite-expression/metrics.json b/metrics/android-render-test-runner/render-tests/text-size/composite-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-size/composite-expression/metrics.json rename to metrics/android-render-test-runner/render-tests/text-size/composite-expression/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-size/composite-function-line-placement/metrics.json b/metrics/android-render-test-runner/render-tests/text-size/composite-function-line-placement/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-size/composite-function-line-placement/metrics.json rename to metrics/android-render-test-runner/render-tests/text-size/composite-function-line-placement/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-size/composite-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-size/composite-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-size/composite-function/metrics.json rename to metrics/android-render-test-runner/render-tests/text-size/composite-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-size/default/metrics.json b/metrics/android-render-test-runner/render-tests/text-size/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-size/default/metrics.json rename to metrics/android-render-test-runner/render-tests/text-size/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-size/function/metrics.json b/metrics/android-render-test-runner/render-tests/text-size/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-size/function/metrics.json rename to metrics/android-render-test-runner/render-tests/text-size/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-size/literal/metrics.json b/metrics/android-render-test-runner/render-tests/text-size/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-size/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/text-size/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-size/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-size/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-size/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/text-size/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-size/zero/metrics.json b/metrics/android-render-test-runner/render-tests/text-size/zero/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-size/zero/metrics.json rename to metrics/android-render-test-runner/render-tests/text-size/zero/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-tile-edge-clipping/default/metrics.json b/metrics/android-render-test-runner/render-tests/text-tile-edge-clipping/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-tile-edge-clipping/default/metrics.json rename to metrics/android-render-test-runner/render-tests/text-tile-edge-clipping/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-transform/lowercase/metrics.json b/metrics/android-render-test-runner/render-tests/text-transform/lowercase/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-transform/lowercase/metrics.json rename to metrics/android-render-test-runner/render-tests/text-transform/lowercase/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-transform/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-transform/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-transform/property-function/metrics.json rename to metrics/android-render-test-runner/render-tests/text-transform/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-transform/uppercase/metrics.json b/metrics/android-render-test-runner/render-tests/text-transform/uppercase/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-transform/uppercase/metrics.json rename to metrics/android-render-test-runner/render-tests/text-transform/uppercase/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-translate-anchor/map/metrics.json b/metrics/android-render-test-runner/render-tests/text-translate-anchor/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-translate-anchor/map/metrics.json rename to metrics/android-render-test-runner/render-tests/text-translate-anchor/map/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-translate-anchor/viewport/metrics.json b/metrics/android-render-test-runner/render-tests/text-translate-anchor/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-translate-anchor/viewport/metrics.json rename to metrics/android-render-test-runner/render-tests/text-translate-anchor/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-translate/default/metrics.json b/metrics/android-render-test-runner/render-tests/text-translate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-translate/default/metrics.json rename to metrics/android-render-test-runner/render-tests/text-translate/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-translate/function/metrics.json b/metrics/android-render-test-runner/render-tests/text-translate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-translate/function/metrics.json rename to metrics/android-render-test-runner/render-tests/text-translate/function/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-translate/literal/metrics.json b/metrics/android-render-test-runner/render-tests/text-translate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-translate/literal/metrics.json rename to metrics/android-render-test-runner/render-tests/text-translate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json rename to metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json rename to metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset/metrics.json rename to metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json rename to metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json rename to metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json rename to metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json rename to metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json rename to metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json rename to metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors/metrics.json rename to metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json rename to metrics/android-render-test-runner/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/icon-image/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/icon-image/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/icon-image/metrics.json rename to metrics/android-render-test-runner/render-tests/text-variable-anchor/icon-image/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json rename to metrics/android-render-test-runner/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/metrics.json rename to metrics/android-render-test-runner/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/no-animate-zoom/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/no-animate-zoom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/no-animate-zoom/metrics.json rename to metrics/android-render-test-runner/render-tests/text-variable-anchor/no-animate-zoom/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/pitched-offset/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/pitched-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/pitched-offset/metrics.json rename to metrics/android-render-test-runner/render-tests/text-variable-anchor/pitched-offset/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json rename to metrics/android-render-test-runner/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/pitched-with-map/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/pitched-with-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/pitched-with-map/metrics.json rename to metrics/android-render-test-runner/render-tests/text-variable-anchor/pitched-with-map/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/pitched/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/pitched/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/pitched/metrics.json rename to metrics/android-render-test-runner/render-tests/text-variable-anchor/pitched/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/rotated-offset/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/rotated-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/rotated-offset/metrics.json rename to metrics/android-render-test-runner/render-tests/text-variable-anchor/rotated-offset/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/rotated-with-map/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/rotated-with-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/rotated-with-map/metrics.json rename to metrics/android-render-test-runner/render-tests/text-variable-anchor/rotated-with-map/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/rotated/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/rotated/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/rotated/metrics.json rename to metrics/android-render-test-runner/render-tests/text-variable-anchor/rotated/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/single-justification/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/single-justification/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/single-justification/metrics.json rename to metrics/android-render-test-runner/render-tests/text-variable-anchor/single-justification/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/single-line/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/single-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/single-line/metrics.json rename to metrics/android-render-test-runner/render-tests/text-variable-anchor/single-line/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/text-allow-overlap/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/text-allow-overlap/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/text-allow-overlap/metrics.json rename to metrics/android-render-test-runner/render-tests/text-variable-anchor/text-allow-overlap/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json rename to metrics/android-render-test-runner/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-visibility/none/metrics.json b/metrics/android-render-test-runner/render-tests/text-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-visibility/none/metrics.json rename to metrics/android-render-test-runner/render-tests/text-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-visibility/visible/metrics.json b/metrics/android-render-test-runner/render-tests/text-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-visibility/visible/metrics.json rename to metrics/android-render-test-runner/render-tests/text-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json b/metrics/android-render-test-runner/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json rename to metrics/android-render-test-runner/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-writing-mode/line_label/chinese/metrics.json b/metrics/android-render-test-runner/render-tests/text-writing-mode/line_label/chinese/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-writing-mode/line_label/chinese/metrics.json rename to metrics/android-render-test-runner/render-tests/text-writing-mode/line_label/chinese/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-writing-mode/line_label/latin/metrics.json b/metrics/android-render-test-runner/render-tests/text-writing-mode/line_label/latin/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-writing-mode/line_label/latin/metrics.json rename to metrics/android-render-test-runner/render-tests/text-writing-mode/line_label/latin/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-writing-mode/line_label/mixed/metrics.json b/metrics/android-render-test-runner/render-tests/text-writing-mode/line_label/mixed/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-writing-mode/line_label/mixed/metrics.json rename to metrics/android-render-test-runner/render-tests/text-writing-mode/line_label/mixed/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json rename to metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json rename to metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json rename to metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json rename to metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json rename to metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json rename to metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json rename to metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json rename to metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json rename to metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json rename to metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json rename to metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json rename to metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/tile-mode/streets-v11/metrics.json b/metrics/android-render-test-runner/render-tests/tile-mode/streets-v11/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/tile-mode/streets-v11/metrics.json rename to metrics/android-render-test-runner/render-tests/tile-mode/streets-v11/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/tilejson-bounds/default/metrics.json b/metrics/android-render-test-runner/render-tests/tilejson-bounds/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/tilejson-bounds/default/metrics.json rename to metrics/android-render-test-runner/render-tests/tilejson-bounds/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/tilejson-bounds/overwrite-bounds/metrics.json b/metrics/android-render-test-runner/render-tests/tilejson-bounds/overwrite-bounds/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/tilejson-bounds/overwrite-bounds/metrics.json rename to metrics/android-render-test-runner/render-tests/tilejson-bounds/overwrite-bounds/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/tms/tms/metrics.json b/metrics/android-render-test-runner/render-tests/tms/tms/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/tms/tms/metrics.json rename to metrics/android-render-test-runner/render-tests/tms/tms/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/within/filter-with-inlined-geojson/metrics.json b/metrics/android-render-test-runner/render-tests/within/filter-with-inlined-geojson/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/within/filter-with-inlined-geojson/metrics.json rename to metrics/android-render-test-runner/render-tests/within/filter-with-inlined-geojson/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/within/layout-text/metrics.json b/metrics/android-render-test-runner/render-tests/within/layout-text/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/within/layout-text/metrics.json rename to metrics/android-render-test-runner/render-tests/within/layout-text/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/within/paint-circle/metrics.json b/metrics/android-render-test-runner/render-tests/within/paint-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/within/paint-circle/metrics.json rename to metrics/android-render-test-runner/render-tests/within/paint-circle/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/within/paint-icon/metrics.json b/metrics/android-render-test-runner/render-tests/within/paint-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/within/paint-icon/metrics.json rename to metrics/android-render-test-runner/render-tests/within/paint-icon/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/within/paint-line/metrics.json b/metrics/android-render-test-runner/render-tests/within/paint-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/within/paint-line/metrics.json rename to metrics/android-render-test-runner/render-tests/within/paint-line/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/within/paint-text/metrics.json b/metrics/android-render-test-runner/render-tests/within/paint-text/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/within/paint-text/metrics.json rename to metrics/android-render-test-runner/render-tests/within/paint-text/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/zoom-history/in/metrics.json b/metrics/android-render-test-runner/render-tests/zoom-history/in/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/zoom-history/in/metrics.json rename to metrics/android-render-test-runner/render-tests/zoom-history/in/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/zoom-history/out/metrics.json b/metrics/android-render-test-runner/render-tests/zoom-history/out/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/zoom-history/out/metrics.json rename to metrics/android-render-test-runner/render-tests/zoom-history/out/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/zoom-visibility/above/metrics.json b/metrics/android-render-test-runner/render-tests/zoom-visibility/above/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/zoom-visibility/above/metrics.json rename to metrics/android-render-test-runner/render-tests/zoom-visibility/above/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/zoom-visibility/below/metrics.json b/metrics/android-render-test-runner/render-tests/zoom-visibility/below/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/zoom-visibility/below/metrics.json rename to metrics/android-render-test-runner/render-tests/zoom-visibility/below/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/zoom-visibility/in-range/metrics.json b/metrics/android-render-test-runner/render-tests/zoom-visibility/in-range/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/zoom-visibility/in-range/metrics.json rename to metrics/android-render-test-runner/render-tests/zoom-visibility/in-range/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/zoom-visibility/out-of-range/metrics.json b/metrics/android-render-test-runner/render-tests/zoom-visibility/out-of-range/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/zoom-visibility/out-of-range/metrics.json rename to metrics/android-render-test-runner/render-tests/zoom-visibility/out-of-range/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/zoom-visibility/was-above/metrics.json b/metrics/android-render-test-runner/render-tests/zoom-visibility/was-above/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/zoom-visibility/was-above/metrics.json rename to metrics/android-render-test-runner/render-tests/zoom-visibility/was-above/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/zoom-visibility/was-below/metrics.json b/metrics/android-render-test-runner/render-tests/zoom-visibility/was-below/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/zoom-visibility/was-below/metrics.json rename to metrics/android-render-test-runner/render-tests/zoom-visibility/was-below/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/zoomed-fill/default/metrics.json b/metrics/android-render-test-runner/render-tests/zoomed-fill/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/zoomed-fill/default/metrics.json rename to metrics/android-render-test-runner/render-tests/zoomed-fill/default/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/zoomed-raster/fractional/metrics.json b/metrics/android-render-test-runner/render-tests/zoomed-raster/fractional/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/zoomed-raster/fractional/metrics.json rename to metrics/android-render-test-runner/render-tests/zoomed-raster/fractional/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/zoomed-raster/overzoom/metrics.json b/metrics/android-render-test-runner/render-tests/zoomed-raster/overzoom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/zoomed-raster/overzoom/metrics.json rename to metrics/android-render-test-runner/render-tests/zoomed-raster/overzoom/metrics.json diff --git a/mapbox-gl-native/metrics/android-render-test-runner/render-tests/zoomed-raster/underzoom/metrics.json b/metrics/android-render-test-runner/render-tests/zoomed-raster/underzoom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/android-render-test-runner/render-tests/zoomed-raster/underzoom/metrics.json rename to metrics/android-render-test-runner/render-tests/zoomed-raster/underzoom/metrics.json diff --git a/mapbox-gl-native/metrics/benchmark/android/results.json b/metrics/benchmark/android/results.json similarity index 100% rename from mapbox-gl-native/metrics/benchmark/android/results.json rename to metrics/benchmark/android/results.json diff --git a/mapbox-gl-native/metrics/benchmark/ios/results.json b/metrics/benchmark/ios/results.json similarity index 100% rename from mapbox-gl-native/metrics/benchmark/ios/results.json rename to metrics/benchmark/ios/results.json diff --git a/mapbox-gl-native/metrics/binary-size.json b/metrics/binary-size.json similarity index 100% rename from mapbox-gl-native/metrics/binary-size.json rename to metrics/binary-size.json diff --git a/mapbox-gl-native/metrics/binary-size/android-arm64-v8a/expected.png b/metrics/binary-size/android-arm64-v8a/expected.png similarity index 100% rename from mapbox-gl-native/metrics/binary-size/android-arm64-v8a/expected.png rename to metrics/binary-size/android-arm64-v8a/expected.png diff --git a/mapbox-gl-native/metrics/binary-size/android-arm64-v8a/metrics.json b/metrics/binary-size/android-arm64-v8a/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/binary-size/android-arm64-v8a/metrics.json rename to metrics/binary-size/android-arm64-v8a/metrics.json diff --git a/mapbox-gl-native/metrics/binary-size/android-arm64-v8a/style.json b/metrics/binary-size/android-arm64-v8a/style.json similarity index 100% rename from mapbox-gl-native/metrics/binary-size/android-arm64-v8a/style.json rename to metrics/binary-size/android-arm64-v8a/style.json diff --git a/mapbox-gl-native/metrics/binary-size/android-armeabi-v7a/expected.png b/metrics/binary-size/android-armeabi-v7a/expected.png similarity index 100% rename from mapbox-gl-native/metrics/binary-size/android-armeabi-v7a/expected.png rename to metrics/binary-size/android-armeabi-v7a/expected.png diff --git a/mapbox-gl-native/metrics/binary-size/android-armeabi-v7a/metrics.json b/metrics/binary-size/android-armeabi-v7a/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/binary-size/android-armeabi-v7a/metrics.json rename to metrics/binary-size/android-armeabi-v7a/metrics.json diff --git a/mapbox-gl-native/metrics/binary-size/android-armeabi-v7a/style.json b/metrics/binary-size/android-armeabi-v7a/style.json similarity index 100% rename from mapbox-gl-native/metrics/binary-size/android-armeabi-v7a/style.json rename to metrics/binary-size/android-armeabi-v7a/style.json diff --git a/mapbox-gl-native/metrics/binary-size/android-x86/expected.png b/metrics/binary-size/android-x86/expected.png similarity index 100% rename from mapbox-gl-native/metrics/binary-size/android-x86/expected.png rename to metrics/binary-size/android-x86/expected.png diff --git a/mapbox-gl-native/metrics/binary-size/android-x86/metrics.json b/metrics/binary-size/android-x86/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/binary-size/android-x86/metrics.json rename to metrics/binary-size/android-x86/metrics.json diff --git a/mapbox-gl-native/metrics/binary-size/android-x86/style.json b/metrics/binary-size/android-x86/style.json similarity index 100% rename from mapbox-gl-native/metrics/binary-size/android-x86/style.json rename to metrics/binary-size/android-x86/style.json diff --git a/mapbox-gl-native/metrics/binary-size/android-x86_64/expected.png b/metrics/binary-size/android-x86_64/expected.png similarity index 100% rename from mapbox-gl-native/metrics/binary-size/android-x86_64/expected.png rename to metrics/binary-size/android-x86_64/expected.png diff --git a/mapbox-gl-native/metrics/binary-size/android-x86_64/metrics.json b/metrics/binary-size/android-x86_64/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/binary-size/android-x86_64/metrics.json rename to metrics/binary-size/android-x86_64/metrics.json diff --git a/mapbox-gl-native/metrics/binary-size/android-x86_64/style.json b/metrics/binary-size/android-x86_64/style.json similarity index 100% rename from mapbox-gl-native/metrics/binary-size/android-x86_64/style.json rename to metrics/binary-size/android-x86_64/style.json diff --git a/mapbox-gl-native/metrics/binary-size/linux-clang8/expected.png b/metrics/binary-size/linux-clang8/expected.png similarity index 100% rename from mapbox-gl-native/metrics/binary-size/linux-clang8/expected.png rename to metrics/binary-size/linux-clang8/expected.png diff --git a/mapbox-gl-native/metrics/binary-size/linux-clang8/metrics.json b/metrics/binary-size/linux-clang8/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/binary-size/linux-clang8/metrics.json rename to metrics/binary-size/linux-clang8/metrics.json diff --git a/mapbox-gl-native/metrics/binary-size/linux-clang8/style.json b/metrics/binary-size/linux-clang8/style.json similarity index 100% rename from mapbox-gl-native/metrics/binary-size/linux-clang8/style.json rename to metrics/binary-size/linux-clang8/style.json diff --git a/mapbox-gl-native/metrics/binary-size/linux-gcc8/expected.png b/metrics/binary-size/linux-gcc8/expected.png similarity index 100% rename from mapbox-gl-native/metrics/binary-size/linux-gcc8/expected.png rename to metrics/binary-size/linux-gcc8/expected.png diff --git a/mapbox-gl-native/metrics/binary-size/linux-gcc8/metrics.json b/metrics/binary-size/linux-gcc8/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/binary-size/linux-gcc8/metrics.json rename to metrics/binary-size/linux-gcc8/metrics.json diff --git a/mapbox-gl-native/metrics/binary-size/linux-gcc8/style.json b/metrics/binary-size/linux-gcc8/style.json similarity index 100% rename from mapbox-gl-native/metrics/binary-size/linux-gcc8/style.json rename to metrics/binary-size/linux-gcc8/style.json diff --git a/mapbox-gl-native/metrics/binary-size/macos-xcode11/expected.png b/metrics/binary-size/macos-xcode11/expected.png similarity index 100% rename from mapbox-gl-native/metrics/binary-size/macos-xcode11/expected.png rename to metrics/binary-size/macos-xcode11/expected.png diff --git a/mapbox-gl-native/metrics/binary-size/macos-xcode11/metrics.json b/metrics/binary-size/macos-xcode11/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/binary-size/macos-xcode11/metrics.json rename to metrics/binary-size/macos-xcode11/metrics.json diff --git a/mapbox-gl-native/metrics/binary-size/macos-xcode11/style.json b/metrics/binary-size/macos-xcode11/style.json similarity index 100% rename from mapbox-gl-native/metrics/binary-size/macos-xcode11/style.json rename to metrics/binary-size/macos-xcode11/style.json diff --git a/mapbox-gl-native/metrics/cache-metrics.db b/metrics/cache-metrics.db similarity index 100% rename from mapbox-gl-native/metrics/cache-metrics.db rename to metrics/cache-metrics.db diff --git a/mapbox-gl-native/metrics/cache-style.db b/metrics/cache-style.db similarity index 100% rename from mapbox-gl-native/metrics/cache-style.db rename to metrics/cache-style.db diff --git a/mapbox-gl-native/metrics/expectations/platform-all/render-tests/circle-sort-key/literal/expected.png b/metrics/expectations/platform-all/render-tests/circle-sort-key/literal/expected.png similarity index 100% rename from mapbox-gl-native/metrics/expectations/platform-all/render-tests/circle-sort-key/literal/expected.png rename to metrics/expectations/platform-all/render-tests/circle-sort-key/literal/expected.png diff --git a/mapbox-gl-native/metrics/expectations/platform-all/render-tests/debug/collision-lines-overscaled/expected.png b/metrics/expectations/platform-all/render-tests/debug/collision-lines-overscaled/expected.png similarity index 100% rename from mapbox-gl-native/metrics/expectations/platform-all/render-tests/debug/collision-lines-overscaled/expected.png rename to metrics/expectations/platform-all/render-tests/debug/collision-lines-overscaled/expected.png diff --git a/mapbox-gl-native/metrics/expectations/platform-all/render-tests/debug/collision-lines-pitched/expected.png b/metrics/expectations/platform-all/render-tests/debug/collision-lines-pitched/expected.png similarity index 100% rename from mapbox-gl-native/metrics/expectations/platform-all/render-tests/debug/collision-lines-pitched/expected.png rename to metrics/expectations/platform-all/render-tests/debug/collision-lines-pitched/expected.png diff --git a/mapbox-gl-native/metrics/expectations/platform-all/render-tests/debug/collision-lines/expected.png b/metrics/expectations/platform-all/render-tests/debug/collision-lines/expected.png similarity index 100% rename from mapbox-gl-native/metrics/expectations/platform-all/render-tests/debug/collision-lines/expected.png rename to metrics/expectations/platform-all/render-tests/debug/collision-lines/expected.png diff --git a/mapbox-gl-native/metrics/expectations/platform-all/render-tests/debug/collision-pitched-wrapped/expected.png b/metrics/expectations/platform-all/render-tests/debug/collision-pitched-wrapped/expected.png similarity index 100% rename from mapbox-gl-native/metrics/expectations/platform-all/render-tests/debug/collision-pitched-wrapped/expected.png rename to metrics/expectations/platform-all/render-tests/debug/collision-pitched-wrapped/expected.png diff --git a/mapbox-gl-native/metrics/expectations/platform-all/render-tests/map-mode/tile-avoid-edges/expected.png b/metrics/expectations/platform-all/render-tests/map-mode/tile-avoid-edges/expected.png similarity index 100% rename from mapbox-gl-native/metrics/expectations/platform-all/render-tests/map-mode/tile-avoid-edges/expected.png rename to metrics/expectations/platform-all/render-tests/map-mode/tile-avoid-edges/expected.png diff --git a/mapbox-gl-native/metrics/expectations/platform-all/render-tests/symbol-visibility/visible/expected.png b/metrics/expectations/platform-all/render-tests/symbol-visibility/visible/expected.png similarity index 100% rename from mapbox-gl-native/metrics/expectations/platform-all/render-tests/symbol-visibility/visible/expected.png rename to metrics/expectations/platform-all/render-tests/symbol-visibility/visible/expected.png diff --git a/mapbox-gl-native/metrics/expectations/platform-all/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/expected.png b/metrics/expectations/platform-all/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/expected.png similarity index 100% rename from mapbox-gl-native/metrics/expectations/platform-all/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/expected.png rename to metrics/expectations/platform-all/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/expected.png diff --git a/mapbox-gl-native/metrics/expectations/platform-all/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/expected.png b/metrics/expectations/platform-all/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/expected.png similarity index 100% rename from mapbox-gl-native/metrics/expectations/platform-all/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/expected.png rename to metrics/expectations/platform-all/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/expected.png diff --git a/mapbox-gl-native/metrics/expectations/platform-all/render-tests/text-pitch-alignment/viewport-overzoomed/expected.png b/metrics/expectations/platform-all/render-tests/text-pitch-alignment/viewport-overzoomed/expected.png similarity index 100% rename from mapbox-gl-native/metrics/expectations/platform-all/render-tests/text-pitch-alignment/viewport-overzoomed/expected.png rename to metrics/expectations/platform-all/render-tests/text-pitch-alignment/viewport-overzoomed/expected.png diff --git a/mapbox-gl-native/metrics/expectations/platform-all/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/expected.png b/metrics/expectations/platform-all/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/expected.png similarity index 100% rename from mapbox-gl-native/metrics/expectations/platform-all/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/expected.png rename to metrics/expectations/platform-all/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/expected.png diff --git a/mapbox-gl-native/metrics/expectations/platform-all/render-tests/text-pitch-scaling/line-half/expected.png b/metrics/expectations/platform-all/render-tests/text-pitch-scaling/line-half/expected.png similarity index 100% rename from mapbox-gl-native/metrics/expectations/platform-all/render-tests/text-pitch-scaling/line-half/expected.png rename to metrics/expectations/platform-all/render-tests/text-pitch-scaling/line-half/expected.png diff --git a/mapbox-gl-native/metrics/expectations/platform-all/render-tests/text-variable-anchor/all-anchors-tile-map-mode/expected.png b/metrics/expectations/platform-all/render-tests/text-variable-anchor/all-anchors-tile-map-mode/expected.png similarity index 100% rename from mapbox-gl-native/metrics/expectations/platform-all/render-tests/text-variable-anchor/all-anchors-tile-map-mode/expected.png rename to metrics/expectations/platform-all/render-tests/text-variable-anchor/all-anchors-tile-map-mode/expected.png diff --git a/mapbox-gl-native/metrics/expectations/platform-all/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/expected.png b/metrics/expectations/platform-all/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/expected.png similarity index 100% rename from mapbox-gl-native/metrics/expectations/platform-all/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/expected.png rename to metrics/expectations/platform-all/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/expected.png diff --git a/mapbox-gl-native/metrics/expectations/platform-all/render-tests/text-variable-anchor/pitched-rotated-debug/expected.png b/metrics/expectations/platform-all/render-tests/text-variable-anchor/pitched-rotated-debug/expected.png similarity index 100% rename from mapbox-gl-native/metrics/expectations/platform-all/render-tests/text-variable-anchor/pitched-rotated-debug/expected.png rename to metrics/expectations/platform-all/render-tests/text-variable-anchor/pitched-rotated-debug/expected.png diff --git a/mapbox-gl-native/metrics/expectations/platform-all/render-tests/text-variable-anchor/rotated-offset/expected.png b/metrics/expectations/platform-all/render-tests/text-variable-anchor/rotated-offset/expected.png similarity index 100% rename from mapbox-gl-native/metrics/expectations/platform-all/render-tests/text-variable-anchor/rotated-offset/expected.png rename to metrics/expectations/platform-all/render-tests/text-variable-anchor/rotated-offset/expected.png diff --git a/mapbox-gl-native/metrics/expectations/platform-android/render-tests/combinations/symbol-translucent--fill-translucent/expected.png b/metrics/expectations/platform-android/render-tests/combinations/symbol-translucent--fill-translucent/expected.png similarity index 100% rename from mapbox-gl-native/metrics/expectations/platform-android/render-tests/combinations/symbol-translucent--fill-translucent/expected.png rename to metrics/expectations/platform-android/render-tests/combinations/symbol-translucent--fill-translucent/expected.png diff --git a/mapbox-gl-native/metrics/expectations/platform-android/render-tests/regressions/mapbox-gl-js#2305/expected.png b/metrics/expectations/platform-android/render-tests/regressions/mapbox-gl-js#2305/expected.png similarity index 100% rename from mapbox-gl-native/metrics/expectations/platform-android/render-tests/regressions/mapbox-gl-js#2305/expected.png rename to metrics/expectations/platform-android/render-tests/regressions/mapbox-gl-js#2305/expected.png diff --git a/mapbox-gl-native/metrics/expectations/platform-android/render-tests/regressions/mapbox-gl-js#5978/expected.png b/metrics/expectations/platform-android/render-tests/regressions/mapbox-gl-js#5978/expected.png similarity index 100% rename from mapbox-gl-native/metrics/expectations/platform-android/render-tests/regressions/mapbox-gl-js#5978/expected.png rename to metrics/expectations/platform-android/render-tests/regressions/mapbox-gl-js#5978/expected.png diff --git a/mapbox-gl-native/metrics/expectations/platform-android/render-tests/sprites/1x-screen-1x-pattern/expected.png b/metrics/expectations/platform-android/render-tests/sprites/1x-screen-1x-pattern/expected.png similarity index 100% rename from mapbox-gl-native/metrics/expectations/platform-android/render-tests/sprites/1x-screen-1x-pattern/expected.png rename to metrics/expectations/platform-android/render-tests/sprites/1x-screen-1x-pattern/expected.png diff --git a/mapbox-gl-native/metrics/expectations/platform-android/render-tests/sprites/1x-screen-2x-pattern/expected.png b/metrics/expectations/platform-android/render-tests/sprites/1x-screen-2x-pattern/expected.png similarity index 100% rename from mapbox-gl-native/metrics/expectations/platform-android/render-tests/sprites/1x-screen-2x-pattern/expected.png rename to metrics/expectations/platform-android/render-tests/sprites/1x-screen-2x-pattern/expected.png diff --git a/mapbox-gl-native/metrics/expectations/platform-android/render-tests/sprites/2x-screen-1x-pattern/expected.png b/metrics/expectations/platform-android/render-tests/sprites/2x-screen-1x-pattern/expected.png similarity index 100% rename from mapbox-gl-native/metrics/expectations/platform-android/render-tests/sprites/2x-screen-1x-pattern/expected.png rename to metrics/expectations/platform-android/render-tests/sprites/2x-screen-1x-pattern/expected.png diff --git a/mapbox-gl-native/metrics/expectations/platform-android/render-tests/sprites/2x-screen-2x-pattern/expected.png b/metrics/expectations/platform-android/render-tests/sprites/2x-screen-2x-pattern/expected.png similarity index 100% rename from mapbox-gl-native/metrics/expectations/platform-android/render-tests/sprites/2x-screen-2x-pattern/expected.png rename to metrics/expectations/platform-android/render-tests/sprites/2x-screen-2x-pattern/expected.png diff --git a/mapbox-gl-native/metrics/expectations/platform-ios/render-tests/combinations/fill-translucent--symbol-translucent/expected.png b/metrics/expectations/platform-ios/render-tests/combinations/fill-translucent--symbol-translucent/expected.png similarity index 100% rename from mapbox-gl-native/metrics/expectations/platform-ios/render-tests/combinations/fill-translucent--symbol-translucent/expected.png rename to metrics/expectations/platform-ios/render-tests/combinations/fill-translucent--symbol-translucent/expected.png diff --git a/mapbox-gl-native/metrics/expectations/platform-ios/render-tests/combinations/symbol-translucent--fill-translucent/expected.png b/metrics/expectations/platform-ios/render-tests/combinations/symbol-translucent--fill-translucent/expected.png similarity index 100% rename from mapbox-gl-native/metrics/expectations/platform-ios/render-tests/combinations/symbol-translucent--fill-translucent/expected.png rename to metrics/expectations/platform-ios/render-tests/combinations/symbol-translucent--fill-translucent/expected.png diff --git a/mapbox-gl-native/metrics/expectations/platform-ios/render-tests/line-dasharray/overscaled/expected.png b/metrics/expectations/platform-ios/render-tests/line-dasharray/overscaled/expected.png similarity index 100% rename from mapbox-gl-native/metrics/expectations/platform-ios/render-tests/line-dasharray/overscaled/expected.png rename to metrics/expectations/platform-ios/render-tests/line-dasharray/overscaled/expected.png diff --git a/mapbox-gl-native/metrics/ignores/platform-all.json b/metrics/ignores/platform-all.json similarity index 100% rename from mapbox-gl-native/metrics/ignores/platform-all.json rename to metrics/ignores/platform-all.json diff --git a/mapbox-gl-native/metrics/ignores/platform-android.json b/metrics/ignores/platform-android.json similarity index 100% rename from mapbox-gl-native/metrics/ignores/platform-android.json rename to metrics/ignores/platform-android.json diff --git a/mapbox-gl-native/metrics/ignores/platform-ios.json b/metrics/ignores/platform-ios.json similarity index 100% rename from mapbox-gl-native/metrics/ignores/platform-ios.json rename to metrics/ignores/platform-ios.json diff --git a/mapbox-gl-native/metrics/ignores/platform-linux.json b/metrics/ignores/platform-linux.json similarity index 100% rename from mapbox-gl-native/metrics/ignores/platform-linux.json rename to metrics/ignores/platform-linux.json diff --git a/mapbox-gl-native/metrics/ignores/platform-macos.json b/metrics/ignores/platform-macos.json similarity index 100% rename from mapbox-gl-native/metrics/ignores/platform-macos.json rename to metrics/ignores/platform-macos.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner-metrics.json b/metrics/ios-render-test-runner-metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner-metrics.json rename to metrics/ios-render-test-runner-metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner-style.json b/metrics/ios-render-test-runner-style.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner-style.json rename to metrics/ios-render-test-runner-style.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/probes/gfx/pass-double-probe/metrics.json b/metrics/ios-render-test-runner/probes/gfx/pass-double-probe/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/probes/gfx/pass-double-probe/metrics.json rename to metrics/ios-render-test-runner/probes/gfx/pass-double-probe/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/probes/gfx/pass-probe-reset/metrics.json b/metrics/ios-render-test-runner/probes/gfx/pass-probe-reset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/probes/gfx/pass-probe-reset/metrics.json rename to metrics/ios-render-test-runner/probes/gfx/pass-probe-reset/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/probes/gfx/pass/metrics.json b/metrics/ios-render-test-runner/probes/gfx/pass/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/probes/gfx/pass/metrics.json rename to metrics/ios-render-test-runner/probes/gfx/pass/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/background-color/colorSpace-lab/metrics.json b/metrics/ios-render-test-runner/render-tests/background-color/colorSpace-lab/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/background-color/colorSpace-lab/metrics.json rename to metrics/ios-render-test-runner/render-tests/background-color/colorSpace-lab/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/background-color/default/metrics.json b/metrics/ios-render-test-runner/render-tests/background-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/background-color/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/background-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/background-color/function/metrics.json b/metrics/ios-render-test-runner/render-tests/background-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/background-color/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/background-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/background-color/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/background-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/background-color/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/background-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/background-opacity/color/metrics.json b/metrics/ios-render-test-runner/render-tests/background-opacity/color/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/background-opacity/color/metrics.json rename to metrics/ios-render-test-runner/render-tests/background-opacity/color/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/background-opacity/image/metrics.json b/metrics/ios-render-test-runner/render-tests/background-opacity/image/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/background-opacity/image/metrics.json rename to metrics/ios-render-test-runner/render-tests/background-opacity/image/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/background-opacity/overlay/metrics.json b/metrics/ios-render-test-runner/render-tests/background-opacity/overlay/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/background-opacity/overlay/metrics.json rename to metrics/ios-render-test-runner/render-tests/background-opacity/overlay/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/background-pattern/@2x/metrics.json b/metrics/ios-render-test-runner/render-tests/background-pattern/@2x/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/background-pattern/@2x/metrics.json rename to metrics/ios-render-test-runner/render-tests/background-pattern/@2x/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/background-pattern/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/background-pattern/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/background-pattern/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/background-pattern/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/background-pattern/missing/metrics.json b/metrics/ios-render-test-runner/render-tests/background-pattern/missing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/background-pattern/missing/metrics.json rename to metrics/ios-render-test-runner/render-tests/background-pattern/missing/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/background-pattern/pitch/metrics.json b/metrics/ios-render-test-runner/render-tests/background-pattern/pitch/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/background-pattern/pitch/metrics.json rename to metrics/ios-render-test-runner/render-tests/background-pattern/pitch/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/background-pattern/rotated/metrics.json b/metrics/ios-render-test-runner/render-tests/background-pattern/rotated/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/background-pattern/rotated/metrics.json rename to metrics/ios-render-test-runner/render-tests/background-pattern/rotated/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/background-pattern/zoomed/metrics.json b/metrics/ios-render-test-runner/render-tests/background-pattern/zoomed/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/background-pattern/zoomed/metrics.json rename to metrics/ios-render-test-runner/render-tests/background-pattern/zoomed/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/background-visibility/none/metrics.json b/metrics/ios-render-test-runner/render-tests/background-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/background-visibility/none/metrics.json rename to metrics/ios-render-test-runner/render-tests/background-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/background-visibility/visible/metrics.json b/metrics/ios-render-test-runner/render-tests/background-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/background-visibility/visible/metrics.json rename to metrics/ios-render-test-runner/render-tests/background-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/basic-v9/z0-narrow-y/metrics.json b/metrics/ios-render-test-runner/render-tests/basic-v9/z0-narrow-y/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/basic-v9/z0-narrow-y/metrics.json rename to metrics/ios-render-test-runner/render-tests/basic-v9/z0-narrow-y/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/basic-v9/z0-wide-x/metrics.json b/metrics/ios-render-test-runner/render-tests/basic-v9/z0-wide-x/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/basic-v9/z0-wide-x/metrics.json rename to metrics/ios-render-test-runner/render-tests/basic-v9/z0-wide-x/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/basic-v9/z0/metrics.json b/metrics/ios-render-test-runner/render-tests/basic-v9/z0/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/basic-v9/z0/metrics.json rename to metrics/ios-render-test-runner/render-tests/basic-v9/z0/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/bright-v9/z0/metrics.json b/metrics/ios-render-test-runner/render-tests/bright-v9/z0/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/bright-v9/z0/metrics.json rename to metrics/ios-render-test-runner/render-tests/bright-v9/z0/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-blur/blending/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-blur/blending/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-blur/blending/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-blur/blending/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-blur/default/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-blur/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-blur/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-blur/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-blur/function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-blur/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-blur/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-blur/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-blur/literal-stroke/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-blur/literal-stroke/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-blur/literal-stroke/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-blur/literal-stroke/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-blur/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-blur/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-blur/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-blur/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-blur/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-blur/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-blur/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-blur/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-blur/zoom-and-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-blur/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-blur/zoom-and-property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-blur/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-color/default/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-color/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-color/function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-color/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-color/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-color/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-color/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-color/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-color/zoom-and-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-color/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-color/zoom-and-property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-color/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-geometry/linestring/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-geometry/linestring/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-geometry/linestring/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-geometry/linestring/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-geometry/multilinestring/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-geometry/multilinestring/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-geometry/multilinestring/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-geometry/multilinestring/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-geometry/multipoint/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-geometry/multipoint/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-geometry/multipoint/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-geometry/multipoint/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-geometry/multipolygon/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-geometry/multipolygon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-geometry/multipolygon/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-geometry/multipolygon/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-geometry/point/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-geometry/point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-geometry/point/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-geometry/point/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-geometry/polygon/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-geometry/polygon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-geometry/polygon/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-geometry/polygon/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-opacity/blending/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-opacity/blending/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-opacity/blending/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-opacity/blending/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-opacity/default/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-opacity/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-opacity/function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-opacity/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-opacity/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-opacity/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-opacity/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-opacity/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-opacity/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-opacity/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-opacity/zoom-and-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-opacity/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-opacity/zoom-and-property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-opacity/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-pitch-alignment/map-scale-map/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-pitch-alignment/map-scale-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-pitch-alignment/map-scale-map/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-pitch-alignment/map-scale-map/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-pitch-scale/default/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-pitch-scale/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-pitch-scale/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-pitch-scale/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-pitch-scale/map/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-pitch-scale/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-pitch-scale/map/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-pitch-scale/map/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-pitch-scale/viewport/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-pitch-scale/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-pitch-scale/viewport/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-pitch-scale/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-radius/antimeridian/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-radius/antimeridian/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-radius/antimeridian/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-radius/antimeridian/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-radius/default/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-radius/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-radius/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-radius/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-radius/function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-radius/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-radius/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-radius/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-radius/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-radius/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-radius/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-radius/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-radius/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-radius/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-radius/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-radius/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-radius/zoom-and-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-radius/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-radius/zoom-and-property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-radius/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-sort-key/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-sort-key/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-sort-key/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-sort-key/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-stroke-color/default/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-stroke-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-stroke-color/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-stroke-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-stroke-color/function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-stroke-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-stroke-color/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-stroke-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-stroke-color/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-stroke-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-stroke-color/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-stroke-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-stroke-color/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-stroke-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-stroke-color/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-stroke-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/default/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/stroke-only/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/stroke-only/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/stroke-only/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/stroke-only/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-stroke-width/default/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-stroke-width/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-stroke-width/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-stroke-width/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-stroke-width/function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-stroke-width/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-stroke-width/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-stroke-width/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-stroke-width/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-stroke-width/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-stroke-width/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-stroke-width/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-stroke-width/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-stroke-width/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-stroke-width/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-stroke-width/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-translate-anchor/map/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-translate-anchor/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-translate-anchor/map/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-translate-anchor/map/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-translate-anchor/viewport/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-translate-anchor/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-translate-anchor/viewport/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-translate-anchor/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-translate/default/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-translate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-translate/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-translate/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-translate/function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-translate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-translate/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-translate/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-translate/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-translate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/circle-translate/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/circle-translate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--background-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--background-opaque/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/background-opaque--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--background-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--background-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/background-opaque--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--circle-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--circle-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/background-opaque--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--fill-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--fill-opaque/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/background-opaque--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--fill-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--fill-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/background-opaque--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--line-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--line-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/background-opaque--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--raster-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--raster-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/background-opaque--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--symbol-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--symbol-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/background-opaque--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--background-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--background-opaque/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/background-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--background-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--background-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/background-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--circle-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--circle-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/background-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--fill-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--fill-opaque/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/background-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--fill-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--fill-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/background-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--line-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--line-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/background-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--raster-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--raster-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/background-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--symbol-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--symbol-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/background-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--background-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--background-opaque/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--background-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--background-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--circle-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--circle-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--fill-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--fill-opaque/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--fill-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--fill-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--line-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--line-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--raster-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--raster-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--background-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--background-opaque/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--background-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--background-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--circle-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--circle-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--fill-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--fill-opaque/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--fill-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--fill-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--line-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--line-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--raster-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--raster-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--background-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--background-opaque/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--background-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--background-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--circle-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--circle-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--fill-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--fill-opaque/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--fill-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--fill-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--line-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--line-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--raster-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--raster-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--background-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--background-opaque/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/line-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--background-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--background-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/line-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--circle-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--circle-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/line-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--fill-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--fill-opaque/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/line-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--fill-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--fill-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/line-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--line-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--line-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/line-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--raster-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--raster-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/line-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--symbol-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--symbol-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/line-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--background-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--background-opaque/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--background-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--background-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--circle-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--circle-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--fill-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--fill-opaque/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--fill-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--fill-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--line-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--line-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--raster-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--raster-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--background-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--background-opaque/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--background-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--background-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--line-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--line-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/debug/collision-icon-text-line-translate/metrics.json b/metrics/ios-render-test-runner/render-tests/debug/collision-icon-text-line-translate/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/debug/collision-icon-text-line-translate/metrics.json rename to metrics/ios-render-test-runner/render-tests/debug/collision-icon-text-line-translate/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/debug/collision-icon-text-point-translate/metrics.json b/metrics/ios-render-test-runner/render-tests/debug/collision-icon-text-point-translate/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/debug/collision-icon-text-point-translate/metrics.json rename to metrics/ios-render-test-runner/render-tests/debug/collision-icon-text-point-translate/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/debug/collision-lines-overscaled/metrics.json b/metrics/ios-render-test-runner/render-tests/debug/collision-lines-overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/debug/collision-lines-overscaled/metrics.json rename to metrics/ios-render-test-runner/render-tests/debug/collision-lines-overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/debug/collision-lines-pitched/metrics.json b/metrics/ios-render-test-runner/render-tests/debug/collision-lines-pitched/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/debug/collision-lines-pitched/metrics.json rename to metrics/ios-render-test-runner/render-tests/debug/collision-lines-pitched/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/debug/collision-lines/metrics.json b/metrics/ios-render-test-runner/render-tests/debug/collision-lines/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/debug/collision-lines/metrics.json rename to metrics/ios-render-test-runner/render-tests/debug/collision-lines/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/debug/collision-overscaled/metrics.json b/metrics/ios-render-test-runner/render-tests/debug/collision-overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/debug/collision-overscaled/metrics.json rename to metrics/ios-render-test-runner/render-tests/debug/collision-overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/debug/collision-pitched-wrapped/metrics.json b/metrics/ios-render-test-runner/render-tests/debug/collision-pitched-wrapped/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/debug/collision-pitched-wrapped/metrics.json rename to metrics/ios-render-test-runner/render-tests/debug/collision-pitched-wrapped/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/debug/collision-pitched/metrics.json b/metrics/ios-render-test-runner/render-tests/debug/collision-pitched/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/debug/collision-pitched/metrics.json rename to metrics/ios-render-test-runner/render-tests/debug/collision-pitched/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/empty/empty/metrics.json b/metrics/ios-render-test-runner/render-tests/empty/empty/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/empty/empty/metrics.json rename to metrics/ios-render-test-runner/render-tests/empty/empty/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/extent/1024-fill/metrics.json b/metrics/ios-render-test-runner/render-tests/extent/1024-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/extent/1024-fill/metrics.json rename to metrics/ios-render-test-runner/render-tests/extent/1024-fill/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/extent/1024-line/metrics.json b/metrics/ios-render-test-runner/render-tests/extent/1024-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/extent/1024-line/metrics.json rename to metrics/ios-render-test-runner/render-tests/extent/1024-line/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/extent/1024-symbol/metrics.json b/metrics/ios-render-test-runner/render-tests/extent/1024-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/extent/1024-symbol/metrics.json rename to metrics/ios-render-test-runner/render-tests/extent/1024-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/feature-state/composite-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/feature-state/composite-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/feature-state/composite-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/feature-state/composite-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/feature-state/data-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/feature-state/data-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/feature-state/data-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/feature-state/data-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/feature-state/vector-source/metrics.json b/metrics/ios-render-test-runner/render-tests/feature-state/vector-source/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/feature-state/vector-source/metrics.json rename to metrics/ios-render-test-runner/render-tests/feature-state/vector-source/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-antialias/false/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-antialias/false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-antialias/false/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-antialias/false/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-color/default/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-color/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-color/function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-color/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-color/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-color/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-color/multiply/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-color/multiply/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-color/multiply/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-color/multiply/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-color/opacity/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-color/opacity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-color/opacity/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-color/opacity/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-color/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-color/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-color/zoom-and-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-color/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-color/zoom-and-property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-color/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-base/default/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-base/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-base/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-extrusion-base/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-base/function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-base/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-base/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-extrusion-base/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-base/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-base/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-base/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-extrusion-base/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-base/negative/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-base/negative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-base/negative/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-extrusion-base/negative/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-base/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-base/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-base/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-extrusion-base/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-color/default/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-color/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-extrusion-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-color/function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-color/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-extrusion-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-color/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-color/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-extrusion-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-color/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-color/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-extrusion-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-height/default/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-height/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-height/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-extrusion-height/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-height/function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-height/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-height/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-extrusion-height/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-height/negative/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-height/negative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-height/negative/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-extrusion-height/negative/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-height/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-height/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-height/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-extrusion-height/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-multiple/multiple/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-multiple/multiple/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-multiple/multiple/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-extrusion-multiple/multiple/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-opacity/default/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-opacity/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-extrusion-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-opacity/function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-opacity/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-extrusion-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-opacity/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-opacity/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-extrusion-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-pattern/missing/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-pattern/missing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-pattern/missing/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-extrusion-pattern/missing/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-translate-anchor/map/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-translate-anchor/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-translate-anchor/map/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-extrusion-translate-anchor/map/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-translate/default/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-translate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-translate/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-extrusion-translate/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-translate/function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-translate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-translate/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-extrusion-translate/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-translate/literal-opacity/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-translate/literal-opacity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-translate/literal-opacity/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-extrusion-translate/literal-opacity/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-translate/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-translate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-translate/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-extrusion-translate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-vertical-gradient/default/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-vertical-gradient/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-vertical-gradient/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-extrusion-vertical-gradient/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-vertical-gradient/false/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-vertical-gradient/false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-extrusion-vertical-gradient/false/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-extrusion-vertical-gradient/false/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-opacity/default/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-opacity/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-opacity/function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-opacity/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-opacity/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-opacity/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-opacity/overlapping/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-opacity/overlapping/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-opacity/overlapping/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-opacity/overlapping/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-opacity/property-function-pattern/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-opacity/property-function-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-opacity/property-function-pattern/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-opacity/property-function-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-opacity/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-opacity/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-opacity/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-opacity/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-opacity/zoom-and-property-function-pattern/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-opacity/zoom-and-property-function-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-opacity/zoom-and-property-function-pattern/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-opacity/zoom-and-property-function-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-opacity/zoom-and-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-opacity/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-opacity/zoom-and-property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-opacity/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-outline-color/default/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-outline-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-outline-color/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-outline-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-outline-color/fill/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-outline-color/fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-outline-color/fill/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-outline-color/fill/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-outline-color/function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-outline-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-outline-color/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-outline-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-outline-color/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-outline-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-outline-color/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-outline-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-outline-color/multiply/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-outline-color/multiply/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-outline-color/multiply/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-outline-color/multiply/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-outline-color/opacity/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-outline-color/opacity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-outline-color/opacity/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-outline-color/opacity/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-outline-color/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-outline-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-outline-color/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-outline-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-outline-color/zoom-and-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-outline-color/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-outline-color/zoom-and-property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-outline-color/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-pattern/@2x/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-pattern/@2x/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-pattern/@2x/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-pattern/@2x/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-pattern/case-data-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-pattern/case-data-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-pattern/case-data-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-pattern/case-data-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-pattern/invalid-feature-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-pattern/invalid-feature-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-pattern/invalid-feature-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-pattern/invalid-feature-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-pattern/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-pattern/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-pattern/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-pattern/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-pattern/missing/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-pattern/missing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-pattern/missing/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-pattern/missing/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-pattern/opacity/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-pattern/opacity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-pattern/opacity/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-pattern/opacity/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-pattern/uneven-pattern/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-pattern/uneven-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-pattern/uneven-pattern/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-pattern/uneven-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-pattern/zoomed/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-pattern/zoomed/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-pattern/zoomed/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-pattern/zoomed/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-sort-key/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-sort-key/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-sort-key/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-sort-key/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-translate-anchor/map/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-translate-anchor/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-translate-anchor/map/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-translate-anchor/map/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-translate-anchor/viewport/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-translate-anchor/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-translate-anchor/viewport/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-translate-anchor/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-translate/default/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-translate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-translate/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-translate/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-translate/function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-translate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-translate/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-translate/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-translate/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-translate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-translate/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-translate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-visibility/none/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-visibility/none/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-visibility/visible/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/fill-visibility/visible/metrics.json rename to metrics/ios-render-test-runner/render-tests/fill-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/filter/equality/metrics.json b/metrics/ios-render-test-runner/render-tests/filter/equality/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/filter/equality/metrics.json rename to metrics/ios-render-test-runner/render-tests/filter/equality/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/filter/in/metrics.json b/metrics/ios-render-test-runner/render-tests/filter/in/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/filter/in/metrics.json rename to metrics/ios-render-test-runner/render-tests/filter/in/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/filter/legacy-equality/metrics.json b/metrics/ios-render-test-runner/render-tests/filter/legacy-equality/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/filter/legacy-equality/metrics.json rename to metrics/ios-render-test-runner/render-tests/filter/legacy-equality/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/filter/none/metrics.json b/metrics/ios-render-test-runner/render-tests/filter/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/filter/none/metrics.json rename to metrics/ios-render-test-runner/render-tests/filter/none/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/clustered-properties/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/clustered-properties/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/clustered-properties/metrics.json rename to metrics/ios-render-test-runner/render-tests/geojson/clustered-properties/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/clustered/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/clustered/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/clustered/metrics.json rename to metrics/ios-render-test-runner/render-tests/geojson/clustered/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/external-feature/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/external-feature/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/external-feature/metrics.json rename to metrics/ios-render-test-runner/render-tests/geojson/external-feature/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/external-invalid/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/external-invalid/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/external-invalid/metrics.json rename to metrics/ios-render-test-runner/render-tests/geojson/external-invalid/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/external-linestring/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/external-linestring/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/external-linestring/metrics.json rename to metrics/ios-render-test-runner/render-tests/geojson/external-linestring/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/external-malformed/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/external-malformed/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/external-malformed/metrics.json rename to metrics/ios-render-test-runner/render-tests/geojson/external-malformed/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/inconsistent-winding-order/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/inconsistent-winding-order/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/inconsistent-winding-order/metrics.json rename to metrics/ios-render-test-runner/render-tests/geojson/inconsistent-winding-order/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/inline-feature/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/inline-feature/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/inline-feature/metrics.json rename to metrics/ios-render-test-runner/render-tests/geojson/inline-feature/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/inline-invalid/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/inline-invalid/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/inline-invalid/metrics.json rename to metrics/ios-render-test-runner/render-tests/geojson/inline-invalid/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/inline-linestring-circle/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/inline-linestring-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/inline-linestring-circle/metrics.json rename to metrics/ios-render-test-runner/render-tests/geojson/inline-linestring-circle/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/inline-linestring-line/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/inline-linestring-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/inline-linestring-line/metrics.json rename to metrics/ios-render-test-runner/render-tests/geojson/inline-linestring-line/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/inline-linestring-symbol/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/inline-linestring-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/inline-linestring-symbol/metrics.json rename to metrics/ios-render-test-runner/render-tests/geojson/inline-linestring-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/inline-malformed/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/inline-malformed/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/inline-malformed/metrics.json rename to metrics/ios-render-test-runner/render-tests/geojson/inline-malformed/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/inline-point-circle/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/inline-point-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/inline-point-circle/metrics.json rename to metrics/ios-render-test-runner/render-tests/geojson/inline-point-circle/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/inline-point-fill/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/inline-point-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/inline-point-fill/metrics.json rename to metrics/ios-render-test-runner/render-tests/geojson/inline-point-fill/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/inline-point-line/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/inline-point-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/inline-point-line/metrics.json rename to metrics/ios-render-test-runner/render-tests/geojson/inline-point-line/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/inline-point-symbol/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/inline-point-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/inline-point-symbol/metrics.json rename to metrics/ios-render-test-runner/render-tests/geojson/inline-point-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/inline-polygon-circle/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/inline-polygon-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/inline-polygon-circle/metrics.json rename to metrics/ios-render-test-runner/render-tests/geojson/inline-polygon-circle/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/inline-polygon-fill/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/inline-polygon-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/inline-polygon-fill/metrics.json rename to metrics/ios-render-test-runner/render-tests/geojson/inline-polygon-fill/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/inline-polygon-line/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/inline-polygon-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/inline-polygon-line/metrics.json rename to metrics/ios-render-test-runner/render-tests/geojson/inline-polygon-line/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/inline-polygon-symbol/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/inline-polygon-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/inline-polygon-symbol/metrics.json rename to metrics/ios-render-test-runner/render-tests/geojson/inline-polygon-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/missing/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/missing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/missing/metrics.json rename to metrics/ios-render-test-runner/render-tests/geojson/missing/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/reparse-overscaled/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/reparse-overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/geojson/reparse-overscaled/metrics.json rename to metrics/ios-render-test-runner/render-tests/geojson/reparse-overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-color/default/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-color/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/heatmap-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-color/expression/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-color/expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-color/expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/heatmap-color/expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-intensity/default/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-intensity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-intensity/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/heatmap-intensity/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-intensity/function/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-intensity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-intensity/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/heatmap-intensity/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-intensity/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-intensity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-intensity/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/heatmap-intensity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-opacity/default/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-opacity/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/heatmap-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-opacity/function/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-opacity/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/heatmap-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-opacity/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-opacity/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/heatmap-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-radius/antimeridian/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-radius/antimeridian/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-radius/antimeridian/metrics.json rename to metrics/ios-render-test-runner/render-tests/heatmap-radius/antimeridian/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-radius/data-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-radius/data-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-radius/data-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/heatmap-radius/data-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-radius/default/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-radius/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-radius/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/heatmap-radius/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-radius/function/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-radius/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-radius/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/heatmap-radius/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-radius/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-radius/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-radius/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/heatmap-radius/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-radius/pitch30/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-radius/pitch30/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-radius/pitch30/metrics.json rename to metrics/ios-render-test-runner/render-tests/heatmap-radius/pitch30/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-weight/default/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-weight/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-weight/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/heatmap-weight/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-weight/identity-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-weight/identity-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-weight/identity-property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/heatmap-weight/identity-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-weight/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-weight/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/heatmap-weight/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/heatmap-weight/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/hillshade-accent-color/default/metrics.json b/metrics/ios-render-test-runner/render-tests/hillshade-accent-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/hillshade-accent-color/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/hillshade-accent-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/hillshade-accent-color/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/hillshade-accent-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/hillshade-accent-color/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/hillshade-accent-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/hillshade-accent-color/terrarium/metrics.json b/metrics/ios-render-test-runner/render-tests/hillshade-accent-color/terrarium/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/hillshade-accent-color/terrarium/metrics.json rename to metrics/ios-render-test-runner/render-tests/hillshade-accent-color/terrarium/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/hillshade-accent-color/zoom-function/metrics.json b/metrics/ios-render-test-runner/render-tests/hillshade-accent-color/zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/hillshade-accent-color/zoom-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/hillshade-accent-color/zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/hillshade-highlight-color/default/metrics.json b/metrics/ios-render-test-runner/render-tests/hillshade-highlight-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/hillshade-highlight-color/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/hillshade-highlight-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/hillshade-highlight-color/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/hillshade-highlight-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/hillshade-highlight-color/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/hillshade-highlight-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/hillshade-highlight-color/zoom-function/metrics.json b/metrics/ios-render-test-runner/render-tests/hillshade-highlight-color/zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/hillshade-highlight-color/zoom-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/hillshade-highlight-color/zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/hillshade-shadow-color/default/metrics.json b/metrics/ios-render-test-runner/render-tests/hillshade-shadow-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/hillshade-shadow-color/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/hillshade-shadow-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/hillshade-shadow-color/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/hillshade-shadow-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/hillshade-shadow-color/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/hillshade-shadow-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/hillshade-shadow-color/zoom-function/metrics.json b/metrics/ios-render-test-runner/render-tests/hillshade-shadow-color/zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/hillshade-shadow-color/zoom-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/hillshade-shadow-color/zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-anchor/bottom-left/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-anchor/bottom-left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-anchor/bottom-left/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-anchor/bottom-left/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-anchor/bottom-right/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-anchor/bottom-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-anchor/bottom-right/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-anchor/bottom-right/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-anchor/bottom/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-anchor/bottom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-anchor/bottom/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-anchor/bottom/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-anchor/center/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-anchor/center/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-anchor/center/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-anchor/center/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-anchor/default/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-anchor/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-anchor/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-anchor/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-anchor/left/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-anchor/left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-anchor/left/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-anchor/left/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-anchor/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-anchor/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-anchor/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-anchor/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-anchor/right/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-anchor/right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-anchor/right/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-anchor/right/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-anchor/top-left/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-anchor/top-left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-anchor/top-left/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-anchor/top-left/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-anchor/top-right/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-anchor/top-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-anchor/top-right/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-anchor/top-right/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-anchor/top/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-anchor/top/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-anchor/top/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-anchor/top/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-color/default/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-color/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-color/function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-color/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-color/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-color/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-color/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-color/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-halo-blur/default/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-halo-blur/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-halo-blur/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-halo-blur/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-halo-blur/function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-halo-blur/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-halo-blur/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-halo-blur/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-halo-blur/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-halo-blur/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-halo-blur/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-halo-blur/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-halo-blur/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-halo-blur/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-halo-blur/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-halo-blur/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-halo-color/default/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-halo-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-halo-color/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-halo-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-halo-color/function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-halo-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-halo-color/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-halo-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-halo-color/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-halo-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-halo-color/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-halo-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-halo-color/multiply/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-halo-color/multiply/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-halo-color/multiply/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-halo-color/multiply/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-halo-color/opacity/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-halo-color/opacity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-halo-color/opacity/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-halo-color/opacity/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-halo-color/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-halo-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-halo-color/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-halo-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-halo-color/transparent/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-halo-color/transparent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-halo-color/transparent/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-halo-color/transparent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-halo-width/default/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-halo-width/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-halo-width/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-halo-width/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-halo-width/function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-halo-width/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-halo-width/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-halo-width/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-halo-width/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-halo-width/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-halo-width/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-halo-width/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-halo-width/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-halo-width/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-halo-width/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-halo-width/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-image/image-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-image/image-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-image/image-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-image/image-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-image/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-image/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-image/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-image/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-image/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-image/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-image/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-image/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-image/stretchable-content/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-image/stretchable-content/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-image/stretchable-content/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-image/stretchable-content/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-image/stretchable/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-image/stretchable/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-image/stretchable/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-image/stretchable/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-image/token/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-image/token/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-image/token/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-image/token/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-no-cross-source-collision/default/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-no-cross-source-collision/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-no-cross-source-collision/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-no-cross-source-collision/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-offset/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-offset/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-offset/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-offset/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-offset/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-offset/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-offset/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-offset/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-offset/zoom-and-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-offset/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-offset/zoom-and-property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-offset/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-opacity/default/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-opacity/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-opacity/function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-opacity/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-opacity/icon-only/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-opacity/icon-only/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-opacity/icon-only/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-opacity/icon-only/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-opacity/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-opacity/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-opacity/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-opacity/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-opacity/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-opacity/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-opacity/text-and-icon/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-opacity/text-and-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-opacity/text-and-icon/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-opacity/text-and-icon/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-opacity/text-only/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-opacity/text-only/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-opacity/text-only/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-opacity/text-only/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-pixelratio-mismatch/default/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-pixelratio-mismatch/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-pixelratio-mismatch/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-pixelratio-mismatch/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-rotate/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-rotate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-rotate/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-rotate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-rotate/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-rotate/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-rotate/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-rotate/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-rotate/with-offset/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-rotate/with-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-rotate/with-offset/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-rotate/with-offset/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-size/camera-function-high-base-plain/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-size/camera-function-high-base-plain/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-size/camera-function-high-base-plain/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-size/camera-function-high-base-plain/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-size/camera-function-high-base-sdf/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-size/camera-function-high-base-sdf/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-size/camera-function-high-base-sdf/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-size/camera-function-high-base-sdf/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-size/camera-function-plain/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-size/camera-function-plain/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-size/camera-function-plain/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-size/camera-function-plain/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-size/camera-function-sdf/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-size/camera-function-sdf/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-size/camera-function-sdf/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-size/camera-function-sdf/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-size/composite-function-plain/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-size/composite-function-plain/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-size/composite-function-plain/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-size/composite-function-plain/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-size/composite-function-sdf/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-size/composite-function-sdf/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-size/composite-function-sdf/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-size/composite-function-sdf/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-size/default/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-size/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-size/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-size/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-size/function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-size/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-size/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-size/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-size/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-size/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-size/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-size/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-size/property-function-plain/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-size/property-function-plain/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-size/property-function-plain/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-size/property-function-plain/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-size/property-function-sdf/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-size/property-function-sdf/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-size/property-function-sdf/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-size/property-function-sdf/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-collision/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-collision/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-collision/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/both-collision/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-padding/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-padding/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/both-padding/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/both/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/both/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/both/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/enlargen-both-padding/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/enlargen-both-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/enlargen-both-padding/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/enlargen-both-padding/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/enlargen-height/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/enlargen-height/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/enlargen-height/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/enlargen-height/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/enlargen-width/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/enlargen-width/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/enlargen-width/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/enlargen-width/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/height-padding/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/height-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/height-padding/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/height-padding/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/height-text-anchor/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/height-text-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/height-text-anchor/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/height-text-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/height/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/height/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/height/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/height/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/none/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/none/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/none/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/placement-line/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/placement-line/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-three-part/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-three-part/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-three-part/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-three-part/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-two-part/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-two-part/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-two-part/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-two-part/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-underscale/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-underscale/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-underscale/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-underscale/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/text-variable-anchor/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/text-variable-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/text-variable-anchor/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/text-variable-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/width-padding/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/width-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/width-padding/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/width-padding/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/width-text-anchor/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/width-text-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/width-text-anchor/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/width-text-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/width/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/width/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-text-fit/width/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-text-fit/width/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-translate-anchor/map/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-translate-anchor/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-translate-anchor/map/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-translate-anchor/map/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-translate-anchor/viewport/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-translate-anchor/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-translate-anchor/viewport/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-translate-anchor/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-translate/default/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-translate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-translate/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-translate/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-translate/function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-translate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-translate/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-translate/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-translate/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-translate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-translate/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-translate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-visibility/none/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-visibility/none/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-visibility/visible/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/icon-visibility/visible/metrics.json rename to metrics/ios-render-test-runner/render-tests/icon-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/image/default/metrics.json b/metrics/ios-render-test-runner/render-tests/image/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/image/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/image/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/image/pitched/metrics.json b/metrics/ios-render-test-runner/render-tests/image/pitched/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/image/pitched/metrics.json rename to metrics/ios-render-test-runner/render-tests/image/pitched/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/image/raster-brightness/metrics.json b/metrics/ios-render-test-runner/render-tests/image/raster-brightness/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/image/raster-brightness/metrics.json rename to metrics/ios-render-test-runner/render-tests/image/raster-brightness/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/image/raster-contrast/metrics.json b/metrics/ios-render-test-runner/render-tests/image/raster-contrast/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/image/raster-contrast/metrics.json rename to metrics/ios-render-test-runner/render-tests/image/raster-contrast/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/image/raster-hue-rotate/metrics.json b/metrics/ios-render-test-runner/render-tests/image/raster-hue-rotate/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/image/raster-hue-rotate/metrics.json rename to metrics/ios-render-test-runner/render-tests/image/raster-hue-rotate/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/image/raster-opacity/metrics.json b/metrics/ios-render-test-runner/render-tests/image/raster-opacity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/image/raster-opacity/metrics.json rename to metrics/ios-render-test-runner/render-tests/image/raster-opacity/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/image/raster-resampling/metrics.json b/metrics/ios-render-test-runner/render-tests/image/raster-resampling/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/image/raster-resampling/metrics.json rename to metrics/ios-render-test-runner/render-tests/image/raster-resampling/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/image/raster-saturation/metrics.json b/metrics/ios-render-test-runner/render-tests/image/raster-saturation/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/image/raster-saturation/metrics.json rename to metrics/ios-render-test-runner/render-tests/image/raster-saturation/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/image/raster-visibility/metrics.json b/metrics/ios-render-test-runner/render-tests/image/raster-visibility/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/image/raster-visibility/metrics.json rename to metrics/ios-render-test-runner/render-tests/image/raster-visibility/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/is-supported-script/filter/metrics.json b/metrics/ios-render-test-runner/render-tests/is-supported-script/filter/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/is-supported-script/filter/metrics.json rename to metrics/ios-render-test-runner/render-tests/is-supported-script/filter/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/is-supported-script/layout/metrics.json b/metrics/ios-render-test-runner/render-tests/is-supported-script/layout/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/is-supported-script/layout/metrics.json rename to metrics/ios-render-test-runner/render-tests/is-supported-script/layout/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-blur/default/metrics.json b/metrics/ios-render-test-runner/render-tests/line-blur/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-blur/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-blur/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-blur/function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-blur/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-blur/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-blur/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-blur/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/line-blur/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-blur/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-blur/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-blur/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-blur/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-blur/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-blur/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-cap/butt/metrics.json b/metrics/ios-render-test-runner/render-tests/line-cap/butt/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-cap/butt/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-cap/butt/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-cap/round/metrics.json b/metrics/ios-render-test-runner/render-tests/line-cap/round/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-cap/round/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-cap/round/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-cap/square/metrics.json b/metrics/ios-render-test-runner/render-tests/line-cap/square/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-cap/square/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-cap/square/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-color/default/metrics.json b/metrics/ios-render-test-runner/render-tests/line-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-color/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-color/function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-color/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-color/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/line-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-color/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-color/property-function-identity/metrics.json b/metrics/ios-render-test-runner/render-tests/line-color/property-function-identity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-color/property-function-identity/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-color/property-function-identity/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-color/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-color/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-dasharray/default/metrics.json b/metrics/ios-render-test-runner/render-tests/line-dasharray/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-dasharray/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-dasharray/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-dasharray/fractional-zoom/metrics.json b/metrics/ios-render-test-runner/render-tests/line-dasharray/fractional-zoom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-dasharray/fractional-zoom/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-dasharray/fractional-zoom/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-dasharray/function/line-width-composite-function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-dasharray/function/line-width-composite-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-dasharray/function/line-width-composite-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-dasharray/function/line-width-composite-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-dasharray/function/line-width-constant/metrics.json b/metrics/ios-render-test-runner/render-tests/line-dasharray/function/line-width-constant/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-dasharray/function/line-width-constant/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-dasharray/function/line-width-constant/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-dasharray/function/line-width-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-dasharray/function/line-width-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-dasharray/function/line-width-property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-dasharray/function/line-width-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-dasharray/literal/line-width-constant/metrics.json b/metrics/ios-render-test-runner/render-tests/line-dasharray/literal/line-width-constant/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-dasharray/literal/line-width-constant/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-dasharray/literal/line-width-constant/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-dasharray/literal/line-width-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-dasharray/literal/line-width-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-dasharray/literal/line-width-property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-dasharray/literal/line-width-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-dasharray/long-segment/metrics.json b/metrics/ios-render-test-runner/render-tests/line-dasharray/long-segment/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-dasharray/long-segment/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-dasharray/long-segment/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-dasharray/overscaled/metrics.json b/metrics/ios-render-test-runner/render-tests/line-dasharray/overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-dasharray/overscaled/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-dasharray/overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-dasharray/round/segments/metrics.json b/metrics/ios-render-test-runner/render-tests/line-dasharray/round/segments/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-dasharray/round/segments/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-dasharray/round/segments/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-dasharray/round/zero-gap-width/metrics.json b/metrics/ios-render-test-runner/render-tests/line-dasharray/round/zero-gap-width/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-dasharray/round/zero-gap-width/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-dasharray/round/zero-gap-width/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-dasharray/slant/metrics.json b/metrics/ios-render-test-runner/render-tests/line-dasharray/slant/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-dasharray/slant/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-dasharray/slant/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-dasharray/zero-length-gap/metrics.json b/metrics/ios-render-test-runner/render-tests/line-dasharray/zero-length-gap/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-dasharray/zero-length-gap/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-dasharray/zero-length-gap/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-dasharray/zoom-history/metrics.json b/metrics/ios-render-test-runner/render-tests/line-dasharray/zoom-history/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-dasharray/zoom-history/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-dasharray/zoom-history/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-gap-width/default/metrics.json b/metrics/ios-render-test-runner/render-tests/line-gap-width/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-gap-width/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-gap-width/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-gap-width/function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-gap-width/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-gap-width/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-gap-width/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-gap-width/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/line-gap-width/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-gap-width/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-gap-width/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-gap-width/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-gap-width/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-gap-width/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-gap-width/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-gradient/gradient-tile-boundaries/metrics.json b/metrics/ios-render-test-runner/render-tests/line-gradient/gradient-tile-boundaries/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-gradient/gradient-tile-boundaries/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-gradient/gradient-tile-boundaries/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-gradient/gradient/metrics.json b/metrics/ios-render-test-runner/render-tests/line-gradient/gradient/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-gradient/gradient/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-gradient/gradient/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-gradient/translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/line-gradient/translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-gradient/translucent/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-gradient/translucent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-join/bevel-transparent/metrics.json b/metrics/ios-render-test-runner/render-tests/line-join/bevel-transparent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-join/bevel-transparent/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-join/bevel-transparent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-join/bevel/metrics.json b/metrics/ios-render-test-runner/render-tests/line-join/bevel/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-join/bevel/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-join/bevel/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-join/default/metrics.json b/metrics/ios-render-test-runner/render-tests/line-join/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-join/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-join/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-join/miter-transparent/metrics.json b/metrics/ios-render-test-runner/render-tests/line-join/miter-transparent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-join/miter-transparent/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-join/miter-transparent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-join/miter/metrics.json b/metrics/ios-render-test-runner/render-tests/line-join/miter/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-join/miter/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-join/miter/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-join/property-function-dasharray/metrics.json b/metrics/ios-render-test-runner/render-tests/line-join/property-function-dasharray/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-join/property-function-dasharray/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-join/property-function-dasharray/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-join/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-join/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-join/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-join/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-join/round-transparent/metrics.json b/metrics/ios-render-test-runner/render-tests/line-join/round-transparent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-join/round-transparent/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-join/round-transparent/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-join/round/metrics.json b/metrics/ios-render-test-runner/render-tests/line-join/round/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-join/round/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-join/round/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-offset/default/metrics.json b/metrics/ios-render-test-runner/render-tests/line-offset/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-offset/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-offset/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-offset/function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-offset/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-offset/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-offset/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-offset/literal-negative/metrics.json b/metrics/ios-render-test-runner/render-tests/line-offset/literal-negative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-offset/literal-negative/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-offset/literal-negative/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-offset/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/line-offset/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-offset/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-offset/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-offset/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-offset/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-offset/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-offset/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-opacity/default/metrics.json b/metrics/ios-render-test-runner/render-tests/line-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-opacity/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-opacity/function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-opacity/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-opacity/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/line-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-opacity/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-opacity/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-opacity/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-opacity/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-opacity/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-opacity/step-curve/metrics.json b/metrics/ios-render-test-runner/render-tests/line-opacity/step-curve/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-opacity/step-curve/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-opacity/step-curve/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-pattern/@2x/metrics.json b/metrics/ios-render-test-runner/render-tests/line-pattern/@2x/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-pattern/@2x/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-pattern/@2x/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-pattern/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/line-pattern/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-pattern/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-pattern/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-pattern/opacity/metrics.json b/metrics/ios-render-test-runner/render-tests/line-pattern/opacity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-pattern/opacity/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-pattern/opacity/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-pattern/pitch/metrics.json b/metrics/ios-render-test-runner/render-tests/line-pattern/pitch/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-pattern/pitch/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-pattern/pitch/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-pattern/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-pattern/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-pattern/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-pattern/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-pattern/step-curve/metrics.json b/metrics/ios-render-test-runner/render-tests/line-pattern/step-curve/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-pattern/step-curve/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-pattern/step-curve/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-pattern/zoom-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/line-pattern/zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-pattern/zoom-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-pattern/zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-pitch/default/metrics.json b/metrics/ios-render-test-runner/render-tests/line-pitch/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-pitch/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-pitch/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-pitch/pitch0/metrics.json b/metrics/ios-render-test-runner/render-tests/line-pitch/pitch0/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-pitch/pitch0/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-pitch/pitch0/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-pitch/pitch15/metrics.json b/metrics/ios-render-test-runner/render-tests/line-pitch/pitch15/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-pitch/pitch15/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-pitch/pitch15/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-pitch/pitch30/metrics.json b/metrics/ios-render-test-runner/render-tests/line-pitch/pitch30/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-pitch/pitch30/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-pitch/pitch30/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-pitch/pitchAndBearing/metrics.json b/metrics/ios-render-test-runner/render-tests/line-pitch/pitchAndBearing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-pitch/pitchAndBearing/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-pitch/pitchAndBearing/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-sort-key/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/line-sort-key/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-sort-key/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-sort-key/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-translate-anchor/map/metrics.json b/metrics/ios-render-test-runner/render-tests/line-translate-anchor/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-translate-anchor/map/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-translate-anchor/map/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-translate-anchor/viewport/metrics.json b/metrics/ios-render-test-runner/render-tests/line-translate-anchor/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-translate-anchor/viewport/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-translate-anchor/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-translate/default/metrics.json b/metrics/ios-render-test-runner/render-tests/line-translate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-translate/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-translate/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-translate/function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-translate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-translate/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-translate/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-translate/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/line-translate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-translate/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-translate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-triangulation/default/metrics.json b/metrics/ios-render-test-runner/render-tests/line-triangulation/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-triangulation/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-triangulation/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-triangulation/round/metrics.json b/metrics/ios-render-test-runner/render-tests/line-triangulation/round/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-triangulation/round/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-triangulation/round/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-visibility/none/metrics.json b/metrics/ios-render-test-runner/render-tests/line-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-visibility/none/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-visibility/visible/metrics.json b/metrics/ios-render-test-runner/render-tests/line-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-visibility/visible/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-width/default/metrics.json b/metrics/ios-render-test-runner/render-tests/line-width/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-width/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-width/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-width/function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-width/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-width/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-width/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-width/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/line-width/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-width/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-width/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-width/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-width/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-width/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-width/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-width/very-overscaled/metrics.json b/metrics/ios-render-test-runner/render-tests/line-width/very-overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-width/very-overscaled/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-width/very-overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-width/zero-width-function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-width/zero-width-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-width/zero-width-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-width/zero-width-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-width/zero-width/metrics.json b/metrics/ios-render-test-runner/render-tests/line-width/zero-width/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/line-width/zero-width/metrics.json rename to metrics/ios-render-test-runner/render-tests/line-width/zero-width/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/linear-filter-opacity-edge/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/linear-filter-opacity-edge/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/linear-filter-opacity-edge/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/linear-filter-opacity-edge/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/map-mode/static/metrics.json b/metrics/ios-render-test-runner/render-tests/map-mode/static/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/map-mode/static/metrics.json rename to metrics/ios-render-test-runner/render-tests/map-mode/static/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/map-mode/tile-avoid-edges/metrics.json b/metrics/ios-render-test-runner/render-tests/map-mode/tile-avoid-edges/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/map-mode/tile-avoid-edges/metrics.json rename to metrics/ios-render-test-runner/render-tests/map-mode/tile-avoid-edges/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/map-mode/tile/metrics.json b/metrics/ios-render-test-runner/render-tests/map-mode/tile/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/map-mode/tile/metrics.json rename to metrics/ios-render-test-runner/render-tests/map-mode/tile/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/projection/axonometric-multiple/metrics.json b/metrics/ios-render-test-runner/render-tests/projection/axonometric-multiple/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/projection/axonometric-multiple/metrics.json rename to metrics/ios-render-test-runner/render-tests/projection/axonometric-multiple/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/projection/axonometric/metrics.json b/metrics/ios-render-test-runner/render-tests/projection/axonometric/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/projection/axonometric/metrics.json rename to metrics/ios-render-test-runner/render-tests/projection/axonometric/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/projection/perspective/metrics.json b/metrics/ios-render-test-runner/render-tests/projection/perspective/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/projection/perspective/metrics.json rename to metrics/ios-render-test-runner/render-tests/projection/perspective/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/projection/skew/metrics.json b/metrics/ios-render-test-runner/render-tests/projection/skew/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/projection/skew/metrics.json rename to metrics/ios-render-test-runner/render-tests/projection/skew/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-alpha/default/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-alpha/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-alpha/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/raster-alpha/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-brightness/default/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-brightness/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-brightness/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/raster-brightness/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-brightness/function/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-brightness/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-brightness/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/raster-brightness/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-brightness/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-brightness/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-brightness/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/raster-brightness/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-contrast/default/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-contrast/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-contrast/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/raster-contrast/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-contrast/function/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-contrast/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-contrast/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/raster-contrast/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-contrast/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-contrast/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-contrast/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/raster-contrast/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-extent/maxzoom/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-extent/maxzoom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-extent/maxzoom/metrics.json rename to metrics/ios-render-test-runner/render-tests/raster-extent/maxzoom/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-extent/minzoom/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-extent/minzoom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-extent/minzoom/metrics.json rename to metrics/ios-render-test-runner/render-tests/raster-extent/minzoom/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-hue-rotate/default/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-hue-rotate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-hue-rotate/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/raster-hue-rotate/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-hue-rotate/function/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-hue-rotate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-hue-rotate/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/raster-hue-rotate/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-hue-rotate/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-hue-rotate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-hue-rotate/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/raster-hue-rotate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-loading/missing/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-loading/missing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-loading/missing/metrics.json rename to metrics/ios-render-test-runner/render-tests/raster-loading/missing/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-masking/overlapping-vector/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-masking/overlapping-vector/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-masking/overlapping-vector/metrics.json rename to metrics/ios-render-test-runner/render-tests/raster-masking/overlapping-vector/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-masking/overlapping/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-masking/overlapping/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-masking/overlapping/metrics.json rename to metrics/ios-render-test-runner/render-tests/raster-masking/overlapping/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-opacity/default/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-opacity/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/raster-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-opacity/function/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-opacity/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/raster-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-opacity/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-opacity/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/raster-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-resampling/default/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-resampling/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-resampling/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/raster-resampling/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-resampling/function/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-resampling/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-resampling/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/raster-resampling/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-resampling/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-resampling/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-resampling/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/raster-resampling/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-rotation/0/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-rotation/0/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-rotation/0/metrics.json rename to metrics/ios-render-test-runner/render-tests/raster-rotation/0/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-rotation/180/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-rotation/180/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-rotation/180/metrics.json rename to metrics/ios-render-test-runner/render-tests/raster-rotation/180/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-rotation/270/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-rotation/270/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-rotation/270/metrics.json rename to metrics/ios-render-test-runner/render-tests/raster-rotation/270/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-rotation/45/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-rotation/45/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-rotation/45/metrics.json rename to metrics/ios-render-test-runner/render-tests/raster-rotation/45/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-rotation/90/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-rotation/90/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-rotation/90/metrics.json rename to metrics/ios-render-test-runner/render-tests/raster-rotation/90/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-saturation/default/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-saturation/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-saturation/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/raster-saturation/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-saturation/function/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-saturation/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-saturation/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/raster-saturation/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-saturation/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-saturation/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-saturation/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/raster-saturation/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-visibility/none/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-visibility/none/metrics.json rename to metrics/ios-render-test-runner/render-tests/raster-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-visibility/visible/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/raster-visibility/visible/metrics.json rename to metrics/ios-render-test-runner/render-tests/raster-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/real-world/nepal/metrics.json b/metrics/ios-render-test-runner/render-tests/real-world/nepal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/real-world/nepal/metrics.json rename to metrics/ios-render-test-runner/render-tests/real-world/nepal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/real-world/norway/metrics.json b/metrics/ios-render-test-runner/render-tests/real-world/norway/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/real-world/norway/metrics.json rename to metrics/ios-render-test-runner/render-tests/real-world/norway/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/real-world/uruguay/metrics.json b/metrics/ios-render-test-runner/render-tests/real-world/uruguay/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/real-world/uruguay/metrics.json rename to metrics/ios-render-test-runner/render-tests/real-world/uruguay/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2523/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2523/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2523/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2523/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2533/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2533/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2533/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2533/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2534/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2534/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2534/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2534/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2787/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2787/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2787/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2787/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2846/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2846/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2846/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2846/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2929/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2929/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2929/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2929/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3010/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3010/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3010/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3010/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3107/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3107/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3107/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3107/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3320/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3320/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3320/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3320/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3365/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3365/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3365/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3365/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3394/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3394/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3394/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3394/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3426/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3426/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3426/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3426/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3548/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3548/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3548/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3548/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3612/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3612/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3612/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3612/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3614/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3614/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3614/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3614/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3623/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3623/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3623/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3623/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3633/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3633/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3633/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3633/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3682/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3682/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3682/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3682/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3702/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3702/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3702/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3702/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3723/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3723/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3723/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3723/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3819/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3819/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3819/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3819/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3903/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3903/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3903/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3903/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3910/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3910/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3910/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3910/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3949/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3949/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3949/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3949/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4124/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4124/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4124/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4124/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4144/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4144/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4144/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4144/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4146/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4146/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4146/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4146/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4150/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4150/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4150/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4150/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4172/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4172/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4172/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4172/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4235/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4235/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4235/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4235/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4550/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4550/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4550/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4550/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4551/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4551/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4551/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4551/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4564/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4564/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4564/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4564/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4573/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4573/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4573/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4573/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4579/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4579/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4579/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4579/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4605/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4605/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4605/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4605/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4617/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4617/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4617/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4617/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4647/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4647/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4647/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4647/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4651/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4651/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4651/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4651/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4860/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4860/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4860/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4860/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4928/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4928/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4928/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4928/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5171/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5171/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5171/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5171/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5370/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5370/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5370/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5370/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5466/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5466/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5466/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5466/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5496/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5496/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5496/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5496/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5544/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5544/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5544/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5544/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5546/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5546/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5546/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5546/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5576/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5576/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5576/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5576/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5599/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5599/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5599/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5599/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5631/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5631/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5631/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5631/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5776/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5776/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5776/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5776/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5911/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5911/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5911/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5911/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5947/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5947/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5947/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5947/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5953/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5953/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5953/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5953/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5978/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5978/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5978/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5978/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6160/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6160/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6160/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6160/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6238/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6238/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6238/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6238/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6548/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6548/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6548/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6548/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6649/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6649/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6649/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6649/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6660/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6660/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6660/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6660/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6919/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6919/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6919/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6919/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#7032/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#7032/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#7032/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#7032/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#7172/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#7172/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#7172/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#7172/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#8273/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#8273/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#8273/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#8273/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#9009/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#9009/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#9009/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#9009/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#10849/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#10849/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#10849/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#10849/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#11451/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#11451/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#11451/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#11451/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#11729/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#11729/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#11729/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#11729/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#12812/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#12812/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#12812/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#12812/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#14402/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#14402/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#14402/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#14402/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#15139/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#15139/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#15139/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#15139/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#3292/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#3292/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#3292/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#3292/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#5648/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#5648/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#5648/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#5648/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#5701/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#5701/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#5701/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#5701/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#5754/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#5754/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#5754/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#5754/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#6063/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#6063/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#6063/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#6063/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#6233/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#6233/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#6233/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#6233/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#6820/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#6820/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#6820/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#6820/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#6903/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#6903/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#6903/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#6903/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#7241/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#7241/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#7241/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#7241/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#7572/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#7572/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#7572/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#7572/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#7714/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#7714/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#7714/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#7714/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#7792/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#7792/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#7792/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#7792/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8078/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8078/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8078/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8078/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8303/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8303/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8303/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8303/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8460/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8460/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8460/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8460/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8505/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8505/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8505/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8505/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8871/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8871/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8871/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8871/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8952/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8952/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8952/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8952/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9406/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9406/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9406/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9406/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9557/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9557/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9557/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9557/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9792/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9792/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9792/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9792/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9900/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9900/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9900/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9900/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9979/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9979/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9979/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9979/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-shaders#37/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-shaders#37/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-shaders#37/metrics.json rename to metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-shaders#37/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/remove-feature-state/composite-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/remove-feature-state/composite-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/remove-feature-state/composite-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/remove-feature-state/composite-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/remove-feature-state/data-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/remove-feature-state/data-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/remove-feature-state/data-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/remove-feature-state/data-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/remove-feature-state/vector-source/metrics.json b/metrics/ios-render-test-runner/render-tests/remove-feature-state/vector-source/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/remove-feature-state/vector-source/metrics.json rename to metrics/ios-render-test-runner/render-tests/remove-feature-state/vector-source/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/retina-raster/default/metrics.json b/metrics/ios-render-test-runner/render-tests/retina-raster/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/retina-raster/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/retina-raster/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/filter-default-to-false/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/filter-default-to-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/filter-default-to-false/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/filter-default-to-false/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/filter-default-to-true/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/filter-default-to-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/filter-default-to-true/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/filter-default-to-true/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/filter-false-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/filter-false-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/filter-false-to-default/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/filter-false-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/filter-false-to-true/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/filter-false-to-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/filter-false-to-true/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/filter-false-to-true/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/filter-true-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/filter-true-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/filter-true-to-default/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/filter-true-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/filter-true-to-false/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/filter-true-to-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/filter-true-to-false/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/filter-true-to-false/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-alpha/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-alpha/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-alpha/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-alpha/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-nonsdf/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-nonsdf/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-nonsdf/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-nonsdf/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-sdf/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-sdf/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-sdf/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-sdf/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/image-remove/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-remove/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/image-remove/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/image-remove/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/image-update-icon/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-update-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/image-update-icon/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/image-update-icon/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-background/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-background/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-background/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-background/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-circle/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-circle/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-circle/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-fill/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-fill/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-fill/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-line/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-line/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-line/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-raster/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-raster/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-raster/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-raster/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-symbol/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-symbol/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-background/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-background/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-background/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-background/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-circle/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-circle/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-circle/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-fill/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-fill/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-fill/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-line/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-line/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-line/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-raster/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-raster/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-raster/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-raster/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-symbol/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-symbol/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-background/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-background/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-background/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-background/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-line/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-line/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-line/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-reorder/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-reorder/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-reorder/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-reorder/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-update/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-update/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-update/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-update/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-sprite/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-sprite/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-sprite/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-sprite/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-geojson-inline/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-geojson-inline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-geojson-inline/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-geojson-inline/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-geojson-url/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-geojson-url/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-geojson-url/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-geojson-url/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-raster-inline/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-raster-inline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-raster-inline/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-raster-inline/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-raster-url/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-raster-url/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-raster-url/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-raster-url/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-vector-inline/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-vector-inline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-vector-inline/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-vector-inline/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-vector-url/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-vector-url/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-vector-url/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-vector-url/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-default-to-none/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-default-to-none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-default-to-none/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-default-to-none/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-default-to-visible/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-default-to-visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-default-to-visible/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-default-to-visible/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-none-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-none-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-none-to-default/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-none-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-none-to-visible/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-none-to-visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-none-to-visible/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-none-to-visible/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-visible-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-visible-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-visible-to-default/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-visible-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-visible-to-none/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-visible-to-none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-visible-to-none/metrics.json rename to metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-visible-to-none/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/satellite-v9/z0/metrics.json b/metrics/ios-render-test-runner/render-tests/satellite-v9/z0/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/satellite-v9/z0/metrics.json rename to metrics/ios-render-test-runner/render-tests/satellite-v9/z0/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/sparse-tileset/overdraw/metrics.json b/metrics/ios-render-test-runner/render-tests/sparse-tileset/overdraw/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/sparse-tileset/overdraw/metrics.json rename to metrics/ios-render-test-runner/render-tests/sparse-tileset/overdraw/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/sprites/1x-screen-1x-icon/metrics.json b/metrics/ios-render-test-runner/render-tests/sprites/1x-screen-1x-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/sprites/1x-screen-1x-icon/metrics.json rename to metrics/ios-render-test-runner/render-tests/sprites/1x-screen-1x-icon/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/sprites/1x-screen-1x-pattern/metrics.json b/metrics/ios-render-test-runner/render-tests/sprites/1x-screen-1x-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/sprites/1x-screen-1x-pattern/metrics.json rename to metrics/ios-render-test-runner/render-tests/sprites/1x-screen-1x-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/sprites/1x-screen-2x-icon/metrics.json b/metrics/ios-render-test-runner/render-tests/sprites/1x-screen-2x-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/sprites/1x-screen-2x-icon/metrics.json rename to metrics/ios-render-test-runner/render-tests/sprites/1x-screen-2x-icon/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/sprites/1x-screen-2x-pattern/metrics.json b/metrics/ios-render-test-runner/render-tests/sprites/1x-screen-2x-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/sprites/1x-screen-2x-pattern/metrics.json rename to metrics/ios-render-test-runner/render-tests/sprites/1x-screen-2x-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/sprites/2x-screen-1x-icon/metrics.json b/metrics/ios-render-test-runner/render-tests/sprites/2x-screen-1x-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/sprites/2x-screen-1x-icon/metrics.json rename to metrics/ios-render-test-runner/render-tests/sprites/2x-screen-1x-icon/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/sprites/2x-screen-1x-pattern/metrics.json b/metrics/ios-render-test-runner/render-tests/sprites/2x-screen-1x-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/sprites/2x-screen-1x-pattern/metrics.json rename to metrics/ios-render-test-runner/render-tests/sprites/2x-screen-1x-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/sprites/2x-screen-2x-icon/metrics.json b/metrics/ios-render-test-runner/render-tests/sprites/2x-screen-2x-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/sprites/2x-screen-2x-icon/metrics.json rename to metrics/ios-render-test-runner/render-tests/sprites/2x-screen-2x-icon/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/sprites/2x-screen-2x-pattern/metrics.json b/metrics/ios-render-test-runner/render-tests/sprites/2x-screen-2x-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/sprites/2x-screen-2x-pattern/metrics.json rename to metrics/ios-render-test-runner/render-tests/sprites/2x-screen-2x-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-geometry/linestring/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-geometry/linestring/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-geometry/linestring/metrics.json rename to metrics/ios-render-test-runner/render-tests/symbol-geometry/linestring/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-geometry/multilinestring/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-geometry/multilinestring/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-geometry/multilinestring/metrics.json rename to metrics/ios-render-test-runner/render-tests/symbol-geometry/multilinestring/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-geometry/multipoint/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-geometry/multipoint/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-geometry/multipoint/metrics.json rename to metrics/ios-render-test-runner/render-tests/symbol-geometry/multipoint/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-geometry/multipolygon/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-geometry/multipolygon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-geometry/multipolygon/metrics.json rename to metrics/ios-render-test-runner/render-tests/symbol-geometry/multipolygon/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-geometry/point/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-geometry/point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-geometry/point/metrics.json rename to metrics/ios-render-test-runner/render-tests/symbol-geometry/point/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-geometry/polygon/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-geometry/polygon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-geometry/polygon/metrics.json rename to metrics/ios-render-test-runner/render-tests/symbol-geometry/polygon/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-placement/line-center-buffer-tile-map-mode/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-placement/line-center-buffer-tile-map-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-placement/line-center-buffer-tile-map-mode/metrics.json rename to metrics/ios-render-test-runner/render-tests/symbol-placement/line-center-buffer-tile-map-mode/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-placement/line-center-buffer/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-placement/line-center-buffer/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-placement/line-center-buffer/metrics.json rename to metrics/ios-render-test-runner/render-tests/symbol-placement/line-center-buffer/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-placement/line-center-tile-map-mode/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-placement/line-center-tile-map-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-placement/line-center-tile-map-mode/metrics.json rename to metrics/ios-render-test-runner/render-tests/symbol-placement/line-center-tile-map-mode/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-placement/line-center/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-placement/line-center/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-placement/line-center/metrics.json rename to metrics/ios-render-test-runner/render-tests/symbol-placement/line-center/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-placement/line-overscaled/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-placement/line-overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-placement/line-overscaled/metrics.json rename to metrics/ios-render-test-runner/render-tests/symbol-placement/line-overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-placement/line/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-placement/line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-placement/line/metrics.json rename to metrics/ios-render-test-runner/render-tests/symbol-placement/line/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-placement/point-polygon/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-placement/point-polygon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-placement/point-polygon/metrics.json rename to metrics/ios-render-test-runner/render-tests/symbol-placement/point-polygon/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-placement/point/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-placement/point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-placement/point/metrics.json rename to metrics/ios-render-test-runner/render-tests/symbol-placement/point/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-sort-key/icon-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-sort-key/icon-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-sort-key/icon-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/symbol-sort-key/icon-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-sort-key/placement-tile-boundary-left-then-right/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-sort-key/placement-tile-boundary-left-then-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-sort-key/placement-tile-boundary-left-then-right/metrics.json rename to metrics/ios-render-test-runner/render-tests/symbol-sort-key/placement-tile-boundary-left-then-right/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-sort-key/text-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-sort-key/text-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-sort-key/text-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/symbol-sort-key/text-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-sort-key/text-ignore-placement/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-sort-key/text-ignore-placement/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-sort-key/text-ignore-placement/metrics.json rename to metrics/ios-render-test-runner/render-tests/symbol-sort-key/text-ignore-placement/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-sort-key/text-placement/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-sort-key/text-placement/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-sort-key/text-placement/metrics.json rename to metrics/ios-render-test-runner/render-tests/symbol-sort-key/text-placement/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-spacing/line-close/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-spacing/line-close/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-spacing/line-close/metrics.json rename to metrics/ios-render-test-runner/render-tests/symbol-spacing/line-close/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-spacing/line-far/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-spacing/line-far/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-spacing/line-far/metrics.json rename to metrics/ios-render-test-runner/render-tests/symbol-spacing/line-far/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-spacing/line-overscaled/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-spacing/line-overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-spacing/line-overscaled/metrics.json rename to metrics/ios-render-test-runner/render-tests/symbol-spacing/line-overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-spacing/point-close/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-spacing/point-close/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-spacing/point-close/metrics.json rename to metrics/ios-render-test-runner/render-tests/symbol-spacing/point-close/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-spacing/point-far/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-spacing/point-far/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-spacing/point-far/metrics.json rename to metrics/ios-render-test-runner/render-tests/symbol-spacing/point-far/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-visibility/none/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-visibility/none/metrics.json rename to metrics/ios-render-test-runner/render-tests/symbol-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-z-order/default/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-z-order/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-z-order/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/symbol-z-order/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-z-order/disabled/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-z-order/disabled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-z-order/disabled/metrics.json rename to metrics/ios-render-test-runner/render-tests/symbol-z-order/disabled/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-z-order/icon-with-text/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-z-order/icon-with-text/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-z-order/icon-with-text/metrics.json rename to metrics/ios-render-test-runner/render-tests/symbol-z-order/icon-with-text/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-z-order/pitched/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-z-order/pitched/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-z-order/pitched/metrics.json rename to metrics/ios-render-test-runner/render-tests/symbol-z-order/pitched/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-z-order/viewport-y/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-z-order/viewport-y/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/symbol-z-order/viewport-y/metrics.json rename to metrics/ios-render-test-runner/render-tests/symbol-z-order/viewport-y/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-anchor/bottom-left/metrics.json b/metrics/ios-render-test-runner/render-tests/text-anchor/bottom-left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-anchor/bottom-left/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-anchor/bottom-left/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-anchor/bottom-right/metrics.json b/metrics/ios-render-test-runner/render-tests/text-anchor/bottom-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-anchor/bottom-right/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-anchor/bottom-right/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-anchor/bottom/metrics.json b/metrics/ios-render-test-runner/render-tests/text-anchor/bottom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-anchor/bottom/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-anchor/bottom/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-anchor/center/metrics.json b/metrics/ios-render-test-runner/render-tests/text-anchor/center/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-anchor/center/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-anchor/center/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-anchor/left/metrics.json b/metrics/ios-render-test-runner/render-tests/text-anchor/left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-anchor/left/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-anchor/left/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-anchor/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-anchor/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-anchor/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-anchor/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-anchor/right/metrics.json b/metrics/ios-render-test-runner/render-tests/text-anchor/right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-anchor/right/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-anchor/right/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-anchor/top-left/metrics.json b/metrics/ios-render-test-runner/render-tests/text-anchor/top-left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-anchor/top-left/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-anchor/top-left/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-anchor/top-right/metrics.json b/metrics/ios-render-test-runner/render-tests/text-anchor/top-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-anchor/top-right/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-anchor/top-right/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-anchor/top/metrics.json b/metrics/ios-render-test-runner/render-tests/text-anchor/top/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-anchor/top/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-anchor/top/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-arabic/letter-spacing/metrics.json b/metrics/ios-render-test-runner/render-tests/text-arabic/letter-spacing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-arabic/letter-spacing/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-arabic/letter-spacing/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-arabic/line-break-mixed/metrics.json b/metrics/ios-render-test-runner/render-tests/text-arabic/line-break-mixed/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-arabic/line-break-mixed/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-arabic/line-break-mixed/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-arabic/line-break/metrics.json b/metrics/ios-render-test-runner/render-tests/text-arabic/line-break/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-arabic/line-break/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-arabic/line-break/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-arabic/mixed-numeric/metrics.json b/metrics/ios-render-test-runner/render-tests/text-arabic/mixed-numeric/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-arabic/mixed-numeric/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-arabic/mixed-numeric/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-arabic/multi-paragraph/metrics.json b/metrics/ios-render-test-runner/render-tests/text-arabic/multi-paragraph/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-arabic/multi-paragraph/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-arabic/multi-paragraph/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-color/default/metrics.json b/metrics/ios-render-test-runner/render-tests/text-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-color/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-color/function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-color/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-color/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/text-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-color/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-color/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-color/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-field/formatted-arabic/metrics.json b/metrics/ios-render-test-runner/render-tests/text-field/formatted-arabic/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-field/formatted-arabic/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-field/formatted-arabic/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-field/formatted-images-constant-size/metrics.json b/metrics/ios-render-test-runner/render-tests/text-field/formatted-images-constant-size/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-field/formatted-images-constant-size/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-field/formatted-images-constant-size/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-field/formatted-images-line/metrics.json b/metrics/ios-render-test-runner/render-tests/text-field/formatted-images-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-field/formatted-images-line/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-field/formatted-images-line/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-field/formatted-images-multiline/metrics.json b/metrics/ios-render-test-runner/render-tests/text-field/formatted-images-multiline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-field/formatted-images-multiline/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-field/formatted-images-multiline/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json b/metrics/ios-render-test-runner/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-field/formatted-images-vertical/metrics.json b/metrics/ios-render-test-runner/render-tests/text-field/formatted-images-vertical/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-field/formatted-images-vertical/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-field/formatted-images-vertical/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json b/metrics/ios-render-test-runner/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-field/formatted-line/metrics.json b/metrics/ios-render-test-runner/render-tests/text-field/formatted-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-field/formatted-line/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-field/formatted-line/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-field/formatted-text-color-overrides/metrics.json b/metrics/ios-render-test-runner/render-tests/text-field/formatted-text-color-overrides/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-field/formatted-text-color-overrides/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-field/formatted-text-color-overrides/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-field/formatted-text-color/metrics.json b/metrics/ios-render-test-runner/render-tests/text-field/formatted-text-color/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-field/formatted-text-color/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-field/formatted-text-color/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-field/formatted/metrics.json b/metrics/ios-render-test-runner/render-tests/text-field/formatted/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-field/formatted/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-field/formatted/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-field/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/text-field/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-field/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-field/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-field/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-field/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-field/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-field/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-field/token/metrics.json b/metrics/ios-render-test-runner/render-tests/text-field/token/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-field/token/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-field/token/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-font/camera-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-font/camera-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-font/camera-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-font/camera-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-font/data-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/text-font/data-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-font/data-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-font/data-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-font/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/text-font/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-font/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-font/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-halo-blur/default/metrics.json b/metrics/ios-render-test-runner/render-tests/text-halo-blur/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-halo-blur/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-halo-blur/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-halo-blur/function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-halo-blur/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-halo-blur/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-halo-blur/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-halo-blur/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/text-halo-blur/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-halo-blur/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-halo-blur/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-halo-blur/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-halo-blur/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-halo-blur/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-halo-blur/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-halo-color/default/metrics.json b/metrics/ios-render-test-runner/render-tests/text-halo-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-halo-color/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-halo-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-halo-color/function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-halo-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-halo-color/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-halo-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-halo-color/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/text-halo-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-halo-color/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-halo-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-halo-color/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-halo-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-halo-color/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-halo-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-halo-width/default/metrics.json b/metrics/ios-render-test-runner/render-tests/text-halo-width/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-halo-width/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-halo-width/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-halo-width/function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-halo-width/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-halo-width/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-halo-width/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-halo-width/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/text-halo-width/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-halo-width/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-halo-width/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-halo-width/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-halo-width/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-halo-width/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-halo-width/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-justify/auto/metrics.json b/metrics/ios-render-test-runner/render-tests/text-justify/auto/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-justify/auto/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-justify/auto/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-justify/left/metrics.json b/metrics/ios-render-test-runner/render-tests/text-justify/left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-justify/left/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-justify/left/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-justify/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-justify/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-justify/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-justify/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-justify/right/metrics.json b/metrics/ios-render-test-runner/render-tests/text-justify/right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-justify/right/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-justify/right/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-false/metrics.json b/metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-false/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-false/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-true-offset/metrics.json b/metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-true-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-true-offset/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-true-offset/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json b/metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json b/metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json b/metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-true/metrics.json b/metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-true/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-true/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json b/metrics/ios-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json b/metrics/ios-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json b/metrics/ios-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json b/metrics/ios-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-letter-spacing/function-close/metrics.json b/metrics/ios-render-test-runner/render-tests/text-letter-spacing/function-close/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-letter-spacing/function-close/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-letter-spacing/function-close/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-letter-spacing/function-far/metrics.json b/metrics/ios-render-test-runner/render-tests/text-letter-spacing/function-far/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-letter-spacing/function-far/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-letter-spacing/function-far/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-letter-spacing/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/text-letter-spacing/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-letter-spacing/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-letter-spacing/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-letter-spacing/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-letter-spacing/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-letter-spacing/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-letter-spacing/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-line-height/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/text-line-height/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-line-height/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-line-height/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-max-angle/line-center/metrics.json b/metrics/ios-render-test-runner/render-tests/text-max-angle/line-center/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-max-angle/line-center/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-max-angle/line-center/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-max-angle/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/text-max-angle/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-max-angle/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-max-angle/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-max-width/force-double-newline/metrics.json b/metrics/ios-render-test-runner/render-tests/text-max-width/force-double-newline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-max-width/force-double-newline/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-max-width/force-double-newline/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-max-width/force-newline/metrics.json b/metrics/ios-render-test-runner/render-tests/text-max-width/force-newline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-max-width/force-newline/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-max-width/force-newline/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-max-width/ideographic-breaking/metrics.json b/metrics/ios-render-test-runner/render-tests/text-max-width/ideographic-breaking/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-max-width/ideographic-breaking/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-max-width/ideographic-breaking/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json b/metrics/ios-render-test-runner/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-max-width/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/text-max-width/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-max-width/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-max-width/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-max-width/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-max-width/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-max-width/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-max-width/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-max-width/zoom-and-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-max-width/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-max-width/zoom-and-property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-max-width/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-no-cross-source-collision/default/metrics.json b/metrics/ios-render-test-runner/render-tests/text-no-cross-source-collision/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-no-cross-source-collision/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-no-cross-source-collision/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-offset/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-offset/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-offset/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-opacity/default/metrics.json b/metrics/ios-render-test-runner/render-tests/text-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-opacity/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-opacity/function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-opacity/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-opacity/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/text-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-opacity/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-opacity/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-opacity/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-opacity/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-opacity/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json b/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json b/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json b/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json b/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json b/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json b/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json b/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json b/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json b/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json b/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-pitch-scaling/line-half/metrics.json b/metrics/ios-render-test-runner/render-tests/text-pitch-scaling/line-half/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-pitch-scaling/line-half/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-pitch-scaling/line-half/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-radial-offset/basic/metrics.json b/metrics/ios-render-test-runner/render-tests/text-radial-offset/basic/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-radial-offset/basic/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-radial-offset/basic/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-rotate/anchor-bottom/metrics.json b/metrics/ios-render-test-runner/render-tests/text-rotate/anchor-bottom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-rotate/anchor-bottom/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-rotate/anchor-bottom/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-rotate/anchor-left/metrics.json b/metrics/ios-render-test-runner/render-tests/text-rotate/anchor-left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-rotate/anchor-left/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-rotate/anchor-left/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-rotate/anchor-right/metrics.json b/metrics/ios-render-test-runner/render-tests/text-rotate/anchor-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-rotate/anchor-right/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-rotate/anchor-right/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-rotate/anchor-top/metrics.json b/metrics/ios-render-test-runner/render-tests/text-rotate/anchor-top/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-rotate/anchor-top/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-rotate/anchor-top/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-rotate/function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-rotate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-rotate/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-rotate/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-rotate/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/text-rotate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-rotate/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-rotate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-rotate/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-rotate/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-rotate/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-rotate/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-rotate/with-offset/metrics.json b/metrics/ios-render-test-runner/render-tests/text-rotate/with-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-rotate/with-offset/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-rotate/with-offset/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json b/metrics/ios-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json b/metrics/ios-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json b/metrics/ios-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json b/metrics/ios-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json b/metrics/ios-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json b/metrics/ios-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-size/camera-function-high-base/metrics.json b/metrics/ios-render-test-runner/render-tests/text-size/camera-function-high-base/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-size/camera-function-high-base/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-size/camera-function-high-base/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-size/camera-function-interval/metrics.json b/metrics/ios-render-test-runner/render-tests/text-size/camera-function-interval/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-size/camera-function-interval/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-size/camera-function-interval/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-size/composite-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/text-size/composite-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-size/composite-expression/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-size/composite-expression/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-size/composite-function-line-placement/metrics.json b/metrics/ios-render-test-runner/render-tests/text-size/composite-function-line-placement/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-size/composite-function-line-placement/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-size/composite-function-line-placement/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-size/composite-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-size/composite-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-size/composite-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-size/composite-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-size/default/metrics.json b/metrics/ios-render-test-runner/render-tests/text-size/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-size/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-size/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-size/function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-size/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-size/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-size/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-size/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/text-size/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-size/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-size/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-size/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-size/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-size/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-size/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-size/zero/metrics.json b/metrics/ios-render-test-runner/render-tests/text-size/zero/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-size/zero/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-size/zero/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-tile-edge-clipping/default/metrics.json b/metrics/ios-render-test-runner/render-tests/text-tile-edge-clipping/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-tile-edge-clipping/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-tile-edge-clipping/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-transform/lowercase/metrics.json b/metrics/ios-render-test-runner/render-tests/text-transform/lowercase/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-transform/lowercase/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-transform/lowercase/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-transform/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-transform/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-transform/property-function/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-transform/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-transform/uppercase/metrics.json b/metrics/ios-render-test-runner/render-tests/text-transform/uppercase/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-transform/uppercase/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-transform/uppercase/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-translate-anchor/map/metrics.json b/metrics/ios-render-test-runner/render-tests/text-translate-anchor/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-translate-anchor/map/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-translate-anchor/map/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-translate-anchor/viewport/metrics.json b/metrics/ios-render-test-runner/render-tests/text-translate-anchor/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-translate-anchor/viewport/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-translate-anchor/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-translate/default/metrics.json b/metrics/ios-render-test-runner/render-tests/text-translate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-translate/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-translate/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-translate/function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-translate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-translate/function/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-translate/function/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-translate/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/text-translate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-translate/literal/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-translate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/icon-image/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/icon-image/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/icon-image/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-variable-anchor/icon-image/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/no-animate-zoom/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/no-animate-zoom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/no-animate-zoom/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-variable-anchor/no-animate-zoom/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/pitched-offset/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/pitched-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/pitched-offset/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-variable-anchor/pitched-offset/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/pitched-with-map/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/pitched-with-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/pitched-with-map/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-variable-anchor/pitched-with-map/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/pitched/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/pitched/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/pitched/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-variable-anchor/pitched/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/rotated-offset/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/rotated-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/rotated-offset/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-variable-anchor/rotated-offset/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/rotated-with-map/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/rotated-with-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/rotated-with-map/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-variable-anchor/rotated-with-map/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/rotated/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/rotated/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/rotated/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-variable-anchor/rotated/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/single-justification/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/single-justification/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/single-justification/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-variable-anchor/single-justification/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/single-line/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/single-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/single-line/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-variable-anchor/single-line/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/text-allow-overlap/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/text-allow-overlap/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/text-allow-overlap/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-variable-anchor/text-allow-overlap/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-visibility/none/metrics.json b/metrics/ios-render-test-runner/render-tests/text-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-visibility/none/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-visibility/visible/metrics.json b/metrics/ios-render-test-runner/render-tests/text-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-visibility/visible/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json b/metrics/ios-render-test-runner/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-writing-mode/line_label/chinese/metrics.json b/metrics/ios-render-test-runner/render-tests/text-writing-mode/line_label/chinese/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-writing-mode/line_label/chinese/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-writing-mode/line_label/chinese/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-writing-mode/line_label/latin/metrics.json b/metrics/ios-render-test-runner/render-tests/text-writing-mode/line_label/latin/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-writing-mode/line_label/latin/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-writing-mode/line_label/latin/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-writing-mode/line_label/mixed/metrics.json b/metrics/ios-render-test-runner/render-tests/text-writing-mode/line_label/mixed/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-writing-mode/line_label/mixed/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-writing-mode/line_label/mixed/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json rename to metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/tile-mode/streets-v11/metrics.json b/metrics/ios-render-test-runner/render-tests/tile-mode/streets-v11/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/tile-mode/streets-v11/metrics.json rename to metrics/ios-render-test-runner/render-tests/tile-mode/streets-v11/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/tilejson-bounds/default/metrics.json b/metrics/ios-render-test-runner/render-tests/tilejson-bounds/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/tilejson-bounds/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/tilejson-bounds/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/tms/tms/metrics.json b/metrics/ios-render-test-runner/render-tests/tms/tms/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/tms/tms/metrics.json rename to metrics/ios-render-test-runner/render-tests/tms/tms/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/within/filter-with-inlined-geojson/metrics.json b/metrics/ios-render-test-runner/render-tests/within/filter-with-inlined-geojson/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/within/filter-with-inlined-geojson/metrics.json rename to metrics/ios-render-test-runner/render-tests/within/filter-with-inlined-geojson/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/within/layout-text/metrics.json b/metrics/ios-render-test-runner/render-tests/within/layout-text/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/within/layout-text/metrics.json rename to metrics/ios-render-test-runner/render-tests/within/layout-text/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/within/paint-circle/metrics.json b/metrics/ios-render-test-runner/render-tests/within/paint-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/within/paint-circle/metrics.json rename to metrics/ios-render-test-runner/render-tests/within/paint-circle/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/within/paint-icon/metrics.json b/metrics/ios-render-test-runner/render-tests/within/paint-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/within/paint-icon/metrics.json rename to metrics/ios-render-test-runner/render-tests/within/paint-icon/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/within/paint-line/metrics.json b/metrics/ios-render-test-runner/render-tests/within/paint-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/within/paint-line/metrics.json rename to metrics/ios-render-test-runner/render-tests/within/paint-line/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/within/paint-text/metrics.json b/metrics/ios-render-test-runner/render-tests/within/paint-text/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/within/paint-text/metrics.json rename to metrics/ios-render-test-runner/render-tests/within/paint-text/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/zoom-history/in/metrics.json b/metrics/ios-render-test-runner/render-tests/zoom-history/in/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/zoom-history/in/metrics.json rename to metrics/ios-render-test-runner/render-tests/zoom-history/in/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/zoom-history/out/metrics.json b/metrics/ios-render-test-runner/render-tests/zoom-history/out/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/zoom-history/out/metrics.json rename to metrics/ios-render-test-runner/render-tests/zoom-history/out/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/zoom-visibility/above/metrics.json b/metrics/ios-render-test-runner/render-tests/zoom-visibility/above/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/zoom-visibility/above/metrics.json rename to metrics/ios-render-test-runner/render-tests/zoom-visibility/above/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/zoom-visibility/below/metrics.json b/metrics/ios-render-test-runner/render-tests/zoom-visibility/below/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/zoom-visibility/below/metrics.json rename to metrics/ios-render-test-runner/render-tests/zoom-visibility/below/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/zoom-visibility/in-range/metrics.json b/metrics/ios-render-test-runner/render-tests/zoom-visibility/in-range/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/zoom-visibility/in-range/metrics.json rename to metrics/ios-render-test-runner/render-tests/zoom-visibility/in-range/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/zoom-visibility/out-of-range/metrics.json b/metrics/ios-render-test-runner/render-tests/zoom-visibility/out-of-range/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/zoom-visibility/out-of-range/metrics.json rename to metrics/ios-render-test-runner/render-tests/zoom-visibility/out-of-range/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/zoom-visibility/was-above/metrics.json b/metrics/ios-render-test-runner/render-tests/zoom-visibility/was-above/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/zoom-visibility/was-above/metrics.json rename to metrics/ios-render-test-runner/render-tests/zoom-visibility/was-above/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/zoom-visibility/was-below/metrics.json b/metrics/ios-render-test-runner/render-tests/zoom-visibility/was-below/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/zoom-visibility/was-below/metrics.json rename to metrics/ios-render-test-runner/render-tests/zoom-visibility/was-below/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/zoomed-fill/default/metrics.json b/metrics/ios-render-test-runner/render-tests/zoomed-fill/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/zoomed-fill/default/metrics.json rename to metrics/ios-render-test-runner/render-tests/zoomed-fill/default/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/zoomed-raster/fractional/metrics.json b/metrics/ios-render-test-runner/render-tests/zoomed-raster/fractional/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/zoomed-raster/fractional/metrics.json rename to metrics/ios-render-test-runner/render-tests/zoomed-raster/fractional/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/zoomed-raster/overzoom/metrics.json b/metrics/ios-render-test-runner/render-tests/zoomed-raster/overzoom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/zoomed-raster/overzoom/metrics.json rename to metrics/ios-render-test-runner/render-tests/zoomed-raster/overzoom/metrics.json diff --git a/mapbox-gl-native/metrics/ios-render-test-runner/render-tests/zoomed-raster/underzoom/metrics.json b/metrics/ios-render-test-runner/render-tests/zoomed-raster/underzoom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/ios-render-test-runner/render-tests/zoomed-raster/underzoom/metrics.json rename to metrics/ios-render-test-runner/render-tests/zoomed-raster/underzoom/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release-metrics.json b/metrics/linux-clang8-release-metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release-metrics.json rename to metrics/linux-clang8-release-metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release-style.json b/metrics/linux-clang8-release-style.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release-style.json rename to metrics/linux-clang8-release-style.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/location_indicator/dateline/metrics.json b/metrics/linux-clang8-release/location_indicator/dateline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/location_indicator/dateline/metrics.json rename to metrics/linux-clang8-release/location_indicator/dateline/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/location_indicator/default/metrics.json b/metrics/linux-clang8-release/location_indicator/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/location_indicator/default/metrics.json rename to metrics/linux-clang8-release/location_indicator/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/location_indicator/no_radius_border/metrics.json b/metrics/linux-clang8-release/location_indicator/no_radius_border/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/location_indicator/no_radius_border/metrics.json rename to metrics/linux-clang8-release/location_indicator/no_radius_border/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/location_indicator/no_radius_fill/metrics.json b/metrics/linux-clang8-release/location_indicator/no_radius_fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/location_indicator/no_radius_fill/metrics.json rename to metrics/linux-clang8-release/location_indicator/no_radius_fill/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/location_indicator/no_textures/metrics.json b/metrics/linux-clang8-release/location_indicator/no_textures/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/location_indicator/no_textures/metrics.json rename to metrics/linux-clang8-release/location_indicator/no_textures/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/location_indicator/one_texture/metrics.json b/metrics/linux-clang8-release/location_indicator/one_texture/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/location_indicator/one_texture/metrics.json rename to metrics/linux-clang8-release/location_indicator/one_texture/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/location_indicator/rotated/metrics.json b/metrics/linux-clang8-release/location_indicator/rotated/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/location_indicator/rotated/metrics.json rename to metrics/linux-clang8-release/location_indicator/rotated/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/location_indicator/tilted/metrics.json b/metrics/linux-clang8-release/location_indicator/tilted/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/location_indicator/tilted/metrics.json rename to metrics/linux-clang8-release/location_indicator/tilted/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/location_indicator/tilted_texture_shift/metrics.json b/metrics/linux-clang8-release/location_indicator/tilted_texture_shift/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/location_indicator/tilted_texture_shift/metrics.json rename to metrics/linux-clang8-release/location_indicator/tilted_texture_shift/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/location_indicator/tilted_texture_shift_bottom_left/metrics.json b/metrics/linux-clang8-release/location_indicator/tilted_texture_shift_bottom_left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/location_indicator/tilted_texture_shift_bottom_left/metrics.json rename to metrics/linux-clang8-release/location_indicator/tilted_texture_shift_bottom_left/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/location_indicator/tilted_texture_shift_bottom_right/metrics.json b/metrics/linux-clang8-release/location_indicator/tilted_texture_shift_bottom_right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/location_indicator/tilted_texture_shift_bottom_right/metrics.json rename to metrics/linux-clang8-release/location_indicator/tilted_texture_shift_bottom_right/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/location_indicator/tilted_texture_shift_top_left/metrics.json b/metrics/linux-clang8-release/location_indicator/tilted_texture_shift_top_left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/location_indicator/tilted_texture_shift_top_left/metrics.json rename to metrics/linux-clang8-release/location_indicator/tilted_texture_shift_top_left/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/location_indicator/tilted_texture_shift_top_right/metrics.json b/metrics/linux-clang8-release/location_indicator/tilted_texture_shift_top_right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/location_indicator/tilted_texture_shift_top_right/metrics.json rename to metrics/linux-clang8-release/location_indicator/tilted_texture_shift_top_right/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/location_indicator/two_textures/metrics.json b/metrics/linux-clang8-release/location_indicator/two_textures/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/location_indicator/two_textures/metrics.json rename to metrics/linux-clang8-release/location_indicator/two_textures/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/probes/gfx/pass-double-probe/metrics.json b/metrics/linux-clang8-release/probes/gfx/pass-double-probe/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/probes/gfx/pass-double-probe/metrics.json rename to metrics/linux-clang8-release/probes/gfx/pass-double-probe/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/probes/gfx/pass-probe-reset/metrics.json b/metrics/linux-clang8-release/probes/gfx/pass-probe-reset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/probes/gfx/pass-probe-reset/metrics.json rename to metrics/linux-clang8-release/probes/gfx/pass-probe-reset/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/probes/gfx/pass/metrics.json b/metrics/linux-clang8-release/probes/gfx/pass/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/probes/gfx/pass/metrics.json rename to metrics/linux-clang8-release/probes/gfx/pass/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/background-color/colorSpace-lab/metrics.json b/metrics/linux-clang8-release/render-tests/background-color/colorSpace-lab/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/background-color/colorSpace-lab/metrics.json rename to metrics/linux-clang8-release/render-tests/background-color/colorSpace-lab/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/background-color/default/metrics.json b/metrics/linux-clang8-release/render-tests/background-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/background-color/default/metrics.json rename to metrics/linux-clang8-release/render-tests/background-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/background-color/function/metrics.json b/metrics/linux-clang8-release/render-tests/background-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/background-color/function/metrics.json rename to metrics/linux-clang8-release/render-tests/background-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/background-color/literal/metrics.json b/metrics/linux-clang8-release/render-tests/background-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/background-color/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/background-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/background-opacity/color/metrics.json b/metrics/linux-clang8-release/render-tests/background-opacity/color/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/background-opacity/color/metrics.json rename to metrics/linux-clang8-release/render-tests/background-opacity/color/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/background-opacity/image/metrics.json b/metrics/linux-clang8-release/render-tests/background-opacity/image/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/background-opacity/image/metrics.json rename to metrics/linux-clang8-release/render-tests/background-opacity/image/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/background-opacity/overlay/metrics.json b/metrics/linux-clang8-release/render-tests/background-opacity/overlay/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/background-opacity/overlay/metrics.json rename to metrics/linux-clang8-release/render-tests/background-opacity/overlay/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/background-pattern/@2x/metrics.json b/metrics/linux-clang8-release/render-tests/background-pattern/@2x/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/background-pattern/@2x/metrics.json rename to metrics/linux-clang8-release/render-tests/background-pattern/@2x/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/background-pattern/literal/metrics.json b/metrics/linux-clang8-release/render-tests/background-pattern/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/background-pattern/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/background-pattern/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/background-pattern/missing/metrics.json b/metrics/linux-clang8-release/render-tests/background-pattern/missing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/background-pattern/missing/metrics.json rename to metrics/linux-clang8-release/render-tests/background-pattern/missing/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/background-pattern/pitch/metrics.json b/metrics/linux-clang8-release/render-tests/background-pattern/pitch/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/background-pattern/pitch/metrics.json rename to metrics/linux-clang8-release/render-tests/background-pattern/pitch/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/background-pattern/rotated/metrics.json b/metrics/linux-clang8-release/render-tests/background-pattern/rotated/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/background-pattern/rotated/metrics.json rename to metrics/linux-clang8-release/render-tests/background-pattern/rotated/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/background-pattern/zoomed/metrics.json b/metrics/linux-clang8-release/render-tests/background-pattern/zoomed/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/background-pattern/zoomed/metrics.json rename to metrics/linux-clang8-release/render-tests/background-pattern/zoomed/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/background-visibility/none/metrics.json b/metrics/linux-clang8-release/render-tests/background-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/background-visibility/none/metrics.json rename to metrics/linux-clang8-release/render-tests/background-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/background-visibility/visible/metrics.json b/metrics/linux-clang8-release/render-tests/background-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/background-visibility/visible/metrics.json rename to metrics/linux-clang8-release/render-tests/background-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/basic-v9/z0-narrow-y/metrics.json b/metrics/linux-clang8-release/render-tests/basic-v9/z0-narrow-y/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/basic-v9/z0-narrow-y/metrics.json rename to metrics/linux-clang8-release/render-tests/basic-v9/z0-narrow-y/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/basic-v9/z0-wide-x/metrics.json b/metrics/linux-clang8-release/render-tests/basic-v9/z0-wide-x/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/basic-v9/z0-wide-x/metrics.json rename to metrics/linux-clang8-release/render-tests/basic-v9/z0-wide-x/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/basic-v9/z0/metrics.json b/metrics/linux-clang8-release/render-tests/basic-v9/z0/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/basic-v9/z0/metrics.json rename to metrics/linux-clang8-release/render-tests/basic-v9/z0/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/bright-v9/z0/metrics.json b/metrics/linux-clang8-release/render-tests/bright-v9/z0/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/bright-v9/z0/metrics.json rename to metrics/linux-clang8-release/render-tests/bright-v9/z0/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-blur/blending/metrics.json b/metrics/linux-clang8-release/render-tests/circle-blur/blending/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-blur/blending/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-blur/blending/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-blur/default/metrics.json b/metrics/linux-clang8-release/render-tests/circle-blur/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-blur/default/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-blur/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-blur/function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-blur/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-blur/function/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-blur/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-blur/literal-stroke/metrics.json b/metrics/linux-clang8-release/render-tests/circle-blur/literal-stroke/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-blur/literal-stroke/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-blur/literal-stroke/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-blur/literal/metrics.json b/metrics/linux-clang8-release/render-tests/circle-blur/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-blur/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-blur/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-blur/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-blur/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-blur/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-blur/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-blur/zoom-and-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-blur/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-blur/zoom-and-property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-blur/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-color/default/metrics.json b/metrics/linux-clang8-release/render-tests/circle-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-color/default/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-color/function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-color/function/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-color/literal/metrics.json b/metrics/linux-clang8-release/render-tests/circle-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-color/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-color/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-color/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-color/zoom-and-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-color/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-color/zoom-and-property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-color/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-geometry/linestring/metrics.json b/metrics/linux-clang8-release/render-tests/circle-geometry/linestring/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-geometry/linestring/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-geometry/linestring/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-geometry/multilinestring/metrics.json b/metrics/linux-clang8-release/render-tests/circle-geometry/multilinestring/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-geometry/multilinestring/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-geometry/multilinestring/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-geometry/multipoint/metrics.json b/metrics/linux-clang8-release/render-tests/circle-geometry/multipoint/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-geometry/multipoint/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-geometry/multipoint/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-geometry/multipolygon/metrics.json b/metrics/linux-clang8-release/render-tests/circle-geometry/multipolygon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-geometry/multipolygon/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-geometry/multipolygon/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-geometry/point/metrics.json b/metrics/linux-clang8-release/render-tests/circle-geometry/point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-geometry/point/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-geometry/point/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-geometry/polygon/metrics.json b/metrics/linux-clang8-release/render-tests/circle-geometry/polygon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-geometry/polygon/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-geometry/polygon/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-opacity/blending/metrics.json b/metrics/linux-clang8-release/render-tests/circle-opacity/blending/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-opacity/blending/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-opacity/blending/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-opacity/default/metrics.json b/metrics/linux-clang8-release/render-tests/circle-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-opacity/default/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-opacity/function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-opacity/function/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-opacity/literal/metrics.json b/metrics/linux-clang8-release/render-tests/circle-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-opacity/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-opacity/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-opacity/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-opacity/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-opacity/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-opacity/zoom-and-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-opacity/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-opacity/zoom-and-property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-opacity/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-pitch-alignment/map-scale-map/metrics.json b/metrics/linux-clang8-release/render-tests/circle-pitch-alignment/map-scale-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-pitch-alignment/map-scale-map/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-pitch-alignment/map-scale-map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json b/metrics/linux-clang8-release/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json b/metrics/linux-clang8-release/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json b/metrics/linux-clang8-release/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-pitch-scale/default/metrics.json b/metrics/linux-clang8-release/render-tests/circle-pitch-scale/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-pitch-scale/default/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-pitch-scale/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-pitch-scale/map/metrics.json b/metrics/linux-clang8-release/render-tests/circle-pitch-scale/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-pitch-scale/map/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-pitch-scale/map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-pitch-scale/viewport/metrics.json b/metrics/linux-clang8-release/render-tests/circle-pitch-scale/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-pitch-scale/viewport/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-pitch-scale/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-radius/antimeridian/metrics.json b/metrics/linux-clang8-release/render-tests/circle-radius/antimeridian/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-radius/antimeridian/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-radius/antimeridian/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-radius/default/metrics.json b/metrics/linux-clang8-release/render-tests/circle-radius/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-radius/default/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-radius/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-radius/function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-radius/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-radius/function/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-radius/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-radius/literal/metrics.json b/metrics/linux-clang8-release/render-tests/circle-radius/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-radius/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-radius/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-radius/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-radius/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-radius/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-radius/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-radius/zoom-and-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-radius/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-radius/zoom-and-property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-radius/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-sort-key/literal/metrics.json b/metrics/linux-clang8-release/render-tests/circle-sort-key/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-sort-key/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-sort-key/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-stroke-color/default/metrics.json b/metrics/linux-clang8-release/render-tests/circle-stroke-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-stroke-color/default/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-stroke-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-stroke-color/function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-stroke-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-stroke-color/function/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-stroke-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-stroke-color/literal/metrics.json b/metrics/linux-clang8-release/render-tests/circle-stroke-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-stroke-color/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-stroke-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-stroke-color/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-stroke-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-stroke-color/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-stroke-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-stroke-opacity/default/metrics.json b/metrics/linux-clang8-release/render-tests/circle-stroke-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-stroke-opacity/default/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-stroke-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-stroke-opacity/function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-stroke-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-stroke-opacity/function/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-stroke-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-stroke-opacity/literal/metrics.json b/metrics/linux-clang8-release/render-tests/circle-stroke-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-stroke-opacity/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-stroke-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-stroke-opacity/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-stroke-opacity/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-stroke-opacity/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-stroke-opacity/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-stroke-opacity/stroke-only/metrics.json b/metrics/linux-clang8-release/render-tests/circle-stroke-opacity/stroke-only/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-stroke-opacity/stroke-only/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-stroke-opacity/stroke-only/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-stroke-width/default/metrics.json b/metrics/linux-clang8-release/render-tests/circle-stroke-width/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-stroke-width/default/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-stroke-width/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-stroke-width/function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-stroke-width/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-stroke-width/function/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-stroke-width/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-stroke-width/literal/metrics.json b/metrics/linux-clang8-release/render-tests/circle-stroke-width/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-stroke-width/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-stroke-width/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-stroke-width/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-stroke-width/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-stroke-width/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-stroke-width/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-translate-anchor/map/metrics.json b/metrics/linux-clang8-release/render-tests/circle-translate-anchor/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-translate-anchor/map/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-translate-anchor/map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-translate-anchor/viewport/metrics.json b/metrics/linux-clang8-release/render-tests/circle-translate-anchor/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-translate-anchor/viewport/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-translate-anchor/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-translate/default/metrics.json b/metrics/linux-clang8-release/render-tests/circle-translate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-translate/default/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-translate/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-translate/function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-translate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-translate/function/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-translate/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-translate/literal/metrics.json b/metrics/linux-clang8-release/render-tests/circle-translate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/circle-translate/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/circle-translate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-opaque--background-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-opaque--background-opaque/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/background-opaque--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-opaque--background-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-opaque--background-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/background-opaque--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-opaque--circle-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-opaque--circle-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/background-opaque--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-opaque--fill-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-opaque--fill-opaque/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/background-opaque--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-opaque--fill-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-opaque--fill-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/background-opaque--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-opaque--line-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-opaque--line-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/background-opaque--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-opaque--raster-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-opaque--raster-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/background-opaque--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-opaque--symbol-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-opaque--symbol-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/background-opaque--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-translucent--background-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-translucent--background-opaque/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/background-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-translucent--background-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-translucent--background-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/background-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-translucent--circle-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-translucent--circle-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/background-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-translucent--fill-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-translucent--fill-opaque/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/background-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-translucent--fill-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-translucent--fill-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/background-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-translucent--line-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-translucent--line-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/background-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-translucent--raster-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-translucent--raster-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/background-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-translucent--symbol-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/background-translucent--symbol-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/background-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--background-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--background-opaque/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/circle-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--background-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--background-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/circle-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--circle-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--circle-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/circle-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--fill-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--fill-opaque/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/circle-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--fill-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--fill-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/circle-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--line-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--line-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/circle-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--raster-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--raster-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/circle-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--background-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--background-opaque/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-opaque--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--background-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--background-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-opaque--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--circle-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--circle-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-opaque--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--fill-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--fill-opaque/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-opaque--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--fill-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--fill-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-opaque--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--line-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--line-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-opaque--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--raster-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--raster-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-opaque--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--background-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--background-opaque/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--background-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--background-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--circle-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--circle-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--fill-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--fill-opaque/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--fill-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--fill-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--line-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--line-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--raster-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--raster-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/line-translucent--background-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/line-translucent--background-opaque/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/line-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/line-translucent--background-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/line-translucent--background-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/line-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/line-translucent--circle-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/line-translucent--circle-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/line-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/line-translucent--fill-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/line-translucent--fill-opaque/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/line-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/line-translucent--fill-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/line-translucent--fill-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/line-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/line-translucent--line-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/line-translucent--line-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/line-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/line-translucent--raster-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/line-translucent--raster-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/line-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/line-translucent--symbol-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/line-translucent--symbol-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/line-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--background-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--background-opaque/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/raster-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--background-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--background-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/raster-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--circle-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--circle-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/raster-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--fill-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--fill-opaque/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/raster-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--fill-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--fill-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/raster-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--line-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--line-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/raster-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--raster-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--raster-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/raster-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--background-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--background-opaque/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--background-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--background-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--line-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--line-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/debug/collision-icon-text-line-translate/metrics.json b/metrics/linux-clang8-release/render-tests/debug/collision-icon-text-line-translate/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/debug/collision-icon-text-line-translate/metrics.json rename to metrics/linux-clang8-release/render-tests/debug/collision-icon-text-line-translate/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/debug/collision-icon-text-point-translate/metrics.json b/metrics/linux-clang8-release/render-tests/debug/collision-icon-text-point-translate/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/debug/collision-icon-text-point-translate/metrics.json rename to metrics/linux-clang8-release/render-tests/debug/collision-icon-text-point-translate/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/debug/collision-lines-overscaled/metrics.json b/metrics/linux-clang8-release/render-tests/debug/collision-lines-overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/debug/collision-lines-overscaled/metrics.json rename to metrics/linux-clang8-release/render-tests/debug/collision-lines-overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/debug/collision-lines-pitched/metrics.json b/metrics/linux-clang8-release/render-tests/debug/collision-lines-pitched/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/debug/collision-lines-pitched/metrics.json rename to metrics/linux-clang8-release/render-tests/debug/collision-lines-pitched/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/debug/collision-lines/metrics.json b/metrics/linux-clang8-release/render-tests/debug/collision-lines/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/debug/collision-lines/metrics.json rename to metrics/linux-clang8-release/render-tests/debug/collision-lines/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/debug/collision-overscaled/metrics.json b/metrics/linux-clang8-release/render-tests/debug/collision-overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/debug/collision-overscaled/metrics.json rename to metrics/linux-clang8-release/render-tests/debug/collision-overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/debug/collision-pitched-wrapped/metrics.json b/metrics/linux-clang8-release/render-tests/debug/collision-pitched-wrapped/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/debug/collision-pitched-wrapped/metrics.json rename to metrics/linux-clang8-release/render-tests/debug/collision-pitched-wrapped/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/debug/collision-pitched/metrics.json b/metrics/linux-clang8-release/render-tests/debug/collision-pitched/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/debug/collision-pitched/metrics.json rename to metrics/linux-clang8-release/render-tests/debug/collision-pitched/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/empty/empty/metrics.json b/metrics/linux-clang8-release/render-tests/empty/empty/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/empty/empty/metrics.json rename to metrics/linux-clang8-release/render-tests/empty/empty/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/extent/1024-fill/metrics.json b/metrics/linux-clang8-release/render-tests/extent/1024-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/extent/1024-fill/metrics.json rename to metrics/linux-clang8-release/render-tests/extent/1024-fill/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/extent/1024-line/metrics.json b/metrics/linux-clang8-release/render-tests/extent/1024-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/extent/1024-line/metrics.json rename to metrics/linux-clang8-release/render-tests/extent/1024-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/extent/1024-symbol/metrics.json b/metrics/linux-clang8-release/render-tests/extent/1024-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/extent/1024-symbol/metrics.json rename to metrics/linux-clang8-release/render-tests/extent/1024-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/feature-state/composite-expression/metrics.json b/metrics/linux-clang8-release/render-tests/feature-state/composite-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/feature-state/composite-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/feature-state/composite-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/feature-state/data-expression/metrics.json b/metrics/linux-clang8-release/render-tests/feature-state/data-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/feature-state/data-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/feature-state/data-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/feature-state/vector-source/metrics.json b/metrics/linux-clang8-release/render-tests/feature-state/vector-source/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/feature-state/vector-source/metrics.json rename to metrics/linux-clang8-release/render-tests/feature-state/vector-source/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-antialias/false/metrics.json b/metrics/linux-clang8-release/render-tests/fill-antialias/false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-antialias/false/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-antialias/false/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-color/default/metrics.json b/metrics/linux-clang8-release/render-tests/fill-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-color/default/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-color/function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-color/function/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-color/literal/metrics.json b/metrics/linux-clang8-release/render-tests/fill-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-color/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-color/multiply/metrics.json b/metrics/linux-clang8-release/render-tests/fill-color/multiply/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-color/multiply/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-color/multiply/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-color/opacity/metrics.json b/metrics/linux-clang8-release/render-tests/fill-color/opacity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-color/opacity/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-color/opacity/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-color/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-color/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-color/zoom-and-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-color/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-color/zoom-and-property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-color/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-base/default/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-base/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-base/default/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-extrusion-base/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-base/function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-base/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-base/function/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-extrusion-base/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-base/literal/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-base/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-base/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-extrusion-base/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-base/negative/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-base/negative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-base/negative/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-extrusion-base/negative/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-base/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-base/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-base/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-extrusion-base/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-color/default/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-color/default/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-extrusion-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-color/function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-color/function/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-extrusion-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-color/literal/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-color/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-extrusion-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-color/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-color/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-extrusion-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-height/default/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-height/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-height/default/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-extrusion-height/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-height/function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-height/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-height/function/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-extrusion-height/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-height/negative/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-height/negative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-height/negative/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-extrusion-height/negative/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-height/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-height/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-height/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-extrusion-height/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-multiple/multiple/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-multiple/multiple/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-multiple/multiple/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-extrusion-multiple/multiple/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-opacity/default/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-opacity/default/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-extrusion-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-opacity/function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-opacity/function/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-extrusion-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-opacity/literal/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-opacity/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-extrusion-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-pattern/missing/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-pattern/missing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-pattern/missing/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-extrusion-pattern/missing/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-translate-anchor/map/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-translate-anchor/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-translate-anchor/map/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-extrusion-translate-anchor/map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-translate/default/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-translate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-translate/default/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-extrusion-translate/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-translate/function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-translate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-translate/function/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-extrusion-translate/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-translate/literal-opacity/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-translate/literal-opacity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-translate/literal-opacity/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-extrusion-translate/literal-opacity/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-translate/literal/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-translate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-translate/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-extrusion-translate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-vertical-gradient/default/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-vertical-gradient/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-vertical-gradient/default/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-extrusion-vertical-gradient/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-vertical-gradient/false/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-vertical-gradient/false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-extrusion-vertical-gradient/false/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-extrusion-vertical-gradient/false/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-opacity/default/metrics.json b/metrics/linux-clang8-release/render-tests/fill-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-opacity/default/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-opacity/function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-opacity/function/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-opacity/literal/metrics.json b/metrics/linux-clang8-release/render-tests/fill-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-opacity/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json b/metrics/linux-clang8-release/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-opacity/overlapping/metrics.json b/metrics/linux-clang8-release/render-tests/fill-opacity/overlapping/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-opacity/overlapping/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-opacity/overlapping/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-opacity/property-function-pattern/metrics.json b/metrics/linux-clang8-release/render-tests/fill-opacity/property-function-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-opacity/property-function-pattern/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-opacity/property-function-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-opacity/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-opacity/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-opacity/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-opacity/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-opacity/zoom-and-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-opacity/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-opacity/zoom-and-property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-opacity/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-outline-color/default/metrics.json b/metrics/linux-clang8-release/render-tests/fill-outline-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-outline-color/default/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-outline-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-outline-color/fill/metrics.json b/metrics/linux-clang8-release/render-tests/fill-outline-color/fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-outline-color/fill/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-outline-color/fill/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-outline-color/function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-outline-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-outline-color/function/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-outline-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-outline-color/literal/metrics.json b/metrics/linux-clang8-release/render-tests/fill-outline-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-outline-color/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-outline-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-outline-color/multiply/metrics.json b/metrics/linux-clang8-release/render-tests/fill-outline-color/multiply/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-outline-color/multiply/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-outline-color/multiply/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-outline-color/opacity/metrics.json b/metrics/linux-clang8-release/render-tests/fill-outline-color/opacity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-outline-color/opacity/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-outline-color/opacity/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-outline-color/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-outline-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-outline-color/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-outline-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-outline-color/zoom-and-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-outline-color/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-outline-color/zoom-and-property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-outline-color/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-pattern/@2x/metrics.json b/metrics/linux-clang8-release/render-tests/fill-pattern/@2x/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-pattern/@2x/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-pattern/@2x/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-pattern/case-data-expression/metrics.json b/metrics/linux-clang8-release/render-tests/fill-pattern/case-data-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-pattern/case-data-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-pattern/case-data-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-pattern/invalid-feature-expression/metrics.json b/metrics/linux-clang8-release/render-tests/fill-pattern/invalid-feature-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-pattern/invalid-feature-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-pattern/invalid-feature-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-pattern/missing/metrics.json b/metrics/linux-clang8-release/render-tests/fill-pattern/missing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-pattern/missing/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-pattern/missing/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-pattern/uneven-pattern/metrics.json b/metrics/linux-clang8-release/render-tests/fill-pattern/uneven-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-pattern/uneven-pattern/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-pattern/uneven-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json b/metrics/linux-clang8-release/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-sort-key/literal/metrics.json b/metrics/linux-clang8-release/render-tests/fill-sort-key/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-sort-key/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-sort-key/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-translate-anchor/map/metrics.json b/metrics/linux-clang8-release/render-tests/fill-translate-anchor/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-translate-anchor/map/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-translate-anchor/map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-translate-anchor/viewport/metrics.json b/metrics/linux-clang8-release/render-tests/fill-translate-anchor/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-translate-anchor/viewport/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-translate-anchor/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-translate/default/metrics.json b/metrics/linux-clang8-release/render-tests/fill-translate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-translate/default/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-translate/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-translate/function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-translate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-translate/function/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-translate/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-translate/literal/metrics.json b/metrics/linux-clang8-release/render-tests/fill-translate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-translate/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-translate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-visibility/none/metrics.json b/metrics/linux-clang8-release/render-tests/fill-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-visibility/none/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-visibility/visible/metrics.json b/metrics/linux-clang8-release/render-tests/fill-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/fill-visibility/visible/metrics.json rename to metrics/linux-clang8-release/render-tests/fill-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/filter/equality/metrics.json b/metrics/linux-clang8-release/render-tests/filter/equality/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/filter/equality/metrics.json rename to metrics/linux-clang8-release/render-tests/filter/equality/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/filter/in/metrics.json b/metrics/linux-clang8-release/render-tests/filter/in/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/filter/in/metrics.json rename to metrics/linux-clang8-release/render-tests/filter/in/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/filter/legacy-equality/metrics.json b/metrics/linux-clang8-release/render-tests/filter/legacy-equality/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/filter/legacy-equality/metrics.json rename to metrics/linux-clang8-release/render-tests/filter/legacy-equality/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/filter/none/metrics.json b/metrics/linux-clang8-release/render-tests/filter/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/filter/none/metrics.json rename to metrics/linux-clang8-release/render-tests/filter/none/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/clustered-properties/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/clustered-properties/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/clustered-properties/metrics.json rename to metrics/linux-clang8-release/render-tests/geojson/clustered-properties/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/clustered/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/clustered/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/clustered/metrics.json rename to metrics/linux-clang8-release/render-tests/geojson/clustered/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/external-feature/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/external-feature/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/external-feature/metrics.json rename to metrics/linux-clang8-release/render-tests/geojson/external-feature/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/external-invalid/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/external-invalid/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/external-invalid/metrics.json rename to metrics/linux-clang8-release/render-tests/geojson/external-invalid/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/external-linestring/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/external-linestring/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/external-linestring/metrics.json rename to metrics/linux-clang8-release/render-tests/geojson/external-linestring/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/external-malformed/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/external-malformed/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/external-malformed/metrics.json rename to metrics/linux-clang8-release/render-tests/geojson/external-malformed/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/inconsistent-winding-order/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/inconsistent-winding-order/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/inconsistent-winding-order/metrics.json rename to metrics/linux-clang8-release/render-tests/geojson/inconsistent-winding-order/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/inline-feature/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/inline-feature/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/inline-feature/metrics.json rename to metrics/linux-clang8-release/render-tests/geojson/inline-feature/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/inline-invalid/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/inline-invalid/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/inline-invalid/metrics.json rename to metrics/linux-clang8-release/render-tests/geojson/inline-invalid/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/inline-linestring-circle/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/inline-linestring-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/inline-linestring-circle/metrics.json rename to metrics/linux-clang8-release/render-tests/geojson/inline-linestring-circle/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/inline-linestring-line/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/inline-linestring-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/inline-linestring-line/metrics.json rename to metrics/linux-clang8-release/render-tests/geojson/inline-linestring-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/inline-linestring-symbol/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/inline-linestring-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/inline-linestring-symbol/metrics.json rename to metrics/linux-clang8-release/render-tests/geojson/inline-linestring-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/inline-malformed/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/inline-malformed/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/inline-malformed/metrics.json rename to metrics/linux-clang8-release/render-tests/geojson/inline-malformed/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/inline-point-circle/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/inline-point-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/inline-point-circle/metrics.json rename to metrics/linux-clang8-release/render-tests/geojson/inline-point-circle/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/inline-point-fill/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/inline-point-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/inline-point-fill/metrics.json rename to metrics/linux-clang8-release/render-tests/geojson/inline-point-fill/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/inline-point-line/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/inline-point-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/inline-point-line/metrics.json rename to metrics/linux-clang8-release/render-tests/geojson/inline-point-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/inline-point-symbol/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/inline-point-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/inline-point-symbol/metrics.json rename to metrics/linux-clang8-release/render-tests/geojson/inline-point-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/inline-polygon-circle/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/inline-polygon-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/inline-polygon-circle/metrics.json rename to metrics/linux-clang8-release/render-tests/geojson/inline-polygon-circle/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/inline-polygon-fill/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/inline-polygon-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/inline-polygon-fill/metrics.json rename to metrics/linux-clang8-release/render-tests/geojson/inline-polygon-fill/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/inline-polygon-line/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/inline-polygon-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/inline-polygon-line/metrics.json rename to metrics/linux-clang8-release/render-tests/geojson/inline-polygon-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/inline-polygon-symbol/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/inline-polygon-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/inline-polygon-symbol/metrics.json rename to metrics/linux-clang8-release/render-tests/geojson/inline-polygon-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/missing/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/missing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/missing/metrics.json rename to metrics/linux-clang8-release/render-tests/geojson/missing/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/reparse-overscaled/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/reparse-overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/geojson/reparse-overscaled/metrics.json rename to metrics/linux-clang8-release/render-tests/geojson/reparse-overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-color/default/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-color/default/metrics.json rename to metrics/linux-clang8-release/render-tests/heatmap-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-color/expression/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-color/expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-color/expression/metrics.json rename to metrics/linux-clang8-release/render-tests/heatmap-color/expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-intensity/default/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-intensity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-intensity/default/metrics.json rename to metrics/linux-clang8-release/render-tests/heatmap-intensity/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-intensity/function/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-intensity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-intensity/function/metrics.json rename to metrics/linux-clang8-release/render-tests/heatmap-intensity/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-intensity/literal/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-intensity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-intensity/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/heatmap-intensity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-opacity/default/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-opacity/default/metrics.json rename to metrics/linux-clang8-release/render-tests/heatmap-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-opacity/function/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-opacity/function/metrics.json rename to metrics/linux-clang8-release/render-tests/heatmap-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-opacity/literal/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-opacity/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/heatmap-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-radius/antimeridian/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-radius/antimeridian/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-radius/antimeridian/metrics.json rename to metrics/linux-clang8-release/render-tests/heatmap-radius/antimeridian/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-radius/data-expression/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-radius/data-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-radius/data-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/heatmap-radius/data-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-radius/default/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-radius/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-radius/default/metrics.json rename to metrics/linux-clang8-release/render-tests/heatmap-radius/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-radius/function/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-radius/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-radius/function/metrics.json rename to metrics/linux-clang8-release/render-tests/heatmap-radius/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-radius/literal/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-radius/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-radius/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/heatmap-radius/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-radius/pitch30/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-radius/pitch30/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-radius/pitch30/metrics.json rename to metrics/linux-clang8-release/render-tests/heatmap-radius/pitch30/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-weight/default/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-weight/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-weight/default/metrics.json rename to metrics/linux-clang8-release/render-tests/heatmap-weight/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-weight/identity-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-weight/identity-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-weight/identity-property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/heatmap-weight/identity-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-weight/literal/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-weight/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/heatmap-weight/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/heatmap-weight/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/hillshade-accent-color/default/metrics.json b/metrics/linux-clang8-release/render-tests/hillshade-accent-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/hillshade-accent-color/default/metrics.json rename to metrics/linux-clang8-release/render-tests/hillshade-accent-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/hillshade-accent-color/literal/metrics.json b/metrics/linux-clang8-release/render-tests/hillshade-accent-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/hillshade-accent-color/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/hillshade-accent-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/hillshade-accent-color/terrarium/metrics.json b/metrics/linux-clang8-release/render-tests/hillshade-accent-color/terrarium/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/hillshade-accent-color/terrarium/metrics.json rename to metrics/linux-clang8-release/render-tests/hillshade-accent-color/terrarium/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/hillshade-accent-color/zoom-function/metrics.json b/metrics/linux-clang8-release/render-tests/hillshade-accent-color/zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/hillshade-accent-color/zoom-function/metrics.json rename to metrics/linux-clang8-release/render-tests/hillshade-accent-color/zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/hillshade-highlight-color/default/metrics.json b/metrics/linux-clang8-release/render-tests/hillshade-highlight-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/hillshade-highlight-color/default/metrics.json rename to metrics/linux-clang8-release/render-tests/hillshade-highlight-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/hillshade-highlight-color/literal/metrics.json b/metrics/linux-clang8-release/render-tests/hillshade-highlight-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/hillshade-highlight-color/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/hillshade-highlight-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/hillshade-highlight-color/zoom-function/metrics.json b/metrics/linux-clang8-release/render-tests/hillshade-highlight-color/zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/hillshade-highlight-color/zoom-function/metrics.json rename to metrics/linux-clang8-release/render-tests/hillshade-highlight-color/zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/hillshade-shadow-color/default/metrics.json b/metrics/linux-clang8-release/render-tests/hillshade-shadow-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/hillshade-shadow-color/default/metrics.json rename to metrics/linux-clang8-release/render-tests/hillshade-shadow-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/hillshade-shadow-color/literal/metrics.json b/metrics/linux-clang8-release/render-tests/hillshade-shadow-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/hillshade-shadow-color/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/hillshade-shadow-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/hillshade-shadow-color/zoom-function/metrics.json b/metrics/linux-clang8-release/render-tests/hillshade-shadow-color/zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/hillshade-shadow-color/zoom-function/metrics.json rename to metrics/linux-clang8-release/render-tests/hillshade-shadow-color/zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-anchor/bottom-left/metrics.json b/metrics/linux-clang8-release/render-tests/icon-anchor/bottom-left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-anchor/bottom-left/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-anchor/bottom-left/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-anchor/bottom-right/metrics.json b/metrics/linux-clang8-release/render-tests/icon-anchor/bottom-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-anchor/bottom-right/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-anchor/bottom-right/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-anchor/bottom/metrics.json b/metrics/linux-clang8-release/render-tests/icon-anchor/bottom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-anchor/bottom/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-anchor/bottom/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-anchor/center/metrics.json b/metrics/linux-clang8-release/render-tests/icon-anchor/center/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-anchor/center/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-anchor/center/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-anchor/default/metrics.json b/metrics/linux-clang8-release/render-tests/icon-anchor/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-anchor/default/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-anchor/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-anchor/left/metrics.json b/metrics/linux-clang8-release/render-tests/icon-anchor/left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-anchor/left/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-anchor/left/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-anchor/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-anchor/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-anchor/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-anchor/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-anchor/right/metrics.json b/metrics/linux-clang8-release/render-tests/icon-anchor/right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-anchor/right/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-anchor/right/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-anchor/top-left/metrics.json b/metrics/linux-clang8-release/render-tests/icon-anchor/top-left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-anchor/top-left/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-anchor/top-left/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-anchor/top-right/metrics.json b/metrics/linux-clang8-release/render-tests/icon-anchor/top-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-anchor/top-right/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-anchor/top-right/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-anchor/top/metrics.json b/metrics/linux-clang8-release/render-tests/icon-anchor/top/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-anchor/top/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-anchor/top/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-color/default/metrics.json b/metrics/linux-clang8-release/render-tests/icon-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-color/default/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-color/function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-color/function/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-color/literal/metrics.json b/metrics/linux-clang8-release/render-tests/icon-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-color/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-color/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-color/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-halo-blur/default/metrics.json b/metrics/linux-clang8-release/render-tests/icon-halo-blur/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-halo-blur/default/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-halo-blur/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-halo-blur/function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-halo-blur/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-halo-blur/function/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-halo-blur/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-halo-blur/literal/metrics.json b/metrics/linux-clang8-release/render-tests/icon-halo-blur/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-halo-blur/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-halo-blur/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-halo-blur/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-halo-blur/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-halo-blur/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-halo-blur/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-halo-color/default/metrics.json b/metrics/linux-clang8-release/render-tests/icon-halo-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-halo-color/default/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-halo-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-halo-color/function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-halo-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-halo-color/function/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-halo-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-halo-color/literal/metrics.json b/metrics/linux-clang8-release/render-tests/icon-halo-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-halo-color/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-halo-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-halo-color/multiply/metrics.json b/metrics/linux-clang8-release/render-tests/icon-halo-color/multiply/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-halo-color/multiply/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-halo-color/multiply/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-halo-color/opacity/metrics.json b/metrics/linux-clang8-release/render-tests/icon-halo-color/opacity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-halo-color/opacity/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-halo-color/opacity/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-halo-color/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-halo-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-halo-color/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-halo-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-halo-color/transparent/metrics.json b/metrics/linux-clang8-release/render-tests/icon-halo-color/transparent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-halo-color/transparent/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-halo-color/transparent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-halo-width/default/metrics.json b/metrics/linux-clang8-release/render-tests/icon-halo-width/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-halo-width/default/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-halo-width/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-halo-width/function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-halo-width/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-halo-width/function/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-halo-width/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-halo-width/literal/metrics.json b/metrics/linux-clang8-release/render-tests/icon-halo-width/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-halo-width/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-halo-width/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-halo-width/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-halo-width/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-halo-width/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-halo-width/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json b/metrics/linux-clang8-release/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-image/image-expression/metrics.json b/metrics/linux-clang8-release/render-tests/icon-image/image-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-image/image-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-image/image-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-image/literal/metrics.json b/metrics/linux-clang8-release/render-tests/icon-image/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-image/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-image/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-image/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-image/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-image/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-image/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-image/stretchable-content/metrics.json b/metrics/linux-clang8-release/render-tests/icon-image/stretchable-content/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-image/stretchable-content/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-image/stretchable-content/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-image/stretchable/metrics.json b/metrics/linux-clang8-release/render-tests/icon-image/stretchable/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-image/stretchable/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-image/stretchable/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-image/token/metrics.json b/metrics/linux-clang8-release/render-tests/icon-image/token/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-image/token/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-image/token/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-no-cross-source-collision/default/metrics.json b/metrics/linux-clang8-release/render-tests/icon-no-cross-source-collision/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-no-cross-source-collision/default/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-no-cross-source-collision/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-offset/literal/metrics.json b/metrics/linux-clang8-release/render-tests/icon-offset/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-offset/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-offset/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-offset/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-offset/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-offset/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-offset/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-offset/zoom-and-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-offset/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-offset/zoom-and-property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-offset/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-opacity/default/metrics.json b/metrics/linux-clang8-release/render-tests/icon-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-opacity/default/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-opacity/function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-opacity/function/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-opacity/icon-only/metrics.json b/metrics/linux-clang8-release/render-tests/icon-opacity/icon-only/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-opacity/icon-only/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-opacity/icon-only/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-opacity/literal/metrics.json b/metrics/linux-clang8-release/render-tests/icon-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-opacity/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-opacity/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-opacity/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-opacity/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-opacity/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-opacity/text-and-icon/metrics.json b/metrics/linux-clang8-release/render-tests/icon-opacity/text-and-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-opacity/text-and-icon/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-opacity/text-and-icon/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-opacity/text-only/metrics.json b/metrics/linux-clang8-release/render-tests/icon-opacity/text-only/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-opacity/text-only/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-opacity/text-only/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json b/metrics/linux-clang8-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json b/metrics/linux-clang8-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json b/metrics/linux-clang8-release/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json b/metrics/linux-clang8-release/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json b/metrics/linux-clang8-release/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json b/metrics/linux-clang8-release/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-pixelratio-mismatch/default/metrics.json b/metrics/linux-clang8-release/render-tests/icon-pixelratio-mismatch/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-pixelratio-mismatch/default/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-pixelratio-mismatch/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-rotate/literal/metrics.json b/metrics/linux-clang8-release/render-tests/icon-rotate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-rotate/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-rotate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-rotate/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-rotate/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-rotate/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-rotate/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-rotate/with-offset/metrics.json b/metrics/linux-clang8-release/render-tests/icon-rotate/with-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-rotate/with-offset/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-rotate/with-offset/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json b/metrics/linux-clang8-release/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json b/metrics/linux-clang8-release/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json b/metrics/linux-clang8-release/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json b/metrics/linux-clang8-release/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json b/metrics/linux-clang8-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json b/metrics/linux-clang8-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-size/camera-function-high-base-plain/metrics.json b/metrics/linux-clang8-release/render-tests/icon-size/camera-function-high-base-plain/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-size/camera-function-high-base-plain/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-size/camera-function-high-base-plain/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-size/camera-function-high-base-sdf/metrics.json b/metrics/linux-clang8-release/render-tests/icon-size/camera-function-high-base-sdf/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-size/camera-function-high-base-sdf/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-size/camera-function-high-base-sdf/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-size/camera-function-plain/metrics.json b/metrics/linux-clang8-release/render-tests/icon-size/camera-function-plain/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-size/camera-function-plain/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-size/camera-function-plain/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-size/camera-function-sdf/metrics.json b/metrics/linux-clang8-release/render-tests/icon-size/camera-function-sdf/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-size/camera-function-sdf/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-size/camera-function-sdf/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-size/composite-function-plain/metrics.json b/metrics/linux-clang8-release/render-tests/icon-size/composite-function-plain/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-size/composite-function-plain/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-size/composite-function-plain/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-size/composite-function-sdf/metrics.json b/metrics/linux-clang8-release/render-tests/icon-size/composite-function-sdf/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-size/composite-function-sdf/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-size/composite-function-sdf/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-size/default/metrics.json b/metrics/linux-clang8-release/render-tests/icon-size/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-size/default/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-size/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-size/function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-size/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-size/function/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-size/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-size/literal/metrics.json b/metrics/linux-clang8-release/render-tests/icon-size/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-size/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-size/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-size/property-function-plain/metrics.json b/metrics/linux-clang8-release/render-tests/icon-size/property-function-plain/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-size/property-function-plain/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-size/property-function-plain/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-size/property-function-sdf/metrics.json b/metrics/linux-clang8-release/render-tests/icon-size/property-function-sdf/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-size/property-function-sdf/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-size/property-function-sdf/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/both-collision/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-collision/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/both-collision/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/both-collision/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/both-padding/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/both-padding/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/both-padding/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/both/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/both/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/both/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/both/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/enlargen-both-padding/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/enlargen-both-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/enlargen-both-padding/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/enlargen-both-padding/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/enlargen-both/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/enlargen-both/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/enlargen-both/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/enlargen-both/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/enlargen-height/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/enlargen-height/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/enlargen-height/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/enlargen-height/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/enlargen-width/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/enlargen-width/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/enlargen-width/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/enlargen-width/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/height-padding/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/height-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/height-padding/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/height-padding/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/height-text-anchor/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/height-text-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/height-text-anchor/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/height-text-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/height/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/height/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/height/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/height/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/none/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/none/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/none/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/placement-line/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/placement-line/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-three-part/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-three-part/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-three-part/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-three-part/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-two-part/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-two-part/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-two-part/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-two-part/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-underscale/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-underscale/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-underscale/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-underscale/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/text-variable-anchor/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/text-variable-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/text-variable-anchor/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/text-variable-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/width-padding/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/width-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/width-padding/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/width-padding/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/width-text-anchor/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/width-text-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/width-text-anchor/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/width-text-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/width/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/width/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-text-fit/width/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-text-fit/width/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-translate-anchor/map/metrics.json b/metrics/linux-clang8-release/render-tests/icon-translate-anchor/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-translate-anchor/map/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-translate-anchor/map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-translate-anchor/viewport/metrics.json b/metrics/linux-clang8-release/render-tests/icon-translate-anchor/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-translate-anchor/viewport/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-translate-anchor/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-translate/default/metrics.json b/metrics/linux-clang8-release/render-tests/icon-translate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-translate/default/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-translate/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-translate/function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-translate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-translate/function/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-translate/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-translate/literal/metrics.json b/metrics/linux-clang8-release/render-tests/icon-translate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-translate/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-translate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-visibility/none/metrics.json b/metrics/linux-clang8-release/render-tests/icon-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-visibility/none/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-visibility/visible/metrics.json b/metrics/linux-clang8-release/render-tests/icon-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/icon-visibility/visible/metrics.json rename to metrics/linux-clang8-release/render-tests/icon-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/image/default/metrics.json b/metrics/linux-clang8-release/render-tests/image/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/image/default/metrics.json rename to metrics/linux-clang8-release/render-tests/image/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/image/pitched/metrics.json b/metrics/linux-clang8-release/render-tests/image/pitched/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/image/pitched/metrics.json rename to metrics/linux-clang8-release/render-tests/image/pitched/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/image/raster-brightness/metrics.json b/metrics/linux-clang8-release/render-tests/image/raster-brightness/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/image/raster-brightness/metrics.json rename to metrics/linux-clang8-release/render-tests/image/raster-brightness/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/image/raster-contrast/metrics.json b/metrics/linux-clang8-release/render-tests/image/raster-contrast/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/image/raster-contrast/metrics.json rename to metrics/linux-clang8-release/render-tests/image/raster-contrast/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/image/raster-hue-rotate/metrics.json b/metrics/linux-clang8-release/render-tests/image/raster-hue-rotate/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/image/raster-hue-rotate/metrics.json rename to metrics/linux-clang8-release/render-tests/image/raster-hue-rotate/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/image/raster-opacity/metrics.json b/metrics/linux-clang8-release/render-tests/image/raster-opacity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/image/raster-opacity/metrics.json rename to metrics/linux-clang8-release/render-tests/image/raster-opacity/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/image/raster-resampling/metrics.json b/metrics/linux-clang8-release/render-tests/image/raster-resampling/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/image/raster-resampling/metrics.json rename to metrics/linux-clang8-release/render-tests/image/raster-resampling/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/image/raster-saturation/metrics.json b/metrics/linux-clang8-release/render-tests/image/raster-saturation/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/image/raster-saturation/metrics.json rename to metrics/linux-clang8-release/render-tests/image/raster-saturation/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/image/raster-visibility/metrics.json b/metrics/linux-clang8-release/render-tests/image/raster-visibility/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/image/raster-visibility/metrics.json rename to metrics/linux-clang8-release/render-tests/image/raster-visibility/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/is-supported-script/filter/metrics.json b/metrics/linux-clang8-release/render-tests/is-supported-script/filter/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/is-supported-script/filter/metrics.json rename to metrics/linux-clang8-release/render-tests/is-supported-script/filter/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/is-supported-script/layout/metrics.json b/metrics/linux-clang8-release/render-tests/is-supported-script/layout/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/is-supported-script/layout/metrics.json rename to metrics/linux-clang8-release/render-tests/is-supported-script/layout/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-blur/default/metrics.json b/metrics/linux-clang8-release/render-tests/line-blur/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-blur/default/metrics.json rename to metrics/linux-clang8-release/render-tests/line-blur/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-blur/function/metrics.json b/metrics/linux-clang8-release/render-tests/line-blur/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-blur/function/metrics.json rename to metrics/linux-clang8-release/render-tests/line-blur/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-blur/literal/metrics.json b/metrics/linux-clang8-release/render-tests/line-blur/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-blur/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/line-blur/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-blur/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/line-blur/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-blur/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/line-blur/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-cap/butt/metrics.json b/metrics/linux-clang8-release/render-tests/line-cap/butt/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-cap/butt/metrics.json rename to metrics/linux-clang8-release/render-tests/line-cap/butt/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-cap/round/metrics.json b/metrics/linux-clang8-release/render-tests/line-cap/round/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-cap/round/metrics.json rename to metrics/linux-clang8-release/render-tests/line-cap/round/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-cap/square/metrics.json b/metrics/linux-clang8-release/render-tests/line-cap/square/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-cap/square/metrics.json rename to metrics/linux-clang8-release/render-tests/line-cap/square/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-color/default/metrics.json b/metrics/linux-clang8-release/render-tests/line-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-color/default/metrics.json rename to metrics/linux-clang8-release/render-tests/line-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-color/function/metrics.json b/metrics/linux-clang8-release/render-tests/line-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-color/function/metrics.json rename to metrics/linux-clang8-release/render-tests/line-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-color/literal/metrics.json b/metrics/linux-clang8-release/render-tests/line-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-color/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/line-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-color/property-function-identity/metrics.json b/metrics/linux-clang8-release/render-tests/line-color/property-function-identity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-color/property-function-identity/metrics.json rename to metrics/linux-clang8-release/render-tests/line-color/property-function-identity/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-color/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/line-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-color/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/line-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-dasharray/default/metrics.json b/metrics/linux-clang8-release/render-tests/line-dasharray/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-dasharray/default/metrics.json rename to metrics/linux-clang8-release/render-tests/line-dasharray/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-dasharray/fractional-zoom/metrics.json b/metrics/linux-clang8-release/render-tests/line-dasharray/fractional-zoom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-dasharray/fractional-zoom/metrics.json rename to metrics/linux-clang8-release/render-tests/line-dasharray/fractional-zoom/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-dasharray/function/line-width-composite-function/metrics.json b/metrics/linux-clang8-release/render-tests/line-dasharray/function/line-width-composite-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-dasharray/function/line-width-composite-function/metrics.json rename to metrics/linux-clang8-release/render-tests/line-dasharray/function/line-width-composite-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-dasharray/function/line-width-constant/metrics.json b/metrics/linux-clang8-release/render-tests/line-dasharray/function/line-width-constant/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-dasharray/function/line-width-constant/metrics.json rename to metrics/linux-clang8-release/render-tests/line-dasharray/function/line-width-constant/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-dasharray/function/line-width-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/line-dasharray/function/line-width-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-dasharray/function/line-width-property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/line-dasharray/function/line-width-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json b/metrics/linux-clang8-release/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json rename to metrics/linux-clang8-release/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-dasharray/literal/line-width-constant/metrics.json b/metrics/linux-clang8-release/render-tests/line-dasharray/literal/line-width-constant/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-dasharray/literal/line-width-constant/metrics.json rename to metrics/linux-clang8-release/render-tests/line-dasharray/literal/line-width-constant/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-dasharray/literal/line-width-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/line-dasharray/literal/line-width-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-dasharray/literal/line-width-property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/line-dasharray/literal/line-width-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json b/metrics/linux-clang8-release/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json rename to metrics/linux-clang8-release/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-dasharray/long-segment/metrics.json b/metrics/linux-clang8-release/render-tests/line-dasharray/long-segment/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-dasharray/long-segment/metrics.json rename to metrics/linux-clang8-release/render-tests/line-dasharray/long-segment/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-dasharray/overscaled/metrics.json b/metrics/linux-clang8-release/render-tests/line-dasharray/overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-dasharray/overscaled/metrics.json rename to metrics/linux-clang8-release/render-tests/line-dasharray/overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-dasharray/round/segments/metrics.json b/metrics/linux-clang8-release/render-tests/line-dasharray/round/segments/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-dasharray/round/segments/metrics.json rename to metrics/linux-clang8-release/render-tests/line-dasharray/round/segments/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-dasharray/round/zero-gap-width/metrics.json b/metrics/linux-clang8-release/render-tests/line-dasharray/round/zero-gap-width/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-dasharray/round/zero-gap-width/metrics.json rename to metrics/linux-clang8-release/render-tests/line-dasharray/round/zero-gap-width/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-dasharray/slant/metrics.json b/metrics/linux-clang8-release/render-tests/line-dasharray/slant/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-dasharray/slant/metrics.json rename to metrics/linux-clang8-release/render-tests/line-dasharray/slant/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-dasharray/zero-length-gap/metrics.json b/metrics/linux-clang8-release/render-tests/line-dasharray/zero-length-gap/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-dasharray/zero-length-gap/metrics.json rename to metrics/linux-clang8-release/render-tests/line-dasharray/zero-length-gap/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-dasharray/zoom-history/metrics.json b/metrics/linux-clang8-release/render-tests/line-dasharray/zoom-history/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-dasharray/zoom-history/metrics.json rename to metrics/linux-clang8-release/render-tests/line-dasharray/zoom-history/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-gap-width/default/metrics.json b/metrics/linux-clang8-release/render-tests/line-gap-width/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-gap-width/default/metrics.json rename to metrics/linux-clang8-release/render-tests/line-gap-width/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-gap-width/function/metrics.json b/metrics/linux-clang8-release/render-tests/line-gap-width/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-gap-width/function/metrics.json rename to metrics/linux-clang8-release/render-tests/line-gap-width/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-gap-width/literal/metrics.json b/metrics/linux-clang8-release/render-tests/line-gap-width/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-gap-width/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/line-gap-width/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-gap-width/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/line-gap-width/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-gap-width/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/line-gap-width/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-gradient/gradient-tile-boundaries/metrics.json b/metrics/linux-clang8-release/render-tests/line-gradient/gradient-tile-boundaries/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-gradient/gradient-tile-boundaries/metrics.json rename to metrics/linux-clang8-release/render-tests/line-gradient/gradient-tile-boundaries/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-gradient/gradient/metrics.json b/metrics/linux-clang8-release/render-tests/line-gradient/gradient/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-gradient/gradient/metrics.json rename to metrics/linux-clang8-release/render-tests/line-gradient/gradient/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-gradient/translucent/metrics.json b/metrics/linux-clang8-release/render-tests/line-gradient/translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-gradient/translucent/metrics.json rename to metrics/linux-clang8-release/render-tests/line-gradient/translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-join/bevel-transparent/metrics.json b/metrics/linux-clang8-release/render-tests/line-join/bevel-transparent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-join/bevel-transparent/metrics.json rename to metrics/linux-clang8-release/render-tests/line-join/bevel-transparent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-join/bevel/metrics.json b/metrics/linux-clang8-release/render-tests/line-join/bevel/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-join/bevel/metrics.json rename to metrics/linux-clang8-release/render-tests/line-join/bevel/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-join/default/metrics.json b/metrics/linux-clang8-release/render-tests/line-join/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-join/default/metrics.json rename to metrics/linux-clang8-release/render-tests/line-join/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-join/miter-transparent/metrics.json b/metrics/linux-clang8-release/render-tests/line-join/miter-transparent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-join/miter-transparent/metrics.json rename to metrics/linux-clang8-release/render-tests/line-join/miter-transparent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-join/miter/metrics.json b/metrics/linux-clang8-release/render-tests/line-join/miter/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-join/miter/metrics.json rename to metrics/linux-clang8-release/render-tests/line-join/miter/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-join/property-function-dasharray/metrics.json b/metrics/linux-clang8-release/render-tests/line-join/property-function-dasharray/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-join/property-function-dasharray/metrics.json rename to metrics/linux-clang8-release/render-tests/line-join/property-function-dasharray/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-join/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/line-join/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-join/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/line-join/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-join/round-transparent/metrics.json b/metrics/linux-clang8-release/render-tests/line-join/round-transparent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-join/round-transparent/metrics.json rename to metrics/linux-clang8-release/render-tests/line-join/round-transparent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-join/round/metrics.json b/metrics/linux-clang8-release/render-tests/line-join/round/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-join/round/metrics.json rename to metrics/linux-clang8-release/render-tests/line-join/round/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-offset/default/metrics.json b/metrics/linux-clang8-release/render-tests/line-offset/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-offset/default/metrics.json rename to metrics/linux-clang8-release/render-tests/line-offset/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-offset/function/metrics.json b/metrics/linux-clang8-release/render-tests/line-offset/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-offset/function/metrics.json rename to metrics/linux-clang8-release/render-tests/line-offset/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-offset/literal-negative/metrics.json b/metrics/linux-clang8-release/render-tests/line-offset/literal-negative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-offset/literal-negative/metrics.json rename to metrics/linux-clang8-release/render-tests/line-offset/literal-negative/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-offset/literal/metrics.json b/metrics/linux-clang8-release/render-tests/line-offset/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-offset/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/line-offset/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-offset/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/line-offset/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-offset/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/line-offset/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-opacity/default/metrics.json b/metrics/linux-clang8-release/render-tests/line-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-opacity/default/metrics.json rename to metrics/linux-clang8-release/render-tests/line-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-opacity/function/metrics.json b/metrics/linux-clang8-release/render-tests/line-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-opacity/function/metrics.json rename to metrics/linux-clang8-release/render-tests/line-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-opacity/literal/metrics.json b/metrics/linux-clang8-release/render-tests/line-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-opacity/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/line-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-opacity/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/line-opacity/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-opacity/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/line-opacity/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-opacity/step-curve/metrics.json b/metrics/linux-clang8-release/render-tests/line-opacity/step-curve/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-opacity/step-curve/metrics.json rename to metrics/linux-clang8-release/render-tests/line-opacity/step-curve/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-pattern/@2x/metrics.json b/metrics/linux-clang8-release/render-tests/line-pattern/@2x/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-pattern/@2x/metrics.json rename to metrics/linux-clang8-release/render-tests/line-pattern/@2x/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-pattern/literal/metrics.json b/metrics/linux-clang8-release/render-tests/line-pattern/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-pattern/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/line-pattern/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-pattern/overscaled/metrics.json b/metrics/linux-clang8-release/render-tests/line-pattern/overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-pattern/overscaled/metrics.json rename to metrics/linux-clang8-release/render-tests/line-pattern/overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-pattern/pitch/metrics.json b/metrics/linux-clang8-release/render-tests/line-pattern/pitch/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-pattern/pitch/metrics.json rename to metrics/linux-clang8-release/render-tests/line-pattern/pitch/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-pattern/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/line-pattern/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-pattern/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/line-pattern/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-pattern/step-curve/metrics.json b/metrics/linux-clang8-release/render-tests/line-pattern/step-curve/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-pattern/step-curve/metrics.json rename to metrics/linux-clang8-release/render-tests/line-pattern/step-curve/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-pattern/zoom-expression/metrics.json b/metrics/linux-clang8-release/render-tests/line-pattern/zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-pattern/zoom-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/line-pattern/zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-pitch/default/metrics.json b/metrics/linux-clang8-release/render-tests/line-pitch/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-pitch/default/metrics.json rename to metrics/linux-clang8-release/render-tests/line-pitch/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-pitch/pitch0/metrics.json b/metrics/linux-clang8-release/render-tests/line-pitch/pitch0/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-pitch/pitch0/metrics.json rename to metrics/linux-clang8-release/render-tests/line-pitch/pitch0/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-pitch/pitch15/metrics.json b/metrics/linux-clang8-release/render-tests/line-pitch/pitch15/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-pitch/pitch15/metrics.json rename to metrics/linux-clang8-release/render-tests/line-pitch/pitch15/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-pitch/pitch30/metrics.json b/metrics/linux-clang8-release/render-tests/line-pitch/pitch30/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-pitch/pitch30/metrics.json rename to metrics/linux-clang8-release/render-tests/line-pitch/pitch30/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-pitch/pitchAndBearing/metrics.json b/metrics/linux-clang8-release/render-tests/line-pitch/pitchAndBearing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-pitch/pitchAndBearing/metrics.json rename to metrics/linux-clang8-release/render-tests/line-pitch/pitchAndBearing/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-sort-key/literal/metrics.json b/metrics/linux-clang8-release/render-tests/line-sort-key/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-sort-key/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/line-sort-key/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-translate-anchor/map/metrics.json b/metrics/linux-clang8-release/render-tests/line-translate-anchor/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-translate-anchor/map/metrics.json rename to metrics/linux-clang8-release/render-tests/line-translate-anchor/map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-translate-anchor/viewport/metrics.json b/metrics/linux-clang8-release/render-tests/line-translate-anchor/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-translate-anchor/viewport/metrics.json rename to metrics/linux-clang8-release/render-tests/line-translate-anchor/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-translate/default/metrics.json b/metrics/linux-clang8-release/render-tests/line-translate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-translate/default/metrics.json rename to metrics/linux-clang8-release/render-tests/line-translate/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-translate/function/metrics.json b/metrics/linux-clang8-release/render-tests/line-translate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-translate/function/metrics.json rename to metrics/linux-clang8-release/render-tests/line-translate/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-triangulation/default/metrics.json b/metrics/linux-clang8-release/render-tests/line-triangulation/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-triangulation/default/metrics.json rename to metrics/linux-clang8-release/render-tests/line-triangulation/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-triangulation/round/metrics.json b/metrics/linux-clang8-release/render-tests/line-triangulation/round/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-triangulation/round/metrics.json rename to metrics/linux-clang8-release/render-tests/line-triangulation/round/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-visibility/none/metrics.json b/metrics/linux-clang8-release/render-tests/line-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-visibility/none/metrics.json rename to metrics/linux-clang8-release/render-tests/line-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-visibility/visible/metrics.json b/metrics/linux-clang8-release/render-tests/line-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-visibility/visible/metrics.json rename to metrics/linux-clang8-release/render-tests/line-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-width/default/metrics.json b/metrics/linux-clang8-release/render-tests/line-width/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-width/default/metrics.json rename to metrics/linux-clang8-release/render-tests/line-width/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-width/function/metrics.json b/metrics/linux-clang8-release/render-tests/line-width/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-width/function/metrics.json rename to metrics/linux-clang8-release/render-tests/line-width/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-width/literal/metrics.json b/metrics/linux-clang8-release/render-tests/line-width/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-width/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/line-width/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-width/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/line-width/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-width/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/line-width/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-width/very-overscaled/metrics.json b/metrics/linux-clang8-release/render-tests/line-width/very-overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-width/very-overscaled/metrics.json rename to metrics/linux-clang8-release/render-tests/line-width/very-overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-width/zero-width-function/metrics.json b/metrics/linux-clang8-release/render-tests/line-width/zero-width-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-width/zero-width-function/metrics.json rename to metrics/linux-clang8-release/render-tests/line-width/zero-width-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-width/zero-width/metrics.json b/metrics/linux-clang8-release/render-tests/line-width/zero-width/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/line-width/zero-width/metrics.json rename to metrics/linux-clang8-release/render-tests/line-width/zero-width/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/linear-filter-opacity-edge/literal/metrics.json b/metrics/linux-clang8-release/render-tests/linear-filter-opacity-edge/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/linear-filter-opacity-edge/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/linear-filter-opacity-edge/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/map-mode/static/metrics.json b/metrics/linux-clang8-release/render-tests/map-mode/static/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/map-mode/static/metrics.json rename to metrics/linux-clang8-release/render-tests/map-mode/static/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/map-mode/tile-avoid-edges/metrics.json b/metrics/linux-clang8-release/render-tests/map-mode/tile-avoid-edges/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/map-mode/tile-avoid-edges/metrics.json rename to metrics/linux-clang8-release/render-tests/map-mode/tile-avoid-edges/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/map-mode/tile/metrics.json b/metrics/linux-clang8-release/render-tests/map-mode/tile/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/map-mode/tile/metrics.json rename to metrics/linux-clang8-release/render-tests/map-mode/tile/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/projection/axonometric-multiple/metrics.json b/metrics/linux-clang8-release/render-tests/projection/axonometric-multiple/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/projection/axonometric-multiple/metrics.json rename to metrics/linux-clang8-release/render-tests/projection/axonometric-multiple/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/projection/axonometric/metrics.json b/metrics/linux-clang8-release/render-tests/projection/axonometric/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/projection/axonometric/metrics.json rename to metrics/linux-clang8-release/render-tests/projection/axonometric/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/projection/perspective/metrics.json b/metrics/linux-clang8-release/render-tests/projection/perspective/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/projection/perspective/metrics.json rename to metrics/linux-clang8-release/render-tests/projection/perspective/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/projection/skew/metrics.json b/metrics/linux-clang8-release/render-tests/projection/skew/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/projection/skew/metrics.json rename to metrics/linux-clang8-release/render-tests/projection/skew/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-alpha/default/metrics.json b/metrics/linux-clang8-release/render-tests/raster-alpha/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-alpha/default/metrics.json rename to metrics/linux-clang8-release/render-tests/raster-alpha/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-brightness/default/metrics.json b/metrics/linux-clang8-release/render-tests/raster-brightness/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-brightness/default/metrics.json rename to metrics/linux-clang8-release/render-tests/raster-brightness/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-brightness/function/metrics.json b/metrics/linux-clang8-release/render-tests/raster-brightness/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-brightness/function/metrics.json rename to metrics/linux-clang8-release/render-tests/raster-brightness/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-brightness/literal/metrics.json b/metrics/linux-clang8-release/render-tests/raster-brightness/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-brightness/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/raster-brightness/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-contrast/default/metrics.json b/metrics/linux-clang8-release/render-tests/raster-contrast/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-contrast/default/metrics.json rename to metrics/linux-clang8-release/render-tests/raster-contrast/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-contrast/function/metrics.json b/metrics/linux-clang8-release/render-tests/raster-contrast/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-contrast/function/metrics.json rename to metrics/linux-clang8-release/render-tests/raster-contrast/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-contrast/literal/metrics.json b/metrics/linux-clang8-release/render-tests/raster-contrast/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-contrast/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/raster-contrast/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-extent/maxzoom/metrics.json b/metrics/linux-clang8-release/render-tests/raster-extent/maxzoom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-extent/maxzoom/metrics.json rename to metrics/linux-clang8-release/render-tests/raster-extent/maxzoom/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-extent/minzoom/metrics.json b/metrics/linux-clang8-release/render-tests/raster-extent/minzoom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-extent/minzoom/metrics.json rename to metrics/linux-clang8-release/render-tests/raster-extent/minzoom/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-hue-rotate/default/metrics.json b/metrics/linux-clang8-release/render-tests/raster-hue-rotate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-hue-rotate/default/metrics.json rename to metrics/linux-clang8-release/render-tests/raster-hue-rotate/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-hue-rotate/function/metrics.json b/metrics/linux-clang8-release/render-tests/raster-hue-rotate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-hue-rotate/function/metrics.json rename to metrics/linux-clang8-release/render-tests/raster-hue-rotate/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-hue-rotate/literal/metrics.json b/metrics/linux-clang8-release/render-tests/raster-hue-rotate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-hue-rotate/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/raster-hue-rotate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-loading/missing/metrics.json b/metrics/linux-clang8-release/render-tests/raster-loading/missing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-loading/missing/metrics.json rename to metrics/linux-clang8-release/render-tests/raster-loading/missing/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-masking/overlapping-vector/metrics.json b/metrics/linux-clang8-release/render-tests/raster-masking/overlapping-vector/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-masking/overlapping-vector/metrics.json rename to metrics/linux-clang8-release/render-tests/raster-masking/overlapping-vector/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-masking/overlapping/metrics.json b/metrics/linux-clang8-release/render-tests/raster-masking/overlapping/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-masking/overlapping/metrics.json rename to metrics/linux-clang8-release/render-tests/raster-masking/overlapping/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-opacity/default/metrics.json b/metrics/linux-clang8-release/render-tests/raster-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-opacity/default/metrics.json rename to metrics/linux-clang8-release/render-tests/raster-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-opacity/function/metrics.json b/metrics/linux-clang8-release/render-tests/raster-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-opacity/function/metrics.json rename to metrics/linux-clang8-release/render-tests/raster-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-opacity/literal/metrics.json b/metrics/linux-clang8-release/render-tests/raster-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-opacity/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/raster-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-resampling/default/metrics.json b/metrics/linux-clang8-release/render-tests/raster-resampling/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-resampling/default/metrics.json rename to metrics/linux-clang8-release/render-tests/raster-resampling/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-resampling/function/metrics.json b/metrics/linux-clang8-release/render-tests/raster-resampling/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-resampling/function/metrics.json rename to metrics/linux-clang8-release/render-tests/raster-resampling/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-resampling/literal/metrics.json b/metrics/linux-clang8-release/render-tests/raster-resampling/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-resampling/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/raster-resampling/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-rotation/0/metrics.json b/metrics/linux-clang8-release/render-tests/raster-rotation/0/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-rotation/0/metrics.json rename to metrics/linux-clang8-release/render-tests/raster-rotation/0/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-rotation/180/metrics.json b/metrics/linux-clang8-release/render-tests/raster-rotation/180/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-rotation/180/metrics.json rename to metrics/linux-clang8-release/render-tests/raster-rotation/180/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-rotation/270/metrics.json b/metrics/linux-clang8-release/render-tests/raster-rotation/270/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-rotation/270/metrics.json rename to metrics/linux-clang8-release/render-tests/raster-rotation/270/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-rotation/45/metrics.json b/metrics/linux-clang8-release/render-tests/raster-rotation/45/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-rotation/45/metrics.json rename to metrics/linux-clang8-release/render-tests/raster-rotation/45/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-rotation/90/metrics.json b/metrics/linux-clang8-release/render-tests/raster-rotation/90/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-rotation/90/metrics.json rename to metrics/linux-clang8-release/render-tests/raster-rotation/90/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-saturation/default/metrics.json b/metrics/linux-clang8-release/render-tests/raster-saturation/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-saturation/default/metrics.json rename to metrics/linux-clang8-release/render-tests/raster-saturation/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-saturation/function/metrics.json b/metrics/linux-clang8-release/render-tests/raster-saturation/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-saturation/function/metrics.json rename to metrics/linux-clang8-release/render-tests/raster-saturation/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-saturation/literal/metrics.json b/metrics/linux-clang8-release/render-tests/raster-saturation/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-saturation/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/raster-saturation/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-visibility/none/metrics.json b/metrics/linux-clang8-release/render-tests/raster-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-visibility/none/metrics.json rename to metrics/linux-clang8-release/render-tests/raster-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-visibility/visible/metrics.json b/metrics/linux-clang8-release/render-tests/raster-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/raster-visibility/visible/metrics.json rename to metrics/linux-clang8-release/render-tests/raster-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/real-world/nepal/metrics.json b/metrics/linux-clang8-release/render-tests/real-world/nepal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/real-world/nepal/metrics.json rename to metrics/linux-clang8-release/render-tests/real-world/nepal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/real-world/norway/metrics.json b/metrics/linux-clang8-release/render-tests/real-world/norway/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/real-world/norway/metrics.json rename to metrics/linux-clang8-release/render-tests/real-world/norway/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/real-world/uruguay/metrics.json b/metrics/linux-clang8-release/render-tests/real-world/uruguay/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/real-world/uruguay/metrics.json rename to metrics/linux-clang8-release/render-tests/real-world/uruguay/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2305/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2305/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2305/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2305/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2523/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2523/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2523/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2523/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2533/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2533/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2533/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2533/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2534/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2534/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2534/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2534/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2787/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2787/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2787/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2787/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2846/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2846/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2846/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2846/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2929/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2929/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2929/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2929/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3010/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3010/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3010/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3010/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3107/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3107/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3107/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3107/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3320/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3320/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3320/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3320/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3365/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3365/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3365/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3365/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3394/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3394/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3394/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3394/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3426/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3426/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3426/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3426/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3548/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3548/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3548/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3548/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3612/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3612/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3612/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3612/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3614/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3614/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3614/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3614/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3623/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3623/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3623/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3623/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3633/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3633/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3633/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3633/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3682/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3682/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3682/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3682/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3702/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3702/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3702/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3702/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3723/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3723/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3723/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3723/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3819/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3819/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3819/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3819/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3903/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3903/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3903/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3903/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3910/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3910/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3910/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3910/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3949/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3949/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3949/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3949/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4124/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4124/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4124/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4124/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4144/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4144/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4144/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4144/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4146/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4146/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4146/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4146/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4150/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4150/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4150/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4150/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4172/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4172/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4172/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4172/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4235/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4235/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4235/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4235/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4550/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4550/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4550/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4550/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4551/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4551/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4551/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4551/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4564/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4564/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4564/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4564/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4573/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4573/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4573/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4573/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4579/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4579/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4579/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4579/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4605/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4605/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4605/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4605/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4617/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4617/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4617/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4617/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4647/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4647/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4647/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4647/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4651/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4651/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4651/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4651/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4860/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4860/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4860/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4860/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4928/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4928/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4928/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4928/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5171/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5171/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5171/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5171/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5370/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5370/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5370/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5370/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5466/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5466/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5466/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5466/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5496/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5496/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5496/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5496/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5544/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5544/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5544/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5544/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5546/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5546/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5546/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5546/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5576/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5576/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5576/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5576/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5599/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5599/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5599/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5599/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5631/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5631/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5631/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5631/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5776/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5776/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5776/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5776/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5911/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5911/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5911/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5911/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5911a/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5911a/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5911a/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5911a/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5947/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5947/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5947/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5947/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5953/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5953/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5953/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5953/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5978/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5978/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5978/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5978/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6160/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6160/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6160/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6160/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6238/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6238/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6238/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6238/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6548/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6548/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6548/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6548/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6649/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6649/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6649/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6649/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6660/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6660/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6660/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6660/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6919/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6919/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6919/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6919/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#7032/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#7032/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#7032/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#7032/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#7172/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#7172/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#7172/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#7172/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#8273/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#8273/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#8273/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#8273/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#9009/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#9009/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#9009/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#9009/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#10849/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#10849/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#10849/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#10849/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#11451/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#11451/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#11451/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#11451/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#11729/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#11729/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#11729/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#11729/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#12812/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#12812/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#12812/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#12812/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#14402/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#14402/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#14402/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#14402/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#15139/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#15139/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#15139/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#15139/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#3292/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#3292/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#3292/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#3292/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#5648/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#5648/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#5648/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#5648/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#5701/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#5701/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#5701/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#5701/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#5754/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#5754/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#5754/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#5754/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#6063/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#6063/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#6063/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#6063/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#6233/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#6233/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#6233/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#6233/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#6820/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#6820/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#6820/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#6820/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#6903/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#6903/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#6903/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#6903/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#7241/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#7241/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#7241/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#7241/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#7572/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#7572/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#7572/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#7572/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#7714/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#7714/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#7714/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#7714/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#7792/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#7792/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#7792/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#7792/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8078/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8078/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8078/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8078/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8303/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8303/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8303/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8303/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8460/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8460/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8460/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8460/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8505/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8505/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8505/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8505/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8871/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8871/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8871/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8871/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8952/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8952/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8952/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8952/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9406/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9406/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9406/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9406/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9557/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9557/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9557/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9557/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9792/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9792/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9792/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9792/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9900/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9900/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9900/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9900/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9976/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9976/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9976/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9976/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9979/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9979/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9979/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9979/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-shaders#37/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-shaders#37/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-shaders#37/metrics.json rename to metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-shaders#37/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/remove-feature-state/composite-expression/metrics.json b/metrics/linux-clang8-release/render-tests/remove-feature-state/composite-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/remove-feature-state/composite-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/remove-feature-state/composite-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/remove-feature-state/data-expression/metrics.json b/metrics/linux-clang8-release/render-tests/remove-feature-state/data-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/remove-feature-state/data-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/remove-feature-state/data-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/remove-feature-state/vector-source/metrics.json b/metrics/linux-clang8-release/render-tests/remove-feature-state/vector-source/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/remove-feature-state/vector-source/metrics.json rename to metrics/linux-clang8-release/render-tests/remove-feature-state/vector-source/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/retina-raster/default/metrics.json b/metrics/linux-clang8-release/render-tests/retina-raster/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/retina-raster/default/metrics.json rename to metrics/linux-clang8-release/render-tests/retina-raster/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/filter-default-to-false/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/filter-default-to-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/filter-default-to-false/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/filter-default-to-false/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/filter-default-to-true/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/filter-default-to-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/filter-default-to-true/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/filter-default-to-true/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/filter-false-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/filter-false-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/filter-false-to-default/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/filter-false-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/filter-false-to-true/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/filter-false-to-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/filter-false-to-true/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/filter-false-to-true/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/filter-true-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/filter-true-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/filter-true-to-default/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/filter-true-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/filter-true-to-false/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/filter-true-to-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/filter-true-to-false/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/filter-true-to-false/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-alpha/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-alpha/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-alpha/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/image-add-alpha/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-nonsdf/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-nonsdf/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-nonsdf/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/image-add-nonsdf/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-pattern/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-pattern/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/image-add-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-sdf/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-sdf/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-sdf/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/image-add-sdf/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/image-remove/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/image-remove/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/image-remove/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/image-remove/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/image-update-icon/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/image-update-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/image-update-icon/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/image-update-icon/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/image-update-pattern/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/image-update-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/image-update-pattern/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/image-update-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-background/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-background/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-background/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-background/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-circle/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-circle/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-circle/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-fill/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-fill/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-fill/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-line/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-line/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-raster/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-raster/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-raster/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-raster/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-symbol/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-symbol/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-background/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-background/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-background/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-background/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-circle/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-circle/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-circle/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-fill/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-fill/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-fill/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-line/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-line/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-raster/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-raster/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-raster/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-raster/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-symbol/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-symbol/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-glyphs/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-glyphs/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-glyphs/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-glyphs/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-background/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-background/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-background/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-background/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-line/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-line/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-change-source/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-change-source/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-change-source/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-change-source/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-reorder/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-reorder/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-reorder/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-reorder/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-update/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-update/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-update/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-update/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-sprite/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-sprite/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-sprite/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-sprite/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/source-add-geojson-inline/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/source-add-geojson-inline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/source-add-geojson-inline/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/source-add-geojson-inline/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/source-add-geojson-url/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/source-add-geojson-url/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/source-add-geojson-url/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/source-add-geojson-url/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/source-add-raster-inline/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/source-add-raster-inline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/source-add-raster-inline/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/source-add-raster-inline/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/source-add-raster-url/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/source-add-raster-url/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/source-add-raster-url/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/source-add-raster-url/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/source-add-vector-inline/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/source-add-vector-inline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/source-add-vector-inline/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/source-add-vector-inline/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/source-add-vector-url/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/source-add-vector-url/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/source-add-vector-url/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/source-add-vector-url/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/visibility-default-to-none/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/visibility-default-to-none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/visibility-default-to-none/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/visibility-default-to-none/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/visibility-default-to-visible/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/visibility-default-to-visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/visibility-default-to-visible/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/visibility-default-to-visible/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/visibility-none-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/visibility-none-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/visibility-none-to-default/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/visibility-none-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/visibility-none-to-visible/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/visibility-none-to-visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/visibility-none-to-visible/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/visibility-none-to-visible/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/visibility-visible-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/visibility-visible-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/visibility-visible-to-default/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/visibility-visible-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/visibility-visible-to-none/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/visibility-visible-to-none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/runtime-styling/visibility-visible-to-none/metrics.json rename to metrics/linux-clang8-release/render-tests/runtime-styling/visibility-visible-to-none/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/satellite-v9/z0/metrics.json b/metrics/linux-clang8-release/render-tests/satellite-v9/z0/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/satellite-v9/z0/metrics.json rename to metrics/linux-clang8-release/render-tests/satellite-v9/z0/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/sparse-tileset/overdraw/metrics.json b/metrics/linux-clang8-release/render-tests/sparse-tileset/overdraw/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/sparse-tileset/overdraw/metrics.json rename to metrics/linux-clang8-release/render-tests/sparse-tileset/overdraw/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/sprites/1x-screen-1x-icon/metrics.json b/metrics/linux-clang8-release/render-tests/sprites/1x-screen-1x-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/sprites/1x-screen-1x-icon/metrics.json rename to metrics/linux-clang8-release/render-tests/sprites/1x-screen-1x-icon/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/sprites/1x-screen-1x-pattern/metrics.json b/metrics/linux-clang8-release/render-tests/sprites/1x-screen-1x-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/sprites/1x-screen-1x-pattern/metrics.json rename to metrics/linux-clang8-release/render-tests/sprites/1x-screen-1x-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/sprites/1x-screen-2x-icon/metrics.json b/metrics/linux-clang8-release/render-tests/sprites/1x-screen-2x-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/sprites/1x-screen-2x-icon/metrics.json rename to metrics/linux-clang8-release/render-tests/sprites/1x-screen-2x-icon/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/sprites/1x-screen-2x-pattern/metrics.json b/metrics/linux-clang8-release/render-tests/sprites/1x-screen-2x-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/sprites/1x-screen-2x-pattern/metrics.json rename to metrics/linux-clang8-release/render-tests/sprites/1x-screen-2x-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/sprites/2x-screen-1x-icon/metrics.json b/metrics/linux-clang8-release/render-tests/sprites/2x-screen-1x-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/sprites/2x-screen-1x-icon/metrics.json rename to metrics/linux-clang8-release/render-tests/sprites/2x-screen-1x-icon/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/sprites/2x-screen-1x-pattern/metrics.json b/metrics/linux-clang8-release/render-tests/sprites/2x-screen-1x-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/sprites/2x-screen-1x-pattern/metrics.json rename to metrics/linux-clang8-release/render-tests/sprites/2x-screen-1x-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/sprites/2x-screen-2x-icon/metrics.json b/metrics/linux-clang8-release/render-tests/sprites/2x-screen-2x-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/sprites/2x-screen-2x-icon/metrics.json rename to metrics/linux-clang8-release/render-tests/sprites/2x-screen-2x-icon/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/sprites/2x-screen-2x-pattern/metrics.json b/metrics/linux-clang8-release/render-tests/sprites/2x-screen-2x-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/sprites/2x-screen-2x-pattern/metrics.json rename to metrics/linux-clang8-release/render-tests/sprites/2x-screen-2x-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-geometry/linestring/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-geometry/linestring/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-geometry/linestring/metrics.json rename to metrics/linux-clang8-release/render-tests/symbol-geometry/linestring/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-geometry/multilinestring/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-geometry/multilinestring/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-geometry/multilinestring/metrics.json rename to metrics/linux-clang8-release/render-tests/symbol-geometry/multilinestring/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-geometry/multipoint/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-geometry/multipoint/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-geometry/multipoint/metrics.json rename to metrics/linux-clang8-release/render-tests/symbol-geometry/multipoint/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-geometry/multipolygon/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-geometry/multipolygon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-geometry/multipolygon/metrics.json rename to metrics/linux-clang8-release/render-tests/symbol-geometry/multipolygon/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-geometry/point/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-geometry/point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-geometry/point/metrics.json rename to metrics/linux-clang8-release/render-tests/symbol-geometry/point/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-geometry/polygon/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-geometry/polygon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-geometry/polygon/metrics.json rename to metrics/linux-clang8-release/render-tests/symbol-geometry/polygon/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-placement/line-center-buffer-tile-map-mode/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-placement/line-center-buffer-tile-map-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-placement/line-center-buffer-tile-map-mode/metrics.json rename to metrics/linux-clang8-release/render-tests/symbol-placement/line-center-buffer-tile-map-mode/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-placement/line-center-buffer/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-placement/line-center-buffer/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-placement/line-center-buffer/metrics.json rename to metrics/linux-clang8-release/render-tests/symbol-placement/line-center-buffer/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-placement/line-center-tile-map-mode/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-placement/line-center-tile-map-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-placement/line-center-tile-map-mode/metrics.json rename to metrics/linux-clang8-release/render-tests/symbol-placement/line-center-tile-map-mode/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-placement/line-center/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-placement/line-center/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-placement/line-center/metrics.json rename to metrics/linux-clang8-release/render-tests/symbol-placement/line-center/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-placement/line-overscaled/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-placement/line-overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-placement/line-overscaled/metrics.json rename to metrics/linux-clang8-release/render-tests/symbol-placement/line-overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-placement/line/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-placement/line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-placement/line/metrics.json rename to metrics/linux-clang8-release/render-tests/symbol-placement/line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-placement/point-polygon/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-placement/point-polygon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-placement/point-polygon/metrics.json rename to metrics/linux-clang8-release/render-tests/symbol-placement/point-polygon/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-placement/point/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-placement/point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-placement/point/metrics.json rename to metrics/linux-clang8-release/render-tests/symbol-placement/point/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-sort-key/icon-expression/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-sort-key/icon-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-sort-key/icon-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/symbol-sort-key/icon-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-sort-key/placement-tile-boundary-left-then-right/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-sort-key/placement-tile-boundary-left-then-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-sort-key/placement-tile-boundary-left-then-right/metrics.json rename to metrics/linux-clang8-release/render-tests/symbol-sort-key/placement-tile-boundary-left-then-right/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-sort-key/text-expression/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-sort-key/text-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-sort-key/text-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/symbol-sort-key/text-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-sort-key/text-ignore-placement/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-sort-key/text-ignore-placement/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-sort-key/text-ignore-placement/metrics.json rename to metrics/linux-clang8-release/render-tests/symbol-sort-key/text-ignore-placement/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-sort-key/text-placement/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-sort-key/text-placement/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-sort-key/text-placement/metrics.json rename to metrics/linux-clang8-release/render-tests/symbol-sort-key/text-placement/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-spacing/line-close/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-spacing/line-close/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-spacing/line-close/metrics.json rename to metrics/linux-clang8-release/render-tests/symbol-spacing/line-close/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-spacing/line-far/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-spacing/line-far/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-spacing/line-far/metrics.json rename to metrics/linux-clang8-release/render-tests/symbol-spacing/line-far/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-spacing/line-overscaled/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-spacing/line-overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-spacing/line-overscaled/metrics.json rename to metrics/linux-clang8-release/render-tests/symbol-spacing/line-overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-spacing/point-close/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-spacing/point-close/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-spacing/point-close/metrics.json rename to metrics/linux-clang8-release/render-tests/symbol-spacing/point-close/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-spacing/point-far/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-spacing/point-far/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-spacing/point-far/metrics.json rename to metrics/linux-clang8-release/render-tests/symbol-spacing/point-far/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-visibility/none/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-visibility/none/metrics.json rename to metrics/linux-clang8-release/render-tests/symbol-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-visibility/visible/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-visibility/visible/metrics.json rename to metrics/linux-clang8-release/render-tests/symbol-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-z-order/default/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-z-order/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-z-order/default/metrics.json rename to metrics/linux-clang8-release/render-tests/symbol-z-order/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-z-order/disabled/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-z-order/disabled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-z-order/disabled/metrics.json rename to metrics/linux-clang8-release/render-tests/symbol-z-order/disabled/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-z-order/icon-with-text/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-z-order/icon-with-text/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-z-order/icon-with-text/metrics.json rename to metrics/linux-clang8-release/render-tests/symbol-z-order/icon-with-text/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-z-order/pitched/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-z-order/pitched/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-z-order/pitched/metrics.json rename to metrics/linux-clang8-release/render-tests/symbol-z-order/pitched/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-z-order/viewport-y/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-z-order/viewport-y/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/symbol-z-order/viewport-y/metrics.json rename to metrics/linux-clang8-release/render-tests/symbol-z-order/viewport-y/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-anchor/bottom-left/metrics.json b/metrics/linux-clang8-release/render-tests/text-anchor/bottom-left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-anchor/bottom-left/metrics.json rename to metrics/linux-clang8-release/render-tests/text-anchor/bottom-left/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-anchor/bottom-right/metrics.json b/metrics/linux-clang8-release/render-tests/text-anchor/bottom-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-anchor/bottom-right/metrics.json rename to metrics/linux-clang8-release/render-tests/text-anchor/bottom-right/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-anchor/bottom/metrics.json b/metrics/linux-clang8-release/render-tests/text-anchor/bottom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-anchor/bottom/metrics.json rename to metrics/linux-clang8-release/render-tests/text-anchor/bottom/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-anchor/center/metrics.json b/metrics/linux-clang8-release/render-tests/text-anchor/center/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-anchor/center/metrics.json rename to metrics/linux-clang8-release/render-tests/text-anchor/center/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-anchor/left/metrics.json b/metrics/linux-clang8-release/render-tests/text-anchor/left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-anchor/left/metrics.json rename to metrics/linux-clang8-release/render-tests/text-anchor/left/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-anchor/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-anchor/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-anchor/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/text-anchor/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-anchor/right/metrics.json b/metrics/linux-clang8-release/render-tests/text-anchor/right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-anchor/right/metrics.json rename to metrics/linux-clang8-release/render-tests/text-anchor/right/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-anchor/top-left/metrics.json b/metrics/linux-clang8-release/render-tests/text-anchor/top-left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-anchor/top-left/metrics.json rename to metrics/linux-clang8-release/render-tests/text-anchor/top-left/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-anchor/top-right/metrics.json b/metrics/linux-clang8-release/render-tests/text-anchor/top-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-anchor/top-right/metrics.json rename to metrics/linux-clang8-release/render-tests/text-anchor/top-right/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-anchor/top/metrics.json b/metrics/linux-clang8-release/render-tests/text-anchor/top/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-anchor/top/metrics.json rename to metrics/linux-clang8-release/render-tests/text-anchor/top/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-arabic/letter-spacing/metrics.json b/metrics/linux-clang8-release/render-tests/text-arabic/letter-spacing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-arabic/letter-spacing/metrics.json rename to metrics/linux-clang8-release/render-tests/text-arabic/letter-spacing/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-arabic/line-break-mixed/metrics.json b/metrics/linux-clang8-release/render-tests/text-arabic/line-break-mixed/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-arabic/line-break-mixed/metrics.json rename to metrics/linux-clang8-release/render-tests/text-arabic/line-break-mixed/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-arabic/line-break/metrics.json b/metrics/linux-clang8-release/render-tests/text-arabic/line-break/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-arabic/line-break/metrics.json rename to metrics/linux-clang8-release/render-tests/text-arabic/line-break/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-arabic/mixed-numeric/metrics.json b/metrics/linux-clang8-release/render-tests/text-arabic/mixed-numeric/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-arabic/mixed-numeric/metrics.json rename to metrics/linux-clang8-release/render-tests/text-arabic/mixed-numeric/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-arabic/multi-paragraph/metrics.json b/metrics/linux-clang8-release/render-tests/text-arabic/multi-paragraph/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-arabic/multi-paragraph/metrics.json rename to metrics/linux-clang8-release/render-tests/text-arabic/multi-paragraph/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-color/default/metrics.json b/metrics/linux-clang8-release/render-tests/text-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-color/default/metrics.json rename to metrics/linux-clang8-release/render-tests/text-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-color/function/metrics.json b/metrics/linux-clang8-release/render-tests/text-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-color/function/metrics.json rename to metrics/linux-clang8-release/render-tests/text-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-color/literal/metrics.json b/metrics/linux-clang8-release/render-tests/text-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-color/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/text-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-color/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-color/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/text-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-field/formatted-arabic/metrics.json b/metrics/linux-clang8-release/render-tests/text-field/formatted-arabic/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-field/formatted-arabic/metrics.json rename to metrics/linux-clang8-release/render-tests/text-field/formatted-arabic/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-field/formatted-images-constant-size/metrics.json b/metrics/linux-clang8-release/render-tests/text-field/formatted-images-constant-size/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-field/formatted-images-constant-size/metrics.json rename to metrics/linux-clang8-release/render-tests/text-field/formatted-images-constant-size/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-field/formatted-images-line/metrics.json b/metrics/linux-clang8-release/render-tests/text-field/formatted-images-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-field/formatted-images-line/metrics.json rename to metrics/linux-clang8-release/render-tests/text-field/formatted-images-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-field/formatted-images-multiline/metrics.json b/metrics/linux-clang8-release/render-tests/text-field/formatted-images-multiline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-field/formatted-images-multiline/metrics.json rename to metrics/linux-clang8-release/render-tests/text-field/formatted-images-multiline/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json b/metrics/linux-clang8-release/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json rename to metrics/linux-clang8-release/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-field/formatted-images-vertical/metrics.json b/metrics/linux-clang8-release/render-tests/text-field/formatted-images-vertical/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-field/formatted-images-vertical/metrics.json rename to metrics/linux-clang8-release/render-tests/text-field/formatted-images-vertical/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json b/metrics/linux-clang8-release/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json rename to metrics/linux-clang8-release/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-field/formatted-images/metrics.json b/metrics/linux-clang8-release/render-tests/text-field/formatted-images/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-field/formatted-images/metrics.json rename to metrics/linux-clang8-release/render-tests/text-field/formatted-images/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-field/formatted-line/metrics.json b/metrics/linux-clang8-release/render-tests/text-field/formatted-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-field/formatted-line/metrics.json rename to metrics/linux-clang8-release/render-tests/text-field/formatted-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json b/metrics/linux-clang8-release/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-field/formatted-text-color-overrides/metrics.json b/metrics/linux-clang8-release/render-tests/text-field/formatted-text-color-overrides/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-field/formatted-text-color-overrides/metrics.json rename to metrics/linux-clang8-release/render-tests/text-field/formatted-text-color-overrides/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-field/formatted-text-color/metrics.json b/metrics/linux-clang8-release/render-tests/text-field/formatted-text-color/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-field/formatted-text-color/metrics.json rename to metrics/linux-clang8-release/render-tests/text-field/formatted-text-color/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-field/formatted/metrics.json b/metrics/linux-clang8-release/render-tests/text-field/formatted/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-field/formatted/metrics.json rename to metrics/linux-clang8-release/render-tests/text-field/formatted/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-field/literal/metrics.json b/metrics/linux-clang8-release/render-tests/text-field/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-field/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/text-field/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-field/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-field/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-field/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/text-field/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-field/token/metrics.json b/metrics/linux-clang8-release/render-tests/text-field/token/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-field/token/metrics.json rename to metrics/linux-clang8-release/render-tests/text-field/token/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-font/camera-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-font/camera-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-font/camera-function/metrics.json rename to metrics/linux-clang8-release/render-tests/text-font/camera-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-font/chinese/metrics.json b/metrics/linux-clang8-release/render-tests/text-font/chinese/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-font/chinese/metrics.json rename to metrics/linux-clang8-release/render-tests/text-font/chinese/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-font/data-expression/metrics.json b/metrics/linux-clang8-release/render-tests/text-font/data-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-font/data-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/text-font/data-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-font/literal/metrics.json b/metrics/linux-clang8-release/render-tests/text-font/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-font/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/text-font/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-halo-blur/default/metrics.json b/metrics/linux-clang8-release/render-tests/text-halo-blur/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-halo-blur/default/metrics.json rename to metrics/linux-clang8-release/render-tests/text-halo-blur/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-halo-blur/function/metrics.json b/metrics/linux-clang8-release/render-tests/text-halo-blur/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-halo-blur/function/metrics.json rename to metrics/linux-clang8-release/render-tests/text-halo-blur/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-halo-blur/literal/metrics.json b/metrics/linux-clang8-release/render-tests/text-halo-blur/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-halo-blur/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/text-halo-blur/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-halo-blur/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-halo-blur/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-halo-blur/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/text-halo-blur/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-halo-color/default/metrics.json b/metrics/linux-clang8-release/render-tests/text-halo-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-halo-color/default/metrics.json rename to metrics/linux-clang8-release/render-tests/text-halo-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-halo-color/function/metrics.json b/metrics/linux-clang8-release/render-tests/text-halo-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-halo-color/function/metrics.json rename to metrics/linux-clang8-release/render-tests/text-halo-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-halo-color/literal/metrics.json b/metrics/linux-clang8-release/render-tests/text-halo-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-halo-color/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/text-halo-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-halo-color/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-halo-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-halo-color/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/text-halo-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-halo-width/default/metrics.json b/metrics/linux-clang8-release/render-tests/text-halo-width/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-halo-width/default/metrics.json rename to metrics/linux-clang8-release/render-tests/text-halo-width/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-halo-width/function/metrics.json b/metrics/linux-clang8-release/render-tests/text-halo-width/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-halo-width/function/metrics.json rename to metrics/linux-clang8-release/render-tests/text-halo-width/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-halo-width/literal/metrics.json b/metrics/linux-clang8-release/render-tests/text-halo-width/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-halo-width/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/text-halo-width/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-halo-width/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-halo-width/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-halo-width/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/text-halo-width/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-justify/auto/metrics.json b/metrics/linux-clang8-release/render-tests/text-justify/auto/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-justify/auto/metrics.json rename to metrics/linux-clang8-release/render-tests/text-justify/auto/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-justify/left/metrics.json b/metrics/linux-clang8-release/render-tests/text-justify/left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-justify/left/metrics.json rename to metrics/linux-clang8-release/render-tests/text-justify/left/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-justify/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-justify/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-justify/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/text-justify/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-justify/right/metrics.json b/metrics/linux-clang8-release/render-tests/text-justify/right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-justify/right/metrics.json rename to metrics/linux-clang8-release/render-tests/text-justify/right/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-false/metrics.json b/metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-false/metrics.json rename to metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-false/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-true-offset/metrics.json b/metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-true-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-true-offset/metrics.json rename to metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-true-offset/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json b/metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json rename to metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json b/metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json rename to metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json b/metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json rename to metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-true/metrics.json b/metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-true/metrics.json rename to metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-true/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json b/metrics/linux-clang8-release/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json rename to metrics/linux-clang8-release/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json b/metrics/linux-clang8-release/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json rename to metrics/linux-clang8-release/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json b/metrics/linux-clang8-release/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json rename to metrics/linux-clang8-release/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json b/metrics/linux-clang8-release/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json rename to metrics/linux-clang8-release/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-letter-spacing/function-close/metrics.json b/metrics/linux-clang8-release/render-tests/text-letter-spacing/function-close/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-letter-spacing/function-close/metrics.json rename to metrics/linux-clang8-release/render-tests/text-letter-spacing/function-close/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-letter-spacing/function-far/metrics.json b/metrics/linux-clang8-release/render-tests/text-letter-spacing/function-far/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-letter-spacing/function-far/metrics.json rename to metrics/linux-clang8-release/render-tests/text-letter-spacing/function-far/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-letter-spacing/literal/metrics.json b/metrics/linux-clang8-release/render-tests/text-letter-spacing/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-letter-spacing/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/text-letter-spacing/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-letter-spacing/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-letter-spacing/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-letter-spacing/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/text-letter-spacing/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-line-height/literal/metrics.json b/metrics/linux-clang8-release/render-tests/text-line-height/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-line-height/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/text-line-height/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-max-angle/line-center/metrics.json b/metrics/linux-clang8-release/render-tests/text-max-angle/line-center/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-max-angle/line-center/metrics.json rename to metrics/linux-clang8-release/render-tests/text-max-angle/line-center/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-max-angle/literal/metrics.json b/metrics/linux-clang8-release/render-tests/text-max-angle/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-max-angle/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/text-max-angle/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-max-width/force-double-newline/metrics.json b/metrics/linux-clang8-release/render-tests/text-max-width/force-double-newline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-max-width/force-double-newline/metrics.json rename to metrics/linux-clang8-release/render-tests/text-max-width/force-double-newline/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-max-width/force-newline/metrics.json b/metrics/linux-clang8-release/render-tests/text-max-width/force-newline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-max-width/force-newline/metrics.json rename to metrics/linux-clang8-release/render-tests/text-max-width/force-newline/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-max-width/ideographic-breaking/metrics.json b/metrics/linux-clang8-release/render-tests/text-max-width/ideographic-breaking/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-max-width/ideographic-breaking/metrics.json rename to metrics/linux-clang8-release/render-tests/text-max-width/ideographic-breaking/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json b/metrics/linux-clang8-release/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json rename to metrics/linux-clang8-release/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-max-width/literal/metrics.json b/metrics/linux-clang8-release/render-tests/text-max-width/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-max-width/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/text-max-width/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-max-width/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-max-width/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-max-width/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/text-max-width/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-max-width/zoom-and-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-max-width/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-max-width/zoom-and-property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/text-max-width/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-no-cross-source-collision/default/metrics.json b/metrics/linux-clang8-release/render-tests/text-no-cross-source-collision/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-no-cross-source-collision/default/metrics.json rename to metrics/linux-clang8-release/render-tests/text-no-cross-source-collision/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json rename to metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json rename to metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json rename to metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json rename to metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json rename to metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json rename to metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json rename to metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json rename to metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json rename to metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json rename to metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json rename to metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json rename to metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json rename to metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json rename to metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json rename to metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json rename to metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json rename to metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json rename to metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/text-offset/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-offset/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/text-offset/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-opacity/default/metrics.json b/metrics/linux-clang8-release/render-tests/text-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-opacity/default/metrics.json rename to metrics/linux-clang8-release/render-tests/text-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-opacity/function/metrics.json b/metrics/linux-clang8-release/render-tests/text-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-opacity/function/metrics.json rename to metrics/linux-clang8-release/render-tests/text-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-opacity/literal/metrics.json b/metrics/linux-clang8-release/render-tests/text-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-opacity/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/text-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-opacity/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-opacity/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-opacity/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/text-opacity/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json b/metrics/linux-clang8-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json rename to metrics/linux-clang8-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json b/metrics/linux-clang8-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json rename to metrics/linux-clang8-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json b/metrics/linux-clang8-release/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json rename to metrics/linux-clang8-release/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json b/metrics/linux-clang8-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json rename to metrics/linux-clang8-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json b/metrics/linux-clang8-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json rename to metrics/linux-clang8-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json b/metrics/linux-clang8-release/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json rename to metrics/linux-clang8-release/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json b/metrics/linux-clang8-release/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json rename to metrics/linux-clang8-release/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json b/metrics/linux-clang8-release/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json rename to metrics/linux-clang8-release/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json b/metrics/linux-clang8-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json rename to metrics/linux-clang8-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json b/metrics/linux-clang8-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json rename to metrics/linux-clang8-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-pitch-scaling/line-half/metrics.json b/metrics/linux-clang8-release/render-tests/text-pitch-scaling/line-half/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-pitch-scaling/line-half/metrics.json rename to metrics/linux-clang8-release/render-tests/text-pitch-scaling/line-half/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-radial-offset/basic/metrics.json b/metrics/linux-clang8-release/render-tests/text-radial-offset/basic/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-radial-offset/basic/metrics.json rename to metrics/linux-clang8-release/render-tests/text-radial-offset/basic/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-rotate/anchor-bottom/metrics.json b/metrics/linux-clang8-release/render-tests/text-rotate/anchor-bottom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-rotate/anchor-bottom/metrics.json rename to metrics/linux-clang8-release/render-tests/text-rotate/anchor-bottom/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-rotate/anchor-left/metrics.json b/metrics/linux-clang8-release/render-tests/text-rotate/anchor-left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-rotate/anchor-left/metrics.json rename to metrics/linux-clang8-release/render-tests/text-rotate/anchor-left/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-rotate/anchor-right/metrics.json b/metrics/linux-clang8-release/render-tests/text-rotate/anchor-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-rotate/anchor-right/metrics.json rename to metrics/linux-clang8-release/render-tests/text-rotate/anchor-right/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-rotate/anchor-top/metrics.json b/metrics/linux-clang8-release/render-tests/text-rotate/anchor-top/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-rotate/anchor-top/metrics.json rename to metrics/linux-clang8-release/render-tests/text-rotate/anchor-top/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-rotate/function/metrics.json b/metrics/linux-clang8-release/render-tests/text-rotate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-rotate/function/metrics.json rename to metrics/linux-clang8-release/render-tests/text-rotate/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-rotate/literal/metrics.json b/metrics/linux-clang8-release/render-tests/text-rotate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-rotate/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/text-rotate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-rotate/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-rotate/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-rotate/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/text-rotate/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-rotate/with-offset/metrics.json b/metrics/linux-clang8-release/render-tests/text-rotate/with-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-rotate/with-offset/metrics.json rename to metrics/linux-clang8-release/render-tests/text-rotate/with-offset/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json b/metrics/linux-clang8-release/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json rename to metrics/linux-clang8-release/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json b/metrics/linux-clang8-release/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json rename to metrics/linux-clang8-release/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json b/metrics/linux-clang8-release/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json rename to metrics/linux-clang8-release/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json b/metrics/linux-clang8-release/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json rename to metrics/linux-clang8-release/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json b/metrics/linux-clang8-release/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json rename to metrics/linux-clang8-release/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json b/metrics/linux-clang8-release/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json rename to metrics/linux-clang8-release/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-size/camera-function-high-base/metrics.json b/metrics/linux-clang8-release/render-tests/text-size/camera-function-high-base/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-size/camera-function-high-base/metrics.json rename to metrics/linux-clang8-release/render-tests/text-size/camera-function-high-base/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-size/camera-function-interval/metrics.json b/metrics/linux-clang8-release/render-tests/text-size/camera-function-interval/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-size/camera-function-interval/metrics.json rename to metrics/linux-clang8-release/render-tests/text-size/camera-function-interval/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-size/composite-expression/metrics.json b/metrics/linux-clang8-release/render-tests/text-size/composite-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-size/composite-expression/metrics.json rename to metrics/linux-clang8-release/render-tests/text-size/composite-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-size/composite-function-line-placement/metrics.json b/metrics/linux-clang8-release/render-tests/text-size/composite-function-line-placement/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-size/composite-function-line-placement/metrics.json rename to metrics/linux-clang8-release/render-tests/text-size/composite-function-line-placement/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-size/composite-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-size/composite-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-size/composite-function/metrics.json rename to metrics/linux-clang8-release/render-tests/text-size/composite-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-size/default/metrics.json b/metrics/linux-clang8-release/render-tests/text-size/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-size/default/metrics.json rename to metrics/linux-clang8-release/render-tests/text-size/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-size/function/metrics.json b/metrics/linux-clang8-release/render-tests/text-size/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-size/function/metrics.json rename to metrics/linux-clang8-release/render-tests/text-size/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-size/literal/metrics.json b/metrics/linux-clang8-release/render-tests/text-size/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-size/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/text-size/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-size/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-size/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-size/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/text-size/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-size/zero/metrics.json b/metrics/linux-clang8-release/render-tests/text-size/zero/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-size/zero/metrics.json rename to metrics/linux-clang8-release/render-tests/text-size/zero/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-tile-edge-clipping/default/metrics.json b/metrics/linux-clang8-release/render-tests/text-tile-edge-clipping/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-tile-edge-clipping/default/metrics.json rename to metrics/linux-clang8-release/render-tests/text-tile-edge-clipping/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-transform/lowercase/metrics.json b/metrics/linux-clang8-release/render-tests/text-transform/lowercase/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-transform/lowercase/metrics.json rename to metrics/linux-clang8-release/render-tests/text-transform/lowercase/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-transform/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-transform/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-transform/property-function/metrics.json rename to metrics/linux-clang8-release/render-tests/text-transform/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-transform/uppercase/metrics.json b/metrics/linux-clang8-release/render-tests/text-transform/uppercase/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-transform/uppercase/metrics.json rename to metrics/linux-clang8-release/render-tests/text-transform/uppercase/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-translate-anchor/map/metrics.json b/metrics/linux-clang8-release/render-tests/text-translate-anchor/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-translate-anchor/map/metrics.json rename to metrics/linux-clang8-release/render-tests/text-translate-anchor/map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-translate-anchor/viewport/metrics.json b/metrics/linux-clang8-release/render-tests/text-translate-anchor/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-translate-anchor/viewport/metrics.json rename to metrics/linux-clang8-release/render-tests/text-translate-anchor/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-translate/default/metrics.json b/metrics/linux-clang8-release/render-tests/text-translate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-translate/default/metrics.json rename to metrics/linux-clang8-release/render-tests/text-translate/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-translate/function/metrics.json b/metrics/linux-clang8-release/render-tests/text-translate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-translate/function/metrics.json rename to metrics/linux-clang8-release/render-tests/text-translate/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-translate/literal/metrics.json b/metrics/linux-clang8-release/render-tests/text-translate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-translate/literal/metrics.json rename to metrics/linux-clang8-release/render-tests/text-translate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json rename to metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json rename to metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-offset/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-offset/metrics.json rename to metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-offset/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json rename to metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json rename to metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json rename to metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json rename to metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json rename to metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json rename to metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors/metrics.json rename to metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json rename to metrics/linux-clang8-release/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/icon-image/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/icon-image/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/icon-image/metrics.json rename to metrics/linux-clang8-release/render-tests/text-variable-anchor/icon-image/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json rename to metrics/linux-clang8-release/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/metrics.json rename to metrics/linux-clang8-release/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/left-top-right-buttom-offset-tile-map-mode/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/left-top-right-buttom-offset-tile-map-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/left-top-right-buttom-offset-tile-map-mode/metrics.json rename to metrics/linux-clang8-release/render-tests/text-variable-anchor/left-top-right-buttom-offset-tile-map-mode/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/no-animate-zoom/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/no-animate-zoom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/no-animate-zoom/metrics.json rename to metrics/linux-clang8-release/render-tests/text-variable-anchor/no-animate-zoom/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/pitched-offset/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/pitched-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/pitched-offset/metrics.json rename to metrics/linux-clang8-release/render-tests/text-variable-anchor/pitched-offset/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json rename to metrics/linux-clang8-release/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/pitched-with-map/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/pitched-with-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/pitched-with-map/metrics.json rename to metrics/linux-clang8-release/render-tests/text-variable-anchor/pitched-with-map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/pitched/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/pitched/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/pitched/metrics.json rename to metrics/linux-clang8-release/render-tests/text-variable-anchor/pitched/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/rotated-offset/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/rotated-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/rotated-offset/metrics.json rename to metrics/linux-clang8-release/render-tests/text-variable-anchor/rotated-offset/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/rotated-with-map/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/rotated-with-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/rotated-with-map/metrics.json rename to metrics/linux-clang8-release/render-tests/text-variable-anchor/rotated-with-map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/rotated/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/rotated/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/rotated/metrics.json rename to metrics/linux-clang8-release/render-tests/text-variable-anchor/rotated/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/single-justification/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/single-justification/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/single-justification/metrics.json rename to metrics/linux-clang8-release/render-tests/text-variable-anchor/single-justification/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/single-line/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/single-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/single-line/metrics.json rename to metrics/linux-clang8-release/render-tests/text-variable-anchor/single-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/text-allow-overlap/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/text-allow-overlap/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/text-allow-overlap/metrics.json rename to metrics/linux-clang8-release/render-tests/text-variable-anchor/text-allow-overlap/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json rename to metrics/linux-clang8-release/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-visibility/none/metrics.json b/metrics/linux-clang8-release/render-tests/text-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-visibility/none/metrics.json rename to metrics/linux-clang8-release/render-tests/text-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-visibility/visible/metrics.json b/metrics/linux-clang8-release/render-tests/text-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-visibility/visible/metrics.json rename to metrics/linux-clang8-release/render-tests/text-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json b/metrics/linux-clang8-release/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json rename to metrics/linux-clang8-release/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-writing-mode/line_label/chinese/metrics.json b/metrics/linux-clang8-release/render-tests/text-writing-mode/line_label/chinese/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-writing-mode/line_label/chinese/metrics.json rename to metrics/linux-clang8-release/render-tests/text-writing-mode/line_label/chinese/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-writing-mode/line_label/latin/metrics.json b/metrics/linux-clang8-release/render-tests/text-writing-mode/line_label/latin/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-writing-mode/line_label/latin/metrics.json rename to metrics/linux-clang8-release/render-tests/text-writing-mode/line_label/latin/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-writing-mode/line_label/mixed/metrics.json b/metrics/linux-clang8-release/render-tests/text-writing-mode/line_label/mixed/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-writing-mode/line_label/mixed/metrics.json rename to metrics/linux-clang8-release/render-tests/text-writing-mode/line_label/mixed/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json rename to metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json rename to metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json rename to metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json rename to metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json rename to metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json rename to metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json rename to metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json rename to metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json rename to metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json rename to metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json rename to metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json rename to metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/tile-mode/streets-v11/metrics.json b/metrics/linux-clang8-release/render-tests/tile-mode/streets-v11/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/tile-mode/streets-v11/metrics.json rename to metrics/linux-clang8-release/render-tests/tile-mode/streets-v11/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/tilejson-bounds/default/metrics.json b/metrics/linux-clang8-release/render-tests/tilejson-bounds/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/tilejson-bounds/default/metrics.json rename to metrics/linux-clang8-release/render-tests/tilejson-bounds/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/tilejson-bounds/overwrite-bounds/metrics.json b/metrics/linux-clang8-release/render-tests/tilejson-bounds/overwrite-bounds/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/tilejson-bounds/overwrite-bounds/metrics.json rename to metrics/linux-clang8-release/render-tests/tilejson-bounds/overwrite-bounds/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/tms/tms/metrics.json b/metrics/linux-clang8-release/render-tests/tms/tms/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/tms/tms/metrics.json rename to metrics/linux-clang8-release/render-tests/tms/tms/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/within/filter-with-inlined-geojson/metrics.json b/metrics/linux-clang8-release/render-tests/within/filter-with-inlined-geojson/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/within/filter-with-inlined-geojson/metrics.json rename to metrics/linux-clang8-release/render-tests/within/filter-with-inlined-geojson/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/within/layout-text/metrics.json b/metrics/linux-clang8-release/render-tests/within/layout-text/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/within/layout-text/metrics.json rename to metrics/linux-clang8-release/render-tests/within/layout-text/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/within/paint-circle/metrics.json b/metrics/linux-clang8-release/render-tests/within/paint-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/within/paint-circle/metrics.json rename to metrics/linux-clang8-release/render-tests/within/paint-circle/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/within/paint-icon/metrics.json b/metrics/linux-clang8-release/render-tests/within/paint-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/within/paint-icon/metrics.json rename to metrics/linux-clang8-release/render-tests/within/paint-icon/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/within/paint-line/metrics.json b/metrics/linux-clang8-release/render-tests/within/paint-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/within/paint-line/metrics.json rename to metrics/linux-clang8-release/render-tests/within/paint-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/within/paint-text/metrics.json b/metrics/linux-clang8-release/render-tests/within/paint-text/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/within/paint-text/metrics.json rename to metrics/linux-clang8-release/render-tests/within/paint-text/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/zoom-history/in/metrics.json b/metrics/linux-clang8-release/render-tests/zoom-history/in/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/zoom-history/in/metrics.json rename to metrics/linux-clang8-release/render-tests/zoom-history/in/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/zoom-history/out/metrics.json b/metrics/linux-clang8-release/render-tests/zoom-history/out/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/zoom-history/out/metrics.json rename to metrics/linux-clang8-release/render-tests/zoom-history/out/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/zoom-visibility/above/metrics.json b/metrics/linux-clang8-release/render-tests/zoom-visibility/above/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/zoom-visibility/above/metrics.json rename to metrics/linux-clang8-release/render-tests/zoom-visibility/above/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/zoom-visibility/below/metrics.json b/metrics/linux-clang8-release/render-tests/zoom-visibility/below/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/zoom-visibility/below/metrics.json rename to metrics/linux-clang8-release/render-tests/zoom-visibility/below/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/zoom-visibility/in-range/metrics.json b/metrics/linux-clang8-release/render-tests/zoom-visibility/in-range/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/zoom-visibility/in-range/metrics.json rename to metrics/linux-clang8-release/render-tests/zoom-visibility/in-range/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/zoom-visibility/out-of-range/metrics.json b/metrics/linux-clang8-release/render-tests/zoom-visibility/out-of-range/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/zoom-visibility/out-of-range/metrics.json rename to metrics/linux-clang8-release/render-tests/zoom-visibility/out-of-range/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/zoom-visibility/was-above/metrics.json b/metrics/linux-clang8-release/render-tests/zoom-visibility/was-above/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/zoom-visibility/was-above/metrics.json rename to metrics/linux-clang8-release/render-tests/zoom-visibility/was-above/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/zoom-visibility/was-below/metrics.json b/metrics/linux-clang8-release/render-tests/zoom-visibility/was-below/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/zoom-visibility/was-below/metrics.json rename to metrics/linux-clang8-release/render-tests/zoom-visibility/was-below/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/zoomed-fill/default/metrics.json b/metrics/linux-clang8-release/render-tests/zoomed-fill/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/zoomed-fill/default/metrics.json rename to metrics/linux-clang8-release/render-tests/zoomed-fill/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/zoomed-raster/fractional/metrics.json b/metrics/linux-clang8-release/render-tests/zoomed-raster/fractional/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/zoomed-raster/fractional/metrics.json rename to metrics/linux-clang8-release/render-tests/zoomed-raster/fractional/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/zoomed-raster/overzoom/metrics.json b/metrics/linux-clang8-release/render-tests/zoomed-raster/overzoom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/zoomed-raster/overzoom/metrics.json rename to metrics/linux-clang8-release/render-tests/zoomed-raster/overzoom/metrics.json diff --git a/mapbox-gl-native/metrics/linux-clang8-release/render-tests/zoomed-raster/underzoom/metrics.json b/metrics/linux-clang8-release/render-tests/zoomed-raster/underzoom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-clang8-release/render-tests/zoomed-raster/underzoom/metrics.json rename to metrics/linux-clang8-release/render-tests/zoomed-raster/underzoom/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-debug-coverage-nightly-style.json b/metrics/linux-gcc8-debug-coverage-nightly-style.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-debug-coverage-nightly-style.json rename to metrics/linux-gcc8-debug-coverage-nightly-style.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-debug-coverage-style.json b/metrics/linux-gcc8-debug-coverage-style.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-debug-coverage-style.json rename to metrics/linux-gcc8-debug-coverage-style.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release-metrics.json b/metrics/linux-gcc8-release-metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release-metrics.json rename to metrics/linux-gcc8-release-metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release-style.json b/metrics/linux-gcc8-release-style.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release-style.json rename to metrics/linux-gcc8-release-style.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/location_indicator/dateline/metrics.json b/metrics/linux-gcc8-release/location_indicator/dateline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/location_indicator/dateline/metrics.json rename to metrics/linux-gcc8-release/location_indicator/dateline/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/location_indicator/default/metrics.json b/metrics/linux-gcc8-release/location_indicator/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/location_indicator/default/metrics.json rename to metrics/linux-gcc8-release/location_indicator/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/location_indicator/image_pixel_ratio/metrics.json b/metrics/linux-gcc8-release/location_indicator/image_pixel_ratio/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/location_indicator/image_pixel_ratio/metrics.json rename to metrics/linux-gcc8-release/location_indicator/image_pixel_ratio/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/location_indicator/no_radius_border/metrics.json b/metrics/linux-gcc8-release/location_indicator/no_radius_border/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/location_indicator/no_radius_border/metrics.json rename to metrics/linux-gcc8-release/location_indicator/no_radius_border/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/location_indicator/no_radius_fill/metrics.json b/metrics/linux-gcc8-release/location_indicator/no_radius_fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/location_indicator/no_radius_fill/metrics.json rename to metrics/linux-gcc8-release/location_indicator/no_radius_fill/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/location_indicator/no_textures/metrics.json b/metrics/linux-gcc8-release/location_indicator/no_textures/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/location_indicator/no_textures/metrics.json rename to metrics/linux-gcc8-release/location_indicator/no_textures/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/location_indicator/one_texture/metrics.json b/metrics/linux-gcc8-release/location_indicator/one_texture/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/location_indicator/one_texture/metrics.json rename to metrics/linux-gcc8-release/location_indicator/one_texture/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/location_indicator/rotated/metrics.json b/metrics/linux-gcc8-release/location_indicator/rotated/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/location_indicator/rotated/metrics.json rename to metrics/linux-gcc8-release/location_indicator/rotated/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/location_indicator/tilted/metrics.json b/metrics/linux-gcc8-release/location_indicator/tilted/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/location_indicator/tilted/metrics.json rename to metrics/linux-gcc8-release/location_indicator/tilted/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift/metrics.json b/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift/metrics.json rename to metrics/linux-gcc8-release/location_indicator/tilted_texture_shift/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift_bottom_left/metrics.json b/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift_bottom_left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift_bottom_left/metrics.json rename to metrics/linux-gcc8-release/location_indicator/tilted_texture_shift_bottom_left/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift_bottom_right/metrics.json b/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift_bottom_right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift_bottom_right/metrics.json rename to metrics/linux-gcc8-release/location_indicator/tilted_texture_shift_bottom_right/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift_top_left/metrics.json b/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift_top_left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift_top_left/metrics.json rename to metrics/linux-gcc8-release/location_indicator/tilted_texture_shift_top_left/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift_top_right/metrics.json b/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift_top_right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift_top_right/metrics.json rename to metrics/linux-gcc8-release/location_indicator/tilted_texture_shift_top_right/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/location_indicator/two_textures/metrics.json b/metrics/linux-gcc8-release/location_indicator/two_textures/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/location_indicator/two_textures/metrics.json rename to metrics/linux-gcc8-release/location_indicator/two_textures/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/probes/gfx/pass-double-probe/metrics.json b/metrics/linux-gcc8-release/probes/gfx/pass-double-probe/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/probes/gfx/pass-double-probe/metrics.json rename to metrics/linux-gcc8-release/probes/gfx/pass-double-probe/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/probes/gfx/pass-probe-reset/metrics.json b/metrics/linux-gcc8-release/probes/gfx/pass-probe-reset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/probes/gfx/pass-probe-reset/metrics.json rename to metrics/linux-gcc8-release/probes/gfx/pass-probe-reset/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/probes/gfx/pass/metrics.json b/metrics/linux-gcc8-release/probes/gfx/pass/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/probes/gfx/pass/metrics.json rename to metrics/linux-gcc8-release/probes/gfx/pass/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/background-color/colorSpace-lab/metrics.json b/metrics/linux-gcc8-release/render-tests/background-color/colorSpace-lab/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/background-color/colorSpace-lab/metrics.json rename to metrics/linux-gcc8-release/render-tests/background-color/colorSpace-lab/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/background-color/default/metrics.json b/metrics/linux-gcc8-release/render-tests/background-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/background-color/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/background-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/background-color/function/metrics.json b/metrics/linux-gcc8-release/render-tests/background-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/background-color/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/background-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/background-color/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/background-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/background-color/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/background-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/background-opacity/color/metrics.json b/metrics/linux-gcc8-release/render-tests/background-opacity/color/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/background-opacity/color/metrics.json rename to metrics/linux-gcc8-release/render-tests/background-opacity/color/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/background-opacity/image/metrics.json b/metrics/linux-gcc8-release/render-tests/background-opacity/image/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/background-opacity/image/metrics.json rename to metrics/linux-gcc8-release/render-tests/background-opacity/image/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/background-opacity/overlay/metrics.json b/metrics/linux-gcc8-release/render-tests/background-opacity/overlay/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/background-opacity/overlay/metrics.json rename to metrics/linux-gcc8-release/render-tests/background-opacity/overlay/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/background-pattern/@2x/metrics.json b/metrics/linux-gcc8-release/render-tests/background-pattern/@2x/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/background-pattern/@2x/metrics.json rename to metrics/linux-gcc8-release/render-tests/background-pattern/@2x/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/background-pattern/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/background-pattern/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/background-pattern/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/background-pattern/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/background-pattern/missing/metrics.json b/metrics/linux-gcc8-release/render-tests/background-pattern/missing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/background-pattern/missing/metrics.json rename to metrics/linux-gcc8-release/render-tests/background-pattern/missing/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/background-pattern/pitch/metrics.json b/metrics/linux-gcc8-release/render-tests/background-pattern/pitch/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/background-pattern/pitch/metrics.json rename to metrics/linux-gcc8-release/render-tests/background-pattern/pitch/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/background-pattern/rotated/metrics.json b/metrics/linux-gcc8-release/render-tests/background-pattern/rotated/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/background-pattern/rotated/metrics.json rename to metrics/linux-gcc8-release/render-tests/background-pattern/rotated/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/background-pattern/zoomed/metrics.json b/metrics/linux-gcc8-release/render-tests/background-pattern/zoomed/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/background-pattern/zoomed/metrics.json rename to metrics/linux-gcc8-release/render-tests/background-pattern/zoomed/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/background-visibility/none/metrics.json b/metrics/linux-gcc8-release/render-tests/background-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/background-visibility/none/metrics.json rename to metrics/linux-gcc8-release/render-tests/background-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/background-visibility/visible/metrics.json b/metrics/linux-gcc8-release/render-tests/background-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/background-visibility/visible/metrics.json rename to metrics/linux-gcc8-release/render-tests/background-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/basic-v9/z0-narrow-y/metrics.json b/metrics/linux-gcc8-release/render-tests/basic-v9/z0-narrow-y/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/basic-v9/z0-narrow-y/metrics.json rename to metrics/linux-gcc8-release/render-tests/basic-v9/z0-narrow-y/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/basic-v9/z0-wide-x/metrics.json b/metrics/linux-gcc8-release/render-tests/basic-v9/z0-wide-x/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/basic-v9/z0-wide-x/metrics.json rename to metrics/linux-gcc8-release/render-tests/basic-v9/z0-wide-x/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/basic-v9/z0/metrics.json b/metrics/linux-gcc8-release/render-tests/basic-v9/z0/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/basic-v9/z0/metrics.json rename to metrics/linux-gcc8-release/render-tests/basic-v9/z0/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/bright-v9/z0/metrics.json b/metrics/linux-gcc8-release/render-tests/bright-v9/z0/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/bright-v9/z0/metrics.json rename to metrics/linux-gcc8-release/render-tests/bright-v9/z0/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-blur/blending/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-blur/blending/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-blur/blending/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-blur/blending/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-blur/default/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-blur/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-blur/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-blur/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-blur/function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-blur/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-blur/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-blur/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-blur/literal-stroke/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-blur/literal-stroke/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-blur/literal-stroke/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-blur/literal-stroke/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-blur/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-blur/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-blur/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-blur/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-blur/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-blur/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-blur/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-blur/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-blur/zoom-and-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-blur/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-blur/zoom-and-property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-blur/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-color/default/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-color/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-color/function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-color/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-color/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-color/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-color/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-color/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-color/zoom-and-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-color/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-color/zoom-and-property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-color/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-geometry/linestring/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-geometry/linestring/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-geometry/linestring/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-geometry/linestring/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-geometry/multilinestring/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-geometry/multilinestring/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-geometry/multilinestring/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-geometry/multilinestring/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-geometry/multipoint/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-geometry/multipoint/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-geometry/multipoint/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-geometry/multipoint/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-geometry/multipolygon/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-geometry/multipolygon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-geometry/multipolygon/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-geometry/multipolygon/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-geometry/point/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-geometry/point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-geometry/point/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-geometry/point/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-geometry/polygon/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-geometry/polygon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-geometry/polygon/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-geometry/polygon/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-opacity/blending/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-opacity/blending/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-opacity/blending/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-opacity/blending/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-opacity/default/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-opacity/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-opacity/function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-opacity/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-opacity/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-opacity/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-opacity/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-opacity/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-opacity/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-opacity/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-opacity/zoom-and-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-opacity/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-opacity/zoom-and-property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-opacity/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-pitch-alignment/map-scale-map/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-pitch-alignment/map-scale-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-pitch-alignment/map-scale-map/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-pitch-alignment/map-scale-map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-pitch-scale/default/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-pitch-scale/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-pitch-scale/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-pitch-scale/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-pitch-scale/map/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-pitch-scale/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-pitch-scale/map/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-pitch-scale/map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-pitch-scale/viewport/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-pitch-scale/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-pitch-scale/viewport/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-pitch-scale/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-radius/antimeridian/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-radius/antimeridian/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-radius/antimeridian/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-radius/antimeridian/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-radius/default/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-radius/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-radius/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-radius/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-radius/function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-radius/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-radius/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-radius/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-radius/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-radius/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-radius/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-radius/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-radius/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-radius/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-radius/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-radius/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-radius/zoom-and-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-radius/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-radius/zoom-and-property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-radius/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-sort-key/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-sort-key/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-sort-key/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-sort-key/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-stroke-color/default/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-stroke-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-stroke-color/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-stroke-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-stroke-color/function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-stroke-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-stroke-color/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-stroke-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-stroke-color/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-stroke-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-stroke-color/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-stroke-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-stroke-color/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-stroke-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-stroke-color/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-stroke-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/default/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/stroke-only/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/stroke-only/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/stroke-only/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/stroke-only/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-stroke-width/default/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-stroke-width/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-stroke-width/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-stroke-width/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-stroke-width/function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-stroke-width/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-stroke-width/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-stroke-width/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-stroke-width/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-stroke-width/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-stroke-width/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-stroke-width/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-stroke-width/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-stroke-width/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-stroke-width/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-stroke-width/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-translate-anchor/map/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-translate-anchor/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-translate-anchor/map/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-translate-anchor/map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-translate-anchor/viewport/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-translate-anchor/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-translate-anchor/viewport/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-translate-anchor/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-translate/default/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-translate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-translate/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-translate/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-translate/function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-translate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-translate/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-translate/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-translate/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-translate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/circle-translate/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/circle-translate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--background-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--background-opaque/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/background-opaque--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--background-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--background-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/background-opaque--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--circle-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--circle-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/background-opaque--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--fill-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--fill-opaque/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/background-opaque--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--fill-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--fill-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/background-opaque--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--line-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--line-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/background-opaque--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--raster-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--raster-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/background-opaque--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--symbol-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--symbol-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/background-opaque--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--background-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--background-opaque/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/background-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--background-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--background-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/background-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--circle-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--circle-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/background-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--fill-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--fill-opaque/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/background-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--fill-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--fill-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/background-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--line-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--line-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/background-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--raster-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--raster-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/background-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--symbol-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--symbol-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/background-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--background-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--background-opaque/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--background-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--background-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--circle-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--circle-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--fill-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--fill-opaque/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--fill-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--fill-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--line-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--line-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--raster-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--raster-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--background-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--background-opaque/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--background-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--background-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--circle-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--circle-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--fill-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--fill-opaque/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--fill-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--fill-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--line-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--line-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--raster-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--raster-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--background-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--background-opaque/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--background-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--background-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--circle-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--circle-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--fill-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--fill-opaque/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--fill-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--fill-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--line-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--line-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--raster-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--raster-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--background-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--background-opaque/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/line-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--background-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--background-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/line-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--circle-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--circle-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/line-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--fill-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--fill-opaque/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/line-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--fill-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--fill-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/line-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--line-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--line-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/line-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--raster-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--raster-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/line-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--symbol-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--symbol-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/line-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--background-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--background-opaque/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--background-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--background-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--circle-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--circle-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--fill-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--fill-opaque/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--fill-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--fill-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--line-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--line-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--raster-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--raster-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--background-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--background-opaque/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--background-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--background-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--line-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--line-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/debug/collision-icon-text-line-translate/metrics.json b/metrics/linux-gcc8-release/render-tests/debug/collision-icon-text-line-translate/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/debug/collision-icon-text-line-translate/metrics.json rename to metrics/linux-gcc8-release/render-tests/debug/collision-icon-text-line-translate/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/debug/collision-icon-text-point-translate/metrics.json b/metrics/linux-gcc8-release/render-tests/debug/collision-icon-text-point-translate/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/debug/collision-icon-text-point-translate/metrics.json rename to metrics/linux-gcc8-release/render-tests/debug/collision-icon-text-point-translate/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/debug/collision-lines-overscaled/metrics.json b/metrics/linux-gcc8-release/render-tests/debug/collision-lines-overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/debug/collision-lines-overscaled/metrics.json rename to metrics/linux-gcc8-release/render-tests/debug/collision-lines-overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/debug/collision-lines-pitched/metrics.json b/metrics/linux-gcc8-release/render-tests/debug/collision-lines-pitched/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/debug/collision-lines-pitched/metrics.json rename to metrics/linux-gcc8-release/render-tests/debug/collision-lines-pitched/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/debug/collision-lines/metrics.json b/metrics/linux-gcc8-release/render-tests/debug/collision-lines/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/debug/collision-lines/metrics.json rename to metrics/linux-gcc8-release/render-tests/debug/collision-lines/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/debug/collision-overscaled/metrics.json b/metrics/linux-gcc8-release/render-tests/debug/collision-overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/debug/collision-overscaled/metrics.json rename to metrics/linux-gcc8-release/render-tests/debug/collision-overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/debug/collision-pitched-wrapped/metrics.json b/metrics/linux-gcc8-release/render-tests/debug/collision-pitched-wrapped/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/debug/collision-pitched-wrapped/metrics.json rename to metrics/linux-gcc8-release/render-tests/debug/collision-pitched-wrapped/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/debug/collision-pitched/metrics.json b/metrics/linux-gcc8-release/render-tests/debug/collision-pitched/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/debug/collision-pitched/metrics.json rename to metrics/linux-gcc8-release/render-tests/debug/collision-pitched/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/empty/empty/metrics.json b/metrics/linux-gcc8-release/render-tests/empty/empty/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/empty/empty/metrics.json rename to metrics/linux-gcc8-release/render-tests/empty/empty/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/extent/1024-fill/metrics.json b/metrics/linux-gcc8-release/render-tests/extent/1024-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/extent/1024-fill/metrics.json rename to metrics/linux-gcc8-release/render-tests/extent/1024-fill/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/extent/1024-line/metrics.json b/metrics/linux-gcc8-release/render-tests/extent/1024-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/extent/1024-line/metrics.json rename to metrics/linux-gcc8-release/render-tests/extent/1024-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/extent/1024-symbol/metrics.json b/metrics/linux-gcc8-release/render-tests/extent/1024-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/extent/1024-symbol/metrics.json rename to metrics/linux-gcc8-release/render-tests/extent/1024-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/feature-state/composite-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/feature-state/composite-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/feature-state/composite-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/feature-state/composite-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/feature-state/data-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/feature-state/data-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/feature-state/data-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/feature-state/data-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/feature-state/vector-source/metrics.json b/metrics/linux-gcc8-release/render-tests/feature-state/vector-source/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/feature-state/vector-source/metrics.json rename to metrics/linux-gcc8-release/render-tests/feature-state/vector-source/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-antialias/false/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-antialias/false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-antialias/false/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-antialias/false/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-color/default/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-color/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-color/function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-color/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-color/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-color/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-color/multiply/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-color/multiply/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-color/multiply/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-color/multiply/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-color/opacity/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-color/opacity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-color/opacity/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-color/opacity/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-color/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-color/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-color/zoom-and-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-color/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-color/zoom-and-property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-color/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-base/default/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-base/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-base/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-extrusion-base/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-base/function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-base/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-base/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-extrusion-base/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-base/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-base/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-base/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-extrusion-base/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-base/negative/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-base/negative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-base/negative/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-extrusion-base/negative/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-base/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-base/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-base/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-extrusion-base/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-color/default/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-color/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-extrusion-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-color/function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-color/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-extrusion-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-color/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-color/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-extrusion-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-color/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-color/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-extrusion-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-height/default/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-height/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-height/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-extrusion-height/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-height/function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-height/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-height/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-extrusion-height/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-height/negative/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-height/negative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-height/negative/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-extrusion-height/negative/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-height/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-height/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-height/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-extrusion-height/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-multiple/multiple/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-multiple/multiple/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-multiple/multiple/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-extrusion-multiple/multiple/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-opacity/default/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-opacity/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-extrusion-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-opacity/function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-opacity/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-extrusion-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-opacity/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-opacity/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-extrusion-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-pattern/missing/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-pattern/missing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-pattern/missing/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-extrusion-pattern/missing/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-translate-anchor/map/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-translate-anchor/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-translate-anchor/map/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-extrusion-translate-anchor/map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-translate/default/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-translate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-translate/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-extrusion-translate/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-translate/function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-translate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-translate/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-extrusion-translate/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-translate/literal-opacity/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-translate/literal-opacity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-translate/literal-opacity/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-extrusion-translate/literal-opacity/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-translate/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-translate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-translate/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-extrusion-translate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-vertical-gradient/default/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-vertical-gradient/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-vertical-gradient/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-extrusion-vertical-gradient/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-vertical-gradient/false/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-vertical-gradient/false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-extrusion-vertical-gradient/false/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-extrusion-vertical-gradient/false/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-opacity/default/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-opacity/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-opacity/function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-opacity/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-opacity/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-opacity/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-opacity/overlapping/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-opacity/overlapping/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-opacity/overlapping/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-opacity/overlapping/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-opacity/property-function-pattern/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-opacity/property-function-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-opacity/property-function-pattern/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-opacity/property-function-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-opacity/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-opacity/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-opacity/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-opacity/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-opacity/zoom-and-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-opacity/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-opacity/zoom-and-property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-opacity/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-outline-color/default/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-outline-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-outline-color/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-outline-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-outline-color/fill/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-outline-color/fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-outline-color/fill/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-outline-color/fill/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-outline-color/function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-outline-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-outline-color/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-outline-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-outline-color/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-outline-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-outline-color/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-outline-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-outline-color/multiply/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-outline-color/multiply/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-outline-color/multiply/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-outline-color/multiply/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-outline-color/opacity/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-outline-color/opacity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-outline-color/opacity/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-outline-color/opacity/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-outline-color/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-outline-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-outline-color/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-outline-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-outline-color/zoom-and-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-outline-color/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-outline-color/zoom-and-property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-outline-color/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-pattern/@2x/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-pattern/@2x/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-pattern/@2x/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-pattern/@2x/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-pattern/case-data-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-pattern/case-data-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-pattern/case-data-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-pattern/case-data-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-pattern/invalid-feature-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-pattern/invalid-feature-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-pattern/invalid-feature-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-pattern/invalid-feature-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-pattern/missing/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-pattern/missing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-pattern/missing/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-pattern/missing/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-pattern/uneven-pattern/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-pattern/uneven-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-pattern/uneven-pattern/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-pattern/uneven-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-sort-key/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-sort-key/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-sort-key/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-sort-key/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-translate-anchor/map/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-translate-anchor/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-translate-anchor/map/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-translate-anchor/map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-translate-anchor/viewport/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-translate-anchor/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-translate-anchor/viewport/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-translate-anchor/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-translate/default/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-translate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-translate/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-translate/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-translate/function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-translate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-translate/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-translate/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-translate/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-translate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-translate/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-translate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-visibility/none/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-visibility/none/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-visibility/visible/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/fill-visibility/visible/metrics.json rename to metrics/linux-gcc8-release/render-tests/fill-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/filter/equality/metrics.json b/metrics/linux-gcc8-release/render-tests/filter/equality/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/filter/equality/metrics.json rename to metrics/linux-gcc8-release/render-tests/filter/equality/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/filter/in/metrics.json b/metrics/linux-gcc8-release/render-tests/filter/in/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/filter/in/metrics.json rename to metrics/linux-gcc8-release/render-tests/filter/in/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/filter/legacy-equality/metrics.json b/metrics/linux-gcc8-release/render-tests/filter/legacy-equality/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/filter/legacy-equality/metrics.json rename to metrics/linux-gcc8-release/render-tests/filter/legacy-equality/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/filter/none/metrics.json b/metrics/linux-gcc8-release/render-tests/filter/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/filter/none/metrics.json rename to metrics/linux-gcc8-release/render-tests/filter/none/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/clustered-properties/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/clustered-properties/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/clustered-properties/metrics.json rename to metrics/linux-gcc8-release/render-tests/geojson/clustered-properties/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/clustered/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/clustered/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/clustered/metrics.json rename to metrics/linux-gcc8-release/render-tests/geojson/clustered/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/external-feature/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/external-feature/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/external-feature/metrics.json rename to metrics/linux-gcc8-release/render-tests/geojson/external-feature/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/external-invalid/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/external-invalid/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/external-invalid/metrics.json rename to metrics/linux-gcc8-release/render-tests/geojson/external-invalid/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/external-linestring/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/external-linestring/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/external-linestring/metrics.json rename to metrics/linux-gcc8-release/render-tests/geojson/external-linestring/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/external-malformed/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/external-malformed/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/external-malformed/metrics.json rename to metrics/linux-gcc8-release/render-tests/geojson/external-malformed/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/inconsistent-winding-order/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/inconsistent-winding-order/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/inconsistent-winding-order/metrics.json rename to metrics/linux-gcc8-release/render-tests/geojson/inconsistent-winding-order/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/inline-feature/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/inline-feature/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/inline-feature/metrics.json rename to metrics/linux-gcc8-release/render-tests/geojson/inline-feature/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/inline-invalid/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/inline-invalid/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/inline-invalid/metrics.json rename to metrics/linux-gcc8-release/render-tests/geojson/inline-invalid/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/inline-linestring-circle/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/inline-linestring-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/inline-linestring-circle/metrics.json rename to metrics/linux-gcc8-release/render-tests/geojson/inline-linestring-circle/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/inline-linestring-line/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/inline-linestring-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/inline-linestring-line/metrics.json rename to metrics/linux-gcc8-release/render-tests/geojson/inline-linestring-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/inline-linestring-symbol/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/inline-linestring-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/inline-linestring-symbol/metrics.json rename to metrics/linux-gcc8-release/render-tests/geojson/inline-linestring-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/inline-malformed/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/inline-malformed/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/inline-malformed/metrics.json rename to metrics/linux-gcc8-release/render-tests/geojson/inline-malformed/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/inline-point-circle/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/inline-point-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/inline-point-circle/metrics.json rename to metrics/linux-gcc8-release/render-tests/geojson/inline-point-circle/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/inline-point-fill/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/inline-point-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/inline-point-fill/metrics.json rename to metrics/linux-gcc8-release/render-tests/geojson/inline-point-fill/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/inline-point-line/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/inline-point-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/inline-point-line/metrics.json rename to metrics/linux-gcc8-release/render-tests/geojson/inline-point-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/inline-point-symbol/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/inline-point-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/inline-point-symbol/metrics.json rename to metrics/linux-gcc8-release/render-tests/geojson/inline-point-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/inline-polygon-circle/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/inline-polygon-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/inline-polygon-circle/metrics.json rename to metrics/linux-gcc8-release/render-tests/geojson/inline-polygon-circle/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/inline-polygon-fill/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/inline-polygon-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/inline-polygon-fill/metrics.json rename to metrics/linux-gcc8-release/render-tests/geojson/inline-polygon-fill/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/inline-polygon-line/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/inline-polygon-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/inline-polygon-line/metrics.json rename to metrics/linux-gcc8-release/render-tests/geojson/inline-polygon-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/inline-polygon-symbol/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/inline-polygon-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/inline-polygon-symbol/metrics.json rename to metrics/linux-gcc8-release/render-tests/geojson/inline-polygon-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/missing/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/missing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/missing/metrics.json rename to metrics/linux-gcc8-release/render-tests/geojson/missing/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/reparse-overscaled/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/reparse-overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/geojson/reparse-overscaled/metrics.json rename to metrics/linux-gcc8-release/render-tests/geojson/reparse-overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-color/default/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-color/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/heatmap-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-color/expression/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-color/expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-color/expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/heatmap-color/expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-intensity/default/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-intensity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-intensity/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/heatmap-intensity/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-intensity/function/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-intensity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-intensity/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/heatmap-intensity/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-intensity/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-intensity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-intensity/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/heatmap-intensity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-opacity/default/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-opacity/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/heatmap-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-opacity/function/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-opacity/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/heatmap-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-opacity/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-opacity/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/heatmap-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-radius/antimeridian/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-radius/antimeridian/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-radius/antimeridian/metrics.json rename to metrics/linux-gcc8-release/render-tests/heatmap-radius/antimeridian/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-radius/data-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-radius/data-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-radius/data-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/heatmap-radius/data-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-radius/default/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-radius/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-radius/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/heatmap-radius/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-radius/function/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-radius/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-radius/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/heatmap-radius/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-radius/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-radius/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-radius/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/heatmap-radius/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-radius/pitch30/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-radius/pitch30/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-radius/pitch30/metrics.json rename to metrics/linux-gcc8-release/render-tests/heatmap-radius/pitch30/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-weight/default/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-weight/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-weight/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/heatmap-weight/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-weight/identity-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-weight/identity-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-weight/identity-property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/heatmap-weight/identity-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-weight/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-weight/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/heatmap-weight/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/heatmap-weight/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/hillshade-accent-color/default/metrics.json b/metrics/linux-gcc8-release/render-tests/hillshade-accent-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/hillshade-accent-color/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/hillshade-accent-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/hillshade-accent-color/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/hillshade-accent-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/hillshade-accent-color/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/hillshade-accent-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/hillshade-accent-color/terrarium/metrics.json b/metrics/linux-gcc8-release/render-tests/hillshade-accent-color/terrarium/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/hillshade-accent-color/terrarium/metrics.json rename to metrics/linux-gcc8-release/render-tests/hillshade-accent-color/terrarium/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/hillshade-accent-color/zoom-function/metrics.json b/metrics/linux-gcc8-release/render-tests/hillshade-accent-color/zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/hillshade-accent-color/zoom-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/hillshade-accent-color/zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/hillshade-highlight-color/default/metrics.json b/metrics/linux-gcc8-release/render-tests/hillshade-highlight-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/hillshade-highlight-color/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/hillshade-highlight-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/hillshade-highlight-color/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/hillshade-highlight-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/hillshade-highlight-color/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/hillshade-highlight-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/hillshade-highlight-color/zoom-function/metrics.json b/metrics/linux-gcc8-release/render-tests/hillshade-highlight-color/zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/hillshade-highlight-color/zoom-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/hillshade-highlight-color/zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/hillshade-shadow-color/default/metrics.json b/metrics/linux-gcc8-release/render-tests/hillshade-shadow-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/hillshade-shadow-color/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/hillshade-shadow-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/hillshade-shadow-color/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/hillshade-shadow-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/hillshade-shadow-color/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/hillshade-shadow-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/hillshade-shadow-color/zoom-function/metrics.json b/metrics/linux-gcc8-release/render-tests/hillshade-shadow-color/zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/hillshade-shadow-color/zoom-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/hillshade-shadow-color/zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-anchor/bottom-left/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-anchor/bottom-left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-anchor/bottom-left/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-anchor/bottom-left/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-anchor/bottom-right/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-anchor/bottom-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-anchor/bottom-right/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-anchor/bottom-right/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-anchor/bottom/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-anchor/bottom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-anchor/bottom/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-anchor/bottom/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-anchor/center/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-anchor/center/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-anchor/center/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-anchor/center/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-anchor/default/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-anchor/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-anchor/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-anchor/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-anchor/left/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-anchor/left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-anchor/left/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-anchor/left/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-anchor/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-anchor/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-anchor/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-anchor/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-anchor/right/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-anchor/right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-anchor/right/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-anchor/right/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-anchor/top-left/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-anchor/top-left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-anchor/top-left/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-anchor/top-left/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-anchor/top-right/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-anchor/top-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-anchor/top-right/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-anchor/top-right/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-anchor/top/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-anchor/top/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-anchor/top/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-anchor/top/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-color/default/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-color/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-color/function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-color/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-color/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-color/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-color/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-color/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-halo-blur/default/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-halo-blur/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-halo-blur/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-halo-blur/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-halo-blur/function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-halo-blur/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-halo-blur/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-halo-blur/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-halo-blur/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-halo-blur/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-halo-blur/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-halo-blur/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-halo-blur/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-halo-blur/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-halo-blur/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-halo-blur/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-halo-color/default/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-halo-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-halo-color/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-halo-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-halo-color/function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-halo-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-halo-color/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-halo-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-halo-color/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-halo-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-halo-color/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-halo-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-halo-color/multiply/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-halo-color/multiply/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-halo-color/multiply/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-halo-color/multiply/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-halo-color/opacity/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-halo-color/opacity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-halo-color/opacity/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-halo-color/opacity/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-halo-color/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-halo-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-halo-color/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-halo-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-halo-color/transparent/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-halo-color/transparent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-halo-color/transparent/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-halo-color/transparent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-halo-width/default/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-halo-width/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-halo-width/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-halo-width/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-halo-width/function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-halo-width/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-halo-width/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-halo-width/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-halo-width/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-halo-width/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-halo-width/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-halo-width/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-halo-width/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-halo-width/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-halo-width/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-halo-width/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-image/image-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-image/image-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-image/image-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-image/image-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-image/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-image/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-image/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-image/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-image/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-image/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-image/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-image/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-image/stretchable-content/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-image/stretchable-content/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-image/stretchable-content/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-image/stretchable-content/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-image/stretchable/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-image/stretchable/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-image/stretchable/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-image/stretchable/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-image/token/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-image/token/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-image/token/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-image/token/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-no-cross-source-collision/default/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-no-cross-source-collision/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-no-cross-source-collision/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-no-cross-source-collision/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-offset/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-offset/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-offset/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-offset/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-offset/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-offset/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-offset/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-offset/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-offset/zoom-and-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-offset/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-offset/zoom-and-property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-offset/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-opacity/default/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-opacity/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-opacity/function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-opacity/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-opacity/icon-only/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-opacity/icon-only/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-opacity/icon-only/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-opacity/icon-only/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-opacity/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-opacity/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-opacity/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-opacity/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-opacity/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-opacity/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-opacity/text-and-icon/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-opacity/text-and-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-opacity/text-and-icon/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-opacity/text-and-icon/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-opacity/text-only/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-opacity/text-only/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-opacity/text-only/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-opacity/text-only/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-pixelratio-mismatch/default/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-pixelratio-mismatch/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-pixelratio-mismatch/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-pixelratio-mismatch/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-rotate/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-rotate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-rotate/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-rotate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-rotate/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-rotate/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-rotate/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-rotate/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-rotate/with-offset/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-rotate/with-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-rotate/with-offset/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-rotate/with-offset/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-size/camera-function-high-base-plain/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-size/camera-function-high-base-plain/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-size/camera-function-high-base-plain/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-size/camera-function-high-base-plain/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-size/camera-function-high-base-sdf/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-size/camera-function-high-base-sdf/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-size/camera-function-high-base-sdf/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-size/camera-function-high-base-sdf/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-size/camera-function-plain/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-size/camera-function-plain/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-size/camera-function-plain/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-size/camera-function-plain/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-size/camera-function-sdf/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-size/camera-function-sdf/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-size/camera-function-sdf/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-size/camera-function-sdf/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-size/composite-function-plain/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-size/composite-function-plain/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-size/composite-function-plain/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-size/composite-function-plain/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-size/composite-function-sdf/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-size/composite-function-sdf/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-size/composite-function-sdf/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-size/composite-function-sdf/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-size/default/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-size/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-size/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-size/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-size/function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-size/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-size/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-size/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-size/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-size/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-size/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-size/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-size/property-function-plain/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-size/property-function-plain/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-size/property-function-plain/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-size/property-function-plain/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-size/property-function-sdf/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-size/property-function-sdf/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-size/property-function-sdf/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-size/property-function-sdf/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-collision/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-collision/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-collision/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/both-collision/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-padding/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-padding/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/both-padding/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/both/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/both/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/both/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/enlargen-both-padding/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/enlargen-both-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/enlargen-both-padding/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/enlargen-both-padding/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/enlargen-both/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/enlargen-both/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/enlargen-both/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/enlargen-both/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/enlargen-height/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/enlargen-height/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/enlargen-height/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/enlargen-height/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/enlargen-width/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/enlargen-width/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/enlargen-width/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/enlargen-width/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/height-padding/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/height-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/height-padding/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/height-padding/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/height-text-anchor/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/height-text-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/height-text-anchor/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/height-text-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/height/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/height/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/height/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/height/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/none/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/none/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/none/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/placement-line/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/placement-line/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-three-part/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-three-part/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-three-part/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-three-part/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-two-part/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-two-part/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-two-part/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-two-part/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-underscale/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-underscale/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-underscale/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-underscale/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/text-variable-anchor/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/text-variable-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/text-variable-anchor/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/text-variable-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/width-padding/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/width-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/width-padding/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/width-padding/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/width-text-anchor/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/width-text-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/width-text-anchor/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/width-text-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/width/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/width/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-text-fit/width/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-text-fit/width/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-translate-anchor/map/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-translate-anchor/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-translate-anchor/map/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-translate-anchor/map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-translate-anchor/viewport/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-translate-anchor/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-translate-anchor/viewport/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-translate-anchor/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-translate/default/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-translate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-translate/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-translate/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-translate/function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-translate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-translate/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-translate/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-translate/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-translate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-translate/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-translate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-visibility/none/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-visibility/none/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-visibility/visible/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/icon-visibility/visible/metrics.json rename to metrics/linux-gcc8-release/render-tests/icon-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/image/default/metrics.json b/metrics/linux-gcc8-release/render-tests/image/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/image/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/image/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/image/pitched/metrics.json b/metrics/linux-gcc8-release/render-tests/image/pitched/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/image/pitched/metrics.json rename to metrics/linux-gcc8-release/render-tests/image/pitched/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/image/raster-brightness/metrics.json b/metrics/linux-gcc8-release/render-tests/image/raster-brightness/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/image/raster-brightness/metrics.json rename to metrics/linux-gcc8-release/render-tests/image/raster-brightness/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/image/raster-contrast/metrics.json b/metrics/linux-gcc8-release/render-tests/image/raster-contrast/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/image/raster-contrast/metrics.json rename to metrics/linux-gcc8-release/render-tests/image/raster-contrast/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/image/raster-hue-rotate/metrics.json b/metrics/linux-gcc8-release/render-tests/image/raster-hue-rotate/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/image/raster-hue-rotate/metrics.json rename to metrics/linux-gcc8-release/render-tests/image/raster-hue-rotate/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/image/raster-opacity/metrics.json b/metrics/linux-gcc8-release/render-tests/image/raster-opacity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/image/raster-opacity/metrics.json rename to metrics/linux-gcc8-release/render-tests/image/raster-opacity/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/image/raster-resampling/metrics.json b/metrics/linux-gcc8-release/render-tests/image/raster-resampling/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/image/raster-resampling/metrics.json rename to metrics/linux-gcc8-release/render-tests/image/raster-resampling/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/image/raster-saturation/metrics.json b/metrics/linux-gcc8-release/render-tests/image/raster-saturation/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/image/raster-saturation/metrics.json rename to metrics/linux-gcc8-release/render-tests/image/raster-saturation/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/image/raster-visibility/metrics.json b/metrics/linux-gcc8-release/render-tests/image/raster-visibility/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/image/raster-visibility/metrics.json rename to metrics/linux-gcc8-release/render-tests/image/raster-visibility/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/is-supported-script/filter/metrics.json b/metrics/linux-gcc8-release/render-tests/is-supported-script/filter/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/is-supported-script/filter/metrics.json rename to metrics/linux-gcc8-release/render-tests/is-supported-script/filter/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/is-supported-script/layout/metrics.json b/metrics/linux-gcc8-release/render-tests/is-supported-script/layout/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/is-supported-script/layout/metrics.json rename to metrics/linux-gcc8-release/render-tests/is-supported-script/layout/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-blur/default/metrics.json b/metrics/linux-gcc8-release/render-tests/line-blur/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-blur/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-blur/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-blur/function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-blur/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-blur/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-blur/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-blur/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/line-blur/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-blur/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-blur/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-blur/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-blur/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-blur/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-blur/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-cap/butt/metrics.json b/metrics/linux-gcc8-release/render-tests/line-cap/butt/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-cap/butt/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-cap/butt/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-cap/round/metrics.json b/metrics/linux-gcc8-release/render-tests/line-cap/round/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-cap/round/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-cap/round/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-cap/square/metrics.json b/metrics/linux-gcc8-release/render-tests/line-cap/square/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-cap/square/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-cap/square/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-color/default/metrics.json b/metrics/linux-gcc8-release/render-tests/line-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-color/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-color/function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-color/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-color/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/line-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-color/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-color/property-function-identity/metrics.json b/metrics/linux-gcc8-release/render-tests/line-color/property-function-identity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-color/property-function-identity/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-color/property-function-identity/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-color/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-color/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-dasharray/default/metrics.json b/metrics/linux-gcc8-release/render-tests/line-dasharray/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-dasharray/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-dasharray/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-dasharray/fractional-zoom/metrics.json b/metrics/linux-gcc8-release/render-tests/line-dasharray/fractional-zoom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-dasharray/fractional-zoom/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-dasharray/fractional-zoom/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-dasharray/function/line-width-composite-function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-dasharray/function/line-width-composite-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-dasharray/function/line-width-composite-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-dasharray/function/line-width-composite-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-dasharray/function/line-width-constant/metrics.json b/metrics/linux-gcc8-release/render-tests/line-dasharray/function/line-width-constant/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-dasharray/function/line-width-constant/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-dasharray/function/line-width-constant/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-dasharray/function/line-width-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-dasharray/function/line-width-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-dasharray/function/line-width-property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-dasharray/function/line-width-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-dasharray/literal/line-width-constant/metrics.json b/metrics/linux-gcc8-release/render-tests/line-dasharray/literal/line-width-constant/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-dasharray/literal/line-width-constant/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-dasharray/literal/line-width-constant/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-dasharray/literal/line-width-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-dasharray/literal/line-width-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-dasharray/literal/line-width-property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-dasharray/literal/line-width-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-dasharray/long-segment/metrics.json b/metrics/linux-gcc8-release/render-tests/line-dasharray/long-segment/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-dasharray/long-segment/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-dasharray/long-segment/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-dasharray/overscaled/metrics.json b/metrics/linux-gcc8-release/render-tests/line-dasharray/overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-dasharray/overscaled/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-dasharray/overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-dasharray/round/segments/metrics.json b/metrics/linux-gcc8-release/render-tests/line-dasharray/round/segments/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-dasharray/round/segments/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-dasharray/round/segments/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-dasharray/round/zero-gap-width/metrics.json b/metrics/linux-gcc8-release/render-tests/line-dasharray/round/zero-gap-width/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-dasharray/round/zero-gap-width/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-dasharray/round/zero-gap-width/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-dasharray/slant/metrics.json b/metrics/linux-gcc8-release/render-tests/line-dasharray/slant/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-dasharray/slant/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-dasharray/slant/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-dasharray/zero-length-gap/metrics.json b/metrics/linux-gcc8-release/render-tests/line-dasharray/zero-length-gap/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-dasharray/zero-length-gap/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-dasharray/zero-length-gap/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-dasharray/zoom-history/metrics.json b/metrics/linux-gcc8-release/render-tests/line-dasharray/zoom-history/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-dasharray/zoom-history/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-dasharray/zoom-history/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-gap-width/default/metrics.json b/metrics/linux-gcc8-release/render-tests/line-gap-width/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-gap-width/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-gap-width/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-gap-width/function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-gap-width/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-gap-width/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-gap-width/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-gap-width/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/line-gap-width/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-gap-width/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-gap-width/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-gap-width/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-gap-width/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-gap-width/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-gap-width/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-gradient/gradient-tile-boundaries/metrics.json b/metrics/linux-gcc8-release/render-tests/line-gradient/gradient-tile-boundaries/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-gradient/gradient-tile-boundaries/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-gradient/gradient-tile-boundaries/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-gradient/gradient/metrics.json b/metrics/linux-gcc8-release/render-tests/line-gradient/gradient/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-gradient/gradient/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-gradient/gradient/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-gradient/translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/line-gradient/translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-gradient/translucent/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-gradient/translucent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-join/bevel-transparent/metrics.json b/metrics/linux-gcc8-release/render-tests/line-join/bevel-transparent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-join/bevel-transparent/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-join/bevel-transparent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-join/bevel/metrics.json b/metrics/linux-gcc8-release/render-tests/line-join/bevel/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-join/bevel/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-join/bevel/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-join/default/metrics.json b/metrics/linux-gcc8-release/render-tests/line-join/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-join/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-join/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-join/miter-transparent/metrics.json b/metrics/linux-gcc8-release/render-tests/line-join/miter-transparent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-join/miter-transparent/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-join/miter-transparent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-join/miter/metrics.json b/metrics/linux-gcc8-release/render-tests/line-join/miter/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-join/miter/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-join/miter/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-join/property-function-dasharray/metrics.json b/metrics/linux-gcc8-release/render-tests/line-join/property-function-dasharray/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-join/property-function-dasharray/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-join/property-function-dasharray/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-join/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-join/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-join/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-join/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-join/round-transparent/metrics.json b/metrics/linux-gcc8-release/render-tests/line-join/round-transparent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-join/round-transparent/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-join/round-transparent/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-join/round/metrics.json b/metrics/linux-gcc8-release/render-tests/line-join/round/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-join/round/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-join/round/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-offset/default/metrics.json b/metrics/linux-gcc8-release/render-tests/line-offset/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-offset/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-offset/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-offset/function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-offset/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-offset/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-offset/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-offset/literal-negative/metrics.json b/metrics/linux-gcc8-release/render-tests/line-offset/literal-negative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-offset/literal-negative/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-offset/literal-negative/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-offset/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/line-offset/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-offset/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-offset/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-offset/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-offset/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-offset/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-offset/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-opacity/default/metrics.json b/metrics/linux-gcc8-release/render-tests/line-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-opacity/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-opacity/function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-opacity/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-opacity/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/line-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-opacity/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-opacity/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-opacity/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-opacity/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-opacity/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-opacity/step-curve/metrics.json b/metrics/linux-gcc8-release/render-tests/line-opacity/step-curve/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-opacity/step-curve/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-opacity/step-curve/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-pattern/@2x/metrics.json b/metrics/linux-gcc8-release/render-tests/line-pattern/@2x/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-pattern/@2x/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-pattern/@2x/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-pattern/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/line-pattern/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-pattern/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-pattern/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-pattern/overscaled/metrics.json b/metrics/linux-gcc8-release/render-tests/line-pattern/overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-pattern/overscaled/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-pattern/overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-pattern/pitch/metrics.json b/metrics/linux-gcc8-release/render-tests/line-pattern/pitch/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-pattern/pitch/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-pattern/pitch/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-pattern/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-pattern/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-pattern/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-pattern/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-pattern/step-curve/metrics.json b/metrics/linux-gcc8-release/render-tests/line-pattern/step-curve/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-pattern/step-curve/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-pattern/step-curve/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-pattern/zoom-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/line-pattern/zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-pattern/zoom-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-pattern/zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-pitch/default/metrics.json b/metrics/linux-gcc8-release/render-tests/line-pitch/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-pitch/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-pitch/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-pitch/pitch0/metrics.json b/metrics/linux-gcc8-release/render-tests/line-pitch/pitch0/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-pitch/pitch0/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-pitch/pitch0/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-pitch/pitch15/metrics.json b/metrics/linux-gcc8-release/render-tests/line-pitch/pitch15/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-pitch/pitch15/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-pitch/pitch15/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-pitch/pitch30/metrics.json b/metrics/linux-gcc8-release/render-tests/line-pitch/pitch30/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-pitch/pitch30/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-pitch/pitch30/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-pitch/pitchAndBearing/metrics.json b/metrics/linux-gcc8-release/render-tests/line-pitch/pitchAndBearing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-pitch/pitchAndBearing/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-pitch/pitchAndBearing/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-sort-key/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/line-sort-key/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-sort-key/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-sort-key/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-translate-anchor/map/metrics.json b/metrics/linux-gcc8-release/render-tests/line-translate-anchor/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-translate-anchor/map/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-translate-anchor/map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-translate-anchor/viewport/metrics.json b/metrics/linux-gcc8-release/render-tests/line-translate-anchor/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-translate-anchor/viewport/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-translate-anchor/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-translate/default/metrics.json b/metrics/linux-gcc8-release/render-tests/line-translate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-translate/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-translate/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-translate/function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-translate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-translate/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-translate/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-triangulation/default/metrics.json b/metrics/linux-gcc8-release/render-tests/line-triangulation/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-triangulation/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-triangulation/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-triangulation/round/metrics.json b/metrics/linux-gcc8-release/render-tests/line-triangulation/round/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-triangulation/round/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-triangulation/round/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-visibility/none/metrics.json b/metrics/linux-gcc8-release/render-tests/line-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-visibility/none/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-visibility/visible/metrics.json b/metrics/linux-gcc8-release/render-tests/line-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-visibility/visible/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-width/default/metrics.json b/metrics/linux-gcc8-release/render-tests/line-width/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-width/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-width/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-width/function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-width/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-width/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-width/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-width/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/line-width/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-width/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-width/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-width/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-width/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-width/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-width/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-width/very-overscaled/metrics.json b/metrics/linux-gcc8-release/render-tests/line-width/very-overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-width/very-overscaled/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-width/very-overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-width/zero-width-function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-width/zero-width-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-width/zero-width-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-width/zero-width-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-width/zero-width/metrics.json b/metrics/linux-gcc8-release/render-tests/line-width/zero-width/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/line-width/zero-width/metrics.json rename to metrics/linux-gcc8-release/render-tests/line-width/zero-width/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/linear-filter-opacity-edge/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/linear-filter-opacity-edge/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/linear-filter-opacity-edge/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/linear-filter-opacity-edge/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/map-mode/static/metrics.json b/metrics/linux-gcc8-release/render-tests/map-mode/static/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/map-mode/static/metrics.json rename to metrics/linux-gcc8-release/render-tests/map-mode/static/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/map-mode/tile-avoid-edges/metrics.json b/metrics/linux-gcc8-release/render-tests/map-mode/tile-avoid-edges/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/map-mode/tile-avoid-edges/metrics.json rename to metrics/linux-gcc8-release/render-tests/map-mode/tile-avoid-edges/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/map-mode/tile/metrics.json b/metrics/linux-gcc8-release/render-tests/map-mode/tile/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/map-mode/tile/metrics.json rename to metrics/linux-gcc8-release/render-tests/map-mode/tile/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/projection/axonometric-multiple/metrics.json b/metrics/linux-gcc8-release/render-tests/projection/axonometric-multiple/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/projection/axonometric-multiple/metrics.json rename to metrics/linux-gcc8-release/render-tests/projection/axonometric-multiple/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/projection/axonometric/metrics.json b/metrics/linux-gcc8-release/render-tests/projection/axonometric/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/projection/axonometric/metrics.json rename to metrics/linux-gcc8-release/render-tests/projection/axonometric/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/projection/perspective/metrics.json b/metrics/linux-gcc8-release/render-tests/projection/perspective/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/projection/perspective/metrics.json rename to metrics/linux-gcc8-release/render-tests/projection/perspective/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/projection/skew/metrics.json b/metrics/linux-gcc8-release/render-tests/projection/skew/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/projection/skew/metrics.json rename to metrics/linux-gcc8-release/render-tests/projection/skew/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-alpha/default/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-alpha/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-alpha/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/raster-alpha/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-brightness/default/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-brightness/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-brightness/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/raster-brightness/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-brightness/function/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-brightness/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-brightness/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/raster-brightness/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-brightness/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-brightness/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-brightness/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/raster-brightness/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-contrast/default/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-contrast/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-contrast/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/raster-contrast/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-contrast/function/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-contrast/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-contrast/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/raster-contrast/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-contrast/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-contrast/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-contrast/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/raster-contrast/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-extent/maxzoom/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-extent/maxzoom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-extent/maxzoom/metrics.json rename to metrics/linux-gcc8-release/render-tests/raster-extent/maxzoom/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-extent/minzoom/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-extent/minzoom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-extent/minzoom/metrics.json rename to metrics/linux-gcc8-release/render-tests/raster-extent/minzoom/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-hue-rotate/default/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-hue-rotate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-hue-rotate/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/raster-hue-rotate/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-hue-rotate/function/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-hue-rotate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-hue-rotate/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/raster-hue-rotate/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-hue-rotate/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-hue-rotate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-hue-rotate/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/raster-hue-rotate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-loading/missing/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-loading/missing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-loading/missing/metrics.json rename to metrics/linux-gcc8-release/render-tests/raster-loading/missing/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-masking/overlapping-vector/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-masking/overlapping-vector/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-masking/overlapping-vector/metrics.json rename to metrics/linux-gcc8-release/render-tests/raster-masking/overlapping-vector/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-masking/overlapping/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-masking/overlapping/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-masking/overlapping/metrics.json rename to metrics/linux-gcc8-release/render-tests/raster-masking/overlapping/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-opacity/default/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-opacity/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/raster-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-opacity/function/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-opacity/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/raster-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-opacity/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-opacity/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/raster-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-resampling/default/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-resampling/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-resampling/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/raster-resampling/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-resampling/function/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-resampling/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-resampling/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/raster-resampling/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-resampling/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-resampling/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-resampling/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/raster-resampling/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-rotation/0/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-rotation/0/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-rotation/0/metrics.json rename to metrics/linux-gcc8-release/render-tests/raster-rotation/0/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-rotation/180/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-rotation/180/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-rotation/180/metrics.json rename to metrics/linux-gcc8-release/render-tests/raster-rotation/180/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-rotation/270/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-rotation/270/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-rotation/270/metrics.json rename to metrics/linux-gcc8-release/render-tests/raster-rotation/270/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-rotation/45/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-rotation/45/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-rotation/45/metrics.json rename to metrics/linux-gcc8-release/render-tests/raster-rotation/45/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-rotation/90/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-rotation/90/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-rotation/90/metrics.json rename to metrics/linux-gcc8-release/render-tests/raster-rotation/90/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-saturation/default/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-saturation/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-saturation/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/raster-saturation/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-saturation/function/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-saturation/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-saturation/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/raster-saturation/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-saturation/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-saturation/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-saturation/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/raster-saturation/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-visibility/none/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-visibility/none/metrics.json rename to metrics/linux-gcc8-release/render-tests/raster-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-visibility/visible/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/raster-visibility/visible/metrics.json rename to metrics/linux-gcc8-release/render-tests/raster-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/real-world/nepal/metrics.json b/metrics/linux-gcc8-release/render-tests/real-world/nepal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/real-world/nepal/metrics.json rename to metrics/linux-gcc8-release/render-tests/real-world/nepal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/real-world/norway/metrics.json b/metrics/linux-gcc8-release/render-tests/real-world/norway/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/real-world/norway/metrics.json rename to metrics/linux-gcc8-release/render-tests/real-world/norway/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/real-world/uruguay/metrics.json b/metrics/linux-gcc8-release/render-tests/real-world/uruguay/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/real-world/uruguay/metrics.json rename to metrics/linux-gcc8-release/render-tests/real-world/uruguay/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2305/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2305/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2305/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2305/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2523/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2523/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2523/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2523/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2533/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2533/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2533/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2533/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2534/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2534/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2534/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2534/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2787/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2787/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2787/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2787/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2846/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2846/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2846/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2846/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2929/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2929/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2929/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2929/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3010/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3010/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3010/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3010/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3107/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3107/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3107/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3107/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3320/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3320/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3320/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3320/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3365/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3365/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3365/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3365/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3394/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3394/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3394/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3394/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3426/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3426/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3426/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3426/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3548/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3548/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3548/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3548/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3612/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3612/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3612/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3612/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3614/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3614/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3614/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3614/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3623/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3623/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3623/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3623/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3633/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3633/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3633/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3633/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3682/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3682/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3682/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3682/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3702/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3702/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3702/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3702/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3723/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3723/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3723/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3723/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3819/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3819/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3819/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3819/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3903/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3903/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3903/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3903/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3910/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3910/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3910/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3910/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3949/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3949/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3949/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3949/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4124/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4124/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4124/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4124/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4144/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4144/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4144/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4144/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4146/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4146/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4146/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4146/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4150/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4150/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4150/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4150/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4172/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4172/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4172/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4172/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4235/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4235/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4235/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4235/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4550/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4550/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4550/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4550/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4551/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4551/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4551/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4551/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4564/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4564/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4564/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4564/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4573/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4573/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4573/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4573/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4579/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4579/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4579/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4579/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4605/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4605/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4605/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4605/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4617/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4617/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4617/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4617/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4647/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4647/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4647/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4647/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4651/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4651/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4651/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4651/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4860/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4860/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4860/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4860/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4928/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4928/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4928/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4928/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5171/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5171/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5171/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5171/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5370/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5370/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5370/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5370/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5466/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5466/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5466/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5466/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5496/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5496/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5496/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5496/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5544/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5544/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5544/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5544/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5546/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5546/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5546/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5546/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5576/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5576/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5576/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5576/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5599/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5599/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5599/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5599/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5631/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5631/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5631/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5631/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5776/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5776/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5776/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5776/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5911/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5911/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5911/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5911/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5911a/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5911a/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5911a/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5911a/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5947/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5947/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5947/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5947/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5953/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5953/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5953/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5953/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5978/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5978/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5978/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5978/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6160/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6160/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6160/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6160/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6238/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6238/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6238/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6238/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6548/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6548/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6548/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6548/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6649/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6649/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6649/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6649/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6660/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6660/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6660/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6660/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6919/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6919/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6919/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6919/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#7032/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#7032/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#7032/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#7032/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#7172/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#7172/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#7172/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#7172/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#8273/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#8273/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#8273/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#8273/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#9009/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#9009/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#9009/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#9009/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#10849/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#10849/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#10849/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#10849/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#11451/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#11451/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#11451/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#11451/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#11729/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#11729/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#11729/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#11729/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#12812/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#12812/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#12812/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#12812/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#14402/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#14402/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#14402/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#14402/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#15139/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#15139/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#15139/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#15139/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#3292/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#3292/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#3292/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#3292/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#5648/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#5648/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#5648/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#5648/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#5701/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#5701/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#5701/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#5701/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#5754/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#5754/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#5754/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#5754/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#6063/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#6063/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#6063/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#6063/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#6233/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#6233/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#6233/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#6233/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#6820/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#6820/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#6820/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#6820/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#6903/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#6903/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#6903/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#6903/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#7241/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#7241/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#7241/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#7241/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#7572/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#7572/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#7572/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#7572/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#7714/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#7714/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#7714/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#7714/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#7792/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#7792/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#7792/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#7792/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8078/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8078/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8078/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8078/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8303/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8303/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8303/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8303/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8460/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8460/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8460/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8460/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8505/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8505/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8505/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8505/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8871/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8871/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8871/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8871/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8952/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8952/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8952/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8952/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9406/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9406/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9406/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9406/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9557/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9557/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9557/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9557/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9792/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9792/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9792/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9792/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9900/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9900/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9900/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9900/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9976/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9976/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9976/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9976/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9979/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9979/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9979/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9979/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-shaders#37/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-shaders#37/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-shaders#37/metrics.json rename to metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-shaders#37/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/remove-feature-state/composite-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/remove-feature-state/composite-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/remove-feature-state/composite-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/remove-feature-state/composite-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/remove-feature-state/data-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/remove-feature-state/data-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/remove-feature-state/data-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/remove-feature-state/data-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/remove-feature-state/vector-source/metrics.json b/metrics/linux-gcc8-release/render-tests/remove-feature-state/vector-source/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/remove-feature-state/vector-source/metrics.json rename to metrics/linux-gcc8-release/render-tests/remove-feature-state/vector-source/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/retina-raster/default/metrics.json b/metrics/linux-gcc8-release/render-tests/retina-raster/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/retina-raster/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/retina-raster/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/filter-default-to-false/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/filter-default-to-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/filter-default-to-false/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/filter-default-to-false/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/filter-default-to-true/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/filter-default-to-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/filter-default-to-true/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/filter-default-to-true/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/filter-false-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/filter-false-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/filter-false-to-default/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/filter-false-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/filter-false-to-true/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/filter-false-to-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/filter-false-to-true/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/filter-false-to-true/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/filter-true-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/filter-true-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/filter-true-to-default/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/filter-true-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/filter-true-to-false/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/filter-true-to-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/filter-true-to-false/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/filter-true-to-false/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-alpha/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-alpha/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-alpha/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-alpha/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-nonsdf/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-nonsdf/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-nonsdf/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-nonsdf/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-pattern/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-pattern/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-sdf/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-sdf/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-sdf/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-sdf/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/image-remove/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-remove/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/image-remove/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/image-remove/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/image-update-icon/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-update-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/image-update-icon/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/image-update-icon/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/image-update-pattern/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-update-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/image-update-pattern/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/image-update-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-background/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-background/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-background/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-background/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-circle/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-circle/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-circle/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-fill/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-fill/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-fill/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-line/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-line/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-raster/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-raster/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-raster/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-raster/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-symbol/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-symbol/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-background/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-background/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-background/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-background/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-circle/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-circle/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-circle/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-fill/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-fill/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-fill/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-line/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-line/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-raster/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-raster/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-raster/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-raster/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-symbol/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-symbol/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-glyphs/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-glyphs/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-glyphs/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-glyphs/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-background/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-background/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-background/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-background/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-line/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-line/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-change-source/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-change-source/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-change-source/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-change-source/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-reorder/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-reorder/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-reorder/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-reorder/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-update/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-update/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-update/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-update/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-sprite/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-sprite/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-sprite/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-sprite/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-geojson-inline/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-geojson-inline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-geojson-inline/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-geojson-inline/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-geojson-url/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-geojson-url/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-geojson-url/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-geojson-url/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-raster-inline/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-raster-inline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-raster-inline/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-raster-inline/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-raster-url/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-raster-url/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-raster-url/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-raster-url/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-vector-inline/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-vector-inline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-vector-inline/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-vector-inline/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-vector-url/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-vector-url/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-vector-url/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-vector-url/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-default-to-none/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-default-to-none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-default-to-none/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-default-to-none/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-default-to-visible/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-default-to-visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-default-to-visible/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-default-to-visible/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-none-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-none-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-none-to-default/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-none-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-none-to-visible/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-none-to-visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-none-to-visible/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-none-to-visible/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-visible-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-visible-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-visible-to-default/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-visible-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-visible-to-none/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-visible-to-none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-visible-to-none/metrics.json rename to metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-visible-to-none/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/satellite-v9/z0/metrics.json b/metrics/linux-gcc8-release/render-tests/satellite-v9/z0/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/satellite-v9/z0/metrics.json rename to metrics/linux-gcc8-release/render-tests/satellite-v9/z0/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/sparse-tileset/overdraw/metrics.json b/metrics/linux-gcc8-release/render-tests/sparse-tileset/overdraw/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/sparse-tileset/overdraw/metrics.json rename to metrics/linux-gcc8-release/render-tests/sparse-tileset/overdraw/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/sprites/1x-screen-1x-icon/metrics.json b/metrics/linux-gcc8-release/render-tests/sprites/1x-screen-1x-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/sprites/1x-screen-1x-icon/metrics.json rename to metrics/linux-gcc8-release/render-tests/sprites/1x-screen-1x-icon/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/sprites/1x-screen-1x-pattern/metrics.json b/metrics/linux-gcc8-release/render-tests/sprites/1x-screen-1x-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/sprites/1x-screen-1x-pattern/metrics.json rename to metrics/linux-gcc8-release/render-tests/sprites/1x-screen-1x-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/sprites/1x-screen-2x-icon/metrics.json b/metrics/linux-gcc8-release/render-tests/sprites/1x-screen-2x-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/sprites/1x-screen-2x-icon/metrics.json rename to metrics/linux-gcc8-release/render-tests/sprites/1x-screen-2x-icon/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/sprites/1x-screen-2x-pattern/metrics.json b/metrics/linux-gcc8-release/render-tests/sprites/1x-screen-2x-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/sprites/1x-screen-2x-pattern/metrics.json rename to metrics/linux-gcc8-release/render-tests/sprites/1x-screen-2x-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/sprites/2x-screen-1x-icon/metrics.json b/metrics/linux-gcc8-release/render-tests/sprites/2x-screen-1x-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/sprites/2x-screen-1x-icon/metrics.json rename to metrics/linux-gcc8-release/render-tests/sprites/2x-screen-1x-icon/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/sprites/2x-screen-1x-pattern/metrics.json b/metrics/linux-gcc8-release/render-tests/sprites/2x-screen-1x-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/sprites/2x-screen-1x-pattern/metrics.json rename to metrics/linux-gcc8-release/render-tests/sprites/2x-screen-1x-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/sprites/2x-screen-2x-icon/metrics.json b/metrics/linux-gcc8-release/render-tests/sprites/2x-screen-2x-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/sprites/2x-screen-2x-icon/metrics.json rename to metrics/linux-gcc8-release/render-tests/sprites/2x-screen-2x-icon/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/sprites/2x-screen-2x-pattern/metrics.json b/metrics/linux-gcc8-release/render-tests/sprites/2x-screen-2x-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/sprites/2x-screen-2x-pattern/metrics.json rename to metrics/linux-gcc8-release/render-tests/sprites/2x-screen-2x-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-geometry/linestring/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-geometry/linestring/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-geometry/linestring/metrics.json rename to metrics/linux-gcc8-release/render-tests/symbol-geometry/linestring/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-geometry/multilinestring/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-geometry/multilinestring/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-geometry/multilinestring/metrics.json rename to metrics/linux-gcc8-release/render-tests/symbol-geometry/multilinestring/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-geometry/multipoint/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-geometry/multipoint/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-geometry/multipoint/metrics.json rename to metrics/linux-gcc8-release/render-tests/symbol-geometry/multipoint/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-geometry/multipolygon/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-geometry/multipolygon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-geometry/multipolygon/metrics.json rename to metrics/linux-gcc8-release/render-tests/symbol-geometry/multipolygon/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-geometry/point/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-geometry/point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-geometry/point/metrics.json rename to metrics/linux-gcc8-release/render-tests/symbol-geometry/point/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-geometry/polygon/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-geometry/polygon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-geometry/polygon/metrics.json rename to metrics/linux-gcc8-release/render-tests/symbol-geometry/polygon/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-placement/line-center-buffer-tile-map-mode/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-placement/line-center-buffer-tile-map-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-placement/line-center-buffer-tile-map-mode/metrics.json rename to metrics/linux-gcc8-release/render-tests/symbol-placement/line-center-buffer-tile-map-mode/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-placement/line-center-buffer/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-placement/line-center-buffer/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-placement/line-center-buffer/metrics.json rename to metrics/linux-gcc8-release/render-tests/symbol-placement/line-center-buffer/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-placement/line-center-tile-map-mode/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-placement/line-center-tile-map-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-placement/line-center-tile-map-mode/metrics.json rename to metrics/linux-gcc8-release/render-tests/symbol-placement/line-center-tile-map-mode/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-placement/line-center/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-placement/line-center/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-placement/line-center/metrics.json rename to metrics/linux-gcc8-release/render-tests/symbol-placement/line-center/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-placement/line-overscaled/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-placement/line-overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-placement/line-overscaled/metrics.json rename to metrics/linux-gcc8-release/render-tests/symbol-placement/line-overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-placement/line/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-placement/line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-placement/line/metrics.json rename to metrics/linux-gcc8-release/render-tests/symbol-placement/line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-placement/point-polygon/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-placement/point-polygon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-placement/point-polygon/metrics.json rename to metrics/linux-gcc8-release/render-tests/symbol-placement/point-polygon/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-placement/point/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-placement/point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-placement/point/metrics.json rename to metrics/linux-gcc8-release/render-tests/symbol-placement/point/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-sort-key/icon-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-sort-key/icon-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-sort-key/icon-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/symbol-sort-key/icon-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-sort-key/placement-tile-boundary-left-then-right/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-sort-key/placement-tile-boundary-left-then-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-sort-key/placement-tile-boundary-left-then-right/metrics.json rename to metrics/linux-gcc8-release/render-tests/symbol-sort-key/placement-tile-boundary-left-then-right/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-sort-key/text-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-sort-key/text-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-sort-key/text-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/symbol-sort-key/text-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-sort-key/text-ignore-placement/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-sort-key/text-ignore-placement/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-sort-key/text-ignore-placement/metrics.json rename to metrics/linux-gcc8-release/render-tests/symbol-sort-key/text-ignore-placement/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-sort-key/text-placement/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-sort-key/text-placement/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-sort-key/text-placement/metrics.json rename to metrics/linux-gcc8-release/render-tests/symbol-sort-key/text-placement/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-spacing/line-close/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-spacing/line-close/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-spacing/line-close/metrics.json rename to metrics/linux-gcc8-release/render-tests/symbol-spacing/line-close/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-spacing/line-far/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-spacing/line-far/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-spacing/line-far/metrics.json rename to metrics/linux-gcc8-release/render-tests/symbol-spacing/line-far/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-spacing/line-overscaled/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-spacing/line-overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-spacing/line-overscaled/metrics.json rename to metrics/linux-gcc8-release/render-tests/symbol-spacing/line-overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-spacing/point-close/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-spacing/point-close/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-spacing/point-close/metrics.json rename to metrics/linux-gcc8-release/render-tests/symbol-spacing/point-close/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-spacing/point-far/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-spacing/point-far/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-spacing/point-far/metrics.json rename to metrics/linux-gcc8-release/render-tests/symbol-spacing/point-far/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-visibility/none/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-visibility/none/metrics.json rename to metrics/linux-gcc8-release/render-tests/symbol-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-visibility/visible/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-visibility/visible/metrics.json rename to metrics/linux-gcc8-release/render-tests/symbol-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-z-order/default/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-z-order/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-z-order/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/symbol-z-order/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-z-order/disabled/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-z-order/disabled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-z-order/disabled/metrics.json rename to metrics/linux-gcc8-release/render-tests/symbol-z-order/disabled/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-z-order/icon-with-text/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-z-order/icon-with-text/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-z-order/icon-with-text/metrics.json rename to metrics/linux-gcc8-release/render-tests/symbol-z-order/icon-with-text/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-z-order/pitched/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-z-order/pitched/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-z-order/pitched/metrics.json rename to metrics/linux-gcc8-release/render-tests/symbol-z-order/pitched/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-z-order/viewport-y/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-z-order/viewport-y/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/symbol-z-order/viewport-y/metrics.json rename to metrics/linux-gcc8-release/render-tests/symbol-z-order/viewport-y/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-anchor/bottom-left/metrics.json b/metrics/linux-gcc8-release/render-tests/text-anchor/bottom-left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-anchor/bottom-left/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-anchor/bottom-left/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-anchor/bottom-right/metrics.json b/metrics/linux-gcc8-release/render-tests/text-anchor/bottom-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-anchor/bottom-right/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-anchor/bottom-right/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-anchor/bottom/metrics.json b/metrics/linux-gcc8-release/render-tests/text-anchor/bottom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-anchor/bottom/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-anchor/bottom/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-anchor/center/metrics.json b/metrics/linux-gcc8-release/render-tests/text-anchor/center/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-anchor/center/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-anchor/center/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-anchor/left/metrics.json b/metrics/linux-gcc8-release/render-tests/text-anchor/left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-anchor/left/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-anchor/left/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-anchor/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-anchor/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-anchor/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-anchor/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-anchor/right/metrics.json b/metrics/linux-gcc8-release/render-tests/text-anchor/right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-anchor/right/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-anchor/right/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-anchor/top-left/metrics.json b/metrics/linux-gcc8-release/render-tests/text-anchor/top-left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-anchor/top-left/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-anchor/top-left/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-anchor/top-right/metrics.json b/metrics/linux-gcc8-release/render-tests/text-anchor/top-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-anchor/top-right/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-anchor/top-right/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-anchor/top/metrics.json b/metrics/linux-gcc8-release/render-tests/text-anchor/top/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-anchor/top/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-anchor/top/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-arabic/letter-spacing/metrics.json b/metrics/linux-gcc8-release/render-tests/text-arabic/letter-spacing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-arabic/letter-spacing/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-arabic/letter-spacing/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-arabic/line-break-mixed/metrics.json b/metrics/linux-gcc8-release/render-tests/text-arabic/line-break-mixed/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-arabic/line-break-mixed/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-arabic/line-break-mixed/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-arabic/line-break/metrics.json b/metrics/linux-gcc8-release/render-tests/text-arabic/line-break/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-arabic/line-break/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-arabic/line-break/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-arabic/mixed-numeric/metrics.json b/metrics/linux-gcc8-release/render-tests/text-arabic/mixed-numeric/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-arabic/mixed-numeric/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-arabic/mixed-numeric/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-arabic/multi-paragraph/metrics.json b/metrics/linux-gcc8-release/render-tests/text-arabic/multi-paragraph/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-arabic/multi-paragraph/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-arabic/multi-paragraph/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-color/default/metrics.json b/metrics/linux-gcc8-release/render-tests/text-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-color/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-color/function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-color/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-color/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/text-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-color/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-color/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-color/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-field/formatted-arabic/metrics.json b/metrics/linux-gcc8-release/render-tests/text-field/formatted-arabic/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-field/formatted-arabic/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-field/formatted-arabic/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-field/formatted-images-constant-size/metrics.json b/metrics/linux-gcc8-release/render-tests/text-field/formatted-images-constant-size/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-field/formatted-images-constant-size/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-field/formatted-images-constant-size/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-field/formatted-images-line/metrics.json b/metrics/linux-gcc8-release/render-tests/text-field/formatted-images-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-field/formatted-images-line/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-field/formatted-images-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-field/formatted-images-multiline/metrics.json b/metrics/linux-gcc8-release/render-tests/text-field/formatted-images-multiline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-field/formatted-images-multiline/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-field/formatted-images-multiline/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json b/metrics/linux-gcc8-release/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-field/formatted-images-vertical/metrics.json b/metrics/linux-gcc8-release/render-tests/text-field/formatted-images-vertical/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-field/formatted-images-vertical/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-field/formatted-images-vertical/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json b/metrics/linux-gcc8-release/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-field/formatted-images/metrics.json b/metrics/linux-gcc8-release/render-tests/text-field/formatted-images/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-field/formatted-images/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-field/formatted-images/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-field/formatted-line/metrics.json b/metrics/linux-gcc8-release/render-tests/text-field/formatted-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-field/formatted-line/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-field/formatted-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-field/formatted-text-color-overrides/metrics.json b/metrics/linux-gcc8-release/render-tests/text-field/formatted-text-color-overrides/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-field/formatted-text-color-overrides/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-field/formatted-text-color-overrides/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-field/formatted-text-color/metrics.json b/metrics/linux-gcc8-release/render-tests/text-field/formatted-text-color/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-field/formatted-text-color/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-field/formatted-text-color/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-field/formatted/metrics.json b/metrics/linux-gcc8-release/render-tests/text-field/formatted/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-field/formatted/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-field/formatted/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-field/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/text-field/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-field/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-field/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-field/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-field/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-field/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-field/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-field/token/metrics.json b/metrics/linux-gcc8-release/render-tests/text-field/token/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-field/token/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-field/token/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-font/camera-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-font/camera-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-font/camera-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-font/camera-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-font/chinese/metrics.json b/metrics/linux-gcc8-release/render-tests/text-font/chinese/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-font/chinese/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-font/chinese/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-font/data-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/text-font/data-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-font/data-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-font/data-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-font/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/text-font/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-font/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-font/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-halo-blur/default/metrics.json b/metrics/linux-gcc8-release/render-tests/text-halo-blur/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-halo-blur/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-halo-blur/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-halo-blur/function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-halo-blur/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-halo-blur/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-halo-blur/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-halo-blur/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/text-halo-blur/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-halo-blur/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-halo-blur/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-halo-blur/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-halo-blur/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-halo-blur/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-halo-blur/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-halo-color/default/metrics.json b/metrics/linux-gcc8-release/render-tests/text-halo-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-halo-color/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-halo-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-halo-color/function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-halo-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-halo-color/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-halo-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-halo-color/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/text-halo-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-halo-color/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-halo-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-halo-color/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-halo-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-halo-color/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-halo-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-halo-width/default/metrics.json b/metrics/linux-gcc8-release/render-tests/text-halo-width/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-halo-width/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-halo-width/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-halo-width/function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-halo-width/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-halo-width/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-halo-width/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-halo-width/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/text-halo-width/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-halo-width/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-halo-width/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-halo-width/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-halo-width/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-halo-width/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-halo-width/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-justify/auto/metrics.json b/metrics/linux-gcc8-release/render-tests/text-justify/auto/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-justify/auto/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-justify/auto/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-justify/left/metrics.json b/metrics/linux-gcc8-release/render-tests/text-justify/left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-justify/left/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-justify/left/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-justify/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-justify/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-justify/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-justify/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-justify/right/metrics.json b/metrics/linux-gcc8-release/render-tests/text-justify/right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-justify/right/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-justify/right/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-false/metrics.json b/metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-false/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-false/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-true-offset/metrics.json b/metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-true-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-true-offset/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-true-offset/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json b/metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json b/metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json b/metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-true/metrics.json b/metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-true/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-true/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json b/metrics/linux-gcc8-release/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json b/metrics/linux-gcc8-release/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json b/metrics/linux-gcc8-release/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json b/metrics/linux-gcc8-release/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-letter-spacing/function-close/metrics.json b/metrics/linux-gcc8-release/render-tests/text-letter-spacing/function-close/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-letter-spacing/function-close/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-letter-spacing/function-close/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-letter-spacing/function-far/metrics.json b/metrics/linux-gcc8-release/render-tests/text-letter-spacing/function-far/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-letter-spacing/function-far/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-letter-spacing/function-far/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-letter-spacing/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/text-letter-spacing/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-letter-spacing/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-letter-spacing/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-letter-spacing/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-letter-spacing/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-letter-spacing/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-letter-spacing/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-line-height/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/text-line-height/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-line-height/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-line-height/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-max-angle/line-center/metrics.json b/metrics/linux-gcc8-release/render-tests/text-max-angle/line-center/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-max-angle/line-center/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-max-angle/line-center/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-max-angle/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/text-max-angle/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-max-angle/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-max-angle/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-max-width/force-double-newline/metrics.json b/metrics/linux-gcc8-release/render-tests/text-max-width/force-double-newline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-max-width/force-double-newline/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-max-width/force-double-newline/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-max-width/force-newline/metrics.json b/metrics/linux-gcc8-release/render-tests/text-max-width/force-newline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-max-width/force-newline/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-max-width/force-newline/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-max-width/ideographic-breaking/metrics.json b/metrics/linux-gcc8-release/render-tests/text-max-width/ideographic-breaking/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-max-width/ideographic-breaking/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-max-width/ideographic-breaking/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json b/metrics/linux-gcc8-release/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-max-width/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/text-max-width/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-max-width/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-max-width/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-max-width/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-max-width/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-max-width/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-max-width/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-max-width/zoom-and-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-max-width/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-max-width/zoom-and-property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-max-width/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-no-cross-source-collision/default/metrics.json b/metrics/linux-gcc8-release/render-tests/text-no-cross-source-collision/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-no-cross-source-collision/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-no-cross-source-collision/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-offset/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-offset/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-offset/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-opacity/default/metrics.json b/metrics/linux-gcc8-release/render-tests/text-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-opacity/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-opacity/function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-opacity/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-opacity/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/text-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-opacity/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-opacity/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-opacity/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-opacity/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-opacity/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json b/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json b/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json b/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json b/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json b/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json b/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json b/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json b/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json b/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json b/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-pitch-scaling/line-half/metrics.json b/metrics/linux-gcc8-release/render-tests/text-pitch-scaling/line-half/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-pitch-scaling/line-half/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-pitch-scaling/line-half/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-radial-offset/basic/metrics.json b/metrics/linux-gcc8-release/render-tests/text-radial-offset/basic/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-radial-offset/basic/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-radial-offset/basic/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-rotate/anchor-bottom/metrics.json b/metrics/linux-gcc8-release/render-tests/text-rotate/anchor-bottom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-rotate/anchor-bottom/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-rotate/anchor-bottom/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-rotate/anchor-left/metrics.json b/metrics/linux-gcc8-release/render-tests/text-rotate/anchor-left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-rotate/anchor-left/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-rotate/anchor-left/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-rotate/anchor-right/metrics.json b/metrics/linux-gcc8-release/render-tests/text-rotate/anchor-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-rotate/anchor-right/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-rotate/anchor-right/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-rotate/anchor-top/metrics.json b/metrics/linux-gcc8-release/render-tests/text-rotate/anchor-top/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-rotate/anchor-top/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-rotate/anchor-top/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-rotate/function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-rotate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-rotate/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-rotate/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-rotate/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/text-rotate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-rotate/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-rotate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-rotate/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-rotate/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-rotate/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-rotate/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-rotate/with-offset/metrics.json b/metrics/linux-gcc8-release/render-tests/text-rotate/with-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-rotate/with-offset/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-rotate/with-offset/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json b/metrics/linux-gcc8-release/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json b/metrics/linux-gcc8-release/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json b/metrics/linux-gcc8-release/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json b/metrics/linux-gcc8-release/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json b/metrics/linux-gcc8-release/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json b/metrics/linux-gcc8-release/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-size/camera-function-high-base/metrics.json b/metrics/linux-gcc8-release/render-tests/text-size/camera-function-high-base/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-size/camera-function-high-base/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-size/camera-function-high-base/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-size/camera-function-interval/metrics.json b/metrics/linux-gcc8-release/render-tests/text-size/camera-function-interval/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-size/camera-function-interval/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-size/camera-function-interval/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-size/composite-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/text-size/composite-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-size/composite-expression/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-size/composite-expression/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-size/composite-function-line-placement/metrics.json b/metrics/linux-gcc8-release/render-tests/text-size/composite-function-line-placement/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-size/composite-function-line-placement/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-size/composite-function-line-placement/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-size/composite-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-size/composite-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-size/composite-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-size/composite-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-size/default/metrics.json b/metrics/linux-gcc8-release/render-tests/text-size/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-size/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-size/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-size/function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-size/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-size/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-size/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-size/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/text-size/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-size/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-size/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-size/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-size/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-size/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-size/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-size/zero/metrics.json b/metrics/linux-gcc8-release/render-tests/text-size/zero/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-size/zero/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-size/zero/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-tile-edge-clipping/default/metrics.json b/metrics/linux-gcc8-release/render-tests/text-tile-edge-clipping/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-tile-edge-clipping/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-tile-edge-clipping/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-transform/lowercase/metrics.json b/metrics/linux-gcc8-release/render-tests/text-transform/lowercase/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-transform/lowercase/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-transform/lowercase/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-transform/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-transform/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-transform/property-function/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-transform/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-transform/uppercase/metrics.json b/metrics/linux-gcc8-release/render-tests/text-transform/uppercase/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-transform/uppercase/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-transform/uppercase/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-translate-anchor/map/metrics.json b/metrics/linux-gcc8-release/render-tests/text-translate-anchor/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-translate-anchor/map/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-translate-anchor/map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-translate-anchor/viewport/metrics.json b/metrics/linux-gcc8-release/render-tests/text-translate-anchor/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-translate-anchor/viewport/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-translate-anchor/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-translate/default/metrics.json b/metrics/linux-gcc8-release/render-tests/text-translate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-translate/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-translate/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-translate/function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-translate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-translate/function/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-translate/function/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-translate/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/text-translate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-translate/literal/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-translate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-offset/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-offset/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-offset/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/icon-image/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/icon-image/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/icon-image/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-variable-anchor/icon-image/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/no-animate-zoom/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/no-animate-zoom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/no-animate-zoom/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-variable-anchor/no-animate-zoom/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/pitched-offset/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/pitched-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/pitched-offset/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-variable-anchor/pitched-offset/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/pitched-with-map/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/pitched-with-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/pitched-with-map/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-variable-anchor/pitched-with-map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/pitched/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/pitched/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/pitched/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-variable-anchor/pitched/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/rotated-offset/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/rotated-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/rotated-offset/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-variable-anchor/rotated-offset/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/rotated-with-map/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/rotated-with-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/rotated-with-map/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-variable-anchor/rotated-with-map/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/rotated/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/rotated/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/rotated/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-variable-anchor/rotated/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/single-justification/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/single-justification/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/single-justification/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-variable-anchor/single-justification/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/single-line/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/single-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/single-line/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-variable-anchor/single-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/text-allow-overlap/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/text-allow-overlap/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/text-allow-overlap/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-variable-anchor/text-allow-overlap/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-visibility/none/metrics.json b/metrics/linux-gcc8-release/render-tests/text-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-visibility/none/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-visibility/visible/metrics.json b/metrics/linux-gcc8-release/render-tests/text-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-visibility/visible/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json b/metrics/linux-gcc8-release/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-writing-mode/line_label/chinese/metrics.json b/metrics/linux-gcc8-release/render-tests/text-writing-mode/line_label/chinese/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-writing-mode/line_label/chinese/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-writing-mode/line_label/chinese/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-writing-mode/line_label/latin/metrics.json b/metrics/linux-gcc8-release/render-tests/text-writing-mode/line_label/latin/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-writing-mode/line_label/latin/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-writing-mode/line_label/latin/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-writing-mode/line_label/mixed/metrics.json b/metrics/linux-gcc8-release/render-tests/text-writing-mode/line_label/mixed/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-writing-mode/line_label/mixed/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-writing-mode/line_label/mixed/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json rename to metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/tile-mode/streets-v11/metrics.json b/metrics/linux-gcc8-release/render-tests/tile-mode/streets-v11/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/tile-mode/streets-v11/metrics.json rename to metrics/linux-gcc8-release/render-tests/tile-mode/streets-v11/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/tilejson-bounds/default/metrics.json b/metrics/linux-gcc8-release/render-tests/tilejson-bounds/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/tilejson-bounds/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/tilejson-bounds/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/tilejson-bounds/overwrite-bounds/metrics.json b/metrics/linux-gcc8-release/render-tests/tilejson-bounds/overwrite-bounds/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/tilejson-bounds/overwrite-bounds/metrics.json rename to metrics/linux-gcc8-release/render-tests/tilejson-bounds/overwrite-bounds/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/tms/tms/metrics.json b/metrics/linux-gcc8-release/render-tests/tms/tms/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/tms/tms/metrics.json rename to metrics/linux-gcc8-release/render-tests/tms/tms/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/within/filter-with-inlined-geojson/metrics.json b/metrics/linux-gcc8-release/render-tests/within/filter-with-inlined-geojson/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/within/filter-with-inlined-geojson/metrics.json rename to metrics/linux-gcc8-release/render-tests/within/filter-with-inlined-geojson/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/within/layout-text/metrics.json b/metrics/linux-gcc8-release/render-tests/within/layout-text/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/within/layout-text/metrics.json rename to metrics/linux-gcc8-release/render-tests/within/layout-text/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/within/paint-circle/metrics.json b/metrics/linux-gcc8-release/render-tests/within/paint-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/within/paint-circle/metrics.json rename to metrics/linux-gcc8-release/render-tests/within/paint-circle/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/within/paint-icon/metrics.json b/metrics/linux-gcc8-release/render-tests/within/paint-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/within/paint-icon/metrics.json rename to metrics/linux-gcc8-release/render-tests/within/paint-icon/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/within/paint-line/metrics.json b/metrics/linux-gcc8-release/render-tests/within/paint-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/within/paint-line/metrics.json rename to metrics/linux-gcc8-release/render-tests/within/paint-line/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/within/paint-text/metrics.json b/metrics/linux-gcc8-release/render-tests/within/paint-text/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/within/paint-text/metrics.json rename to metrics/linux-gcc8-release/render-tests/within/paint-text/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/zoom-history/in/metrics.json b/metrics/linux-gcc8-release/render-tests/zoom-history/in/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/zoom-history/in/metrics.json rename to metrics/linux-gcc8-release/render-tests/zoom-history/in/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/zoom-history/out/metrics.json b/metrics/linux-gcc8-release/render-tests/zoom-history/out/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/zoom-history/out/metrics.json rename to metrics/linux-gcc8-release/render-tests/zoom-history/out/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/zoom-visibility/above/metrics.json b/metrics/linux-gcc8-release/render-tests/zoom-visibility/above/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/zoom-visibility/above/metrics.json rename to metrics/linux-gcc8-release/render-tests/zoom-visibility/above/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/zoom-visibility/below/metrics.json b/metrics/linux-gcc8-release/render-tests/zoom-visibility/below/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/zoom-visibility/below/metrics.json rename to metrics/linux-gcc8-release/render-tests/zoom-visibility/below/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/zoom-visibility/in-range/metrics.json b/metrics/linux-gcc8-release/render-tests/zoom-visibility/in-range/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/zoom-visibility/in-range/metrics.json rename to metrics/linux-gcc8-release/render-tests/zoom-visibility/in-range/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/zoom-visibility/out-of-range/metrics.json b/metrics/linux-gcc8-release/render-tests/zoom-visibility/out-of-range/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/zoom-visibility/out-of-range/metrics.json rename to metrics/linux-gcc8-release/render-tests/zoom-visibility/out-of-range/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/zoom-visibility/was-above/metrics.json b/metrics/linux-gcc8-release/render-tests/zoom-visibility/was-above/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/zoom-visibility/was-above/metrics.json rename to metrics/linux-gcc8-release/render-tests/zoom-visibility/was-above/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/zoom-visibility/was-below/metrics.json b/metrics/linux-gcc8-release/render-tests/zoom-visibility/was-below/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/zoom-visibility/was-below/metrics.json rename to metrics/linux-gcc8-release/render-tests/zoom-visibility/was-below/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/zoomed-fill/default/metrics.json b/metrics/linux-gcc8-release/render-tests/zoomed-fill/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/zoomed-fill/default/metrics.json rename to metrics/linux-gcc8-release/render-tests/zoomed-fill/default/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/zoomed-raster/fractional/metrics.json b/metrics/linux-gcc8-release/render-tests/zoomed-raster/fractional/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/zoomed-raster/fractional/metrics.json rename to metrics/linux-gcc8-release/render-tests/zoomed-raster/fractional/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/zoomed-raster/overzoom/metrics.json b/metrics/linux-gcc8-release/render-tests/zoomed-raster/overzoom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/zoomed-raster/overzoom/metrics.json rename to metrics/linux-gcc8-release/render-tests/zoomed-raster/overzoom/metrics.json diff --git a/mapbox-gl-native/metrics/linux-gcc8-release/render-tests/zoomed-raster/underzoom/metrics.json b/metrics/linux-gcc8-release/render-tests/zoomed-raster/underzoom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/linux-gcc8-release/render-tests/zoomed-raster/underzoom/metrics.json rename to metrics/linux-gcc8-release/render-tests/zoomed-raster/underzoom/metrics.json diff --git a/mapbox-gl-native/metrics/linux-tsan-style.json b/metrics/linux-tsan-style.json similarity index 100% rename from mapbox-gl-native/metrics/linux-tsan-style.json rename to metrics/linux-tsan-style.json diff --git a/mapbox-gl-native/metrics/linux-ubsan-style.json b/metrics/linux-ubsan-style.json similarity index 100% rename from mapbox-gl-native/metrics/linux-ubsan-style.json rename to metrics/linux-ubsan-style.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-debug-coverage-nightly-style.json b/metrics/macos-xcode11-debug-coverage-nightly-style.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-debug-coverage-nightly-style.json rename to metrics/macos-xcode11-debug-coverage-nightly-style.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-debug-style.json b/metrics/macos-xcode11-debug-style.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-debug-style.json rename to metrics/macos-xcode11-debug-style.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release-metrics.json b/metrics/macos-xcode11-release-metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release-metrics.json rename to metrics/macos-xcode11-release-metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release-style.json b/metrics/macos-xcode11-release-style.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release-style.json rename to metrics/macos-xcode11-release-style.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/probes/gfx/pass-double-probe/metrics.json b/metrics/macos-xcode11-release/probes/gfx/pass-double-probe/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/probes/gfx/pass-double-probe/metrics.json rename to metrics/macos-xcode11-release/probes/gfx/pass-double-probe/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/probes/gfx/pass-probe-reset/metrics.json b/metrics/macos-xcode11-release/probes/gfx/pass-probe-reset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/probes/gfx/pass-probe-reset/metrics.json rename to metrics/macos-xcode11-release/probes/gfx/pass-probe-reset/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/probes/gfx/pass/metrics.json b/metrics/macos-xcode11-release/probes/gfx/pass/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/probes/gfx/pass/metrics.json rename to metrics/macos-xcode11-release/probes/gfx/pass/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/background-color/colorSpace-lab/metrics.json b/metrics/macos-xcode11-release/render-tests/background-color/colorSpace-lab/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/background-color/colorSpace-lab/metrics.json rename to metrics/macos-xcode11-release/render-tests/background-color/colorSpace-lab/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/background-color/default/metrics.json b/metrics/macos-xcode11-release/render-tests/background-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/background-color/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/background-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/background-color/function/metrics.json b/metrics/macos-xcode11-release/render-tests/background-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/background-color/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/background-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/background-color/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/background-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/background-color/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/background-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/background-opacity/color/metrics.json b/metrics/macos-xcode11-release/render-tests/background-opacity/color/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/background-opacity/color/metrics.json rename to metrics/macos-xcode11-release/render-tests/background-opacity/color/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/background-opacity/image/metrics.json b/metrics/macos-xcode11-release/render-tests/background-opacity/image/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/background-opacity/image/metrics.json rename to metrics/macos-xcode11-release/render-tests/background-opacity/image/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/background-opacity/overlay/metrics.json b/metrics/macos-xcode11-release/render-tests/background-opacity/overlay/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/background-opacity/overlay/metrics.json rename to metrics/macos-xcode11-release/render-tests/background-opacity/overlay/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/background-pattern/@2x/metrics.json b/metrics/macos-xcode11-release/render-tests/background-pattern/@2x/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/background-pattern/@2x/metrics.json rename to metrics/macos-xcode11-release/render-tests/background-pattern/@2x/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/background-pattern/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/background-pattern/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/background-pattern/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/background-pattern/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/background-pattern/missing/metrics.json b/metrics/macos-xcode11-release/render-tests/background-pattern/missing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/background-pattern/missing/metrics.json rename to metrics/macos-xcode11-release/render-tests/background-pattern/missing/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/background-pattern/pitch/metrics.json b/metrics/macos-xcode11-release/render-tests/background-pattern/pitch/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/background-pattern/pitch/metrics.json rename to metrics/macos-xcode11-release/render-tests/background-pattern/pitch/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/background-pattern/rotated/metrics.json b/metrics/macos-xcode11-release/render-tests/background-pattern/rotated/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/background-pattern/rotated/metrics.json rename to metrics/macos-xcode11-release/render-tests/background-pattern/rotated/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/background-pattern/zoomed/metrics.json b/metrics/macos-xcode11-release/render-tests/background-pattern/zoomed/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/background-pattern/zoomed/metrics.json rename to metrics/macos-xcode11-release/render-tests/background-pattern/zoomed/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/background-visibility/none/metrics.json b/metrics/macos-xcode11-release/render-tests/background-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/background-visibility/none/metrics.json rename to metrics/macos-xcode11-release/render-tests/background-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/background-visibility/visible/metrics.json b/metrics/macos-xcode11-release/render-tests/background-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/background-visibility/visible/metrics.json rename to metrics/macos-xcode11-release/render-tests/background-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/basic-v9/z0-narrow-y/metrics.json b/metrics/macos-xcode11-release/render-tests/basic-v9/z0-narrow-y/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/basic-v9/z0-narrow-y/metrics.json rename to metrics/macos-xcode11-release/render-tests/basic-v9/z0-narrow-y/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/basic-v9/z0-wide-x/metrics.json b/metrics/macos-xcode11-release/render-tests/basic-v9/z0-wide-x/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/basic-v9/z0-wide-x/metrics.json rename to metrics/macos-xcode11-release/render-tests/basic-v9/z0-wide-x/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/basic-v9/z0/metrics.json b/metrics/macos-xcode11-release/render-tests/basic-v9/z0/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/basic-v9/z0/metrics.json rename to metrics/macos-xcode11-release/render-tests/basic-v9/z0/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/bright-v9/z0/metrics.json b/metrics/macos-xcode11-release/render-tests/bright-v9/z0/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/bright-v9/z0/metrics.json rename to metrics/macos-xcode11-release/render-tests/bright-v9/z0/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-blur/blending/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-blur/blending/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-blur/blending/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-blur/blending/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-blur/default/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-blur/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-blur/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-blur/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-blur/function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-blur/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-blur/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-blur/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-blur/literal-stroke/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-blur/literal-stroke/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-blur/literal-stroke/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-blur/literal-stroke/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-blur/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-blur/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-blur/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-blur/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-blur/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-blur/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-blur/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-blur/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-blur/zoom-and-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-blur/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-blur/zoom-and-property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-blur/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-color/default/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-color/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-color/function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-color/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-color/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-color/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-color/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-color/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-color/zoom-and-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-color/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-color/zoom-and-property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-color/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-geometry/linestring/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-geometry/linestring/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-geometry/linestring/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-geometry/linestring/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-geometry/multilinestring/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-geometry/multilinestring/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-geometry/multilinestring/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-geometry/multilinestring/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-geometry/multipoint/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-geometry/multipoint/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-geometry/multipoint/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-geometry/multipoint/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-geometry/multipolygon/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-geometry/multipolygon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-geometry/multipolygon/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-geometry/multipolygon/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-geometry/point/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-geometry/point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-geometry/point/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-geometry/point/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-geometry/polygon/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-geometry/polygon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-geometry/polygon/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-geometry/polygon/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-opacity/blending/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-opacity/blending/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-opacity/blending/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-opacity/blending/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-opacity/default/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-opacity/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-opacity/function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-opacity/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-opacity/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-opacity/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-opacity/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-opacity/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-opacity/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-opacity/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-opacity/zoom-and-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-opacity/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-opacity/zoom-and-property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-opacity/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-pitch-alignment/map-scale-map/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-pitch-alignment/map-scale-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-pitch-alignment/map-scale-map/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-pitch-alignment/map-scale-map/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-pitch-scale/default/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-pitch-scale/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-pitch-scale/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-pitch-scale/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-pitch-scale/map/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-pitch-scale/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-pitch-scale/map/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-pitch-scale/map/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-pitch-scale/viewport/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-pitch-scale/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-pitch-scale/viewport/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-pitch-scale/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-radius/antimeridian/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-radius/antimeridian/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-radius/antimeridian/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-radius/antimeridian/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-radius/default/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-radius/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-radius/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-radius/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-radius/function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-radius/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-radius/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-radius/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-radius/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-radius/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-radius/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-radius/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-radius/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-radius/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-radius/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-radius/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-radius/zoom-and-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-radius/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-radius/zoom-and-property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-radius/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-stroke-color/default/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-stroke-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-stroke-color/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-stroke-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-stroke-color/function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-stroke-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-stroke-color/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-stroke-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-stroke-color/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-stroke-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-stroke-color/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-stroke-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-stroke-color/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-stroke-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-stroke-color/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-stroke-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/default/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/stroke-only/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/stroke-only/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/stroke-only/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/stroke-only/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-stroke-width/default/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-stroke-width/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-stroke-width/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-stroke-width/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-stroke-width/function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-stroke-width/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-stroke-width/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-stroke-width/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-stroke-width/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-stroke-width/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-stroke-width/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-stroke-width/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-stroke-width/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-stroke-width/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-stroke-width/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-stroke-width/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-translate-anchor/map/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-translate-anchor/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-translate-anchor/map/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-translate-anchor/map/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-translate-anchor/viewport/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-translate-anchor/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-translate-anchor/viewport/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-translate-anchor/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-translate/default/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-translate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-translate/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-translate/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-translate/function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-translate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-translate/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-translate/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-translate/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-translate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/circle-translate/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/circle-translate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--background-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--background-opaque/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/background-opaque--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--background-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--background-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/background-opaque--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--circle-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--circle-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/background-opaque--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--fill-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--fill-opaque/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/background-opaque--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--fill-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--fill-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/background-opaque--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--line-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--line-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/background-opaque--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--raster-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--raster-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/background-opaque--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--symbol-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--symbol-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/background-opaque--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--background-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--background-opaque/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/background-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--background-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--background-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/background-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--circle-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--circle-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/background-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--fill-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--fill-opaque/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/background-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--fill-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--fill-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/background-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--line-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--line-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/background-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--raster-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--raster-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/background-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--symbol-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--symbol-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/background-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--background-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--background-opaque/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--background-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--background-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--circle-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--circle-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--fill-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--fill-opaque/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--fill-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--fill-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--line-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--line-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--raster-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--raster-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--background-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--background-opaque/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--background-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--background-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--circle-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--circle-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--fill-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--fill-opaque/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--fill-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--fill-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--line-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--line-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--raster-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--raster-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--background-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--background-opaque/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--background-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--background-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--circle-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--circle-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--fill-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--fill-opaque/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--fill-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--fill-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--line-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--line-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--raster-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--raster-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--background-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--background-opaque/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/line-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--background-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--background-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/line-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--circle-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--circle-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/line-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--fill-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--fill-opaque/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/line-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--fill-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--fill-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/line-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--line-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--line-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/line-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--raster-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--raster-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/line-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--symbol-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--symbol-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/line-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--background-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--background-opaque/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--background-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--background-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--circle-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--circle-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--fill-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--fill-opaque/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--fill-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--fill-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--line-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--line-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--raster-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--raster-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--background-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--background-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--background-opaque/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--background-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--background-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--background-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--background-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--background-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--line-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--line-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--line-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--line-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/debug/collision-icon-text-line-translate/metrics.json b/metrics/macos-xcode11-release/render-tests/debug/collision-icon-text-line-translate/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/debug/collision-icon-text-line-translate/metrics.json rename to metrics/macos-xcode11-release/render-tests/debug/collision-icon-text-line-translate/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/debug/collision-icon-text-point-translate/metrics.json b/metrics/macos-xcode11-release/render-tests/debug/collision-icon-text-point-translate/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/debug/collision-icon-text-point-translate/metrics.json rename to metrics/macos-xcode11-release/render-tests/debug/collision-icon-text-point-translate/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/debug/collision-lines-overscaled/metrics.json b/metrics/macos-xcode11-release/render-tests/debug/collision-lines-overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/debug/collision-lines-overscaled/metrics.json rename to metrics/macos-xcode11-release/render-tests/debug/collision-lines-overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/debug/collision-lines-pitched/metrics.json b/metrics/macos-xcode11-release/render-tests/debug/collision-lines-pitched/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/debug/collision-lines-pitched/metrics.json rename to metrics/macos-xcode11-release/render-tests/debug/collision-lines-pitched/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/debug/collision-lines/metrics.json b/metrics/macos-xcode11-release/render-tests/debug/collision-lines/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/debug/collision-lines/metrics.json rename to metrics/macos-xcode11-release/render-tests/debug/collision-lines/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/debug/collision-overscaled/metrics.json b/metrics/macos-xcode11-release/render-tests/debug/collision-overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/debug/collision-overscaled/metrics.json rename to metrics/macos-xcode11-release/render-tests/debug/collision-overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/debug/collision-pitched-wrapped/metrics.json b/metrics/macos-xcode11-release/render-tests/debug/collision-pitched-wrapped/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/debug/collision-pitched-wrapped/metrics.json rename to metrics/macos-xcode11-release/render-tests/debug/collision-pitched-wrapped/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/debug/collision-pitched/metrics.json b/metrics/macos-xcode11-release/render-tests/debug/collision-pitched/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/debug/collision-pitched/metrics.json rename to metrics/macos-xcode11-release/render-tests/debug/collision-pitched/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/empty/empty/metrics.json b/metrics/macos-xcode11-release/render-tests/empty/empty/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/empty/empty/metrics.json rename to metrics/macos-xcode11-release/render-tests/empty/empty/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/extent/1024-fill/metrics.json b/metrics/macos-xcode11-release/render-tests/extent/1024-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/extent/1024-fill/metrics.json rename to metrics/macos-xcode11-release/render-tests/extent/1024-fill/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/extent/1024-line/metrics.json b/metrics/macos-xcode11-release/render-tests/extent/1024-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/extent/1024-line/metrics.json rename to metrics/macos-xcode11-release/render-tests/extent/1024-line/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/extent/1024-symbol/metrics.json b/metrics/macos-xcode11-release/render-tests/extent/1024-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/extent/1024-symbol/metrics.json rename to metrics/macos-xcode11-release/render-tests/extent/1024-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/feature-state/composite-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/feature-state/composite-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/feature-state/composite-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/feature-state/composite-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/feature-state/data-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/feature-state/data-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/feature-state/data-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/feature-state/data-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/feature-state/vector-source/metrics.json b/metrics/macos-xcode11-release/render-tests/feature-state/vector-source/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/feature-state/vector-source/metrics.json rename to metrics/macos-xcode11-release/render-tests/feature-state/vector-source/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-antialias/false/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-antialias/false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-antialias/false/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-antialias/false/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-color/default/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-color/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-color/function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-color/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-color/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-color/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-color/multiply/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-color/multiply/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-color/multiply/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-color/multiply/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-color/opacity/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-color/opacity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-color/opacity/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-color/opacity/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-color/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-color/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-color/zoom-and-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-color/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-color/zoom-and-property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-color/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-base/default/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-base/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-base/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-extrusion-base/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-base/function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-base/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-base/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-extrusion-base/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-base/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-base/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-base/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-extrusion-base/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-base/negative/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-base/negative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-base/negative/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-extrusion-base/negative/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-base/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-base/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-base/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-extrusion-base/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-color/default/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-color/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-extrusion-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-color/function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-color/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-extrusion-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-color/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-color/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-extrusion-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-color/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-color/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-extrusion-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-height/default/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-height/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-height/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-extrusion-height/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-height/function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-height/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-height/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-extrusion-height/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-height/negative/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-height/negative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-height/negative/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-extrusion-height/negative/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-height/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-height/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-height/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-extrusion-height/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-multiple/multiple/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-multiple/multiple/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-multiple/multiple/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-extrusion-multiple/multiple/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-opacity/default/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-opacity/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-extrusion-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-opacity/function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-opacity/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-extrusion-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-opacity/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-opacity/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-extrusion-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-pattern/missing/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-pattern/missing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-pattern/missing/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-extrusion-pattern/missing/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-translate-anchor/map/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-translate-anchor/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-translate-anchor/map/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-extrusion-translate-anchor/map/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-translate/default/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-translate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-translate/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-extrusion-translate/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-translate/function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-translate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-translate/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-extrusion-translate/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-translate/literal-opacity/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-translate/literal-opacity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-translate/literal-opacity/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-extrusion-translate/literal-opacity/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-translate/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-translate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-translate/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-extrusion-translate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-vertical-gradient/default/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-vertical-gradient/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-vertical-gradient/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-extrusion-vertical-gradient/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-vertical-gradient/false/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-vertical-gradient/false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-extrusion-vertical-gradient/false/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-extrusion-vertical-gradient/false/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-opacity/default/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-opacity/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-opacity/function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-opacity/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-opacity/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-opacity/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-opacity/overlapping/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-opacity/overlapping/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-opacity/overlapping/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-opacity/overlapping/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-opacity/property-function-pattern/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-opacity/property-function-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-opacity/property-function-pattern/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-opacity/property-function-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-opacity/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-opacity/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-opacity/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-opacity/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-opacity/zoom-and-property-function-pattern/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-opacity/zoom-and-property-function-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-opacity/zoom-and-property-function-pattern/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-opacity/zoom-and-property-function-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-opacity/zoom-and-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-opacity/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-opacity/zoom-and-property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-opacity/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-outline-color/default/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-outline-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-outline-color/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-outline-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-outline-color/fill/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-outline-color/fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-outline-color/fill/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-outline-color/fill/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-outline-color/function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-outline-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-outline-color/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-outline-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-outline-color/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-outline-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-outline-color/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-outline-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-outline-color/multiply/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-outline-color/multiply/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-outline-color/multiply/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-outline-color/multiply/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-outline-color/opacity/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-outline-color/opacity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-outline-color/opacity/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-outline-color/opacity/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-outline-color/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-outline-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-outline-color/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-outline-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-outline-color/zoom-and-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-outline-color/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-outline-color/zoom-and-property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-outline-color/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-pattern/@2x/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-pattern/@2x/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-pattern/@2x/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-pattern/@2x/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-pattern/case-data-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-pattern/case-data-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-pattern/case-data-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-pattern/case-data-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-pattern/invalid-feature-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-pattern/invalid-feature-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-pattern/invalid-feature-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-pattern/invalid-feature-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-pattern/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-pattern/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-pattern/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-pattern/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-pattern/missing/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-pattern/missing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-pattern/missing/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-pattern/missing/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-pattern/opacity/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-pattern/opacity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-pattern/opacity/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-pattern/opacity/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-pattern/uneven-pattern/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-pattern/uneven-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-pattern/uneven-pattern/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-pattern/uneven-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-pattern/zoomed/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-pattern/zoomed/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-pattern/zoomed/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-pattern/zoomed/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-sort-key/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-sort-key/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-sort-key/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-sort-key/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-translate-anchor/map/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-translate-anchor/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-translate-anchor/map/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-translate-anchor/map/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-translate-anchor/viewport/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-translate-anchor/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-translate-anchor/viewport/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-translate-anchor/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-translate/default/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-translate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-translate/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-translate/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-translate/function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-translate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-translate/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-translate/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-translate/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-translate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-translate/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-translate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-visibility/none/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-visibility/none/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-visibility/visible/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/fill-visibility/visible/metrics.json rename to metrics/macos-xcode11-release/render-tests/fill-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/filter/equality/metrics.json b/metrics/macos-xcode11-release/render-tests/filter/equality/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/filter/equality/metrics.json rename to metrics/macos-xcode11-release/render-tests/filter/equality/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/filter/legacy-equality/metrics.json b/metrics/macos-xcode11-release/render-tests/filter/legacy-equality/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/filter/legacy-equality/metrics.json rename to metrics/macos-xcode11-release/render-tests/filter/legacy-equality/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/filter/none/metrics.json b/metrics/macos-xcode11-release/render-tests/filter/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/filter/none/metrics.json rename to metrics/macos-xcode11-release/render-tests/filter/none/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/clustered-properties/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/clustered-properties/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/clustered-properties/metrics.json rename to metrics/macos-xcode11-release/render-tests/geojson/clustered-properties/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/clustered/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/clustered/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/clustered/metrics.json rename to metrics/macos-xcode11-release/render-tests/geojson/clustered/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/external-feature/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/external-feature/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/external-feature/metrics.json rename to metrics/macos-xcode11-release/render-tests/geojson/external-feature/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/external-invalid/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/external-invalid/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/external-invalid/metrics.json rename to metrics/macos-xcode11-release/render-tests/geojson/external-invalid/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/external-linestring/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/external-linestring/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/external-linestring/metrics.json rename to metrics/macos-xcode11-release/render-tests/geojson/external-linestring/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/external-malformed/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/external-malformed/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/external-malformed/metrics.json rename to metrics/macos-xcode11-release/render-tests/geojson/external-malformed/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/inconsistent-winding-order/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/inconsistent-winding-order/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/inconsistent-winding-order/metrics.json rename to metrics/macos-xcode11-release/render-tests/geojson/inconsistent-winding-order/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/inline-feature/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/inline-feature/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/inline-feature/metrics.json rename to metrics/macos-xcode11-release/render-tests/geojson/inline-feature/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/inline-invalid/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/inline-invalid/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/inline-invalid/metrics.json rename to metrics/macos-xcode11-release/render-tests/geojson/inline-invalid/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/inline-linestring-circle/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/inline-linestring-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/inline-linestring-circle/metrics.json rename to metrics/macos-xcode11-release/render-tests/geojson/inline-linestring-circle/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/inline-linestring-line/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/inline-linestring-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/inline-linestring-line/metrics.json rename to metrics/macos-xcode11-release/render-tests/geojson/inline-linestring-line/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/inline-linestring-symbol/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/inline-linestring-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/inline-linestring-symbol/metrics.json rename to metrics/macos-xcode11-release/render-tests/geojson/inline-linestring-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/inline-malformed/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/inline-malformed/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/inline-malformed/metrics.json rename to metrics/macos-xcode11-release/render-tests/geojson/inline-malformed/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/inline-point-circle/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/inline-point-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/inline-point-circle/metrics.json rename to metrics/macos-xcode11-release/render-tests/geojson/inline-point-circle/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/inline-point-fill/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/inline-point-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/inline-point-fill/metrics.json rename to metrics/macos-xcode11-release/render-tests/geojson/inline-point-fill/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/inline-point-line/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/inline-point-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/inline-point-line/metrics.json rename to metrics/macos-xcode11-release/render-tests/geojson/inline-point-line/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/inline-point-symbol/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/inline-point-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/inline-point-symbol/metrics.json rename to metrics/macos-xcode11-release/render-tests/geojson/inline-point-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/inline-polygon-circle/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/inline-polygon-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/inline-polygon-circle/metrics.json rename to metrics/macos-xcode11-release/render-tests/geojson/inline-polygon-circle/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/inline-polygon-fill/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/inline-polygon-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/inline-polygon-fill/metrics.json rename to metrics/macos-xcode11-release/render-tests/geojson/inline-polygon-fill/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/inline-polygon-line/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/inline-polygon-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/inline-polygon-line/metrics.json rename to metrics/macos-xcode11-release/render-tests/geojson/inline-polygon-line/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/inline-polygon-symbol/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/inline-polygon-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/inline-polygon-symbol/metrics.json rename to metrics/macos-xcode11-release/render-tests/geojson/inline-polygon-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/missing/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/missing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/missing/metrics.json rename to metrics/macos-xcode11-release/render-tests/geojson/missing/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/reparse-overscaled/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/reparse-overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/geojson/reparse-overscaled/metrics.json rename to metrics/macos-xcode11-release/render-tests/geojson/reparse-overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-color/default/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-color/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/heatmap-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-color/expression/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-color/expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-color/expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/heatmap-color/expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-intensity/default/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-intensity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-intensity/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/heatmap-intensity/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-intensity/function/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-intensity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-intensity/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/heatmap-intensity/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-intensity/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-intensity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-intensity/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/heatmap-intensity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-opacity/default/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-opacity/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/heatmap-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-opacity/function/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-opacity/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/heatmap-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-opacity/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-opacity/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/heatmap-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-radius/antimeridian/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-radius/antimeridian/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-radius/antimeridian/metrics.json rename to metrics/macos-xcode11-release/render-tests/heatmap-radius/antimeridian/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-radius/data-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-radius/data-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-radius/data-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/heatmap-radius/data-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-radius/default/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-radius/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-radius/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/heatmap-radius/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-radius/function/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-radius/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-radius/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/heatmap-radius/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-radius/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-radius/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-radius/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/heatmap-radius/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-radius/pitch30/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-radius/pitch30/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-radius/pitch30/metrics.json rename to metrics/macos-xcode11-release/render-tests/heatmap-radius/pitch30/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-weight/default/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-weight/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-weight/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/heatmap-weight/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-weight/identity-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-weight/identity-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-weight/identity-property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/heatmap-weight/identity-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-weight/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-weight/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/heatmap-weight/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/heatmap-weight/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/hillshade-accent-color/default/metrics.json b/metrics/macos-xcode11-release/render-tests/hillshade-accent-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/hillshade-accent-color/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/hillshade-accent-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/hillshade-accent-color/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/hillshade-accent-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/hillshade-accent-color/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/hillshade-accent-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/hillshade-accent-color/terrarium/metrics.json b/metrics/macos-xcode11-release/render-tests/hillshade-accent-color/terrarium/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/hillshade-accent-color/terrarium/metrics.json rename to metrics/macos-xcode11-release/render-tests/hillshade-accent-color/terrarium/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/hillshade-accent-color/zoom-function/metrics.json b/metrics/macos-xcode11-release/render-tests/hillshade-accent-color/zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/hillshade-accent-color/zoom-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/hillshade-accent-color/zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/hillshade-highlight-color/default/metrics.json b/metrics/macos-xcode11-release/render-tests/hillshade-highlight-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/hillshade-highlight-color/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/hillshade-highlight-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/hillshade-highlight-color/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/hillshade-highlight-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/hillshade-highlight-color/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/hillshade-highlight-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/hillshade-highlight-color/zoom-function/metrics.json b/metrics/macos-xcode11-release/render-tests/hillshade-highlight-color/zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/hillshade-highlight-color/zoom-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/hillshade-highlight-color/zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/hillshade-shadow-color/default/metrics.json b/metrics/macos-xcode11-release/render-tests/hillshade-shadow-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/hillshade-shadow-color/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/hillshade-shadow-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/hillshade-shadow-color/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/hillshade-shadow-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/hillshade-shadow-color/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/hillshade-shadow-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/hillshade-shadow-color/zoom-function/metrics.json b/metrics/macos-xcode11-release/render-tests/hillshade-shadow-color/zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/hillshade-shadow-color/zoom-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/hillshade-shadow-color/zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-anchor/bottom-left/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-anchor/bottom-left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-anchor/bottom-left/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-anchor/bottom-left/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-anchor/bottom-right/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-anchor/bottom-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-anchor/bottom-right/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-anchor/bottom-right/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-anchor/bottom/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-anchor/bottom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-anchor/bottom/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-anchor/bottom/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-anchor/center/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-anchor/center/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-anchor/center/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-anchor/center/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-anchor/default/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-anchor/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-anchor/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-anchor/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-anchor/left/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-anchor/left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-anchor/left/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-anchor/left/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-anchor/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-anchor/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-anchor/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-anchor/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-anchor/right/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-anchor/right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-anchor/right/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-anchor/right/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-anchor/top-left/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-anchor/top-left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-anchor/top-left/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-anchor/top-left/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-anchor/top-right/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-anchor/top-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-anchor/top-right/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-anchor/top-right/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-anchor/top/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-anchor/top/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-anchor/top/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-anchor/top/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-color/default/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-color/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-color/function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-color/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-color/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-color/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-color/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-color/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-halo-blur/default/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-halo-blur/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-halo-blur/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-halo-blur/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-halo-blur/function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-halo-blur/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-halo-blur/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-halo-blur/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-halo-blur/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-halo-blur/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-halo-blur/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-halo-blur/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-halo-blur/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-halo-blur/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-halo-blur/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-halo-blur/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-halo-color/default/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-halo-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-halo-color/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-halo-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-halo-color/function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-halo-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-halo-color/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-halo-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-halo-color/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-halo-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-halo-color/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-halo-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-halo-color/multiply/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-halo-color/multiply/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-halo-color/multiply/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-halo-color/multiply/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-halo-color/opacity/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-halo-color/opacity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-halo-color/opacity/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-halo-color/opacity/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-halo-color/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-halo-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-halo-color/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-halo-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-halo-color/transparent/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-halo-color/transparent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-halo-color/transparent/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-halo-color/transparent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-halo-width/default/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-halo-width/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-halo-width/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-halo-width/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-halo-width/function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-halo-width/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-halo-width/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-halo-width/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-halo-width/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-halo-width/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-halo-width/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-halo-width/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-halo-width/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-halo-width/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-halo-width/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-halo-width/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-image/image-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-image/image-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-image/image-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-image/image-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-image/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-image/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-image/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-image/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-image/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-image/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-image/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-image/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-image/stretchable-content/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-image/stretchable-content/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-image/stretchable-content/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-image/stretchable-content/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-image/stretchable/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-image/stretchable/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-image/stretchable/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-image/stretchable/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-image/token/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-image/token/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-image/token/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-image/token/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-no-cross-source-collision/default/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-no-cross-source-collision/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-no-cross-source-collision/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-no-cross-source-collision/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-offset/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-offset/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-offset/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-offset/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-offset/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-offset/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-offset/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-offset/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-offset/zoom-and-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-offset/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-offset/zoom-and-property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-offset/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-opacity/default/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-opacity/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-opacity/function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-opacity/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-opacity/icon-only/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-opacity/icon-only/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-opacity/icon-only/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-opacity/icon-only/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-opacity/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-opacity/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-opacity/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-opacity/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-opacity/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-opacity/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-opacity/text-and-icon/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-opacity/text-and-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-opacity/text-and-icon/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-opacity/text-and-icon/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-opacity/text-only/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-opacity/text-only/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-opacity/text-only/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-opacity/text-only/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-pixelratio-mismatch/default/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-pixelratio-mismatch/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-pixelratio-mismatch/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-pixelratio-mismatch/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-rotate/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-rotate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-rotate/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-rotate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-rotate/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-rotate/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-rotate/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-rotate/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-rotate/with-offset/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-rotate/with-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-rotate/with-offset/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-rotate/with-offset/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-size/camera-function-high-base-plain/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-size/camera-function-high-base-plain/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-size/camera-function-high-base-plain/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-size/camera-function-high-base-plain/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-size/camera-function-high-base-sdf/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-size/camera-function-high-base-sdf/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-size/camera-function-high-base-sdf/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-size/camera-function-high-base-sdf/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-size/camera-function-plain/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-size/camera-function-plain/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-size/camera-function-plain/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-size/camera-function-plain/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-size/camera-function-sdf/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-size/camera-function-sdf/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-size/camera-function-sdf/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-size/camera-function-sdf/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-size/composite-function-plain/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-size/composite-function-plain/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-size/composite-function-plain/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-size/composite-function-plain/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-size/composite-function-sdf/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-size/composite-function-sdf/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-size/composite-function-sdf/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-size/composite-function-sdf/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-size/default/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-size/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-size/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-size/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-size/function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-size/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-size/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-size/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-size/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-size/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-size/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-size/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-size/property-function-plain/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-size/property-function-plain/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-size/property-function-plain/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-size/property-function-plain/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-size/property-function-sdf/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-size/property-function-sdf/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-size/property-function-sdf/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-size/property-function-sdf/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-collision/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-collision/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-collision/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/both-collision/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-padding/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-padding/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/both-padding/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/both/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/both/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/both/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/enlargen-both-padding/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/enlargen-both-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/enlargen-both-padding/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/enlargen-both-padding/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/enlargen-both/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/enlargen-both/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/enlargen-both/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/enlargen-both/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/enlargen-height/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/enlargen-height/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/enlargen-height/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/enlargen-height/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/enlargen-width/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/enlargen-width/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/enlargen-width/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/enlargen-width/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/height-padding/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/height-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/height-padding/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/height-padding/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/height-text-anchor/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/height-text-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/height-text-anchor/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/height-text-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/height/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/height/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/height/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/height/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/none/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/none/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/none/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/placement-line/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/placement-line/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-three-part/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-three-part/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-three-part/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-three-part/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-two-part/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-two-part/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-two-part/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-two-part/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-underscale/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-underscale/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-underscale/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-underscale/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/text-variable-anchor/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/text-variable-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/text-variable-anchor/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/text-variable-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/width-padding/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/width-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/width-padding/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/width-padding/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/width-text-anchor/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/width-text-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/width-text-anchor/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/width-text-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/width/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/width/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-text-fit/width/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-text-fit/width/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-translate-anchor/map/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-translate-anchor/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-translate-anchor/map/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-translate-anchor/map/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-translate-anchor/viewport/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-translate-anchor/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-translate-anchor/viewport/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-translate-anchor/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-translate/default/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-translate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-translate/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-translate/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-translate/function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-translate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-translate/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-translate/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-translate/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-translate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-translate/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-translate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-visibility/none/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-visibility/none/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-visibility/visible/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/icon-visibility/visible/metrics.json rename to metrics/macos-xcode11-release/render-tests/icon-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/image/default/metrics.json b/metrics/macos-xcode11-release/render-tests/image/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/image/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/image/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/image/pitched/metrics.json b/metrics/macos-xcode11-release/render-tests/image/pitched/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/image/pitched/metrics.json rename to metrics/macos-xcode11-release/render-tests/image/pitched/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/image/raster-brightness/metrics.json b/metrics/macos-xcode11-release/render-tests/image/raster-brightness/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/image/raster-brightness/metrics.json rename to metrics/macos-xcode11-release/render-tests/image/raster-brightness/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/image/raster-contrast/metrics.json b/metrics/macos-xcode11-release/render-tests/image/raster-contrast/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/image/raster-contrast/metrics.json rename to metrics/macos-xcode11-release/render-tests/image/raster-contrast/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/image/raster-hue-rotate/metrics.json b/metrics/macos-xcode11-release/render-tests/image/raster-hue-rotate/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/image/raster-hue-rotate/metrics.json rename to metrics/macos-xcode11-release/render-tests/image/raster-hue-rotate/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/image/raster-opacity/metrics.json b/metrics/macos-xcode11-release/render-tests/image/raster-opacity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/image/raster-opacity/metrics.json rename to metrics/macos-xcode11-release/render-tests/image/raster-opacity/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/image/raster-resampling/metrics.json b/metrics/macos-xcode11-release/render-tests/image/raster-resampling/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/image/raster-resampling/metrics.json rename to metrics/macos-xcode11-release/render-tests/image/raster-resampling/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/image/raster-saturation/metrics.json b/metrics/macos-xcode11-release/render-tests/image/raster-saturation/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/image/raster-saturation/metrics.json rename to metrics/macos-xcode11-release/render-tests/image/raster-saturation/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/image/raster-visibility/metrics.json b/metrics/macos-xcode11-release/render-tests/image/raster-visibility/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/image/raster-visibility/metrics.json rename to metrics/macos-xcode11-release/render-tests/image/raster-visibility/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/is-supported-script/filter/metrics.json b/metrics/macos-xcode11-release/render-tests/is-supported-script/filter/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/is-supported-script/filter/metrics.json rename to metrics/macos-xcode11-release/render-tests/is-supported-script/filter/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/is-supported-script/layout/metrics.json b/metrics/macos-xcode11-release/render-tests/is-supported-script/layout/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/is-supported-script/layout/metrics.json rename to metrics/macos-xcode11-release/render-tests/is-supported-script/layout/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-blur/default/metrics.json b/metrics/macos-xcode11-release/render-tests/line-blur/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-blur/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-blur/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-blur/function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-blur/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-blur/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-blur/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-blur/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/line-blur/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-blur/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-blur/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-blur/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-blur/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-blur/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-blur/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-cap/butt/metrics.json b/metrics/macos-xcode11-release/render-tests/line-cap/butt/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-cap/butt/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-cap/butt/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-cap/round/metrics.json b/metrics/macos-xcode11-release/render-tests/line-cap/round/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-cap/round/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-cap/round/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-cap/square/metrics.json b/metrics/macos-xcode11-release/render-tests/line-cap/square/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-cap/square/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-cap/square/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-color/default/metrics.json b/metrics/macos-xcode11-release/render-tests/line-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-color/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-color/function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-color/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-color/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/line-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-color/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-color/property-function-identity/metrics.json b/metrics/macos-xcode11-release/render-tests/line-color/property-function-identity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-color/property-function-identity/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-color/property-function-identity/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-color/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-color/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-dasharray/default/metrics.json b/metrics/macos-xcode11-release/render-tests/line-dasharray/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-dasharray/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-dasharray/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-dasharray/fractional-zoom/metrics.json b/metrics/macos-xcode11-release/render-tests/line-dasharray/fractional-zoom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-dasharray/fractional-zoom/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-dasharray/fractional-zoom/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-dasharray/function/line-width-composite-function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-dasharray/function/line-width-composite-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-dasharray/function/line-width-composite-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-dasharray/function/line-width-composite-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-dasharray/function/line-width-constant/metrics.json b/metrics/macos-xcode11-release/render-tests/line-dasharray/function/line-width-constant/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-dasharray/function/line-width-constant/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-dasharray/function/line-width-constant/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-dasharray/function/line-width-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-dasharray/function/line-width-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-dasharray/function/line-width-property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-dasharray/function/line-width-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-dasharray/literal/line-width-constant/metrics.json b/metrics/macos-xcode11-release/render-tests/line-dasharray/literal/line-width-constant/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-dasharray/literal/line-width-constant/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-dasharray/literal/line-width-constant/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-dasharray/literal/line-width-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-dasharray/literal/line-width-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-dasharray/literal/line-width-property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-dasharray/literal/line-width-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-dasharray/long-segment/metrics.json b/metrics/macos-xcode11-release/render-tests/line-dasharray/long-segment/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-dasharray/long-segment/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-dasharray/long-segment/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-dasharray/overscaled/metrics.json b/metrics/macos-xcode11-release/render-tests/line-dasharray/overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-dasharray/overscaled/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-dasharray/overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-dasharray/round/segments/metrics.json b/metrics/macos-xcode11-release/render-tests/line-dasharray/round/segments/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-dasharray/round/segments/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-dasharray/round/segments/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-dasharray/round/zero-gap-width/metrics.json b/metrics/macos-xcode11-release/render-tests/line-dasharray/round/zero-gap-width/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-dasharray/round/zero-gap-width/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-dasharray/round/zero-gap-width/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-dasharray/slant/metrics.json b/metrics/macos-xcode11-release/render-tests/line-dasharray/slant/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-dasharray/slant/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-dasharray/slant/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-dasharray/zoom-history/metrics.json b/metrics/macos-xcode11-release/render-tests/line-dasharray/zoom-history/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-dasharray/zoom-history/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-dasharray/zoom-history/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-gap-width/default/metrics.json b/metrics/macos-xcode11-release/render-tests/line-gap-width/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-gap-width/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-gap-width/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-gap-width/function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-gap-width/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-gap-width/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-gap-width/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-gap-width/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/line-gap-width/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-gap-width/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-gap-width/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-gap-width/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-gap-width/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-gap-width/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-gap-width/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-gradient/gradient/metrics.json b/metrics/macos-xcode11-release/render-tests/line-gradient/gradient/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-gradient/gradient/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-gradient/gradient/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-gradient/translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/line-gradient/translucent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-gradient/translucent/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-gradient/translucent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-join/bevel-transparent/metrics.json b/metrics/macos-xcode11-release/render-tests/line-join/bevel-transparent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-join/bevel-transparent/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-join/bevel-transparent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-join/bevel/metrics.json b/metrics/macos-xcode11-release/render-tests/line-join/bevel/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-join/bevel/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-join/bevel/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-join/default/metrics.json b/metrics/macos-xcode11-release/render-tests/line-join/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-join/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-join/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-join/miter-transparent/metrics.json b/metrics/macos-xcode11-release/render-tests/line-join/miter-transparent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-join/miter-transparent/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-join/miter-transparent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-join/miter/metrics.json b/metrics/macos-xcode11-release/render-tests/line-join/miter/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-join/miter/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-join/miter/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-join/property-function-dasharray/metrics.json b/metrics/macos-xcode11-release/render-tests/line-join/property-function-dasharray/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-join/property-function-dasharray/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-join/property-function-dasharray/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-join/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-join/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-join/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-join/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-join/round-transparent/metrics.json b/metrics/macos-xcode11-release/render-tests/line-join/round-transparent/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-join/round-transparent/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-join/round-transparent/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-join/round/metrics.json b/metrics/macos-xcode11-release/render-tests/line-join/round/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-join/round/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-join/round/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-offset/default/metrics.json b/metrics/macos-xcode11-release/render-tests/line-offset/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-offset/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-offset/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-offset/function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-offset/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-offset/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-offset/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-offset/literal-negative/metrics.json b/metrics/macos-xcode11-release/render-tests/line-offset/literal-negative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-offset/literal-negative/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-offset/literal-negative/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-offset/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/line-offset/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-offset/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-offset/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-offset/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-offset/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-offset/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-offset/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-opacity/default/metrics.json b/metrics/macos-xcode11-release/render-tests/line-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-opacity/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-opacity/function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-opacity/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-opacity/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/line-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-opacity/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-opacity/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-opacity/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-opacity/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-opacity/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-opacity/step-curve/metrics.json b/metrics/macos-xcode11-release/render-tests/line-opacity/step-curve/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-opacity/step-curve/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-opacity/step-curve/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-pattern/@2x/metrics.json b/metrics/macos-xcode11-release/render-tests/line-pattern/@2x/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-pattern/@2x/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-pattern/@2x/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-pattern/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/line-pattern/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-pattern/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-pattern/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-pattern/opacity/metrics.json b/metrics/macos-xcode11-release/render-tests/line-pattern/opacity/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-pattern/opacity/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-pattern/opacity/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-pattern/overscaled/metrics.json b/metrics/macos-xcode11-release/render-tests/line-pattern/overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-pattern/overscaled/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-pattern/overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-pattern/pitch/metrics.json b/metrics/macos-xcode11-release/render-tests/line-pattern/pitch/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-pattern/pitch/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-pattern/pitch/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-pattern/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-pattern/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-pattern/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-pattern/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-pattern/step-curve/metrics.json b/metrics/macos-xcode11-release/render-tests/line-pattern/step-curve/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-pattern/step-curve/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-pattern/step-curve/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-pattern/zoom-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/line-pattern/zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-pattern/zoom-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-pattern/zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-pitch/default/metrics.json b/metrics/macos-xcode11-release/render-tests/line-pitch/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-pitch/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-pitch/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-pitch/pitch0/metrics.json b/metrics/macos-xcode11-release/render-tests/line-pitch/pitch0/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-pitch/pitch0/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-pitch/pitch0/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-pitch/pitch15/metrics.json b/metrics/macos-xcode11-release/render-tests/line-pitch/pitch15/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-pitch/pitch15/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-pitch/pitch15/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-pitch/pitch30/metrics.json b/metrics/macos-xcode11-release/render-tests/line-pitch/pitch30/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-pitch/pitch30/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-pitch/pitch30/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-pitch/pitchAndBearing/metrics.json b/metrics/macos-xcode11-release/render-tests/line-pitch/pitchAndBearing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-pitch/pitchAndBearing/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-pitch/pitchAndBearing/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-sort-key/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/line-sort-key/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-sort-key/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-sort-key/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-translate-anchor/map/metrics.json b/metrics/macos-xcode11-release/render-tests/line-translate-anchor/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-translate-anchor/map/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-translate-anchor/map/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-translate-anchor/viewport/metrics.json b/metrics/macos-xcode11-release/render-tests/line-translate-anchor/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-translate-anchor/viewport/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-translate-anchor/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-translate/default/metrics.json b/metrics/macos-xcode11-release/render-tests/line-translate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-translate/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-translate/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-translate/function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-translate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-translate/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-translate/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-translate/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/line-translate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-translate/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-translate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-triangulation/default/metrics.json b/metrics/macos-xcode11-release/render-tests/line-triangulation/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-triangulation/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-triangulation/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-triangulation/round/metrics.json b/metrics/macos-xcode11-release/render-tests/line-triangulation/round/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-triangulation/round/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-triangulation/round/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-visibility/none/metrics.json b/metrics/macos-xcode11-release/render-tests/line-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-visibility/none/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-visibility/visible/metrics.json b/metrics/macos-xcode11-release/render-tests/line-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-visibility/visible/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-width/default/metrics.json b/metrics/macos-xcode11-release/render-tests/line-width/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-width/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-width/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-width/function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-width/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-width/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-width/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-width/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/line-width/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-width/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-width/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-width/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-width/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-width/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-width/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-width/very-overscaled/metrics.json b/metrics/macos-xcode11-release/render-tests/line-width/very-overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-width/very-overscaled/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-width/very-overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-width/zero-width-function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-width/zero-width-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-width/zero-width-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-width/zero-width-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-width/zero-width/metrics.json b/metrics/macos-xcode11-release/render-tests/line-width/zero-width/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/line-width/zero-width/metrics.json rename to metrics/macos-xcode11-release/render-tests/line-width/zero-width/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/linear-filter-opacity-edge/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/linear-filter-opacity-edge/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/linear-filter-opacity-edge/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/linear-filter-opacity-edge/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/map-mode/static/metrics.json b/metrics/macos-xcode11-release/render-tests/map-mode/static/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/map-mode/static/metrics.json rename to metrics/macos-xcode11-release/render-tests/map-mode/static/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/map-mode/tile-avoid-edges/metrics.json b/metrics/macos-xcode11-release/render-tests/map-mode/tile-avoid-edges/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/map-mode/tile-avoid-edges/metrics.json rename to metrics/macos-xcode11-release/render-tests/map-mode/tile-avoid-edges/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/map-mode/tile/metrics.json b/metrics/macos-xcode11-release/render-tests/map-mode/tile/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/map-mode/tile/metrics.json rename to metrics/macos-xcode11-release/render-tests/map-mode/tile/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/projection/axonometric-multiple/metrics.json b/metrics/macos-xcode11-release/render-tests/projection/axonometric-multiple/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/projection/axonometric-multiple/metrics.json rename to metrics/macos-xcode11-release/render-tests/projection/axonometric-multiple/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/projection/axonometric/metrics.json b/metrics/macos-xcode11-release/render-tests/projection/axonometric/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/projection/axonometric/metrics.json rename to metrics/macos-xcode11-release/render-tests/projection/axonometric/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/projection/perspective/metrics.json b/metrics/macos-xcode11-release/render-tests/projection/perspective/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/projection/perspective/metrics.json rename to metrics/macos-xcode11-release/render-tests/projection/perspective/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/projection/skew/metrics.json b/metrics/macos-xcode11-release/render-tests/projection/skew/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/projection/skew/metrics.json rename to metrics/macos-xcode11-release/render-tests/projection/skew/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-alpha/default/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-alpha/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-alpha/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/raster-alpha/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-brightness/default/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-brightness/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-brightness/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/raster-brightness/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-brightness/function/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-brightness/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-brightness/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/raster-brightness/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-brightness/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-brightness/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-brightness/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/raster-brightness/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-contrast/default/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-contrast/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-contrast/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/raster-contrast/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-contrast/function/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-contrast/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-contrast/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/raster-contrast/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-contrast/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-contrast/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-contrast/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/raster-contrast/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-extent/maxzoom/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-extent/maxzoom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-extent/maxzoom/metrics.json rename to metrics/macos-xcode11-release/render-tests/raster-extent/maxzoom/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-extent/minzoom/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-extent/minzoom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-extent/minzoom/metrics.json rename to metrics/macos-xcode11-release/render-tests/raster-extent/minzoom/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-hue-rotate/default/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-hue-rotate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-hue-rotate/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/raster-hue-rotate/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-hue-rotate/function/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-hue-rotate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-hue-rotate/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/raster-hue-rotate/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-hue-rotate/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-hue-rotate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-hue-rotate/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/raster-hue-rotate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-loading/missing/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-loading/missing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-loading/missing/metrics.json rename to metrics/macos-xcode11-release/render-tests/raster-loading/missing/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-masking/overlapping-vector/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-masking/overlapping-vector/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-masking/overlapping-vector/metrics.json rename to metrics/macos-xcode11-release/render-tests/raster-masking/overlapping-vector/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-masking/overlapping/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-masking/overlapping/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-masking/overlapping/metrics.json rename to metrics/macos-xcode11-release/render-tests/raster-masking/overlapping/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-opacity/default/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-opacity/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/raster-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-opacity/function/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-opacity/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/raster-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-opacity/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-opacity/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/raster-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-resampling/default/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-resampling/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-resampling/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/raster-resampling/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-resampling/function/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-resampling/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-resampling/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/raster-resampling/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-resampling/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-resampling/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-resampling/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/raster-resampling/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-rotation/0/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-rotation/0/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-rotation/0/metrics.json rename to metrics/macos-xcode11-release/render-tests/raster-rotation/0/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-rotation/180/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-rotation/180/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-rotation/180/metrics.json rename to metrics/macos-xcode11-release/render-tests/raster-rotation/180/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-rotation/270/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-rotation/270/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-rotation/270/metrics.json rename to metrics/macos-xcode11-release/render-tests/raster-rotation/270/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-rotation/45/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-rotation/45/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-rotation/45/metrics.json rename to metrics/macos-xcode11-release/render-tests/raster-rotation/45/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-rotation/90/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-rotation/90/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-rotation/90/metrics.json rename to metrics/macos-xcode11-release/render-tests/raster-rotation/90/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-saturation/default/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-saturation/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-saturation/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/raster-saturation/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-saturation/function/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-saturation/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-saturation/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/raster-saturation/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-saturation/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-saturation/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-saturation/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/raster-saturation/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-visibility/none/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-visibility/none/metrics.json rename to metrics/macos-xcode11-release/render-tests/raster-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-visibility/visible/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/raster-visibility/visible/metrics.json rename to metrics/macos-xcode11-release/render-tests/raster-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/real-world/nepal/metrics.json b/metrics/macos-xcode11-release/render-tests/real-world/nepal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/real-world/nepal/metrics.json rename to metrics/macos-xcode11-release/render-tests/real-world/nepal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/real-world/norway/metrics.json b/metrics/macos-xcode11-release/render-tests/real-world/norway/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/real-world/norway/metrics.json rename to metrics/macos-xcode11-release/render-tests/real-world/norway/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/real-world/uruguay/metrics.json b/metrics/macos-xcode11-release/render-tests/real-world/uruguay/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/real-world/uruguay/metrics.json rename to metrics/macos-xcode11-release/render-tests/real-world/uruguay/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2305/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2305/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2305/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2305/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2523/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2523/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2523/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2523/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2533/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2533/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2533/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2533/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2534/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2534/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2534/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2534/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2787/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2787/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2787/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2787/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2846/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2846/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2846/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2846/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2929/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2929/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2929/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2929/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3010/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3010/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3010/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3010/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3107/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3107/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3107/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3107/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3320/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3320/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3320/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3320/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3365/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3365/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3365/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3365/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3394/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3394/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3394/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3394/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3426/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3426/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3426/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3426/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3548/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3548/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3548/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3548/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3612/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3612/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3612/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3612/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3614/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3614/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3614/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3614/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3623/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3623/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3623/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3623/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3633/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3633/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3633/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3633/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3682/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3682/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3682/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3682/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3702/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3702/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3702/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3702/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3723/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3723/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3723/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3723/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3819/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3819/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3819/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3819/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3903/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3903/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3903/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3903/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3910/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3910/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3910/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3910/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3949/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3949/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3949/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3949/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4124/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4124/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4124/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4124/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4144/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4144/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4144/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4144/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4146/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4146/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4146/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4146/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4150/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4150/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4150/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4150/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4172/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4172/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4172/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4172/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4235/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4235/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4235/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4235/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4550/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4550/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4550/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4550/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4551/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4551/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4551/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4551/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4564/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4564/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4564/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4564/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4573/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4573/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4573/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4573/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4579/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4579/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4579/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4579/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4605/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4605/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4605/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4605/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4617/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4617/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4617/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4617/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4647/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4647/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4647/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4647/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4651/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4651/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4651/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4651/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4860/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4860/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4860/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4860/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4928/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4928/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4928/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4928/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5370/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5370/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5370/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5370/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5466/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5466/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5466/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5466/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5496/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5496/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5496/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5496/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5544/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5544/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5544/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5544/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5546/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5546/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5546/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5546/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5576/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5576/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5576/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5576/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5599/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5599/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5599/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5599/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5631/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5631/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5631/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5631/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5776/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5776/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5776/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5776/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5911/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5911/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5911/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5911/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5911a/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5911a/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5911a/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5911a/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5947/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5947/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5947/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5947/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5953/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5953/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5953/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5953/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5978/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5978/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5978/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5978/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6160/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6160/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6160/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6160/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6238/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6238/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6238/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6238/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6548/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6548/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6548/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6548/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6649/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6649/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6649/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6649/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6660/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6660/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6660/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6660/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6919/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6919/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6919/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6919/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#7032/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#7032/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#7032/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#7032/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#7172/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#7172/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#7172/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#7172/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#8273/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#8273/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#8273/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#8273/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#9009/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#9009/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#9009/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#9009/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#10849/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#10849/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#10849/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#10849/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#11451/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#11451/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#11451/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#11451/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#11729/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#11729/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#11729/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#11729/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#12812/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#12812/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#12812/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#12812/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#14402/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#14402/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#14402/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#14402/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#15139/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#15139/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#15139/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#15139/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#3292/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#3292/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#3292/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#3292/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#5648/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#5648/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#5648/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#5648/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#5701/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#5701/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#5701/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#5701/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#5754/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#5754/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#5754/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#5754/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#6063/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#6063/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#6063/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#6063/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#6233/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#6233/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#6233/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#6233/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#6820/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#6820/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#6820/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#6820/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#6903/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#6903/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#6903/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#6903/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#7241/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#7241/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#7241/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#7241/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#7572/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#7572/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#7572/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#7572/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#7714/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#7714/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#7714/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#7714/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#7792/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#7792/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#7792/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#7792/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8078/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8078/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8078/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8078/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8303/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8303/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8303/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8303/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8460/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8460/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8460/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8460/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8505/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8505/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8505/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8505/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8871/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8871/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8871/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8871/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8952/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8952/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8952/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8952/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9406/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9406/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9406/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9406/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9557/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9557/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9557/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9557/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9792/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9792/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9792/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9792/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9900/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9900/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9900/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9900/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9976/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9976/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9976/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9976/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9979/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9979/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9979/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9979/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-shaders#37/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-shaders#37/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-shaders#37/metrics.json rename to metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-shaders#37/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/remove-feature-state/composite-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/remove-feature-state/composite-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/remove-feature-state/composite-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/remove-feature-state/composite-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/remove-feature-state/data-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/remove-feature-state/data-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/remove-feature-state/data-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/remove-feature-state/data-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/remove-feature-state/vector-source/metrics.json b/metrics/macos-xcode11-release/render-tests/remove-feature-state/vector-source/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/remove-feature-state/vector-source/metrics.json rename to metrics/macos-xcode11-release/render-tests/remove-feature-state/vector-source/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/retina-raster/default/metrics.json b/metrics/macos-xcode11-release/render-tests/retina-raster/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/retina-raster/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/retina-raster/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/filter-default-to-false/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/filter-default-to-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/filter-default-to-false/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/filter-default-to-false/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/filter-default-to-true/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/filter-default-to-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/filter-default-to-true/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/filter-default-to-true/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/filter-false-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/filter-false-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/filter-false-to-default/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/filter-false-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/filter-false-to-true/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/filter-false-to-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/filter-false-to-true/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/filter-false-to-true/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/filter-true-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/filter-true-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/filter-true-to-default/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/filter-true-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/filter-true-to-false/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/filter-true-to-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/filter-true-to-false/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/filter-true-to-false/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-alpha/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-alpha/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-alpha/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-alpha/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-nonsdf/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-nonsdf/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-nonsdf/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-nonsdf/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-pattern/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-pattern/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-sdf/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-sdf/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-sdf/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-sdf/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/image-remove/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-remove/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/image-remove/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/image-remove/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/image-update-icon/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-update-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/image-update-icon/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/image-update-icon/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/image-update-pattern/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-update-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/image-update-pattern/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/image-update-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-background/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-background/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-background/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-background/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-circle/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-circle/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-circle/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-fill/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-fill/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-fill/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-line/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-line/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-line/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-raster/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-raster/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-raster/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-raster/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-symbol/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-symbol/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-background/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-background/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-background/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-background/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-circle/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-circle/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-circle/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-fill/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-fill/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-fill/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-line/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-line/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-line/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-raster/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-raster/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-raster/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-raster/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-symbol/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-symbol/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-glyphs/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-glyphs/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-glyphs/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-glyphs/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-background/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-background/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-background/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-background/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-line/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-line/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-line/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-change-source/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-change-source/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-change-source/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-change-source/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-reorder/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-reorder/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-reorder/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-reorder/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-update/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-update/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-update/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-update/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-sprite/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-sprite/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-sprite/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-sprite/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-geojson-inline/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-geojson-inline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-geojson-inline/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-geojson-inline/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-geojson-url/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-geojson-url/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-geojson-url/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-geojson-url/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-raster-inline/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-raster-inline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-raster-inline/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-raster-inline/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-raster-url/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-raster-url/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-raster-url/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-raster-url/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-vector-inline/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-vector-inline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-vector-inline/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-vector-inline/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-vector-url/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-vector-url/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-vector-url/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-vector-url/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-default-to-none/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-default-to-none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-default-to-none/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-default-to-none/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-default-to-visible/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-default-to-visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-default-to-visible/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-default-to-visible/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-none-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-none-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-none-to-default/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-none-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-none-to-visible/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-none-to-visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-none-to-visible/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-none-to-visible/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-visible-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-visible-to-default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-visible-to-default/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-visible-to-default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-visible-to-none/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-visible-to-none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-visible-to-none/metrics.json rename to metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-visible-to-none/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/satellite-v9/z0/metrics.json b/metrics/macos-xcode11-release/render-tests/satellite-v9/z0/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/satellite-v9/z0/metrics.json rename to metrics/macos-xcode11-release/render-tests/satellite-v9/z0/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/sparse-tileset/overdraw/metrics.json b/metrics/macos-xcode11-release/render-tests/sparse-tileset/overdraw/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/sparse-tileset/overdraw/metrics.json rename to metrics/macos-xcode11-release/render-tests/sparse-tileset/overdraw/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/sprites/1x-screen-1x-icon/metrics.json b/metrics/macos-xcode11-release/render-tests/sprites/1x-screen-1x-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/sprites/1x-screen-1x-icon/metrics.json rename to metrics/macos-xcode11-release/render-tests/sprites/1x-screen-1x-icon/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/sprites/1x-screen-1x-pattern/metrics.json b/metrics/macos-xcode11-release/render-tests/sprites/1x-screen-1x-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/sprites/1x-screen-1x-pattern/metrics.json rename to metrics/macos-xcode11-release/render-tests/sprites/1x-screen-1x-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/sprites/1x-screen-2x-icon/metrics.json b/metrics/macos-xcode11-release/render-tests/sprites/1x-screen-2x-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/sprites/1x-screen-2x-icon/metrics.json rename to metrics/macos-xcode11-release/render-tests/sprites/1x-screen-2x-icon/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/sprites/1x-screen-2x-pattern/metrics.json b/metrics/macos-xcode11-release/render-tests/sprites/1x-screen-2x-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/sprites/1x-screen-2x-pattern/metrics.json rename to metrics/macos-xcode11-release/render-tests/sprites/1x-screen-2x-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/sprites/2x-screen-1x-icon/metrics.json b/metrics/macos-xcode11-release/render-tests/sprites/2x-screen-1x-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/sprites/2x-screen-1x-icon/metrics.json rename to metrics/macos-xcode11-release/render-tests/sprites/2x-screen-1x-icon/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/sprites/2x-screen-1x-pattern/metrics.json b/metrics/macos-xcode11-release/render-tests/sprites/2x-screen-1x-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/sprites/2x-screen-1x-pattern/metrics.json rename to metrics/macos-xcode11-release/render-tests/sprites/2x-screen-1x-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/sprites/2x-screen-2x-icon/metrics.json b/metrics/macos-xcode11-release/render-tests/sprites/2x-screen-2x-icon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/sprites/2x-screen-2x-icon/metrics.json rename to metrics/macos-xcode11-release/render-tests/sprites/2x-screen-2x-icon/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/sprites/2x-screen-2x-pattern/metrics.json b/metrics/macos-xcode11-release/render-tests/sprites/2x-screen-2x-pattern/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/sprites/2x-screen-2x-pattern/metrics.json rename to metrics/macos-xcode11-release/render-tests/sprites/2x-screen-2x-pattern/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-geometry/linestring/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-geometry/linestring/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-geometry/linestring/metrics.json rename to metrics/macos-xcode11-release/render-tests/symbol-geometry/linestring/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-geometry/multilinestring/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-geometry/multilinestring/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-geometry/multilinestring/metrics.json rename to metrics/macos-xcode11-release/render-tests/symbol-geometry/multilinestring/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-geometry/multipoint/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-geometry/multipoint/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-geometry/multipoint/metrics.json rename to metrics/macos-xcode11-release/render-tests/symbol-geometry/multipoint/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-geometry/multipolygon/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-geometry/multipolygon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-geometry/multipolygon/metrics.json rename to metrics/macos-xcode11-release/render-tests/symbol-geometry/multipolygon/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-geometry/point/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-geometry/point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-geometry/point/metrics.json rename to metrics/macos-xcode11-release/render-tests/symbol-geometry/point/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-geometry/polygon/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-geometry/polygon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-geometry/polygon/metrics.json rename to metrics/macos-xcode11-release/render-tests/symbol-geometry/polygon/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-placement/line-center-buffer/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-placement/line-center-buffer/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-placement/line-center-buffer/metrics.json rename to metrics/macos-xcode11-release/render-tests/symbol-placement/line-center-buffer/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-placement/line-center/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-placement/line-center/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-placement/line-center/metrics.json rename to metrics/macos-xcode11-release/render-tests/symbol-placement/line-center/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-placement/line-overscaled/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-placement/line-overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-placement/line-overscaled/metrics.json rename to metrics/macos-xcode11-release/render-tests/symbol-placement/line-overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-placement/line/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-placement/line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-placement/line/metrics.json rename to metrics/macos-xcode11-release/render-tests/symbol-placement/line/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-placement/point-polygon/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-placement/point-polygon/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-placement/point-polygon/metrics.json rename to metrics/macos-xcode11-release/render-tests/symbol-placement/point-polygon/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-placement/point/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-placement/point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-placement/point/metrics.json rename to metrics/macos-xcode11-release/render-tests/symbol-placement/point/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-sort-key/icon-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-sort-key/icon-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-sort-key/icon-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/symbol-sort-key/icon-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-sort-key/text-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-sort-key/text-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-sort-key/text-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/symbol-sort-key/text-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-sort-key/text-ignore-placement/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-sort-key/text-ignore-placement/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-sort-key/text-ignore-placement/metrics.json rename to metrics/macos-xcode11-release/render-tests/symbol-sort-key/text-ignore-placement/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-sort-key/text-placement/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-sort-key/text-placement/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-sort-key/text-placement/metrics.json rename to metrics/macos-xcode11-release/render-tests/symbol-sort-key/text-placement/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-spacing/line-close/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-spacing/line-close/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-spacing/line-close/metrics.json rename to metrics/macos-xcode11-release/render-tests/symbol-spacing/line-close/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-spacing/line-far/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-spacing/line-far/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-spacing/line-far/metrics.json rename to metrics/macos-xcode11-release/render-tests/symbol-spacing/line-far/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-spacing/line-overscaled/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-spacing/line-overscaled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-spacing/line-overscaled/metrics.json rename to metrics/macos-xcode11-release/render-tests/symbol-spacing/line-overscaled/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-spacing/point-close/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-spacing/point-close/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-spacing/point-close/metrics.json rename to metrics/macos-xcode11-release/render-tests/symbol-spacing/point-close/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-spacing/point-far/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-spacing/point-far/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-spacing/point-far/metrics.json rename to metrics/macos-xcode11-release/render-tests/symbol-spacing/point-far/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-visibility/none/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-visibility/none/metrics.json rename to metrics/macos-xcode11-release/render-tests/symbol-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-visibility/visible/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-visibility/visible/metrics.json rename to metrics/macos-xcode11-release/render-tests/symbol-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-z-order/default/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-z-order/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-z-order/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/symbol-z-order/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-z-order/disabled/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-z-order/disabled/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-z-order/disabled/metrics.json rename to metrics/macos-xcode11-release/render-tests/symbol-z-order/disabled/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-z-order/icon-with-text/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-z-order/icon-with-text/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-z-order/icon-with-text/metrics.json rename to metrics/macos-xcode11-release/render-tests/symbol-z-order/icon-with-text/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-z-order/pitched/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-z-order/pitched/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-z-order/pitched/metrics.json rename to metrics/macos-xcode11-release/render-tests/symbol-z-order/pitched/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-z-order/viewport-y/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-z-order/viewport-y/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/symbol-z-order/viewport-y/metrics.json rename to metrics/macos-xcode11-release/render-tests/symbol-z-order/viewport-y/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-anchor/bottom-left/metrics.json b/metrics/macos-xcode11-release/render-tests/text-anchor/bottom-left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-anchor/bottom-left/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-anchor/bottom-left/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-anchor/bottom-right/metrics.json b/metrics/macos-xcode11-release/render-tests/text-anchor/bottom-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-anchor/bottom-right/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-anchor/bottom-right/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-anchor/bottom/metrics.json b/metrics/macos-xcode11-release/render-tests/text-anchor/bottom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-anchor/bottom/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-anchor/bottom/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-anchor/center/metrics.json b/metrics/macos-xcode11-release/render-tests/text-anchor/center/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-anchor/center/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-anchor/center/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-anchor/left/metrics.json b/metrics/macos-xcode11-release/render-tests/text-anchor/left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-anchor/left/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-anchor/left/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-anchor/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-anchor/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-anchor/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-anchor/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-anchor/right/metrics.json b/metrics/macos-xcode11-release/render-tests/text-anchor/right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-anchor/right/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-anchor/right/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-anchor/top-left/metrics.json b/metrics/macos-xcode11-release/render-tests/text-anchor/top-left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-anchor/top-left/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-anchor/top-left/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-anchor/top-right/metrics.json b/metrics/macos-xcode11-release/render-tests/text-anchor/top-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-anchor/top-right/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-anchor/top-right/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-anchor/top/metrics.json b/metrics/macos-xcode11-release/render-tests/text-anchor/top/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-anchor/top/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-anchor/top/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-arabic/letter-spacing/metrics.json b/metrics/macos-xcode11-release/render-tests/text-arabic/letter-spacing/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-arabic/letter-spacing/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-arabic/letter-spacing/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-arabic/line-break-mixed/metrics.json b/metrics/macos-xcode11-release/render-tests/text-arabic/line-break-mixed/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-arabic/line-break-mixed/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-arabic/line-break-mixed/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-arabic/line-break/metrics.json b/metrics/macos-xcode11-release/render-tests/text-arabic/line-break/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-arabic/line-break/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-arabic/line-break/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-arabic/mixed-numeric/metrics.json b/metrics/macos-xcode11-release/render-tests/text-arabic/mixed-numeric/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-arabic/mixed-numeric/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-arabic/mixed-numeric/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-arabic/multi-paragraph/metrics.json b/metrics/macos-xcode11-release/render-tests/text-arabic/multi-paragraph/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-arabic/multi-paragraph/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-arabic/multi-paragraph/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-color/default/metrics.json b/metrics/macos-xcode11-release/render-tests/text-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-color/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-color/function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-color/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-color/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/text-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-color/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-color/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-color/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-field/formatted-arabic/metrics.json b/metrics/macos-xcode11-release/render-tests/text-field/formatted-arabic/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-field/formatted-arabic/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-field/formatted-arabic/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-field/formatted-images-constant-size/metrics.json b/metrics/macos-xcode11-release/render-tests/text-field/formatted-images-constant-size/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-field/formatted-images-constant-size/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-field/formatted-images-constant-size/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-field/formatted-images-line/metrics.json b/metrics/macos-xcode11-release/render-tests/text-field/formatted-images-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-field/formatted-images-line/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-field/formatted-images-line/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-field/formatted-images-multiline/metrics.json b/metrics/macos-xcode11-release/render-tests/text-field/formatted-images-multiline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-field/formatted-images-multiline/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-field/formatted-images-multiline/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json b/metrics/macos-xcode11-release/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-field/formatted-images-vertical/metrics.json b/metrics/macos-xcode11-release/render-tests/text-field/formatted-images-vertical/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-field/formatted-images-vertical/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-field/formatted-images-vertical/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json b/metrics/macos-xcode11-release/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-field/formatted-images/metrics.json b/metrics/macos-xcode11-release/render-tests/text-field/formatted-images/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-field/formatted-images/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-field/formatted-images/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-field/formatted-line/metrics.json b/metrics/macos-xcode11-release/render-tests/text-field/formatted-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-field/formatted-line/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-field/formatted-line/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-field/formatted-text-color-overrides/metrics.json b/metrics/macos-xcode11-release/render-tests/text-field/formatted-text-color-overrides/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-field/formatted-text-color-overrides/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-field/formatted-text-color-overrides/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-field/formatted-text-color/metrics.json b/metrics/macos-xcode11-release/render-tests/text-field/formatted-text-color/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-field/formatted-text-color/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-field/formatted-text-color/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-field/formatted/metrics.json b/metrics/macos-xcode11-release/render-tests/text-field/formatted/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-field/formatted/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-field/formatted/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-field/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/text-field/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-field/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-field/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-field/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-field/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-field/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-field/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-field/token/metrics.json b/metrics/macos-xcode11-release/render-tests/text-field/token/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-field/token/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-field/token/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-font/camera-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-font/camera-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-font/camera-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-font/camera-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-font/chinese/metrics.json b/metrics/macos-xcode11-release/render-tests/text-font/chinese/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-font/chinese/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-font/chinese/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-font/data-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/text-font/data-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-font/data-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-font/data-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-font/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/text-font/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-font/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-font/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-halo-blur/default/metrics.json b/metrics/macos-xcode11-release/render-tests/text-halo-blur/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-halo-blur/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-halo-blur/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-halo-blur/function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-halo-blur/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-halo-blur/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-halo-blur/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-halo-blur/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/text-halo-blur/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-halo-blur/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-halo-blur/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-halo-blur/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-halo-blur/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-halo-blur/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-halo-blur/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-halo-color/default/metrics.json b/metrics/macos-xcode11-release/render-tests/text-halo-color/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-halo-color/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-halo-color/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-halo-color/function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-halo-color/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-halo-color/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-halo-color/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-halo-color/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/text-halo-color/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-halo-color/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-halo-color/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-halo-color/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-halo-color/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-halo-color/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-halo-color/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-halo-width/default/metrics.json b/metrics/macos-xcode11-release/render-tests/text-halo-width/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-halo-width/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-halo-width/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-halo-width/function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-halo-width/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-halo-width/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-halo-width/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-halo-width/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/text-halo-width/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-halo-width/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-halo-width/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-halo-width/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-halo-width/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-halo-width/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-halo-width/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-justify/auto/metrics.json b/metrics/macos-xcode11-release/render-tests/text-justify/auto/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-justify/auto/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-justify/auto/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-justify/left/metrics.json b/metrics/macos-xcode11-release/render-tests/text-justify/left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-justify/left/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-justify/left/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-justify/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-justify/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-justify/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-justify/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-justify/right/metrics.json b/metrics/macos-xcode11-release/render-tests/text-justify/right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-justify/right/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-justify/right/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-false/metrics.json b/metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-false/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-false/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-true-offset/metrics.json b/metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-true-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-true-offset/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-true-offset/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json b/metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json b/metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json b/metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-true/metrics.json b/metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-true/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-true/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json b/metrics/macos-xcode11-release/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json b/metrics/macos-xcode11-release/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json b/metrics/macos-xcode11-release/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json b/metrics/macos-xcode11-release/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-letter-spacing/function-close/metrics.json b/metrics/macos-xcode11-release/render-tests/text-letter-spacing/function-close/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-letter-spacing/function-close/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-letter-spacing/function-close/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-letter-spacing/function-far/metrics.json b/metrics/macos-xcode11-release/render-tests/text-letter-spacing/function-far/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-letter-spacing/function-far/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-letter-spacing/function-far/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-letter-spacing/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/text-letter-spacing/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-letter-spacing/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-letter-spacing/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-letter-spacing/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-letter-spacing/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-letter-spacing/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-letter-spacing/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-line-height/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/text-line-height/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-line-height/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-line-height/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-max-angle/line-center/metrics.json b/metrics/macos-xcode11-release/render-tests/text-max-angle/line-center/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-max-angle/line-center/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-max-angle/line-center/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-max-angle/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/text-max-angle/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-max-angle/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-max-angle/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-max-width/force-double-newline/metrics.json b/metrics/macos-xcode11-release/render-tests/text-max-width/force-double-newline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-max-width/force-double-newline/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-max-width/force-double-newline/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-max-width/force-newline/metrics.json b/metrics/macos-xcode11-release/render-tests/text-max-width/force-newline/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-max-width/force-newline/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-max-width/force-newline/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-max-width/ideographic-breaking/metrics.json b/metrics/macos-xcode11-release/render-tests/text-max-width/ideographic-breaking/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-max-width/ideographic-breaking/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-max-width/ideographic-breaking/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json b/metrics/macos-xcode11-release/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-max-width/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/text-max-width/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-max-width/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-max-width/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-max-width/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-max-width/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-max-width/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-max-width/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-max-width/zoom-and-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-max-width/zoom-and-property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-max-width/zoom-and-property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-max-width/zoom-and-property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-no-cross-source-collision/default/metrics.json b/metrics/macos-xcode11-release/render-tests/text-no-cross-source-collision/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-no-cross-source-collision/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-no-cross-source-collision/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-offset/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-offset/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-offset/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-opacity/default/metrics.json b/metrics/macos-xcode11-release/render-tests/text-opacity/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-opacity/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-opacity/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-opacity/function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-opacity/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-opacity/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-opacity/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-opacity/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/text-opacity/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-opacity/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-opacity/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-opacity/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-opacity/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-opacity/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-opacity/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json b/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json b/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json b/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json b/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json b/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json b/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json b/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json b/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json b/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json b/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-pitch-scaling/line-half/metrics.json b/metrics/macos-xcode11-release/render-tests/text-pitch-scaling/line-half/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-pitch-scaling/line-half/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-pitch-scaling/line-half/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-radial-offset/basic/metrics.json b/metrics/macos-xcode11-release/render-tests/text-radial-offset/basic/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-radial-offset/basic/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-radial-offset/basic/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-rotate/anchor-bottom/metrics.json b/metrics/macos-xcode11-release/render-tests/text-rotate/anchor-bottom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-rotate/anchor-bottom/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-rotate/anchor-bottom/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-rotate/anchor-left/metrics.json b/metrics/macos-xcode11-release/render-tests/text-rotate/anchor-left/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-rotate/anchor-left/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-rotate/anchor-left/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-rotate/anchor-right/metrics.json b/metrics/macos-xcode11-release/render-tests/text-rotate/anchor-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-rotate/anchor-right/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-rotate/anchor-right/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-rotate/anchor-top/metrics.json b/metrics/macos-xcode11-release/render-tests/text-rotate/anchor-top/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-rotate/anchor-top/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-rotate/anchor-top/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-rotate/function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-rotate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-rotate/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-rotate/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-rotate/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/text-rotate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-rotate/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-rotate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-rotate/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-rotate/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-rotate/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-rotate/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-rotate/with-offset/metrics.json b/metrics/macos-xcode11-release/render-tests/text-rotate/with-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-rotate/with-offset/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-rotate/with-offset/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json b/metrics/macos-xcode11-release/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json b/metrics/macos-xcode11-release/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json b/metrics/macos-xcode11-release/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json b/metrics/macos-xcode11-release/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json b/metrics/macos-xcode11-release/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json b/metrics/macos-xcode11-release/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-size/camera-function-high-base/metrics.json b/metrics/macos-xcode11-release/render-tests/text-size/camera-function-high-base/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-size/camera-function-high-base/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-size/camera-function-high-base/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-size/camera-function-interval/metrics.json b/metrics/macos-xcode11-release/render-tests/text-size/camera-function-interval/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-size/camera-function-interval/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-size/camera-function-interval/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-size/composite-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/text-size/composite-expression/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-size/composite-expression/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-size/composite-expression/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-size/composite-function-line-placement/metrics.json b/metrics/macos-xcode11-release/render-tests/text-size/composite-function-line-placement/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-size/composite-function-line-placement/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-size/composite-function-line-placement/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-size/composite-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-size/composite-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-size/composite-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-size/composite-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-size/default/metrics.json b/metrics/macos-xcode11-release/render-tests/text-size/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-size/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-size/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-size/function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-size/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-size/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-size/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-size/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/text-size/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-size/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-size/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-size/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-size/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-size/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-size/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-tile-edge-clipping/default/metrics.json b/metrics/macos-xcode11-release/render-tests/text-tile-edge-clipping/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-tile-edge-clipping/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-tile-edge-clipping/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-transform/lowercase/metrics.json b/metrics/macos-xcode11-release/render-tests/text-transform/lowercase/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-transform/lowercase/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-transform/lowercase/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-transform/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-transform/property-function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-transform/property-function/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-transform/property-function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-transform/uppercase/metrics.json b/metrics/macos-xcode11-release/render-tests/text-transform/uppercase/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-transform/uppercase/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-transform/uppercase/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-translate-anchor/map/metrics.json b/metrics/macos-xcode11-release/render-tests/text-translate-anchor/map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-translate-anchor/map/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-translate-anchor/map/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-translate-anchor/viewport/metrics.json b/metrics/macos-xcode11-release/render-tests/text-translate-anchor/viewport/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-translate-anchor/viewport/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-translate-anchor/viewport/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-translate/default/metrics.json b/metrics/macos-xcode11-release/render-tests/text-translate/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-translate/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-translate/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-translate/function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-translate/function/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-translate/function/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-translate/function/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-translate/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/text-translate/literal/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-translate/literal/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-translate/literal/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-offset/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-offset/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-offset/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/icon-image/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/icon-image/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/icon-image/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-variable-anchor/icon-image/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/no-animate-zoom/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/no-animate-zoom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/no-animate-zoom/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-variable-anchor/no-animate-zoom/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/pitched-offset/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/pitched-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/pitched-offset/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-variable-anchor/pitched-offset/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/pitched-with-map/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/pitched-with-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/pitched-with-map/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-variable-anchor/pitched-with-map/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/pitched/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/pitched/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/pitched/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-variable-anchor/pitched/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/rotated-offset/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/rotated-offset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/rotated-offset/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-variable-anchor/rotated-offset/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/rotated-with-map/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/rotated-with-map/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/rotated-with-map/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-variable-anchor/rotated-with-map/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/rotated/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/rotated/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/rotated/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-variable-anchor/rotated/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/single-justification/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/single-justification/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/single-justification/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-variable-anchor/single-justification/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/single-line/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/single-line/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/single-line/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-variable-anchor/single-line/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/text-allow-overlap/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/text-allow-overlap/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/text-allow-overlap/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-variable-anchor/text-allow-overlap/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-visibility/none/metrics.json b/metrics/macos-xcode11-release/render-tests/text-visibility/none/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-visibility/none/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-visibility/none/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-visibility/visible/metrics.json b/metrics/macos-xcode11-release/render-tests/text-visibility/visible/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-visibility/visible/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-visibility/visible/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json b/metrics/macos-xcode11-release/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-writing-mode/line_label/chinese/metrics.json b/metrics/macos-xcode11-release/render-tests/text-writing-mode/line_label/chinese/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-writing-mode/line_label/chinese/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-writing-mode/line_label/chinese/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-writing-mode/line_label/latin/metrics.json b/metrics/macos-xcode11-release/render-tests/text-writing-mode/line_label/latin/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-writing-mode/line_label/latin/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-writing-mode/line_label/latin/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-writing-mode/line_label/mixed/metrics.json b/metrics/macos-xcode11-release/render-tests/text-writing-mode/line_label/mixed/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-writing-mode/line_label/mixed/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-writing-mode/line_label/mixed/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json rename to metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/tilejson-bounds/default/metrics.json b/metrics/macos-xcode11-release/render-tests/tilejson-bounds/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/tilejson-bounds/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/tilejson-bounds/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/tilejson-bounds/overwrite-bounds/metrics.json b/metrics/macos-xcode11-release/render-tests/tilejson-bounds/overwrite-bounds/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/tilejson-bounds/overwrite-bounds/metrics.json rename to metrics/macos-xcode11-release/render-tests/tilejson-bounds/overwrite-bounds/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/tms/tms/metrics.json b/metrics/macos-xcode11-release/render-tests/tms/tms/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/tms/tms/metrics.json rename to metrics/macos-xcode11-release/render-tests/tms/tms/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/zoom-history/in/metrics.json b/metrics/macos-xcode11-release/render-tests/zoom-history/in/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/zoom-history/in/metrics.json rename to metrics/macos-xcode11-release/render-tests/zoom-history/in/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/zoom-history/out/metrics.json b/metrics/macos-xcode11-release/render-tests/zoom-history/out/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/zoom-history/out/metrics.json rename to metrics/macos-xcode11-release/render-tests/zoom-history/out/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/zoom-visibility/above/metrics.json b/metrics/macos-xcode11-release/render-tests/zoom-visibility/above/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/zoom-visibility/above/metrics.json rename to metrics/macos-xcode11-release/render-tests/zoom-visibility/above/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/zoom-visibility/below/metrics.json b/metrics/macos-xcode11-release/render-tests/zoom-visibility/below/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/zoom-visibility/below/metrics.json rename to metrics/macos-xcode11-release/render-tests/zoom-visibility/below/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/zoom-visibility/in-range/metrics.json b/metrics/macos-xcode11-release/render-tests/zoom-visibility/in-range/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/zoom-visibility/in-range/metrics.json rename to metrics/macos-xcode11-release/render-tests/zoom-visibility/in-range/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/zoom-visibility/out-of-range/metrics.json b/metrics/macos-xcode11-release/render-tests/zoom-visibility/out-of-range/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/zoom-visibility/out-of-range/metrics.json rename to metrics/macos-xcode11-release/render-tests/zoom-visibility/out-of-range/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/zoom-visibility/was-above/metrics.json b/metrics/macos-xcode11-release/render-tests/zoom-visibility/was-above/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/zoom-visibility/was-above/metrics.json rename to metrics/macos-xcode11-release/render-tests/zoom-visibility/was-above/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/zoom-visibility/was-below/metrics.json b/metrics/macos-xcode11-release/render-tests/zoom-visibility/was-below/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/zoom-visibility/was-below/metrics.json rename to metrics/macos-xcode11-release/render-tests/zoom-visibility/was-below/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/zoomed-fill/default/metrics.json b/metrics/macos-xcode11-release/render-tests/zoomed-fill/default/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/zoomed-fill/default/metrics.json rename to metrics/macos-xcode11-release/render-tests/zoomed-fill/default/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/zoomed-raster/fractional/metrics.json b/metrics/macos-xcode11-release/render-tests/zoomed-raster/fractional/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/zoomed-raster/fractional/metrics.json rename to metrics/macos-xcode11-release/render-tests/zoomed-raster/fractional/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/zoomed-raster/overzoom/metrics.json b/metrics/macos-xcode11-release/render-tests/zoomed-raster/overzoom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/zoomed-raster/overzoom/metrics.json rename to metrics/macos-xcode11-release/render-tests/zoomed-raster/overzoom/metrics.json diff --git a/mapbox-gl-native/metrics/macos-xcode11-release/render-tests/zoomed-raster/underzoom/metrics.json b/metrics/macos-xcode11-release/render-tests/zoomed-raster/underzoom/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/macos-xcode11-release/render-tests/zoomed-raster/underzoom/metrics.json rename to metrics/macos-xcode11-release/render-tests/zoomed-raster/underzoom/metrics.json diff --git a/mapbox-gl-native/metrics/tests/location_indicator/change_image/expected.png b/metrics/tests/location_indicator/change_image/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/change_image/expected.png rename to metrics/tests/location_indicator/change_image/expected.png diff --git a/mapbox-gl-native/metrics/tests/location_indicator/change_image/style.json b/metrics/tests/location_indicator/change_image/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/change_image/style.json rename to metrics/tests/location_indicator/change_image/style.json diff --git a/mapbox-gl-native/metrics/tests/location_indicator/dateline/expected.png b/metrics/tests/location_indicator/dateline/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/dateline/expected.png rename to metrics/tests/location_indicator/dateline/expected.png diff --git a/mapbox-gl-native/metrics/tests/location_indicator/dateline/style.json b/metrics/tests/location_indicator/dateline/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/dateline/style.json rename to metrics/tests/location_indicator/dateline/style.json diff --git a/mapbox-gl-native/metrics/tests/location_indicator/default/expected.png b/metrics/tests/location_indicator/default/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/default/expected.png rename to metrics/tests/location_indicator/default/expected.png diff --git a/mapbox-gl-native/metrics/tests/location_indicator/default/style.json b/metrics/tests/location_indicator/default/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/default/style.json rename to metrics/tests/location_indicator/default/style.json diff --git a/mapbox-gl-native/metrics/tests/location_indicator/image_pixel_ratio/expected.png b/metrics/tests/location_indicator/image_pixel_ratio/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/image_pixel_ratio/expected.png rename to metrics/tests/location_indicator/image_pixel_ratio/expected.png diff --git a/mapbox-gl-native/metrics/tests/location_indicator/image_pixel_ratio/style.json b/metrics/tests/location_indicator/image_pixel_ratio/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/image_pixel_ratio/style.json rename to metrics/tests/location_indicator/image_pixel_ratio/style.json diff --git a/mapbox-gl-native/metrics/tests/location_indicator/no_radius_border/expected.png b/metrics/tests/location_indicator/no_radius_border/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/no_radius_border/expected.png rename to metrics/tests/location_indicator/no_radius_border/expected.png diff --git a/mapbox-gl-native/metrics/tests/location_indicator/no_radius_border/style.json b/metrics/tests/location_indicator/no_radius_border/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/no_radius_border/style.json rename to metrics/tests/location_indicator/no_radius_border/style.json diff --git a/mapbox-gl-native/metrics/tests/location_indicator/no_radius_fill/expected.png b/metrics/tests/location_indicator/no_radius_fill/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/no_radius_fill/expected.png rename to metrics/tests/location_indicator/no_radius_fill/expected.png diff --git a/mapbox-gl-native/metrics/tests/location_indicator/no_radius_fill/style.json b/metrics/tests/location_indicator/no_radius_fill/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/no_radius_fill/style.json rename to metrics/tests/location_indicator/no_radius_fill/style.json diff --git a/mapbox-gl-native/metrics/tests/location_indicator/no_textures/expected.png b/metrics/tests/location_indicator/no_textures/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/no_textures/expected.png rename to metrics/tests/location_indicator/no_textures/expected.png diff --git a/mapbox-gl-native/metrics/tests/location_indicator/no_textures/style.json b/metrics/tests/location_indicator/no_textures/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/no_textures/style.json rename to metrics/tests/location_indicator/no_textures/style.json diff --git a/mapbox-gl-native/metrics/tests/location_indicator/one_texture/expected.png b/metrics/tests/location_indicator/one_texture/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/one_texture/expected.png rename to metrics/tests/location_indicator/one_texture/expected.png diff --git a/mapbox-gl-native/metrics/tests/location_indicator/one_texture/style.json b/metrics/tests/location_indicator/one_texture/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/one_texture/style.json rename to metrics/tests/location_indicator/one_texture/style.json diff --git a/mapbox-gl-native/metrics/tests/location_indicator/query_test/expected.json b/metrics/tests/location_indicator/query_test/expected.json similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/query_test/expected.json rename to metrics/tests/location_indicator/query_test/expected.json diff --git a/mapbox-gl-native/metrics/tests/location_indicator/query_test/style.json b/metrics/tests/location_indicator/query_test/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/query_test/style.json rename to metrics/tests/location_indicator/query_test/style.json diff --git a/mapbox-gl-native/metrics/tests/location_indicator/query_test_miss/expected.json b/metrics/tests/location_indicator/query_test_miss/expected.json similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/query_test_miss/expected.json rename to metrics/tests/location_indicator/query_test_miss/expected.json diff --git a/mapbox-gl-native/metrics/tests/location_indicator/query_test_miss/style.json b/metrics/tests/location_indicator/query_test_miss/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/query_test_miss/style.json rename to metrics/tests/location_indicator/query_test_miss/style.json diff --git a/mapbox-gl-native/metrics/tests/location_indicator/query_test_no_image/expected.json b/metrics/tests/location_indicator/query_test_no_image/expected.json similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/query_test_no_image/expected.json rename to metrics/tests/location_indicator/query_test_no_image/expected.json diff --git a/mapbox-gl-native/metrics/tests/location_indicator/query_test_no_image/style.json b/metrics/tests/location_indicator/query_test_no_image/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/query_test_no_image/style.json rename to metrics/tests/location_indicator/query_test_no_image/style.json diff --git a/mapbox-gl-native/metrics/tests/location_indicator/rotated/expected.png b/metrics/tests/location_indicator/rotated/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/rotated/expected.png rename to metrics/tests/location_indicator/rotated/expected.png diff --git a/mapbox-gl-native/metrics/tests/location_indicator/rotated/style.json b/metrics/tests/location_indicator/rotated/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/rotated/style.json rename to metrics/tests/location_indicator/rotated/style.json diff --git a/mapbox-gl-native/metrics/tests/location_indicator/tilted/expected.png b/metrics/tests/location_indicator/tilted/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/tilted/expected.png rename to metrics/tests/location_indicator/tilted/expected.png diff --git a/mapbox-gl-native/metrics/tests/location_indicator/tilted/style.json b/metrics/tests/location_indicator/tilted/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/tilted/style.json rename to metrics/tests/location_indicator/tilted/style.json diff --git a/mapbox-gl-native/metrics/tests/location_indicator/tilted_texture_shift/expected.png b/metrics/tests/location_indicator/tilted_texture_shift/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/tilted_texture_shift/expected.png rename to metrics/tests/location_indicator/tilted_texture_shift/expected.png diff --git a/mapbox-gl-native/metrics/tests/location_indicator/tilted_texture_shift/style.json b/metrics/tests/location_indicator/tilted_texture_shift/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/tilted_texture_shift/style.json rename to metrics/tests/location_indicator/tilted_texture_shift/style.json diff --git a/mapbox-gl-native/metrics/tests/location_indicator/tilted_texture_shift_bottom_left/expected.png b/metrics/tests/location_indicator/tilted_texture_shift_bottom_left/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/tilted_texture_shift_bottom_left/expected.png rename to metrics/tests/location_indicator/tilted_texture_shift_bottom_left/expected.png diff --git a/mapbox-gl-native/metrics/tests/location_indicator/tilted_texture_shift_bottom_left/style.json b/metrics/tests/location_indicator/tilted_texture_shift_bottom_left/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/tilted_texture_shift_bottom_left/style.json rename to metrics/tests/location_indicator/tilted_texture_shift_bottom_left/style.json diff --git a/mapbox-gl-native/metrics/tests/location_indicator/tilted_texture_shift_bottom_right/expected.png b/metrics/tests/location_indicator/tilted_texture_shift_bottom_right/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/tilted_texture_shift_bottom_right/expected.png rename to metrics/tests/location_indicator/tilted_texture_shift_bottom_right/expected.png diff --git a/mapbox-gl-native/metrics/tests/location_indicator/tilted_texture_shift_bottom_right/style.json b/metrics/tests/location_indicator/tilted_texture_shift_bottom_right/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/tilted_texture_shift_bottom_right/style.json rename to metrics/tests/location_indicator/tilted_texture_shift_bottom_right/style.json diff --git a/mapbox-gl-native/metrics/tests/location_indicator/tilted_texture_shift_top_left/expected.png b/metrics/tests/location_indicator/tilted_texture_shift_top_left/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/tilted_texture_shift_top_left/expected.png rename to metrics/tests/location_indicator/tilted_texture_shift_top_left/expected.png diff --git a/mapbox-gl-native/metrics/tests/location_indicator/tilted_texture_shift_top_left/style.json b/metrics/tests/location_indicator/tilted_texture_shift_top_left/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/tilted_texture_shift_top_left/style.json rename to metrics/tests/location_indicator/tilted_texture_shift_top_left/style.json diff --git a/mapbox-gl-native/metrics/tests/location_indicator/tilted_texture_shift_top_right/expected.png b/metrics/tests/location_indicator/tilted_texture_shift_top_right/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/tilted_texture_shift_top_right/expected.png rename to metrics/tests/location_indicator/tilted_texture_shift_top_right/expected.png diff --git a/mapbox-gl-native/metrics/tests/location_indicator/tilted_texture_shift_top_right/style.json b/metrics/tests/location_indicator/tilted_texture_shift_top_right/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/tilted_texture_shift_top_right/style.json rename to metrics/tests/location_indicator/tilted_texture_shift_top_right/style.json diff --git a/mapbox-gl-native/metrics/tests/location_indicator/two_textures/expected.png b/metrics/tests/location_indicator/two_textures/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/two_textures/expected.png rename to metrics/tests/location_indicator/two_textures/expected.png diff --git a/mapbox-gl-native/metrics/tests/location_indicator/two_textures/style.json b/metrics/tests/location_indicator/two_textures/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/location_indicator/two_textures/style.json rename to metrics/tests/location_indicator/two_textures/style.json diff --git a/mapbox-gl-native/metrics/tests/probes/file-size/fail-file-doesnt-match/expected.png b/metrics/tests/probes/file-size/fail-file-doesnt-match/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/file-size/fail-file-doesnt-match/expected.png rename to metrics/tests/probes/file-size/fail-file-doesnt-match/expected.png diff --git a/mapbox-gl-native/metrics/tests/probes/file-size/fail-file-doesnt-match/metrics.json b/metrics/tests/probes/file-size/fail-file-doesnt-match/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/file-size/fail-file-doesnt-match/metrics.json rename to metrics/tests/probes/file-size/fail-file-doesnt-match/metrics.json diff --git a/mapbox-gl-native/metrics/tests/probes/file-size/fail-file-doesnt-match/style.json b/metrics/tests/probes/file-size/fail-file-doesnt-match/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/file-size/fail-file-doesnt-match/style.json rename to metrics/tests/probes/file-size/fail-file-doesnt-match/style.json diff --git a/mapbox-gl-native/metrics/tests/probes/file-size/fail-size-is-over/expected.png b/metrics/tests/probes/file-size/fail-size-is-over/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/file-size/fail-size-is-over/expected.png rename to metrics/tests/probes/file-size/fail-size-is-over/expected.png diff --git a/mapbox-gl-native/metrics/tests/probes/file-size/fail-size-is-over/metrics.json b/metrics/tests/probes/file-size/fail-size-is-over/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/file-size/fail-size-is-over/metrics.json rename to metrics/tests/probes/file-size/fail-size-is-over/metrics.json diff --git a/mapbox-gl-native/metrics/tests/probes/file-size/fail-size-is-over/style.json b/metrics/tests/probes/file-size/fail-size-is-over/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/file-size/fail-size-is-over/style.json rename to metrics/tests/probes/file-size/fail-size-is-over/style.json diff --git a/mapbox-gl-native/metrics/tests/probes/file-size/fail-size-is-under/expected.png b/metrics/tests/probes/file-size/fail-size-is-under/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/file-size/fail-size-is-under/expected.png rename to metrics/tests/probes/file-size/fail-size-is-under/expected.png diff --git a/mapbox-gl-native/metrics/tests/probes/file-size/fail-size-is-under/metrics.json b/metrics/tests/probes/file-size/fail-size-is-under/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/file-size/fail-size-is-under/metrics.json rename to metrics/tests/probes/file-size/fail-size-is-under/metrics.json diff --git a/mapbox-gl-native/metrics/tests/probes/file-size/fail-size-is-under/style.json b/metrics/tests/probes/file-size/fail-size-is-under/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/file-size/fail-size-is-under/style.json rename to metrics/tests/probes/file-size/fail-size-is-under/style.json diff --git a/mapbox-gl-native/metrics/tests/probes/file-size/pass-size-is-in-tolerance-higher/expected.png b/metrics/tests/probes/file-size/pass-size-is-in-tolerance-higher/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/file-size/pass-size-is-in-tolerance-higher/expected.png rename to metrics/tests/probes/file-size/pass-size-is-in-tolerance-higher/expected.png diff --git a/mapbox-gl-native/metrics/tests/probes/file-size/pass-size-is-in-tolerance-higher/metrics.json b/metrics/tests/probes/file-size/pass-size-is-in-tolerance-higher/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/file-size/pass-size-is-in-tolerance-higher/metrics.json rename to metrics/tests/probes/file-size/pass-size-is-in-tolerance-higher/metrics.json diff --git a/mapbox-gl-native/metrics/tests/probes/file-size/pass-size-is-in-tolerance-higher/style.json b/metrics/tests/probes/file-size/pass-size-is-in-tolerance-higher/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/file-size/pass-size-is-in-tolerance-higher/style.json rename to metrics/tests/probes/file-size/pass-size-is-in-tolerance-higher/style.json diff --git a/mapbox-gl-native/metrics/tests/probes/file-size/pass-size-is-in-tolerance-lower/expected.png b/metrics/tests/probes/file-size/pass-size-is-in-tolerance-lower/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/file-size/pass-size-is-in-tolerance-lower/expected.png rename to metrics/tests/probes/file-size/pass-size-is-in-tolerance-lower/expected.png diff --git a/mapbox-gl-native/metrics/tests/probes/file-size/pass-size-is-in-tolerance-lower/metrics.json b/metrics/tests/probes/file-size/pass-size-is-in-tolerance-lower/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/file-size/pass-size-is-in-tolerance-lower/metrics.json rename to metrics/tests/probes/file-size/pass-size-is-in-tolerance-lower/metrics.json diff --git a/mapbox-gl-native/metrics/tests/probes/file-size/pass-size-is-in-tolerance-lower/style.json b/metrics/tests/probes/file-size/pass-size-is-in-tolerance-lower/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/file-size/pass-size-is-in-tolerance-lower/style.json rename to metrics/tests/probes/file-size/pass-size-is-in-tolerance-lower/style.json diff --git a/mapbox-gl-native/metrics/tests/probes/file-size/pass-size-is-same/expected.png b/metrics/tests/probes/file-size/pass-size-is-same/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/file-size/pass-size-is-same/expected.png rename to metrics/tests/probes/file-size/pass-size-is-same/expected.png diff --git a/mapbox-gl-native/metrics/tests/probes/file-size/pass-size-is-same/metrics.json b/metrics/tests/probes/file-size/pass-size-is-same/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/file-size/pass-size-is-same/metrics.json rename to metrics/tests/probes/file-size/pass-size-is-same/metrics.json diff --git a/mapbox-gl-native/metrics/tests/probes/file-size/pass-size-is-same/style.json b/metrics/tests/probes/file-size/pass-size-is-same/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/file-size/pass-size-is-same/style.json rename to metrics/tests/probes/file-size/pass-size-is-same/style.json diff --git a/mapbox-gl-native/metrics/tests/probes/gfx/fail-ib-mem-mismatch/expected.png b/metrics/tests/probes/gfx/fail-ib-mem-mismatch/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/gfx/fail-ib-mem-mismatch/expected.png rename to metrics/tests/probes/gfx/fail-ib-mem-mismatch/expected.png diff --git a/mapbox-gl-native/metrics/tests/probes/gfx/fail-ib-mem-mismatch/metrics.json b/metrics/tests/probes/gfx/fail-ib-mem-mismatch/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/gfx/fail-ib-mem-mismatch/metrics.json rename to metrics/tests/probes/gfx/fail-ib-mem-mismatch/metrics.json diff --git a/mapbox-gl-native/metrics/tests/probes/gfx/fail-ib-mem-mismatch/style.json b/metrics/tests/probes/gfx/fail-ib-mem-mismatch/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/gfx/fail-ib-mem-mismatch/style.json rename to metrics/tests/probes/gfx/fail-ib-mem-mismatch/style.json diff --git a/mapbox-gl-native/metrics/tests/probes/gfx/fail-negative-framebuffer-count/expected.png b/metrics/tests/probes/gfx/fail-negative-framebuffer-count/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/gfx/fail-negative-framebuffer-count/expected.png rename to metrics/tests/probes/gfx/fail-negative-framebuffer-count/expected.png diff --git a/mapbox-gl-native/metrics/tests/probes/gfx/fail-negative-framebuffer-count/metrics.json b/metrics/tests/probes/gfx/fail-negative-framebuffer-count/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/gfx/fail-negative-framebuffer-count/metrics.json rename to metrics/tests/probes/gfx/fail-negative-framebuffer-count/metrics.json diff --git a/mapbox-gl-native/metrics/tests/probes/gfx/fail-negative-framebuffer-count/style.json b/metrics/tests/probes/gfx/fail-negative-framebuffer-count/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/gfx/fail-negative-framebuffer-count/style.json rename to metrics/tests/probes/gfx/fail-negative-framebuffer-count/style.json diff --git a/mapbox-gl-native/metrics/tests/probes/gfx/fail-texture-mem-mismatch/expected.png b/metrics/tests/probes/gfx/fail-texture-mem-mismatch/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/gfx/fail-texture-mem-mismatch/expected.png rename to metrics/tests/probes/gfx/fail-texture-mem-mismatch/expected.png diff --git a/mapbox-gl-native/metrics/tests/probes/gfx/fail-texture-mem-mismatch/metrics.json b/metrics/tests/probes/gfx/fail-texture-mem-mismatch/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/gfx/fail-texture-mem-mismatch/metrics.json rename to metrics/tests/probes/gfx/fail-texture-mem-mismatch/metrics.json diff --git a/mapbox-gl-native/metrics/tests/probes/gfx/fail-texture-mem-mismatch/style.json b/metrics/tests/probes/gfx/fail-texture-mem-mismatch/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/gfx/fail-texture-mem-mismatch/style.json rename to metrics/tests/probes/gfx/fail-texture-mem-mismatch/style.json diff --git a/mapbox-gl-native/metrics/tests/probes/gfx/fail-too-few-buffers/expected.png b/metrics/tests/probes/gfx/fail-too-few-buffers/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/gfx/fail-too-few-buffers/expected.png rename to metrics/tests/probes/gfx/fail-too-few-buffers/expected.png diff --git a/mapbox-gl-native/metrics/tests/probes/gfx/fail-too-few-buffers/metrics.json b/metrics/tests/probes/gfx/fail-too-few-buffers/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/gfx/fail-too-few-buffers/metrics.json rename to metrics/tests/probes/gfx/fail-too-few-buffers/metrics.json diff --git a/mapbox-gl-native/metrics/tests/probes/gfx/fail-too-few-buffers/style.json b/metrics/tests/probes/gfx/fail-too-few-buffers/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/gfx/fail-too-few-buffers/style.json rename to metrics/tests/probes/gfx/fail-too-few-buffers/style.json diff --git a/mapbox-gl-native/metrics/tests/probes/gfx/fail-too-few-textures/expected.png b/metrics/tests/probes/gfx/fail-too-few-textures/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/gfx/fail-too-few-textures/expected.png rename to metrics/tests/probes/gfx/fail-too-few-textures/expected.png diff --git a/mapbox-gl-native/metrics/tests/probes/gfx/fail-too-few-textures/metrics.json b/metrics/tests/probes/gfx/fail-too-few-textures/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/gfx/fail-too-few-textures/metrics.json rename to metrics/tests/probes/gfx/fail-too-few-textures/metrics.json diff --git a/mapbox-gl-native/metrics/tests/probes/gfx/fail-too-few-textures/style.json b/metrics/tests/probes/gfx/fail-too-few-textures/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/gfx/fail-too-few-textures/style.json rename to metrics/tests/probes/gfx/fail-too-few-textures/style.json diff --git a/mapbox-gl-native/metrics/tests/probes/gfx/fail-too-many-drawcalls/expected.png b/metrics/tests/probes/gfx/fail-too-many-drawcalls/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/gfx/fail-too-many-drawcalls/expected.png rename to metrics/tests/probes/gfx/fail-too-many-drawcalls/expected.png diff --git a/mapbox-gl-native/metrics/tests/probes/gfx/fail-too-many-drawcalls/metrics.json b/metrics/tests/probes/gfx/fail-too-many-drawcalls/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/gfx/fail-too-many-drawcalls/metrics.json rename to metrics/tests/probes/gfx/fail-too-many-drawcalls/metrics.json diff --git a/mapbox-gl-native/metrics/tests/probes/gfx/fail-too-many-drawcalls/style.json b/metrics/tests/probes/gfx/fail-too-many-drawcalls/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/gfx/fail-too-many-drawcalls/style.json rename to metrics/tests/probes/gfx/fail-too-many-drawcalls/style.json diff --git a/mapbox-gl-native/metrics/tests/probes/gfx/fail-vb-mem-mismatch/expected.png b/metrics/tests/probes/gfx/fail-vb-mem-mismatch/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/gfx/fail-vb-mem-mismatch/expected.png rename to metrics/tests/probes/gfx/fail-vb-mem-mismatch/expected.png diff --git a/mapbox-gl-native/metrics/tests/probes/gfx/fail-vb-mem-mismatch/metrics.json b/metrics/tests/probes/gfx/fail-vb-mem-mismatch/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/gfx/fail-vb-mem-mismatch/metrics.json rename to metrics/tests/probes/gfx/fail-vb-mem-mismatch/metrics.json diff --git a/mapbox-gl-native/metrics/tests/probes/gfx/fail-vb-mem-mismatch/style.json b/metrics/tests/probes/gfx/fail-vb-mem-mismatch/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/gfx/fail-vb-mem-mismatch/style.json rename to metrics/tests/probes/gfx/fail-vb-mem-mismatch/style.json diff --git a/mapbox-gl-native/metrics/tests/probes/gfx/pass-double-probe/expected.png b/metrics/tests/probes/gfx/pass-double-probe/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/gfx/pass-double-probe/expected.png rename to metrics/tests/probes/gfx/pass-double-probe/expected.png diff --git a/mapbox-gl-native/metrics/tests/probes/gfx/pass-double-probe/metrics.json b/metrics/tests/probes/gfx/pass-double-probe/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/gfx/pass-double-probe/metrics.json rename to metrics/tests/probes/gfx/pass-double-probe/metrics.json diff --git a/mapbox-gl-native/metrics/tests/probes/gfx/pass-double-probe/style.json b/metrics/tests/probes/gfx/pass-double-probe/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/gfx/pass-double-probe/style.json rename to metrics/tests/probes/gfx/pass-double-probe/style.json diff --git a/mapbox-gl-native/metrics/tests/probes/gfx/pass-probe-reset/expected.png b/metrics/tests/probes/gfx/pass-probe-reset/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/gfx/pass-probe-reset/expected.png rename to metrics/tests/probes/gfx/pass-probe-reset/expected.png diff --git a/mapbox-gl-native/metrics/tests/probes/gfx/pass-probe-reset/metrics.json b/metrics/tests/probes/gfx/pass-probe-reset/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/gfx/pass-probe-reset/metrics.json rename to metrics/tests/probes/gfx/pass-probe-reset/metrics.json diff --git a/mapbox-gl-native/metrics/tests/probes/gfx/pass-probe-reset/style.json b/metrics/tests/probes/gfx/pass-probe-reset/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/gfx/pass-probe-reset/style.json rename to metrics/tests/probes/gfx/pass-probe-reset/style.json diff --git a/mapbox-gl-native/metrics/tests/probes/gfx/pass/expected.png b/metrics/tests/probes/gfx/pass/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/gfx/pass/expected.png rename to metrics/tests/probes/gfx/pass/expected.png diff --git a/mapbox-gl-native/metrics/tests/probes/gfx/pass/metrics.json b/metrics/tests/probes/gfx/pass/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/gfx/pass/metrics.json rename to metrics/tests/probes/gfx/pass/metrics.json diff --git a/mapbox-gl-native/metrics/tests/probes/gfx/pass/style.json b/metrics/tests/probes/gfx/pass/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/gfx/pass/style.json rename to metrics/tests/probes/gfx/pass/style.json diff --git a/mapbox-gl-native/metrics/tests/probes/memory/fail-memory-size-is-too-big/expected.png b/metrics/tests/probes/memory/fail-memory-size-is-too-big/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/memory/fail-memory-size-is-too-big/expected.png rename to metrics/tests/probes/memory/fail-memory-size-is-too-big/expected.png diff --git a/mapbox-gl-native/metrics/tests/probes/memory/fail-memory-size-is-too-big/metrics.json b/metrics/tests/probes/memory/fail-memory-size-is-too-big/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/memory/fail-memory-size-is-too-big/metrics.json rename to metrics/tests/probes/memory/fail-memory-size-is-too-big/metrics.json diff --git a/mapbox-gl-native/metrics/tests/probes/memory/fail-memory-size-is-too-big/style.json b/metrics/tests/probes/memory/fail-memory-size-is-too-big/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/memory/fail-memory-size-is-too-big/style.json rename to metrics/tests/probes/memory/fail-memory-size-is-too-big/style.json diff --git a/mapbox-gl-native/metrics/tests/probes/memory/fail-memory-size-is-too-small/expected.png b/metrics/tests/probes/memory/fail-memory-size-is-too-small/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/memory/fail-memory-size-is-too-small/expected.png rename to metrics/tests/probes/memory/fail-memory-size-is-too-small/expected.png diff --git a/mapbox-gl-native/metrics/tests/probes/memory/fail-memory-size-is-too-small/metrics.json b/metrics/tests/probes/memory/fail-memory-size-is-too-small/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/memory/fail-memory-size-is-too-small/metrics.json rename to metrics/tests/probes/memory/fail-memory-size-is-too-small/metrics.json diff --git a/mapbox-gl-native/metrics/tests/probes/memory/fail-memory-size-is-too-small/style.json b/metrics/tests/probes/memory/fail-memory-size-is-too-small/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/memory/fail-memory-size-is-too-small/style.json rename to metrics/tests/probes/memory/fail-memory-size-is-too-small/style.json diff --git a/mapbox-gl-native/metrics/tests/probes/memory/pass-memory-size-is-same/expected.png b/metrics/tests/probes/memory/pass-memory-size-is-same/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/memory/pass-memory-size-is-same/expected.png rename to metrics/tests/probes/memory/pass-memory-size-is-same/expected.png diff --git a/mapbox-gl-native/metrics/tests/probes/memory/pass-memory-size-is-same/metrics.json b/metrics/tests/probes/memory/pass-memory-size-is-same/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/memory/pass-memory-size-is-same/metrics.json rename to metrics/tests/probes/memory/pass-memory-size-is-same/metrics.json diff --git a/mapbox-gl-native/metrics/tests/probes/memory/pass-memory-size-is-same/style.json b/metrics/tests/probes/memory/pass-memory-size-is-same/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/memory/pass-memory-size-is-same/style.json rename to metrics/tests/probes/memory/pass-memory-size-is-same/style.json diff --git a/mapbox-gl-native/metrics/tests/probes/network/fail-requests-transferred/expected.png b/metrics/tests/probes/network/fail-requests-transferred/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/network/fail-requests-transferred/expected.png rename to metrics/tests/probes/network/fail-requests-transferred/expected.png diff --git a/mapbox-gl-native/metrics/tests/probes/network/fail-requests-transferred/metrics.json b/metrics/tests/probes/network/fail-requests-transferred/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/network/fail-requests-transferred/metrics.json rename to metrics/tests/probes/network/fail-requests-transferred/metrics.json diff --git a/mapbox-gl-native/metrics/tests/probes/network/fail-requests-transferred/style.json b/metrics/tests/probes/network/fail-requests-transferred/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/network/fail-requests-transferred/style.json rename to metrics/tests/probes/network/fail-requests-transferred/style.json diff --git a/mapbox-gl-native/metrics/tests/probes/network/fail-requests/expected.png b/metrics/tests/probes/network/fail-requests/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/network/fail-requests/expected.png rename to metrics/tests/probes/network/fail-requests/expected.png diff --git a/mapbox-gl-native/metrics/tests/probes/network/fail-requests/metrics.json b/metrics/tests/probes/network/fail-requests/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/network/fail-requests/metrics.json rename to metrics/tests/probes/network/fail-requests/metrics.json diff --git a/mapbox-gl-native/metrics/tests/probes/network/fail-requests/style.json b/metrics/tests/probes/network/fail-requests/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/network/fail-requests/style.json rename to metrics/tests/probes/network/fail-requests/style.json diff --git a/mapbox-gl-native/metrics/tests/probes/network/fail-transferred/expected.png b/metrics/tests/probes/network/fail-transferred/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/network/fail-transferred/expected.png rename to metrics/tests/probes/network/fail-transferred/expected.png diff --git a/mapbox-gl-native/metrics/tests/probes/network/fail-transferred/metrics.json b/metrics/tests/probes/network/fail-transferred/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/network/fail-transferred/metrics.json rename to metrics/tests/probes/network/fail-transferred/metrics.json diff --git a/mapbox-gl-native/metrics/tests/probes/network/fail-transferred/style.json b/metrics/tests/probes/network/fail-transferred/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/network/fail-transferred/style.json rename to metrics/tests/probes/network/fail-transferred/style.json diff --git a/mapbox-gl-native/metrics/tests/probes/network/pass/expected.png b/metrics/tests/probes/network/pass/expected.png similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/network/pass/expected.png rename to metrics/tests/probes/network/pass/expected.png diff --git a/mapbox-gl-native/metrics/tests/probes/network/pass/metrics.json b/metrics/tests/probes/network/pass/metrics.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/network/pass/metrics.json rename to metrics/tests/probes/network/pass/metrics.json diff --git a/mapbox-gl-native/metrics/tests/probes/network/pass/style.json b/metrics/tests/probes/network/pass/style.json similarity index 100% rename from mapbox-gl-native/metrics/tests/probes/network/pass/style.json rename to metrics/tests/probes/network/pass/style.json diff --git a/mapbox-gl-native/misc/bench-icon.svg b/misc/bench-icon.svg similarity index 100% rename from mapbox-gl-native/misc/bench-icon.svg rename to misc/bench-icon.svg diff --git a/mapbox-gl-native/misc/mb-icon-blue-circle.svg b/misc/mb-icon-blue-circle.svg similarity index 100% rename from mapbox-gl-native/misc/mb-icon-blue-circle.svg rename to misc/mb-icon-blue-circle.svg diff --git a/mapbox-gl-native/misc/mb-icon-blue-square.png b/misc/mb-icon-blue-square.png similarity index 100% rename from mapbox-gl-native/misc/mb-icon-blue-square.png rename to misc/mb-icon-blue-square.png diff --git a/mapbox-gl-native/misc/mb-icon-blue-square.svg b/misc/mb-icon-blue-square.svg similarity index 100% rename from mapbox-gl-native/misc/mb-icon-blue-square.svg rename to misc/mb-icon-blue-square.svg diff --git a/mapbox-gl-native/misc/proto/glyphs.proto b/misc/proto/glyphs.proto similarity index 100% rename from mapbox-gl-native/misc/proto/glyphs.proto rename to misc/proto/glyphs.proto diff --git a/mapbox-gl-native/misc/proto/style.proto b/misc/proto/style.proto similarity index 100% rename from mapbox-gl-native/misc/proto/style.proto rename to misc/proto/style.proto diff --git a/mapbox-gl-native/misc/proto/vector_tile.proto b/misc/proto/vector_tile.proto similarity index 100% rename from mapbox-gl-native/misc/proto/vector_tile.proto rename to misc/proto/vector_tile.proto diff --git a/mapbox-gl-native-ios/package.json b/package.json similarity index 100% rename from mapbox-gl-native-ios/package.json rename to package.json diff --git a/mapbox-gl-native-android/CHANGELOG.md b/platform/android/CHANGELOG.md similarity index 100% rename from mapbox-gl-native-android/CHANGELOG.md rename to platform/android/CHANGELOG.md diff --git a/mapbox-gl-native-android/DISTRIBUTE.md b/platform/android/DISTRIBUTE.md similarity index 100% rename from mapbox-gl-native-android/DISTRIBUTE.md rename to platform/android/DISTRIBUTE.md diff --git a/mapbox-gl-native-android/LICENSE.md b/platform/android/LICENSE.md similarity index 100% rename from mapbox-gl-native-android/LICENSE.md rename to platform/android/LICENSE.md diff --git a/mapbox-gl-native-android/Makefile b/platform/android/Makefile similarity index 100% rename from mapbox-gl-native-android/Makefile rename to platform/android/Makefile diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/.gitignore b/platform/android/MapboxGLAndroidSDK/.gitignore similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/.gitignore rename to platform/android/MapboxGLAndroidSDK/.gitignore diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/build.gradle rename to platform/android/MapboxGLAndroidSDK/build.gradle diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/gradle.properties b/platform/android/MapboxGLAndroidSDK/gradle.properties similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/gradle.properties rename to platform/android/MapboxGLAndroidSDK/gradle.properties diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/lint.xml b/platform/android/MapboxGLAndroidSDK/lint.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/lint.xml rename to platform/android/MapboxGLAndroidSDK/lint.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/proguard-rules.pro b/platform/android/MapboxGLAndroidSDK/proguard-rules.pro similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/proguard-rules.pro rename to platform/android/MapboxGLAndroidSDK/proguard-rules.pro diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/CMakeLists.txt b/platform/android/MapboxGLAndroidSDK/src/cpp/CMakeLists.txt similarity index 97% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/CMakeLists.txt rename to platform/android/MapboxGLAndroidSDK/src/cpp/CMakeLists.txt index 28a80e2c4..a3deab8e6 100644 --- a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/CMakeLists.txt +++ b/platform/android/MapboxGLAndroidSDK/src/cpp/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.10) -add_subdirectory(../../../../mapbox-gl-native - ../../../../mapbox-gl-native/${ANDROID_ABI}) +add_subdirectory(../../../../../ + ../../../../../${ANDROID_ABI}) target_compile_options(mbgl-compiler-options INTERFACE -frtti) @@ -188,9 +188,9 @@ add_library(mapbox-gl SHARED target_include_directories( mapbox-gl PRIVATE ${PROJECT_SOURCE_DIR} - ../../../../mapbox-gl-native/src - ../../../../mapbox-gl-native/platform/android/src - ../../../../mapbox-gl-native/platform/default/include) + ../../../../../src + ../../../src + ../../../../default/include) target_compile_options(mapbox-gl PRIVATE $<$:-Oz> diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/android_renderer_backend.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/android_renderer_backend.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/android_renderer_backend.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/android_renderer_backend.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/android_renderer_backend.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/android_renderer_backend.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/android_renderer_backend.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/android_renderer_backend.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/android_renderer_frontend.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/android_renderer_frontend.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/android_renderer_frontend.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/android_renderer_frontend.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/android_renderer_frontend.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/android_renderer_frontend.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/android_renderer_frontend.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/android_renderer_frontend.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/annotation/marker.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/annotation/marker.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/annotation/marker.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/annotation/marker.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/annotation/marker.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/annotation/marker.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/annotation/marker.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/annotation/marker.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/annotation/multi_point.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/annotation/multi_point.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/annotation/multi_point.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/annotation/multi_point.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/annotation/polygon.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/annotation/polygon.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/annotation/polygon.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/annotation/polygon.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/annotation/polygon.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/annotation/polygon.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/annotation/polygon.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/annotation/polygon.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/annotation/polyline.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/annotation/polyline.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/annotation/polyline.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/annotation/polyline.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/annotation/polyline.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/annotation/polyline.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/annotation/polyline.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/annotation/polyline.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/asset_manager.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/asset_manager.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/asset_manager.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/asset_manager.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/asset_manager_file_source.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/asset_manager_file_source.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/asset_manager_file_source.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/asset_manager_file_source.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/asset_manager_file_source.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/asset_manager_file_source.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/asset_manager_file_source.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/asset_manager_file_source.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/connectivity_listener.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/connectivity_listener.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/connectivity_listener.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/connectivity_listener.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/connectivity_listener.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/connectivity_listener.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/connectivity_listener.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/connectivity_listener.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/conversion/collection.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/conversion/collection.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/conversion/collection.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/conversion/collection.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/conversion/collection.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/conversion/collection.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/conversion/collection.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/conversion/collection.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/conversion/color.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/conversion/color.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/conversion/color.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/conversion/color.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/conversion/color.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/conversion/color.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/conversion/color.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/conversion/color.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/conversion/constant.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/conversion/constant.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/conversion/constant.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/conversion/constant.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/conversion/constant.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/conversion/constant.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/conversion/constant.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/conversion/constant.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/conversion/conversion.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/conversion/conversion.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/conversion/conversion.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/conversion/conversion.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/file_source.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/file_source.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/file_source.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/file_source.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/file_source.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/file_source.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/file_source.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/file_source.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/feature.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/feature.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/feature.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/geojson/feature.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/feature.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/feature.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/feature.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/geojson/feature.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/feature_collection.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/feature_collection.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/feature_collection.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/geojson/feature_collection.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/feature_collection.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/feature_collection.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/feature_collection.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/geojson/feature_collection.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/geometry.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/geometry.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/geometry.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/geojson/geometry.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/geometry.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/geometry.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/geometry.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/geojson/geometry.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/geometry_collection.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/geometry_collection.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/geometry_collection.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/geojson/geometry_collection.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/geometry_collection.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/geometry_collection.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/geometry_collection.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/geojson/geometry_collection.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/line_string.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/line_string.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/line_string.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/geojson/line_string.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/line_string.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/line_string.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/line_string.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/geojson/line_string.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/multi_line_string.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/multi_line_string.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/multi_line_string.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/geojson/multi_line_string.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/multi_line_string.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/multi_line_string.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/multi_line_string.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/geojson/multi_line_string.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/multi_point.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/multi_point.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/multi_point.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/geojson/multi_point.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/multi_point.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/multi_point.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/multi_point.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/geojson/multi_point.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/multi_polygon.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/multi_polygon.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/multi_polygon.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/geojson/multi_polygon.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/multi_polygon.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/multi_polygon.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/multi_polygon.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/geojson/multi_polygon.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/point.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/point.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/point.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/geojson/point.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/point.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/point.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/point.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/geojson/point.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/polygon.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/polygon.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/polygon.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/geojson/polygon.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/polygon.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/polygon.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/polygon.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/geojson/polygon.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/util.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/util.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geojson/util.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/geojson/util.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_bounds.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_bounds.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_bounds.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_bounds.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_bounds.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_bounds.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_bounds.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_bounds.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_quad.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_quad.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_quad.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_quad.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_quad.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_quad.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_quad.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_quad.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geometry/projected_meters.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/geometry/projected_meters.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geometry/projected_meters.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/geometry/projected_meters.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geometry/projected_meters.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/geometry/projected_meters.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/geometry/projected_meters.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/geometry/projected_meters.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/graphics/pointf.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/graphics/pointf.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/graphics/pointf.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/graphics/pointf.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/graphics/pointf.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/graphics/pointf.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/graphics/pointf.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/graphics/pointf.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/graphics/rectf.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/graphics/rectf.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/graphics/rectf.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/graphics/rectf.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/graphics/rectf.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/graphics/rectf.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/graphics/rectf.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/graphics/rectf.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/gson/json_array.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/gson/json_array.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/gson/json_array.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/gson/json_array.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/gson/json_array.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/gson/json_array.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/gson/json_array.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/gson/json_array.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/gson/json_element.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/gson/json_element.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/gson/json_element.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/gson/json_element.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/gson/json_element.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/gson/json_element.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/gson/json_element.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/gson/json_element.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/gson/json_object.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/gson/json_object.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/gson/json_object.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/gson/json_object.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/gson/json_object.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/gson/json_object.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/gson/json_object.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/gson/json_object.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/gson/json_primitive.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/gson/json_primitive.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/gson/json_primitive.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/gson/json_primitive.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/gson/json_primitive.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/gson/json_primitive.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/gson/json_primitive.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/gson/json_primitive.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/http_file_source.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/http_file_source.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/http_file_source.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/http_file_source.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/i18n/collator.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/i18n/collator.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/i18n/collator.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/i18n/collator.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/i18n/collator_jni.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/i18n/collator_jni.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/i18n/collator_jni.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/i18n/collator_jni.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/i18n/number_format.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/i18n/number_format.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/i18n/number_format.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/i18n/number_format.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/i18n/number_format_jni.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/i18n/number_format_jni.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/i18n/number_format_jni.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/i18n/number_format_jni.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/java/util.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/java/util.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/java/util.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/java/util.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/java/util.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/java/util.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/java/util.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/java/util.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/java_types.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/java_types.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/java_types.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/java_types.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/java_types.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/java_types.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/java_types.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/java_types.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/jni_native.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/jni_native.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/jni_native.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/jni_native.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/jni_native.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/jni_native.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/jni_native.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/jni_native.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/logger.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/logger.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/logger.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/logger.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/logger.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/logger.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/logger.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/logger.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/logging_android.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/logging_android.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/logging_android.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/logging_android.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/main.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/main.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/main.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/main.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/map/camera_position.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/map/camera_position.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/map/camera_position.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/map/camera_position.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/map/camera_position.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/map/camera_position.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/map/camera_position.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/map/camera_position.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/map/image.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/map/image.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/map/image.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/map/image.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/map/image.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/map/image.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/map/image.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/map/image.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/map_renderer.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/map_renderer.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/map_renderer.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/map_renderer.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/map_renderer.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/map_renderer.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/map_renderer.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/map_renderer.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/map_renderer_runnable.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/map_renderer_runnable.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/map_renderer_runnable.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/map_renderer_runnable.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/map_renderer_runnable.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/map_renderer_runnable.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/map_renderer_runnable.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/map_renderer_runnable.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/mapbox.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/mapbox.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/mapbox.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/mapbox.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/mapbox.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/mapbox.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/mapbox.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/mapbox.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/native_map_view.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/native_map_view.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/native_map_view.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/native_map_view.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/native_map_view.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/native_map_view.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/native_map_view.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/native_map_view.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_manager.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_manager.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_manager.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_manager.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_manager.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_manager.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_manager.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_manager.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_region.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_region.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_region.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_region.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_definition.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_definition.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_definition.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_definition.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_definition.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_definition.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_definition.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_definition.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_error.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_error.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_error.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_error.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_error.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_error.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_error.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_error.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_status.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_status.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_status.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_status.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_status.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_status.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_status.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_status.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshot.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshot.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshot.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshot.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshot.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshot.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshot.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshot.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshotter.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshotter.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshotter.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshotter.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshotter.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshotter.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshotter.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshotter.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/android_conversion.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/android_conversion.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/android_conversion.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/android_conversion.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/filter.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/filter.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/filter.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/filter.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/filter.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/filter.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/filter.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/filter.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/position.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/position.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/position.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/position.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/position.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/position.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/position.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/position.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/property_expression.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/property_expression.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/property_expression.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/property_expression.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/property_value.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/property_value.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/property_value.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/property_value.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/transition_options.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/transition_options.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/transition_options.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/transition_options.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/transition_options.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/transition_options.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/transition_options.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/transition_options.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/url_or_tileset.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/url_or_tileset.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/url_or_tileset.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/url_or_tileset.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/url_or_tileset.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/url_or_tileset.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/conversion/url_or_tileset.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/url_or_tileset.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/formatted.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/formatted.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/formatted.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/formatted.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/formatted.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/formatted.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/formatted.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/formatted.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/formatted_section.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/formatted_section.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/formatted_section.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/formatted_section.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/formatted_section.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/formatted_section.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/formatted_section.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/formatted_section.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/background_layer.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/background_layer.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/background_layer.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/background_layer.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/background_layer.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/background_layer.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/background_layer.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/background_layer.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/circle_layer.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/circle_layer.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/circle_layer.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/circle_layer.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/circle_layer.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/circle_layer.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/circle_layer.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/circle_layer.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/custom_layer.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/custom_layer.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/custom_layer.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/custom_layer.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/custom_layer.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/custom_layer.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/custom_layer.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/custom_layer.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_extrusion_layer.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_extrusion_layer.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_extrusion_layer.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_extrusion_layer.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_extrusion_layer.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_extrusion_layer.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_extrusion_layer.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_extrusion_layer.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_layer.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_layer.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_layer.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_layer.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_layer.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_layer.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_layer.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_layer.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/heatmap_layer.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/heatmap_layer.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/heatmap_layer.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/heatmap_layer.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/heatmap_layer.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/heatmap_layer.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/heatmap_layer.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/heatmap_layer.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/hillshade_layer.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/hillshade_layer.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/hillshade_layer.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/hillshade_layer.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/hillshade_layer.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/hillshade_layer.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/hillshade_layer.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/hillshade_layer.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.cpp.ejs b/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.cpp.ejs similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.cpp.ejs rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.cpp.ejs diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.hpp.ejs b/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.hpp.ejs similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.hpp.ejs rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.hpp.ejs diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/layer_manager.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/layer_manager.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/layer_manager.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/layer_manager.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/layer_manager.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/layer_manager.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/layer_manager.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/layer_manager.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/line_layer.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/line_layer.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/line_layer.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/line_layer.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/line_layer.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/line_layer.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/line_layer.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/line_layer.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/location_indicator_layer.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/location_indicator_layer.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/location_indicator_layer.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/location_indicator_layer.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/location_indicator_layer.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/location_indicator_layer.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/location_indicator_layer.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/location_indicator_layer.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/raster_layer.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/raster_layer.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/raster_layer.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/raster_layer.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/raster_layer.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/raster_layer.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/raster_layer.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/raster_layer.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/symbol_layer.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/symbol_layer.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/symbol_layer.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/symbol_layer.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/symbol_layer.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/symbol_layer.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/layers/symbol_layer.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/symbol_layer.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/light.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/light.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/light.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/light.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/light.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/light.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/light.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/light.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/position.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/position.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/position.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/position.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/position.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/position.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/position.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/position.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/custom_geometry_source.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/custom_geometry_source.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/custom_geometry_source.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/custom_geometry_source.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/custom_geometry_source.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/custom_geometry_source.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/custom_geometry_source.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/custom_geometry_source.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/geojson_source.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/geojson_source.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/geojson_source.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/geojson_source.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/geojson_source.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/geojson_source.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/geojson_source.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/geojson_source.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/image_source.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/image_source.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/image_source.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/image_source.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/image_source.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/image_source.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/image_source.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/image_source.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_dem_source.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_dem_source.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_dem_source.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_dem_source.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_dem_source.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_dem_source.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_dem_source.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_dem_source.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_source.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_source.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_source.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_source.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_source.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_source.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_source.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_source.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/source.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/source.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/source.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/source.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/source.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/source.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/source.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/source.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/unknown_source.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/unknown_source.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/unknown_source.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/unknown_source.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/unknown_source.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/unknown_source.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/unknown_source.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/unknown_source.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/vector_source.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/vector_source.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/vector_source.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/vector_source.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/vector_source.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/vector_source.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/sources/vector_source.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/vector_source.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/transition_options.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/transition_options.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/transition_options.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/transition_options.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/transition_options.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/transition_options.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/transition_options.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/transition_options.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/value.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/value.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/value.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/value.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/value.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/style/value.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/style/value.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/style/value.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/text/local_glyph_rasterizer.cpp b/platform/android/MapboxGLAndroidSDK/src/cpp/text/local_glyph_rasterizer.cpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/text/local_glyph_rasterizer.cpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/text/local_glyph_rasterizer.cpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/text/local_glyph_rasterizer_jni.hpp b/platform/android/MapboxGLAndroidSDK/src/cpp/text/local_glyph_rasterizer_jni.hpp similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/cpp/text/local_glyph_rasterizer_jni.hpp rename to platform/android/MapboxGLAndroidSDK/src/cpp/text/local_glyph_rasterizer_jni.hpp diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml b/platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml rename to platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/assets/sdk_versions/com.mapbox.mapboxsdk b/platform/android/MapboxGLAndroidSDK/src/main/assets/sdk_versions/com.mapbox.mapboxsdk similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/assets/sdk_versions/com.mapbox.mapboxsdk rename to platform/android/MapboxGLAndroidSDK/src/main/assets/sdk_versions/com.mapbox.mapboxsdk diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/AccountsManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/AccountsManager.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/AccountsManager.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/AccountsManager.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/LibraryLoader.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/LibraryLoader.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/LibraryLoader.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/LibraryLoader.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/LibraryLoaderProvider.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/LibraryLoaderProvider.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/LibraryLoaderProvider.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/LibraryLoaderProvider.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapStrictMode.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapStrictMode.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapStrictMode.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapStrictMode.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapStrictModeException.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapStrictModeException.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapStrictModeException.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapStrictModeException.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/ModuleProvider.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/ModuleProvider.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/ModuleProvider.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/ModuleProvider.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/ModuleProviderImpl.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/ModuleProviderImpl.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/ModuleProviderImpl.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/ModuleProviderImpl.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/ArrowDirection.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/ArrowDirection.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/ArrowDirection.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/ArrowDirection.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerOptions.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerOptions.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerOptions.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BasePointCollection.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BasePointCollection.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BasePointCollection.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BasePointCollection.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Bubble.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Bubble.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Bubble.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Bubble.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubbleLayout.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubbleLayout.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubbleLayout.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubbleLayout.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubblePopupHelper.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubblePopupHelper.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubblePopupHelper.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubblePopupHelper.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Icon.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Icon.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Icon.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Icon.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolygonOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolygonOptions.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolygonOptions.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolygonOptions.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolylineOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolylineOptions.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolylineOptions.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolylineOptions.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/package-info.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/package-info.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/Attribution.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/Attribution.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/Attribution.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/Attribution.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionLayout.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionLayout.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionLayout.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionLayout.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionMeasure.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionMeasure.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionMeasure.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionMeasure.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionParser.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionParser.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionParser.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionParser.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/package-info.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/package-info.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdate.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdate.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdate.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdate.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/package-info.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/package-info.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/GeometryConstants.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/GeometryConstants.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/GeometryConstants.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/GeometryConstants.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/TelemetryConstants.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/TelemetryConstants.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/TelemetryConstants.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/TelemetryConstants.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/package-info.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/package-info.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/CalledFromWorkerThreadException.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/CalledFromWorkerThreadException.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/CalledFromWorkerThreadException.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/CalledFromWorkerThreadException.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/ConversionException.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/ConversionException.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/ConversionException.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/ConversionException.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/IconBitmapChangedException.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/IconBitmapChangedException.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/IconBitmapChangedException.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/IconBitmapChangedException.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/InvalidLatLngBoundsException.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/InvalidLatLngBoundsException.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/InvalidLatLngBoundsException.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/InvalidLatLngBoundsException.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/InvalidMarkerPositionException.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/InvalidMarkerPositionException.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/InvalidMarkerPositionException.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/InvalidMarkerPositionException.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/MapboxConfigurationException.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/MapboxConfigurationException.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/MapboxConfigurationException.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/MapboxConfigurationException.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/TooManyIconsException.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/TooManyIconsException.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/TooManyIconsException.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/TooManyIconsException.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/package-info.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/package-info.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngQuad.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngQuad.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngQuad.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngQuad.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngSpan.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngSpan.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngSpan.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngSpan.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ProjectedMeters.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ProjectedMeters.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ProjectedMeters.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ProjectedMeters.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/VisibleRegion.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/VisibleRegion.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/VisibleRegion.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/VisibleRegion.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/package-info.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/package-info.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpIdentifier.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpIdentifier.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpIdentifier.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpIdentifier.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpLogger.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpLogger.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpLogger.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpLogger.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequest.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequest.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequestUrl.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequestUrl.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequestUrl.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequestUrl.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpResponder.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpResponder.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpResponder.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpResponder.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/LocalRequestTask.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/LocalRequestTask.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/LocalRequestTask.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/LocalRequestTask.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/NativeHttpRequest.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/NativeHttpRequest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/NativeHttpRequest.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/NativeHttpRequest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/package-info.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/package-info.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/AnimatorListenerHolder.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/AnimatorListenerHolder.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/AnimatorListenerHolder.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/AnimatorListenerHolder.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CompassEngine.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CompassEngine.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CompassEngine.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CompassEngine.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CompassListener.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CompassListener.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CompassListener.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CompassListener.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/IndicatorLocationLayerRenderer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/IndicatorLocationLayerRenderer.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/IndicatorLocationLayerRenderer.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/IndicatorLocationLayerRenderer.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LatLngEvaluator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LatLngEvaluator.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LatLngEvaluator.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LatLngEvaluator.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerBitmapProvider.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerBitmapProvider.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerBitmapProvider.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerBitmapProvider.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerFeatureProvider.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerFeatureProvider.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerFeatureProvider.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerFeatureProvider.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerSourceProvider.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerSourceProvider.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerSourceProvider.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerSourceProvider.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinator.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinator.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinator.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationCameraController.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationCameraController.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationCameraController.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationCameraController.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentActivationOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentActivationOptions.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentActivationOptions.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentActivationOptions.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentCompassEngine.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentCompassEngine.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentCompassEngine.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentCompassEngine.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentConstants.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentConstants.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentConstants.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentConstants.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentNotInitializedException.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentNotInitializedException.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentNotInitializedException.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentNotInitializedException.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentOptions.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentOptions.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentOptions.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentPositionManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentPositionManager.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentPositionManager.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentPositionManager.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationIndicatorLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationIndicatorLayer.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationIndicatorLayer.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationIndicatorLayer.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerController.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerController.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerController.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerController.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerRenderer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerRenderer.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerRenderer.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerRenderer.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationPropertyFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationPropertyFactory.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationPropertyFactory.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationPropertyFactory.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxAnimator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxAnimator.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxAnimator.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxAnimator.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxAnimatorProvider.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxAnimatorProvider.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxAnimatorProvider.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxAnimatorProvider.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxAnimatorSetProvider.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxAnimatorSetProvider.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxAnimatorSetProvider.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxAnimatorSetProvider.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxCameraAnimatorAdapter.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxCameraAnimatorAdapter.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxCameraAnimatorAdapter.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxCameraAnimatorAdapter.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxFloatAnimator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxFloatAnimator.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxFloatAnimator.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxFloatAnimator.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxLatLngAnimator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxLatLngAnimator.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxLatLngAnimator.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxLatLngAnimator.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnCameraMoveInvalidateListener.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnCameraMoveInvalidateListener.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnCameraMoveInvalidateListener.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnCameraMoveInvalidateListener.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnCameraTrackingChangedListener.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnCameraTrackingChangedListener.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnCameraTrackingChangedListener.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnCameraTrackingChangedListener.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnLocationCameraTransitionListener.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnLocationCameraTransitionListener.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnLocationCameraTransitionListener.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnLocationCameraTransitionListener.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnLocationClickListener.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnLocationClickListener.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnLocationClickListener.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnLocationClickListener.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnLocationLongClickListener.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnLocationLongClickListener.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnLocationLongClickListener.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnLocationLongClickListener.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnLocationStaleListener.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnLocationStaleListener.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnLocationStaleListener.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnLocationStaleListener.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnRenderModeChangedListener.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnRenderModeChangedListener.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnRenderModeChangedListener.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/OnRenderModeChangedListener.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/PulsingLocationCircleAnimator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/PulsingLocationCircleAnimator.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/PulsingLocationCircleAnimator.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/PulsingLocationCircleAnimator.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/StaleStateManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/StaleStateManager.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/StaleStateManager.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/StaleStateManager.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/SymbolLocationLayerRenderer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/SymbolLocationLayerRenderer.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/SymbolLocationLayerRenderer.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/SymbolLocationLayerRenderer.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/Utils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/Utils.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/Utils.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/Utils.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/modes/CameraMode.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/modes/CameraMode.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/modes/CameraMode.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/modes/CameraMode.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/modes/RenderMode.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/modes/RenderMode.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/modes/RenderMode.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/modes/RenderMode.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/modes/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/modes/package-info.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/modes/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/modes/package-info.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/package-info.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/package-info.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/Logger.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/Logger.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/Logger.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/Logger.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/LoggerDefinition.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/LoggerDefinition.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/LoggerDefinition.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/LoggerDefinition.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/package-info.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/package-info.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationContainer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationContainer.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationContainer.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationContainer.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Annotations.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Annotations.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Annotations.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Annotations.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/FocalPointChangeListener.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/FocalPointChangeListener.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/FocalPointChangeListener.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/FocalPointChangeListener.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Image.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Image.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Image.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Image.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ImageContent.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ImageContent.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ImageContent.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ImageContent.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ImageStretches.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ImageStretches.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ImageStretches.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ImageStretches.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/InfoWindowManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/InfoWindowManager.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/InfoWindowManager.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/InfoWindowManager.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapChangeReceiver.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapChangeReceiver.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapChangeReceiver.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapChangeReceiver.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapKeyListener.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapKeyListener.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapKeyListener.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapKeyListener.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MarkerContainer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MarkerContainer.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MarkerContainer.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MarkerContainer.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Markers.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Markers.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Markers.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Markers.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMap.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMap.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMap.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/OnMapReadyCallback.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/OnMapReadyCallback.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/OnMapReadyCallback.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/OnMapReadyCallback.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/PolygonContainer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/PolygonContainer.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/PolygonContainer.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/PolygonContainer.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Polygons.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Polygons.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Polygons.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Polygons.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/PolylineContainer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/PolylineContainer.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/PolylineContainer.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/PolylineContainer.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Polylines.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Polylines.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Polylines.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Polylines.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Projection.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Projection.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Projection.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Projection.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ShapeAnnotationContainer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ShapeAnnotationContainer.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ShapeAnnotationContainer.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ShapeAnnotationContainer.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ShapeAnnotations.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ShapeAnnotations.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ShapeAnnotations.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ShapeAnnotations.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Style.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Style.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Style.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Style.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TelemetryDefinition.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TelemetryDefinition.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TelemetryDefinition.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TelemetryDefinition.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/package-info.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/package-info.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRenderer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRenderer.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRenderer.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRenderer.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRendererRunnable.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRendererRunnable.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRendererRunnable.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRendererRunnable.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRendererScheduler.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRendererScheduler.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRendererScheduler.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRendererScheduler.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLConfigChooser.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLConfigChooser.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLConfigChooser.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLConfigChooser.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLContextFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLContextFactory.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLContextFactory.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLContextFactory.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLLogWrapper.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLLogWrapper.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLLogWrapper.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLLogWrapper.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLWindowSurfaceFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLWindowSurfaceFactory.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLWindowSurfaceFactory.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLWindowSurfaceFactory.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/package-info.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/package-info.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/glsurfaceview/GLSurfaceViewMapRenderer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/glsurfaceview/GLSurfaceViewMapRenderer.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/glsurfaceview/GLSurfaceViewMapRenderer.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/glsurfaceview/GLSurfaceViewMapRenderer.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/glsurfaceview/MapboxGLSurfaceView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/glsurfaceview/MapboxGLSurfaceView.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/glsurfaceview/MapboxGLSurfaceView.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/glsurfaceview/MapboxGLSurfaceView.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/glsurfaceview/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/glsurfaceview/package-info.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/glsurfaceview/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/glsurfaceview/package-info.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/package-info.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/package-info.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/TextureViewMapRenderer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/TextureViewMapRenderer.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/TextureViewMapRenderer.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/TextureViewMapRenderer.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/TextureViewRenderThread.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/TextureViewRenderThread.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/TextureViewRenderThread.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/TextureViewRenderThread.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/package-info.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/package-info.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/package-info.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/package-info.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestImpl.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestImpl.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestImpl.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestImpl.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestUtil.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestUtil.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestUtil.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestUtil.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/package-info.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/package-info.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/loader/LibraryLoaderProviderImpl.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/loader/LibraryLoaderProviderImpl.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/loader/LibraryLoaderProviderImpl.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/loader/LibraryLoaderProviderImpl.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/loader/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/loader/package-info.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/loader/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/loader/package-info.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapBaseEvent.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapBaseEvent.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapBaseEvent.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapBaseEvent.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapEventFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapEventFactory.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapEventFactory.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapEventFactory.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapLoadEvent.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapLoadEvent.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapLoadEvent.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapLoadEvent.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/OfflineDownloadEndEvent.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/OfflineDownloadEndEvent.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/OfflineDownloadEndEvent.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/OfflineDownloadEndEvent.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/OfflineDownloadStartEvent.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/OfflineDownloadStartEvent.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/OfflineDownloadStartEvent.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/OfflineDownloadStartEvent.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/PerformanceEvent.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/PerformanceEvent.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/PerformanceEvent.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/PerformanceEvent.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/PhoneState.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/PhoneState.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/PhoneState.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/PhoneState.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/TelemetryImpl.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/TelemetryImpl.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/TelemetryImpl.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/TelemetryImpl.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/package-info.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/package-info.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/ConnectivityListener.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/ConnectivityListener.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/ConnectivityListener.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/ConnectivityListener.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/ConnectivityReceiver.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/ConnectivityReceiver.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/ConnectivityReceiver.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/ConnectivityReceiver.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/NativeConnectivityListener.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/NativeConnectivityListener.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/NativeConnectivityListener.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/NativeConnectivityListener.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/package-info.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/package-info.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineGeometryRegionDefinition.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineGeometryRegionDefinition.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineGeometryRegionDefinition.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineGeometryRegionDefinition.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionDefinition.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionDefinition.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionDefinition.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionDefinition.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionError.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionError.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionError.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionError.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionStatus.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionStatus.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionStatus.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionStatus.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineTilePyramidRegionDefinition.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineTilePyramidRegionDefinition.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineTilePyramidRegionDefinition.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineTilePyramidRegionDefinition.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/package-info.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/package-info.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/package-info.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/package-info.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnaphotUtil.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnaphotUtil.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnaphotUtil.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnaphotUtil.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshot.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshot.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshot.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshot.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/package-info.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/package-info.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/Resource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/Resource.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/Resource.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/Resource.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/package-info.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/package-info.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/package-info.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/package-info.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CannotAddLayerException.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CannotAddLayerException.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CannotAddLayerException.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CannotAddLayerException.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CustomLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CustomLayer.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CustomLayer.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CustomLayer.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LayoutPropertyValue.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LayoutPropertyValue.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LayoutPropertyValue.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LayoutPropertyValue.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PaintPropertyValue.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PaintPropertyValue.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PaintPropertyValue.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PaintPropertyValue.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Property.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Property.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Property.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Property.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/TransitionOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/TransitionOptions.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/TransitionOptions.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/TransitionOptions.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/package-info.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/package-info.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property.java.ejs b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property.java.ejs similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property.java.ejs rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property.java.ejs diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property_factory.java.ejs b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property_factory.java.ejs similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property_factory.java.ejs rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property_factory.java.ejs diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Light.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Light.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Light.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Light.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Position.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Position.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Position.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Position.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/package-info.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/package-info.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CannotAddSourceException.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CannotAddSourceException.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CannotAddSourceException.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CannotAddSourceException.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySource.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySource.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySource.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySourceOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySourceOptions.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySourceOptions.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySourceOptions.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonOptions.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonOptions.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonOptions.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeometryTileProvider.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeometryTileProvider.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeometryTileProvider.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeometryTileProvider.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/ImageSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/ImageSource.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/ImageSource.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/ImageSource.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterDemSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterDemSource.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterDemSource.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterDemSource.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterSource.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterSource.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterSource.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/Source.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/Source.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/Source.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/Source.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/TileSet.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/TileSet.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/TileSet.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/TileSet.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/UnknownSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/UnknownSource.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/UnknownSource.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/UnknownSource.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/package-info.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/package-info.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/Formatted.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/Formatted.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/Formatted.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/Formatted.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/FormattedSection.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/FormattedSection.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/FormattedSection.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/FormattedSection.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/package-info.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/types/package-info.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/LocalGlyphRasterizer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/LocalGlyphRasterizer.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/LocalGlyphRasterizer.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/LocalGlyphRasterizer.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/package-info.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/package-info.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/AnimatorUtils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/AnimatorUtils.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/AnimatorUtils.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/AnimatorUtils.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/Compare.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/Compare.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/Compare.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/Compare.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/FileUtils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/FileUtils.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/FileUtils.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/FileUtils.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/FontUtils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/FontUtils.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/FontUtils.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/FontUtils.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/MapFragmentUtils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/MapFragmentUtils.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/MapFragmentUtils.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/MapFragmentUtils.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/MathUtils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/MathUtils.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/MathUtils.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/MathUtils.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/StringUtils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/StringUtils.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/StringUtils.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/StringUtils.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ThreadUtils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ThreadUtils.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ThreadUtils.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ThreadUtils.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/package-info.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/package-info.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/overview.html b/platform/android/MapboxGLAndroidSDK/src/main/java/overview.html similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/java/overview.html rename to platform/android/MapboxGLAndroidSDK/src/main/java/overview.html diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml b/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_compass_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_compass_icon.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_compass_icon.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_compass_icon.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_logo_helmet.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_logo_helmet.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_logo_helmet.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_logo_helmet.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_logo_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_logo_icon.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_logo_icon.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_logo_icon.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_marker_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_marker_icon_default.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_marker_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_marker_icon_default.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_markerview_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_markerview_icon_default.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_markerview_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_markerview_icon_default.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_bearing.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_bearing.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_bearing.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_default.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_default.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_compass_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_compass_icon.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_compass_icon.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_compass_icon.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_logo_helmet.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_logo_helmet.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_logo_helmet.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_logo_helmet.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_logo_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_logo_icon.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_logo_icon.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_logo_icon.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_marker_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_marker_icon_default.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_marker_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_marker_icon_default.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_markerview_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_markerview_icon_default.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_markerview_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_markerview_icon_default.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_bearing.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_bearing.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_bearing.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_default.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_default.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_compass_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_compass_icon.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_compass_icon.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_compass_icon.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_logo_helmet.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_logo_helmet.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_logo_helmet.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_logo_helmet.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_logo_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_logo_icon.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_logo_icon.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_logo_icon.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_marker_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_marker_icon_default.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_marker_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_marker_icon_default.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_markerview_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_markerview_icon_default.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_markerview_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_markerview_icon_default.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_bearing.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_bearing.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_bearing.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_default.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_default.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_compass_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_compass_icon.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_compass_icon.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_compass_icon.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_logo_helmet.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_logo_helmet.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_logo_helmet.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_logo_helmet.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_logo_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_logo_icon.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_logo_icon.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_logo_icon.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_marker_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_marker_icon_default.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_marker_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_marker_icon_default.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_markerview_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_markerview_icon_default.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_markerview_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_markerview_icon_default.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_bearing.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_bearing.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_bearing.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_default.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_default.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_compass_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_compass_icon.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_compass_icon.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_compass_icon.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_logo_helmet.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_logo_helmet.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_logo_helmet.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_logo_helmet.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_logo_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_logo_icon.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_logo_icon.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_logo_icon.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_marker_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_marker_icon_default.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_marker_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_marker_icon_default.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_markerview_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_markerview_icon_default.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_markerview_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_markerview_icon_default.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_bearing.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_bearing.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_bearing.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_default.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_default.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_bg_selector.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_bg_selector.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_bg_selector.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_bg_selector.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_icon_default.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_icon_default.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_icon_default.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_icon_default.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_icon_selected.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_icon_selected.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_icon_selected.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_icon_selected.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_mylocation_bg_shape.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_mylocation_bg_shape.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_mylocation_bg_shape.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_mylocation_bg_shape.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_popup_window_transparent.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_popup_window_transparent.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_popup_window_transparent.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_popup_window_transparent.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_rounded_corner.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_rounded_corner.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_rounded_corner.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_rounded_corner.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_bearing_icon.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_bearing_icon.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_bearing_icon.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_bearing_icon.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon_shadow.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon_shadow.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon_shadow.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon_shadow.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon_stale.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon_stale.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon_stale.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon_stale.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_puck_icon.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_puck_icon.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_puck_icon.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_puck_icon.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_stroke_icon.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_stroke_icon.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_stroke_icon.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_stroke_icon.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_attribution_list_item.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_attribution_list_item.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_attribution_list_item.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_attribution_list_item.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_infowindow_content.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_infowindow_content.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_infowindow_content.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_infowindow_content.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_view_image_marker.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_view_image_marker.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_view_image_marker.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_view_image_marker.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-bg/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-bg/strings.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-bg/strings.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/values-bg/strings.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-ca/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-ca/strings.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-ca/strings.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/values-ca/strings.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-cs/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-cs/strings.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-cs/strings.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/values-cs/strings.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-es/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-es/strings.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-es/strings.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/values-es/strings.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-fr/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-fr/strings.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-fr/strings.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/values-fr/strings.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-gl/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-gl/strings.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-gl/strings.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/values-gl/strings.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-he/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-he/strings.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-he/strings.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/values-he/strings.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-hu/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-hu/strings.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-hu/strings.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/values-hu/strings.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-iw/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-iw/strings.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-iw/strings.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/values-iw/strings.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-ko/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-ko/strings.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-ko/strings.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/values-ko/strings.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-lt/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-lt/strings.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-lt/strings.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/values-lt/strings.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-nl/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-nl/strings.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-nl/strings.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/values-nl/strings.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-pl/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-pl/strings.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-pl/strings.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/values-pl/strings.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-pt-rPT/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-pt-rPT/strings.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-pt-rPT/strings.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/values-pt-rPT/strings.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-ru/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-ru/strings.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-ru/strings.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/values-ru/strings.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-sv/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-sv/strings.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-sv/strings.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/values-sv/strings.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-uk/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-uk/strings.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-uk/strings.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/values-uk/strings.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-vi/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-vi/strings.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-vi/strings.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/values-vi/strings.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-zh-rCN/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-zh-rCN/strings.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rCN/strings.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-zh-rHK/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rHK/strings.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-zh-rHK/strings.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rHK/strings.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-zh-rTW/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values-zh-rTW/strings.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rTW/strings.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values/colors.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values/colors.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values/strings.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values/styles.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/styles.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/main/res/values/styles.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/values/styles.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/AccountsManagerTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/AccountsManagerTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/AccountsManagerTest.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/AccountsManagerTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/MapboxInjector.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/MapboxInjector.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/MapboxInjector.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/MapboxInjector.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/MapboxTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/MapboxTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/MapboxTest.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/MapboxTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/AnnotationTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/AnnotationTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/AnnotationTest.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/AnnotationTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/IconTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/IconTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/IconTest.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/IconTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/InfoWindowTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/InfoWindowTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/InfoWindowTest.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/InfoWindowTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/MarkerTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/MarkerTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/MarkerTest.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/MarkerTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/PolygonTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/PolygonTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/PolygonTest.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/PolygonTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/PolylineTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/PolylineTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/PolylineTest.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/annotations/PolylineTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/attribution/AttributionParseTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/attribution/AttributionParseTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/attribution/AttributionParseTest.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/attribution/AttributionParseTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/constants/AppConstant.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/constants/AppConstant.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/constants/AppConstant.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/constants/AppConstant.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngSpanTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngSpanTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngSpanTest.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngSpanTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngTest.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/ProjectedMetersTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/ProjectedMetersTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/ProjectedMetersTest.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/ProjectedMetersTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/VisibleRegionTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/VisibleRegionTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/VisibleRegionTest.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/VisibleRegionTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/CompassEngineTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/CompassEngineTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/CompassEngineTest.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/CompassEngineTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/IndicatorLocationLayerRendererTest.kt b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/IndicatorLocationLayerRendererTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/IndicatorLocationLayerRendererTest.kt rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/IndicatorLocationLayerRendererTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinatorTest.kt b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinatorTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinatorTest.kt rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinatorTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationCameraControllerTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationCameraControllerTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationCameraControllerTest.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationCameraControllerTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentActivationOptionsTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentActivationOptionsTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentActivationOptionsTest.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentActivationOptionsTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentOptionsTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentOptionsTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentOptionsTest.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentOptionsTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentPositionManagerTest.kt b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentPositionManagerTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentPositionManagerTest.kt rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentPositionManagerTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentTest.kt b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentTest.kt rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/MapboxAnimatorTest.kt b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/MapboxAnimatorTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/MapboxAnimatorTest.kt rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/MapboxAnimatorTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/UtilsTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/UtilsTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/UtilsTest.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/UtilsTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/log/LoggerTest.kt b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/log/LoggerTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/log/LoggerTest.kt rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/log/LoggerTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/AnnotationManagerTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/AnnotationManagerTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/AnnotationManagerTest.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/AnnotationManagerTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/AttributionDialogManagerTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/AttributionDialogManagerTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/AttributionDialogManagerTest.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/AttributionDialogManagerTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapChangeReceiverTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapChangeReceiverTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapChangeReceiverTest.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapChangeReceiverTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapTouchListenersTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapTouchListenersTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapTouchListenersTest.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapTouchListenersTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsAttrsTest.kt b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsAttrsTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsAttrsTest.kt rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsAttrsTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsTest.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.kt b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.kt rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/StyleBuilderTest.kt b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/StyleBuilderTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/StyleBuilderTest.kt rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/StyleBuilderTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/StyleTest.kt b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/StyleTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/StyleTest.kt rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/StyleTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/TransformTest.kt b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/TransformTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/TransformTest.kt rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/TransformTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/UiSettingsTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/UiSettingsTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/UiSettingsTest.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/UiSettingsTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/http/HttpRequestUrlTest.kt b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/http/HttpRequestUrlTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/http/HttpRequestUrlTest.kt rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/http/HttpRequestUrlTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/http/HttpRequestUtilTest.kt b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/http/HttpRequestUtilTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/http/HttpRequestUtilTest.kt rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/http/HttpRequestUtilTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/telemetry/MapEventFactoryTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/telemetry/MapEventFactoryTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/telemetry/MapEventFactoryTest.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/telemetry/MapEventFactoryTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/telemetry/SchemaTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/telemetry/SchemaTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/telemetry/SchemaTest.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/telemetry/SchemaTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/style/expressions/ExpressionTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/style/expressions/ExpressionTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/style/expressions/ExpressionTest.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/style/expressions/ExpressionTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/telemetry/HttpTransportTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/telemetry/HttpTransportTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/telemetry/HttpTransportTest.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/telemetry/HttpTransportTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/utils/ColorUtilsTest.kt b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/utils/ColorUtilsTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/utils/ColorUtilsTest.kt rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/utils/ColorUtilsTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/utils/MockParcel.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/utils/MockParcel.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/utils/MockParcel.java rename to platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/utils/MockParcel.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/platform/android/MapboxGLAndroidSDK/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDK/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker rename to platform/android/MapboxGLAndroidSDK/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKLint/.gitignore b/platform/android/MapboxGLAndroidSDKLint/.gitignore similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKLint/.gitignore rename to platform/android/MapboxGLAndroidSDKLint/.gitignore diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKLint/build.gradle b/platform/android/MapboxGLAndroidSDKLint/build.gradle similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKLint/build.gradle rename to platform/android/MapboxGLAndroidSDKLint/build.gradle diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKLint/src/main/java/com/mapbox/mapboxsdk/lint/KeepDetector.kt b/platform/android/MapboxGLAndroidSDKLint/src/main/java/com/mapbox/mapboxsdk/lint/KeepDetector.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKLint/src/main/java/com/mapbox/mapboxsdk/lint/KeepDetector.kt rename to platform/android/MapboxGLAndroidSDKLint/src/main/java/com/mapbox/mapboxsdk/lint/KeepDetector.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKLint/src/main/java/com/mapbox/mapboxsdk/lint/MapboxIssueRegistry.kt b/platform/android/MapboxGLAndroidSDKLint/src/main/java/com/mapbox/mapboxsdk/lint/MapboxIssueRegistry.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKLint/src/main/java/com/mapbox/mapboxsdk/lint/MapboxIssueRegistry.kt rename to platform/android/MapboxGLAndroidSDKLint/src/main/java/com/mapbox/mapboxsdk/lint/MapboxIssueRegistry.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKLint/src/test/java/com/mapbox/mapboxsdk/lint/KeepDetectorTest.kt b/platform/android/MapboxGLAndroidSDKLint/src/test/java/com/mapbox/mapboxsdk/lint/KeepDetectorTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKLint/src/test/java/com/mapbox/mapboxsdk/lint/KeepDetectorTest.kt rename to platform/android/MapboxGLAndroidSDKLint/src/test/java/com/mapbox/mapboxsdk/lint/KeepDetectorTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/.gitignore b/platform/android/MapboxGLAndroidSDKTestApp/.gitignore similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/.gitignore rename to platform/android/MapboxGLAndroidSDKTestApp/.gitignore diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/README.md b/platform/android/MapboxGLAndroidSDKTestApp/README.md similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/README.md rename to platform/android/MapboxGLAndroidSDKTestApp/README.md diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/build.gradle rename to platform/android/MapboxGLAndroidSDKTestApp/build.gradle diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/lint-baseline-local.xml b/platform/android/MapboxGLAndroidSDKTestApp/lint-baseline-local.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/lint-baseline-local.xml rename to platform/android/MapboxGLAndroidSDKTestApp/lint-baseline-local.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/lint/lint-baseline-ci.xml b/platform/android/MapboxGLAndroidSDKTestApp/lint/lint-baseline-ci.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/lint/lint-baseline-ci.xml rename to platform/android/MapboxGLAndroidSDKTestApp/lint/lint-baseline-ci.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/proguard-rules.pro b/platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/proguard-rules.pro rename to platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/AndroidManifest.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/AndroidManifest.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/AndroidManifest.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/AndroidManifest.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/assets/streets.json b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/assets/streets.json similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/assets/streets.json rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/assets/streets.json diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/AppCenter.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/AppCenter.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/AppCenter.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/AppCenter.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/InstrumentationApplication.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/InstrumentationApplication.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/InstrumentationApplication.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/InstrumentationApplication.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/InstrumentationRunner.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/InstrumentationRunner.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/InstrumentationRunner.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/InstrumentationRunner.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactoryTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactoryTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactoryTest.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactoryTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/BaseIntegrationTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/BaseIntegrationTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/BaseIntegrationTest.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/BaseIntegrationTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/FragmentBackStackTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/FragmentBackStackTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/FragmentBackStackTest.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/FragmentBackStackTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/GLSurfaceViewReopenTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/GLSurfaceViewReopenTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/GLSurfaceViewReopenTest.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/GLSurfaceViewReopenTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/GLSurfaceViewReuseTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/GLSurfaceViewReuseTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/GLSurfaceViewReuseTest.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/GLSurfaceViewReuseTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/OrientationChangeTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/OrientationChangeTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/OrientationChangeTest.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/OrientationChangeTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/QueryRenderedFeaturesBoxCountTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/QueryRenderedFeaturesBoxCountTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/QueryRenderedFeaturesBoxCountTest.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/QueryRenderedFeaturesBoxCountTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/TextureViewReopenTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/TextureViewReopenTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/TextureViewReopenTest.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/TextureViewReopenTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/TextureViewReuseTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/TextureViewReuseTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/TextureViewReuseTest.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/TextureViewReuseTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/ViewPagerScrollTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/ViewPagerScrollTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/ViewPagerScrollTest.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/integration/ViewPagerScrollTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationComponentTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationComponentTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationComponentTest.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationComponentTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationIndicatorLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationIndicatorLayerTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationIndicatorLayerTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationIndicatorLayerTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/utils/LocationComponentAction.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/utils/LocationComponentAction.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/utils/LocationComponentAction.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/utils/LocationComponentAction.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/utils/MapboxLocationTestingUtils.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/utils/MapboxLocationTestingUtils.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/utils/MapboxLocationTestingUtils.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/utils/MapboxLocationTestingUtils.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/utils/StyleChangeIdlingResource.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/utils/StyleChangeIdlingResource.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/utils/StyleChangeIdlingResource.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/utils/StyleChangeIdlingResource.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/BaseLayerTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/BaseLayerTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/BaseLayerTest.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/BaseLayerTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/GesturesUiTestUtils.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/GesturesUiTestUtils.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/GesturesUiTestUtils.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/GesturesUiTestUtils.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/IconManagerResolver.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/IconManagerResolver.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/IconManagerResolver.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/IconManagerResolver.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapGestureDetectorTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapGestureDetectorTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapGestureDetectorTest.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapGestureDetectorTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/NativeMapViewTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/NativeMapViewTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/NativeMapViewTest.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/NativeMapViewTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/TransformTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/TransformTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/TransformTest.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/TransformTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/VisibleRegionTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/VisibleRegionTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/VisibleRegionTest.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/VisibleRegionTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/offline/OfflineDownloadTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/offline/OfflineDownloadTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/offline/OfflineDownloadTest.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/offline/OfflineDownloadTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotterTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotterTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotterTest.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotterTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/MapboxMapAction.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/MapboxMapAction.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/MapboxMapAction.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/MapboxMapAction.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/OrientationAction.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/OrientationAction.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/OrientationAction.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/OrientationAction.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/WaitAction.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/WaitAction.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/WaitAction.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/WaitAction.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/BaseTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/BaseTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/BaseTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/BaseTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/EspressoTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/EspressoTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/EspressoTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/EspressoTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/activity.junit.ejs b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/activity.junit.ejs similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/activity.junit.ejs rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/activity.junit.ejs diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/IconTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/IconTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/IconTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/IconTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/MarkerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/MarkerTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/MarkerTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/MarkerTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/PolygonTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/PolygonTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/PolygonTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/PolygonTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/PolylineTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/PolylineTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/PolylineTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/PolylineTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraAnimateTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraAnimateTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraAnimateTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraAnimateTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraEaseTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraEaseTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraEaseTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraEaseTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraForTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraForTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraForTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraForTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraMoveTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraMoveTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraMoveTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraMoveTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/fragment/MapDialogFragmentTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/fragment/MapDialogFragmentTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/fragment/MapDialogFragmentTest.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/fragment/MapDialogFragmentTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/geometry/GeoJsonConversionTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/geometry/GeoJsonConversionTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/geometry/GeoJsonConversionTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/geometry/GeoJsonConversionTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/geometry/LatLngBoundsTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/geometry/LatLngBoundsTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/geometry/LatLngBoundsTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/geometry/LatLngBoundsTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/ImageMissingTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/ImageMissingTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/ImageMissingTest.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/ImageMissingTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/RemoveUnusedImagesTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/RemoveUnusedImagesTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/RemoveUnusedImagesTest.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/RemoveUnusedImagesTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/RenderViewGetterTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/RenderViewGetterTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/RenderViewGetterTest.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/RenderViewGetterTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/ScreenCoordinateConversion.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/ScreenCoordinateConversion.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/ScreenCoordinateConversion.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/ScreenCoordinateConversion.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/StyleLoadTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/StyleLoadTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/StyleLoadTest.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/StyleLoadTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/AttributionTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/AttributionTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/AttributionTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/AttributionTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/CompassViewTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/CompassViewTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/CompassViewTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/CompassViewTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/LogoTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/LogoTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/LogoTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/LogoTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/CacheTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/CacheTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/CacheTest.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/CacheTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineManagerTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineManagerTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineManagerTest.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineManagerTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineUtilsTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineUtilsTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineUtilsTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineUtilsTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/render/RenderTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/render/RenderTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/render/RenderTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/render/RenderTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/storage/FileSourceMapTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/storage/FileSourceMapTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/storage/FileSourceMapTest.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/storage/FileSourceMapTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/storage/FileSourceStandaloneTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/storage/FileSourceStandaloneTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/storage/FileSourceStandaloneTest.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/storage/FileSourceStandaloneTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/storage/FileSourceTestUtils.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/storage/FileSourceTestUtils.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/storage/FileSourceTestUtils.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/storage/FileSourceTestUtils.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/string/UppperLowerCaseTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/string/UppperLowerCaseTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/string/UppperLowerCaseTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/string/UppperLowerCaseTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BackgroundLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BackgroundLayerTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BackgroundLayerTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BackgroundLayerTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CustomGeometrySourceTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CustomGeometrySourceTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CustomGeometrySourceTest.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CustomGeometrySourceTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/ExpressionTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/ExpressionTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/ExpressionTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/ExpressionTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillExtrusionLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillExtrusionLayerTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillExtrusionLayerTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillExtrusionLayerTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/GeoJsonSourceTests.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/GeoJsonSourceTests.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/GeoJsonSourceTests.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/GeoJsonSourceTests.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/HeatmapLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/HeatmapLayerTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/HeatmapLayerTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/HeatmapLayerTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/HillshadeLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/HillshadeLayerTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/HillshadeLayerTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/HillshadeLayerTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/ImageTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/ImageTest.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/ImageTest.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/ImageTest.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LightTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LightTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LightTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LightTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTests.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTests.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTests.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTests.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTimingTests.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTimingTests.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTimingTests.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTimingTests.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/StyleLoaderTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/StyleLoaderTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/StyleLoaderTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/StyleLoaderTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/light.junit.ejs b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/light.junit.ejs similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/light.junit.ejs rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/light.junit.ejs diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/SnapshotterIdlingResource.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/SnapshotterIdlingResource.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/SnapshotterIdlingResource.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/SnapshotterIdlingResource.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/TestConstants.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/TestConstants.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/TestConstants.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/TestConstants.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/TestingAsyncUtils.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/TestingAsyncUtils.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/TestingAsyncUtils.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/TestingAsyncUtils.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/utils/FontUtilsTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/utils/FontUtilsTest.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/utils/FontUtilsTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/utils/FontUtilsTest.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/Roboto-Medium.ttf b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/Roboto-Medium.ttf similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/Roboto-Medium.ttf rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/Roboto-Medium.ttf diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/Roboto-Regular.ttf b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/Roboto-Regular.ttf similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/Roboto-Regular.ttf rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/Roboto-Regular.ttf diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/commercial-24.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/commercial-24.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/commercial-24.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/commercial-24.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/dog-park-24.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/dog-park-24.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/dog-park-24.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/dog-park-24.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/earthquakes.geojson b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/earthquakes.geojson similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/earthquakes.geojson rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/earthquakes.geojson diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/fill_color_style.json b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/fill_color_style.json similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/fill_color_style.json rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/fill_color_style.json diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/fill_filter_style.json b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/fill_filter_style.json similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/fill_filter_style.json rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/fill_filter_style.json diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Bold,Arial Unicode MS Bold/0-255.pbf b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Bold,Arial Unicode MS Bold/0-255.pbf similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Bold,Arial Unicode MS Bold/0-255.pbf rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Bold,Arial Unicode MS Bold/0-255.pbf diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Italic,Arial Unicode MS Regular/0-255.pbf b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Italic,Arial Unicode MS Regular/0-255.pbf similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Italic,Arial Unicode MS Regular/0-255.pbf rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Italic,Arial Unicode MS Regular/0-255.pbf diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Medium,Arial Unicode MS Regular/0-255.pbf b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Medium,Arial Unicode MS Regular/0-255.pbf similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Medium,Arial Unicode MS Regular/0-255.pbf rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Medium,Arial Unicode MS Regular/0-255.pbf diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Regular,Arial Unicode MS Regular/0-255.pbf b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Regular,Arial Unicode MS Regular/0-255.pbf similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Regular,Arial Unicode MS Regular/0-255.pbf rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Regular,Arial Unicode MS Regular/0-255.pbf diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Regular,Arial Unicode MS Regular/8192-8447.pbf b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Regular,Arial Unicode MS Regular/8192-8447.pbf similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Regular,Arial Unicode MS Regular/8192-8447.pbf rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Regular,Arial Unicode MS Regular/8192-8447.pbf diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/heavy_style.json b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/heavy_style.json similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/heavy_style.json rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/heavy_style.json diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/line_filter_style.json b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/line_filter_style.json similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/line_filter_style.json rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/line_filter_style.json diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/london-underground-24.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/london-underground-24.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/london-underground-24.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/london-underground-24.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/numeric_filter_style.json b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/numeric_filter_style.json similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/numeric_filter_style.json rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/numeric_filter_style.json diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/offline_test.db b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/offline_test.db similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/offline_test.db rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/offline_test.db diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/points-sf.geojson b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/points-sf.geojson similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/points-sf.geojson rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/points-sf.geojson diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/points.geojson b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/points.geojson similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/points.geojson rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/points.geojson diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/small_line.geojson b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/small_line.geojson similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/small_line.geojson rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/small_line.geojson diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/small_poly.geojson b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/small_poly.geojson similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/small_poly.geojson rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/small_poly.geojson diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/streets.json b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/streets.json similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/streets.json rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/streets.json diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/stretchable_image.geojson b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/stretchable_image.geojson similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/stretchable_image.geojson rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/stretchable_image.geojson diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/town-hall-24.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/town-hall-24.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/assets/town-hall-24.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/town-hall-24.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapboxApplication.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapboxApplication.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapboxApplication.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapboxApplication.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/FeatureOverviewActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/FeatureOverviewActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/FeatureOverviewActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/FeatureOverviewActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedSymbolLayerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedSymbolLayerActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedSymbolLayerActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedSymbolLayerActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/DynamicMarkerChangeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/DynamicMarkerChangeActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/DynamicMarkerChangeActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/DynamicMarkerChangeActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolygonActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolygonActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolygonActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolygonActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolylineActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolylineActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolylineActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolylineActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PressForMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PressForMarkerActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PressForMarkerActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PressForMarkerActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimationTypeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimationTypeActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimationTypeActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimationTypeActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimatorActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimatorActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimatorActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimatorActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/GestureDetectorActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/GestureDetectorActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/GestureDetectorActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/GestureDetectorActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ManualZoomActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ManualZoomActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ManualZoomActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ManualZoomActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/MaxMinZoomActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/MaxMinZoomActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/MaxMinZoomActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/MaxMinZoomActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ScrollByActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ScrollByActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ScrollByActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ScrollByActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/customlayer/CustomLayerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/customlayer/CustomLayerActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/customlayer/CustomLayerActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/customlayer/CustomLayerActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/espresso/DeviceIndependentTestActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/espresso/DeviceIndependentTestActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/espresso/DeviceIndependentTestActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/espresso/DeviceIndependentTestActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/espresso/EspressoTestActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/espresso/EspressoTestActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/espresso/EspressoTestActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/espresso/EspressoTestActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/espresso/PixelTestActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/espresso/PixelTestActivity.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/espresso/PixelTestActivity.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/espresso/PixelTestActivity.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxCountActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxCountActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxCountActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxCountActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxHighlightActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxHighlightActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxHighlightActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxHighlightActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesPropertiesActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesPropertiesActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesPropertiesActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesPropertiesActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QuerySourceFeaturesActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QuerySourceFeaturesActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QuerySourceFeaturesActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QuerySourceFeaturesActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/FragmentBackStackActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/FragmentBackStackActivity.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/FragmentBackStackActivity.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/FragmentBackStackActivity.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MapFragmentActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MapFragmentActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MapFragmentActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MapFragmentActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MultiMapActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MultiMapActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MultiMapActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MultiMapActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/NestedViewPagerActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/NestedViewPagerActivity.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/NestedViewPagerActivity.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/NestedViewPagerActivity.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/SupportMapFragmentActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/SupportMapFragmentActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/SupportMapFragmentActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/SupportMapFragmentActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/ViewPagerActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/ViewPagerActivity.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/ViewPagerActivity.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/ViewPagerActivity.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/imagegenerator/PrintActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/imagegenerator/PrintActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/imagegenerator/PrintActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/imagegenerator/PrintActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/imagegenerator/SnapshotActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/imagegenerator/SnapshotActivity.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/imagegenerator/SnapshotActivity.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/imagegenerator/SnapshotActivity.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/DynamicInfoWindowAdapterActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/DynamicInfoWindowAdapterActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/DynamicInfoWindowAdapterActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/DynamicInfoWindowAdapterActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/InfoWindowActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/InfoWindowActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/InfoWindowActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/InfoWindowActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/InfoWindowAdapterActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/InfoWindowAdapterActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/InfoWindowAdapterActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/InfoWindowAdapterActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/BasicLocationPulsingCircleActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/BasicLocationPulsingCircleActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/BasicLocationPulsingCircleActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/BasicLocationPulsingCircleActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/CustomizedLocationPulsingCircleActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/CustomizedLocationPulsingCircleActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/CustomizedLocationPulsingCircleActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/CustomizedLocationPulsingCircleActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationComponentActivationActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationComponentActivationActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationComponentActivationActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationComponentActivationActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationFragmentActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationFragmentActivity.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationFragmentActivity.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationFragmentActivity.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationMapChangeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationMapChangeActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationMapChangeActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationMapChangeActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationModesActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationModesActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationModesActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationModesActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/ManualLocationUpdatesActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/ManualLocationUpdatesActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/ManualLocationUpdatesActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/ManualLocationUpdatesActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/Utils.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/Utils.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/Utils.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/Utils.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/BottomSheetActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/BottomSheetActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/BottomSheetActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/BottomSheetActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DoubleMapActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DoubleMapActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DoubleMapActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DoubleMapActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/GLSurfaceRecyclerViewActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/GLSurfaceRecyclerViewActivity.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/GLSurfaceRecyclerViewActivity.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/GLSurfaceRecyclerViewActivity.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LatLngBoundsForCameraActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LatLngBoundsForCameraActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LatLngBoundsForCameraActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LatLngBoundsForCameraActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LocalGlyphActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LocalGlyphActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LocalGlyphActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LocalGlyphActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapChangeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapChangeActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapChangeActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapChangeActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapInDialogActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapInDialogActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapInDialogActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapInDialogActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapPaddingActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapPaddingActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapPaddingActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapPaddingActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/OverlayMapActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/OverlayMapActivity.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/OverlayMapActivity.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/OverlayMapActivity.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/SimpleMapActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/SimpleMapActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/SimpleMapActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/SimpleMapActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/TextureRecyclerViewActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/TextureRecyclerViewActivity.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/TextureRecyclerViewActivity.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/TextureRecyclerViewActivity.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/VisibilityChangeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/VisibilityChangeActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/VisibilityChangeActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/VisibilityChangeActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/ChangeResourcesCachePathActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/ChangeResourcesCachePathActivity.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/ChangeResourcesCachePathActivity.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/ChangeResourcesCachePathActivity.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/DeleteRegionActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/DeleteRegionActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/DeleteRegionActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/DeleteRegionActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/DownloadRegionActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/DownloadRegionActivity.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/DownloadRegionActivity.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/DownloadRegionActivity.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/MergeOfflineRegionsActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/MergeOfflineRegionsActivity.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/MergeOfflineRegionsActivity.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/MergeOfflineRegionsActivity.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/OfflineActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/OfflineActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/OfflineActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/OfflineActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/UpdateMetadataActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/UpdateMetadataActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/UpdateMetadataActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/UpdateMetadataActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestDefinition.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestDefinition.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestDefinition.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestDefinition.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestSnapshotter.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestSnapshotter.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestSnapshotter.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestSnapshotter.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestStyleDefinition.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestStyleDefinition.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestStyleDefinition.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestStyleDefinition.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterBitMapOverlayActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterBitMapOverlayActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterBitMapOverlayActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterBitMapOverlayActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterHeatMapActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterHeatMapActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterHeatMapActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterHeatMapActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterLocalStyleActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterLocalStyleActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterLocalStyleActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterLocalStyleActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterReuseActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterReuseActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterReuseActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterReuseActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/storage/CacheManagementActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/storage/CacheManagementActivity.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/storage/CacheManagementActivity.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/storage/CacheManagementActivity.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/storage/UrlTransformActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/storage/UrlTransformActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/storage/UrlTransformActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/storage/UrlTransformActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/AnimatedImageSourceActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/AnimatedImageSourceActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/AnimatedImageSourceActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/AnimatedImageSourceActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/BuildingFillExtrusionActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/BuildingFillExtrusionActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/BuildingFillExtrusionActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/BuildingFillExtrusionActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CircleLayerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CircleLayerActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CircleLayerActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CircleLayerActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CollectionUpdateOnStyleChange.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CollectionUpdateOnStyleChange.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CollectionUpdateOnStyleChange.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CollectionUpdateOnStyleChange.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CustomSpriteActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CustomSpriteActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CustomSpriteActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CustomSpriteActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DataDrivenStyleActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DataDrivenStyleActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DataDrivenStyleActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DataDrivenStyleActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DistanceExpressionActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DistanceExpressionActivity.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DistanceExpressionActivity.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DistanceExpressionActivity.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DraggableMarkerActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DraggableMarkerActivity.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DraggableMarkerActivity.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DraggableMarkerActivity.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/FillExtrusionActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/FillExtrusionActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/FillExtrusionActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/FillExtrusionActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/FillExtrusionStyleTestActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/FillExtrusionStyleTestActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/FillExtrusionStyleTestActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/FillExtrusionStyleTestActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/GeoJsonClusteringActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/GeoJsonClusteringActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/GeoJsonClusteringActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/GeoJsonClusteringActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/GradientLineActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/GradientLineActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/GradientLineActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/GradientLineActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/GridSourceActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/GridSourceActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/GridSourceActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/GridSourceActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/HeatmapLayerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/HeatmapLayerActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/HeatmapLayerActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/HeatmapLayerActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/HillshadeLayerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/HillshadeLayerActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/HillshadeLayerActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/HillshadeLayerActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/ImageInLabelActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/ImageInLabelActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/ImageInLabelActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/ImageInLabelActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/NoStyleActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/NoStyleActivity.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/NoStyleActivity.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/NoStyleActivity.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RealTimeGeoJsonActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RealTimeGeoJsonActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RealTimeGeoJsonActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RealTimeGeoJsonActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleTimingTestActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleTimingTestActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleTimingTestActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleTimingTestActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/StretchableImageActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/StretchableImageActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/StretchableImageActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/StretchableImageActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/StyleFileActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/StyleFileActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/StyleFileActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/StyleFileActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolGeneratorActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolGeneratorActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolGeneratorActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolGeneratorActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolLayerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolLayerActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolLayerActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolLayerActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/ZoomFunctionSymbolLayerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/ZoomFunctionSymbolLayerActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/ZoomFunctionSymbolLayerActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/ZoomFunctionSymbolLayerActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/telemetry/PerformanceMeasurementActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/telemetry/PerformanceMeasurementActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/telemetry/PerformanceMeasurementActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/telemetry/PerformanceMeasurementActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewAnimationActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewAnimationActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewAnimationActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewAnimationActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewDebugModeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewDebugModeActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewDebugModeActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewDebugModeActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewResizeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewResizeActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewResizeActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewResizeActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewTransparentBackgroundActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewTransparentBackgroundActivity.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewTransparentBackgroundActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewTransparentBackgroundActivity.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/turf/MapSnapshotterWithinExpression.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/turf/MapSnapshotterWithinExpression.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/turf/MapSnapshotterWithinExpression.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/turf/MapSnapshotterWithinExpression.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/turf/PhysicalUnitCircleActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/turf/PhysicalUnitCircleActivity.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/turf/PhysicalUnitCircleActivity.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/turf/PhysicalUnitCircleActivity.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/turf/WithinExpressionActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/turf/WithinExpressionActivity.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/turf/WithinExpressionActivity.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/turf/WithinExpressionActivity.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/adapter/FeatureAdapter.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/adapter/FeatureAdapter.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/adapter/FeatureAdapter.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/adapter/FeatureAdapter.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/adapter/FeatureSectionAdapter.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/adapter/FeatureSectionAdapter.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/adapter/FeatureSectionAdapter.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/adapter/FeatureSectionAdapter.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/activity/Feature.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/activity/Feature.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/activity/Feature.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/activity/Feature.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CityStateMarker.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CityStateMarker.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CityStateMarker.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CityStateMarker.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CityStateMarkerOptions.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CityStateMarkerOptions.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CityStateMarkerOptions.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CityStateMarkerOptions.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CountryMarker.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CountryMarker.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CountryMarker.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CountryMarker.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CountryMarkerOptions.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CountryMarkerOptions.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CountryMarkerOptions.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CountryMarkerOptions.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/customlayer/ExampleCustomLayer.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/customlayer/ExampleCustomLayer.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/customlayer/ExampleCustomLayer.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/customlayer/ExampleCustomLayer.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/OfflineDownloadRegionDialog.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/OfflineDownloadRegionDialog.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/OfflineDownloadRegionDialog.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/OfflineDownloadRegionDialog.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/OfflineListRegionsDialog.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/OfflineListRegionsDialog.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/OfflineListRegionsDialog.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/OfflineListRegionsDialog.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/FileUtils.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/FileUtils.kt similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/FileUtils.kt rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/FileUtils.kt diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/FontCache.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/FontCache.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/FontCache.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/FontCache.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/GeoParseUtil.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/GeoParseUtil.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/GeoParseUtil.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/GeoParseUtil.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/IconUtils.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/IconUtils.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/IconUtils.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/IconUtils.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/IdleZoomListener.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/IdleZoomListener.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/IdleZoomListener.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/IdleZoomListener.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/ItemClickSupport.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/ItemClickSupport.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/ItemClickSupport.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/ItemClickSupport.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/NavUtils.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/NavUtils.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/NavUtils.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/NavUtils.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/OfflineUtils.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/OfflineUtils.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/OfflineUtils.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/OfflineUtils.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/ResourceUtils.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/ResourceUtils.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/ResourceUtils.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/ResourceUtils.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TileLoadingMeasurementUtils.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TileLoadingMeasurementUtils.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TileLoadingMeasurementUtils.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TileLoadingMeasurementUtils.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimberLogger.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimberLogger.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimberLogger.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimberLogger.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimingLogger.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimingLogger.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimingLogger.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimingLogger.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TokenUtils.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TokenUtils.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TokenUtils.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TokenUtils.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/ViewToBitmapUtil.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/ViewToBitmapUtil.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/ViewToBitmapUtil.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/ViewToBitmapUtil.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/view/LockableBottomSheetBehavior.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/view/LockableBottomSheetBehavior.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/view/LockableBottomSheetBehavior.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/view/LockableBottomSheetBehavior.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/view/MapViewPager.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/view/MapViewPager.java similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/view/MapViewPager.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/view/MapViewPager.java diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/animator/scale_down.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/animator/scale_down.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/animator/scale_down.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/animator/scale_down.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/animator/scale_up.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/animator/scale_up.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/animator/scale_up.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/animator/scale_up.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_android.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_android.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_android.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_android.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_android_2.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_android_2.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_android_2.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_android_2.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_launcher_round.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_launcher_round.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_launcher_round.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_launcher_round.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon_burned.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon_burned.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon_burned.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon_burned.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/popup.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/popup.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/popup.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/popup.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/popup_debug.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/popup_debug.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/popup_debug.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/popup_debug.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_android.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_android.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_android.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_android.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_android_2.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_android_2.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_android_2.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_android_2.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_launcher_round.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_launcher_round.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_launcher_round.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_launcher_round.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon_burned.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon_burned.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon_burned.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon_burned.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_0.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_0.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_0.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_0.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_1.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_1.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_1.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_1.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_2.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_2.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_2.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_2.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_3.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_3.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_3.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_3.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_android.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_android.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_android.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_android.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_android_2.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_android_2.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_android_2.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_android_2.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_launcher_round.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_launcher_round.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_launcher_round.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_launcher_round.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon_burned.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon_burned.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon_burned.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon_burned.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_android.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_android.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_android.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_android.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_android_2.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_android_2.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_android_2.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_android_2.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_launcher_round.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_launcher_round.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_launcher_round.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_launcher_round.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_us.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_us.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_us.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_us.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon_burned.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon_burned.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon_burned.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon_burned.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_android.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_android.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_android.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_android.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_android_2.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_android_2.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_android_2.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_android_2.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_car_top.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_car_top.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_car_top.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_car_top.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_launcher_round.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_launcher_round.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_launcher_round.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_launcher_round.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_taxi_top.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_taxi_top.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_taxi_top.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_taxi_top.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon_burned.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon_burned.png similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon_burned.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon_burned.png diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/water.jpg b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/water.jpg similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/water.jpg rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/water.jpg diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/custom_user_arrow.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/custom_user_arrow.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/custom_user_arrow.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/custom_user_arrow.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/custom_user_icon.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/custom_user_icon.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/custom_user_icon.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/custom_user_icon.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/custom_user_puck_icon.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/custom_user_puck_icon.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/custom_user_puck_icon.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/custom_user_puck_icon.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_ab_back.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_ab_back.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_ab_back.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_ab_back.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add_a_photo_black.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add_a_photo_black.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add_a_photo_black.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add_a_photo_black.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add_white.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add_white.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add_white.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add_white.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_airplanemode_active_black.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_airplanemode_active_black.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_airplanemode_active_black.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_airplanemode_active_black.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_animate_coordinates.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_animate_coordinates.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_animate_coordinates.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_animate_coordinates.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_arrow_downward.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_arrow_downward.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_arrow_downward.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_arrow_downward.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_arrow_upward.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_arrow_upward.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_arrow_upward.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_arrow_upward.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_check_box.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_check_box.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_check_box.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_check_box.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_delete.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_delete.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_delete.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_delete.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_bus_black.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_bus_black.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_bus_black.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_bus_black.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_car_black.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_car_black.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_car_black.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_car_black.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_run_black.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_run_black.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_run_black.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_run_black.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_droppin.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_droppin.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_droppin.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_droppin.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_hearing_black_24dp.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_hearing_black_24dp.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_hearing_black_24dp.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_hearing_black_24dp.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_input.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_input.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_input.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_input.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_layers.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_layers.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_layers.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_layers.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_layers_clear.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_layers_clear.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_layers_clear.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_layers_clear.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_city.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_city.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_city.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_city.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_disabled.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_disabled.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_disabled.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_disabled.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_my_location.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_my_location.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_my_location.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_my_location.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_paint.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_paint.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_paint.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_paint.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_pause_black_24dp.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_pause_black_24dp.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_pause_black_24dp.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_pause_black_24dp.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_play_arrow_black_24dp.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_play_arrow_black_24dp.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_play_arrow_black_24dp.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_play_arrow_black_24dp.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_print.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_print.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_print.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_print.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_refresh.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_refresh.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_refresh.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_refresh.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_stars.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_stars.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_stars.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_stars.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/line_divider.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/line_divider.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/line_divider.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/line_divider.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/mapbox_user_icon_shadow_0px_test.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/mapbox_user_icon_shadow_0px_test.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/mapbox_user_icon_shadow_0px_test.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/mapbox_user_icon_shadow_0px_test.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_sprite.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_sprite.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_sprite.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_sprite.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_image_source.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_image_source.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_image_source.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_image_source.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_backstack_fragment.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_backstack_fragment.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_backstack_fragment.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_backstack_fragment.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_bottom_sheet.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_bottom_sheet.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_bottom_sheet.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_bottom_sheet.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_building_layer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_building_layer.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_building_layer.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_building_layer.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_cache_management.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_cache_management.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_cache_management.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_cache_management.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animator.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animator.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animator.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animator.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_position.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_position.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_position.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_position.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_test.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_test.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_test.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_test.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_change_resources_cache_path.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_change_resources_cache_path.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_change_resources_cache_path.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_change_resources_cache_path.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circle_layer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circle_layer.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circle_layer.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circle_layer.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_collection_update_on_style_change.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_collection_update_on_style_change.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_collection_update_on_style_change.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_collection_update_on_style_change.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_custom_layer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_custom_layer.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_custom_layer.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_custom_layer.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_data_driven_style.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_data_driven_style.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_data_driven_style.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_data_driven_style.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_debug_mode.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_debug_mode.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_debug_mode.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_debug_mode.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_default.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_default.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_default.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_default.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_draggable_marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_draggable_marker.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_draggable_marker.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_draggable_marker.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_dynamic_marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_dynamic_marker.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_dynamic_marker.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_dynamic_marker.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_espresso_test.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_espresso_test.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_espresso_test.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_espresso_test.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_extrusion_test.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_extrusion_test.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_extrusion_test.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_extrusion_test.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_feature_overview.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_feature_overview.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_feature_overview.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_feature_overview.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_fill_extrusion_layer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_fill_extrusion_layer.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_fill_extrusion_layer.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_fill_extrusion_layer.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_geojson_clustering.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_geojson_clustering.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_geojson_clustering.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_geojson_clustering.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_gesture_detector.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_gesture_detector.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_gesture_detector.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_gesture_detector.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_gradient_line.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_gradient_line.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_gradient_line.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_gradient_line.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_grid_source.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_grid_source.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_grid_source.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_grid_source.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_heatmaplayer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_heatmaplayer.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_heatmaplayer.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_heatmaplayer.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_hillshade_layer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_hillshade_layer.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_hillshade_layer.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_hillshade_layer.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_latlngbounds.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_latlngbounds.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_latlngbounds.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_latlngbounds.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_activation_builder.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_activation_builder.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_activation_builder.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_activation_builder.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_basic_pulsing_circle.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_basic_pulsing_circle.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_basic_pulsing_circle.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_basic_pulsing_circle.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_customized_pulsing_circle.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_customized_pulsing_circle.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_customized_pulsing_circle.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_customized_pulsing_circle.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_fragment.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_fragment.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_fragment.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_fragment.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_map_change.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_map_change.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_map_change.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_map_change.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_mode.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_mode.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_mode.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_mode.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_manual_update.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_manual_update.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_manual_update.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_manual_update.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_manual_zoom.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_manual_zoom.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_manual_zoom.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_manual_zoom.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_in_dialog.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_in_dialog.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_in_dialog.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_in_dialog.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_padding.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_padding.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_padding.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_padding.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_simple.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_simple.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_simple.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_simple.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_snapshotter.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_snapshotter.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_snapshotter.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_snapshotter.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_snapshotter_marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_snapshotter_marker.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_snapshotter_marker.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_snapshotter_marker.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_snapshotter_reuse.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_snapshotter_reuse.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_snapshotter_reuse.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_snapshotter_reuse.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_visibility.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_visibility.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_visibility.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_visibility.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_mapsnapshotter_within_expression.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_mapsnapshotter_within_expression.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_mapsnapshotter_within_expression.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_mapsnapshotter_within_expression.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_maxmin_zoom.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_maxmin_zoom.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_maxmin_zoom.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_maxmin_zoom.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_merge_offline_regions.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_merge_offline_regions.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_merge_offline_regions.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_merge_offline_regions.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_metadata_update.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_metadata_update.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_metadata_update.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_metadata_update.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_offline.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_offline.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_offline.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_offline.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_offline_region_delete.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_offline_region_delete.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_offline_region_delete.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_offline_region_delete.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_overlay.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_overlay.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_overlay.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_overlay.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_physical_circle.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_physical_circle.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_physical_circle.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_physical_circle.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_pixel_test.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_pixel_test.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_pixel_test.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_pixel_test.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_print.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_print.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_print.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_print.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_box.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_box.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_box.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_box.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_point.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_point.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_point.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_point.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_source_features.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_source_features.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_source_features.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_source_features.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_recyclerview.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_recyclerview.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_recyclerview.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_recyclerview.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_region_download.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_region_download.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_region_download.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_region_download.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_restricted_bounds.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_restricted_bounds.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_restricted_bounds.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_restricted_bounds.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_runtime_style.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_runtime_style.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_runtime_style.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_runtime_style.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_snapshot.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_snapshot.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_snapshot.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_snapshot.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_stretchable_image.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_stretchable_image.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_stretchable_image.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_stretchable_image.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_symbol_generator.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_symbol_generator.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_symbol_generator.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_symbol_generator.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_symbollayer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_symbollayer.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_symbollayer.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_symbollayer.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_animate.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_animate.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_animate.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_animate.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_debug_mode.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_debug_mode.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_debug_mode.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_debug_mode.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_resize.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_resize.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_resize.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_resize.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_transparent.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_transparent.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_transparent.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_transparent.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_viewpager.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_viewpager.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_viewpager.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_viewpager.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_within_expression.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_within_expression.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_within_expression.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_within_expression.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_zoom_symbol_layer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_zoom_symbol_layer.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_zoom_symbol_layer.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_zoom_symbol_layer.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/dialog_camera_position.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/dialog_camera_position.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/dialog_camera_position.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/dialog_camera_position.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/drawer_navigation_drawer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/drawer_navigation_drawer.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/drawer_navigation_drawer.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/drawer_navigation_drawer.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_gesture_alert.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_gesture_alert.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_gesture_alert.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_gesture_alert.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_main_feature.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_main_feature.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_main_feature.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_main_feature.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_gl.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_gl.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_gl.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_gl.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_texture.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_texture.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_texture.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_texture.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_viewpager.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_viewpager.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_viewpager.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_viewpager.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/section_main_layout.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/section_main_layout.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/section_main_layout.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/section_main_layout.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_custom_marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_custom_marker.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_custom_marker.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_custom_marker.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_text_marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_text_marker.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_text_marker.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_text_marker.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_animator.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_animator.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_animator.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_animator.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_bounds.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_bounds.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_bounds.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_bounds.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_building.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_building.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_building.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_building.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_bulk_marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_bulk_marker.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_bulk_marker.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_bulk_marker.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_custom_layer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_custom_layer.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_custom_layer.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_custom_layer.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_data_driven_style.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_data_driven_style.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_data_driven_style.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_data_driven_style.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_debug.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_debug.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_debug.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_debug.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_generator_symbol.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_generator_symbol.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_generator_symbol.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_generator_symbol.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_gestures.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_gestures.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_gestures.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_gestures.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_infowindow.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_infowindow.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_infowindow.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_infowindow.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_location_mode.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_location_mode.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_location_mode.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_location_mode.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_padding.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_padding.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_padding.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_padding.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_polygon.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_polygon.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_polygon.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_polygon.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_polyline.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_polyline.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_polyline.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_polyline.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_press_for_marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_press_for_marker.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_press_for_marker.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_press_for_marker.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_pulsing_location_mode.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_pulsing_location_mode.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_pulsing_location_mode.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_pulsing_location_mode.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_runtime_style.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_runtime_style.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_runtime_style.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_runtime_style.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_symbol_layer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_symbol_layer.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_symbol_layer.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_symbol_layer.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_symbols.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_symbols.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_symbols.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_symbols.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_zoom.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_zoom.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_zoom.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_zoom.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/amsterdam.geojson b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/amsterdam.geojson similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/amsterdam.geojson rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/amsterdam.geojson diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/local_style.json b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/local_style.json similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/local_style.json rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/local_style.json diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/no_bg_style.json b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/no_bg_style.json similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/no_bg_style.json rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/no_bg_style.json diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/sat_style.json b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/sat_style.json similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/sat_style.json rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/sat_style.json diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_feature_collection.geojson b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_feature_collection.geojson similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_feature_collection.geojson rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_feature_collection.geojson diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_feature_properties.geojson b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_feature_properties.geojson similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_feature_properties.geojson rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_feature_properties.geojson diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_line_gradient_feature.geojson b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_line_gradient_feature.geojson similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_line_gradient_feature.geojson rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_line_gradient_feature.geojson diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_line_string_feature.geojson b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_line_string_feature.geojson similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_line_string_feature.geojson rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_line_string_feature.geojson diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_multi_line_string_feature.geojson b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_multi_line_string_feature.geojson similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_multi_line_string_feature.geojson rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_multi_line_string_feature.geojson diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_multi_point_feature.geojson b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_multi_point_feature.geojson similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_multi_point_feature.geojson rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_multi_point_feature.geojson diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_multi_polygon_feature.geojson b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_multi_polygon_feature.geojson similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_multi_polygon_feature.geojson rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_multi_polygon_feature.geojson diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_point_feature.geojson b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_point_feature.geojson similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_point_feature.geojson rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_point_feature.geojson diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_points_utrecht.geojson b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_points_utrecht.geojson similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_points_utrecht.geojson rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_points_utrecht.geojson diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_polygon_feature.geojson b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_polygon_feature.geojson similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_polygon_feature.geojson rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_polygon_feature.geojson diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_polygon_with_hole_feature.geojson b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_polygon_with_hole_feature.geojson similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_polygon_with_hole_feature.geojson rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_polygon_with_hole_feature.geojson diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/tiny_countries.geojson b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/tiny_countries.geojson similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/raw/tiny_countries.geojson rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/tiny_countries.geojson diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values-v21/attrs.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values-v21/attrs.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values-v21/attrs.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values-v21/attrs.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values-v21/styles.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values-v21/styles.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values-v21/styles.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values-v21/styles.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/actions.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/actions.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/actions.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/actions.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/arrays.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/arrays.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/arrays.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/arrays.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/categories.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/categories.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/categories.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/categories.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/ids.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/ids.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/ids.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/ids.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml diff --git a/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/titles.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/titles.xml similarity index 100% rename from mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/src/main/res/values/titles.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/titles.xml diff --git a/mapbox-gl-native-android/README.md b/platform/android/README.md similarity index 100% rename from mapbox-gl-native-android/README.md rename to platform/android/README.md diff --git a/mapbox-gl-native-android/TESTS.md b/platform/android/TESTS.md similarity index 100% rename from mapbox-gl-native-android/TESTS.md rename to platform/android/TESTS.md diff --git a/mapbox-gl-native/platform/android/android.cmake b/platform/android/android.cmake similarity index 100% rename from mapbox-gl-native/platform/android/android.cmake rename to platform/android/android.cmake diff --git a/mapbox-gl-native-android/build.gradle b/platform/android/build.gradle similarity index 100% rename from mapbox-gl-native-android/build.gradle rename to platform/android/build.gradle diff --git a/mapbox-gl-native-android/checkstyle.xml b/platform/android/checkstyle.xml similarity index 100% rename from mapbox-gl-native-android/checkstyle.xml rename to platform/android/checkstyle.xml diff --git a/mapbox-gl-native-android/circle.yml b/platform/android/circle.yml similarity index 100% rename from mapbox-gl-native-android/circle.yml rename to platform/android/circle.yml diff --git a/mapbox-gl-native-android/gradle.properties b/platform/android/gradle.properties similarity index 100% rename from mapbox-gl-native-android/gradle.properties rename to platform/android/gradle.properties diff --git a/mapbox-gl-native-android/gradle/android-nitpick.gradle b/platform/android/gradle/android-nitpick.gradle similarity index 100% rename from mapbox-gl-native-android/gradle/android-nitpick.gradle rename to platform/android/gradle/android-nitpick.gradle diff --git a/mapbox-gl-native-android/gradle/artifact-settings.gradle b/platform/android/gradle/artifact-settings.gradle similarity index 100% rename from mapbox-gl-native-android/gradle/artifact-settings.gradle rename to platform/android/gradle/artifact-settings.gradle diff --git a/mapbox-gl-native-android/gradle/dependencies.gradle b/platform/android/gradle/dependencies.gradle similarity index 100% rename from mapbox-gl-native-android/gradle/dependencies.gradle rename to platform/android/gradle/dependencies.gradle diff --git a/mapbox-gl-native-android/gradle/gradle-bintray.gradle b/platform/android/gradle/gradle-bintray.gradle similarity index 100% rename from mapbox-gl-native-android/gradle/gradle-bintray.gradle rename to platform/android/gradle/gradle-bintray.gradle diff --git a/mapbox-gl-native-android/gradle/gradle-checkstyle.gradle b/platform/android/gradle/gradle-checkstyle.gradle similarity index 100% rename from mapbox-gl-native-android/gradle/gradle-checkstyle.gradle rename to platform/android/gradle/gradle-checkstyle.gradle diff --git a/mapbox-gl-native-android/gradle/gradle-config.gradle b/platform/android/gradle/gradle-config.gradle similarity index 100% rename from mapbox-gl-native-android/gradle/gradle-config.gradle rename to platform/android/gradle/gradle-config.gradle diff --git a/mapbox-gl-native-android/gradle/gradle-dependencies-graph.gradle b/platform/android/gradle/gradle-dependencies-graph.gradle similarity index 100% rename from mapbox-gl-native-android/gradle/gradle-dependencies-graph.gradle rename to platform/android/gradle/gradle-dependencies-graph.gradle diff --git a/mapbox-gl-native-android/gradle/gradle-gitpackages.gradle b/platform/android/gradle/gradle-gitpackages.gradle similarity index 100% rename from mapbox-gl-native-android/gradle/gradle-gitpackages.gradle rename to platform/android/gradle/gradle-gitpackages.gradle diff --git a/mapbox-gl-native-android/gradle/gradle-javadoc.gradle b/platform/android/gradle/gradle-javadoc.gradle similarity index 100% rename from mapbox-gl-native-android/gradle/gradle-javadoc.gradle rename to platform/android/gradle/gradle-javadoc.gradle diff --git a/mapbox-gl-native-android/gradle/gradle-lint.gradle b/platform/android/gradle/gradle-lint.gradle similarity index 100% rename from mapbox-gl-native-android/gradle/gradle-lint.gradle rename to platform/android/gradle/gradle-lint.gradle diff --git a/mapbox-gl-native-android/gradle/gradle-make.gradle b/platform/android/gradle/gradle-make.gradle similarity index 100% rename from mapbox-gl-native-android/gradle/gradle-make.gradle rename to platform/android/gradle/gradle-make.gradle diff --git a/mapbox-gl-native-android/gradle/gradle-update-vendor-modules.gradle b/platform/android/gradle/gradle-update-vendor-modules.gradle similarity index 100% rename from mapbox-gl-native-android/gradle/gradle-update-vendor-modules.gradle rename to platform/android/gradle/gradle-update-vendor-modules.gradle diff --git a/mapbox-gl-native-android/gradle/jacoco-report.gradle b/platform/android/gradle/jacoco-report.gradle similarity index 100% rename from mapbox-gl-native-android/gradle/jacoco-report.gradle rename to platform/android/gradle/jacoco-report.gradle diff --git a/mapbox-gl-native-android/gradle/ktlint.gradle b/platform/android/gradle/ktlint.gradle similarity index 100% rename from mapbox-gl-native-android/gradle/ktlint.gradle rename to platform/android/gradle/ktlint.gradle diff --git a/mapbox-gl-native-android/gradle/native-build.gradle b/platform/android/gradle/native-build.gradle similarity index 100% rename from mapbox-gl-native-android/gradle/native-build.gradle rename to platform/android/gradle/native-build.gradle diff --git a/mapbox-gl-native-android/gradle/wrapper/gradle-wrapper.jar b/platform/android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from mapbox-gl-native-android/gradle/wrapper/gradle-wrapper.jar rename to platform/android/gradle/wrapper/gradle-wrapper.jar diff --git a/mapbox-gl-native-android/gradle/wrapper/gradle-wrapper.properties b/platform/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from mapbox-gl-native-android/gradle/wrapper/gradle-wrapper.properties rename to platform/android/gradle/wrapper/gradle-wrapper.properties diff --git a/mapbox-gl-native-android/gradlew b/platform/android/gradlew similarity index 100% rename from mapbox-gl-native-android/gradlew rename to platform/android/gradlew diff --git a/mapbox-gl-native-android/gradlew.bat b/platform/android/gradlew.bat similarity index 100% rename from mapbox-gl-native-android/gradlew.bat rename to platform/android/gradlew.bat diff --git a/mapbox-gl-native-android/package-lock.json b/platform/android/package-lock.json similarity index 100% rename from mapbox-gl-native-android/package-lock.json rename to platform/android/package-lock.json diff --git a/mapbox-gl-native-android/package.json b/platform/android/package.json similarity index 100% rename from mapbox-gl-native-android/package.json rename to platform/android/package.json diff --git a/mapbox-gl-native-android/resources/compass.svg b/platform/android/resources/compass.svg similarity index 100% rename from mapbox-gl-native-android/resources/compass.svg rename to platform/android/resources/compass.svg diff --git a/mapbox-gl-native-android/resources/direction-dot.svg b/platform/android/resources/direction-dot.svg similarity index 100% rename from mapbox-gl-native-android/resources/direction-dot.svg rename to platform/android/resources/direction-dot.svg diff --git a/mapbox-gl-native-android/resources/dot-arrow.svg b/platform/android/resources/dot-arrow.svg similarity index 100% rename from mapbox-gl-native-android/resources/dot-arrow.svg rename to platform/android/resources/dot-arrow.svg diff --git a/mapbox-gl-native-android/resources/location-dot.svg b/platform/android/resources/location-dot.svg similarity index 100% rename from mapbox-gl-native-android/resources/location-dot.svg rename to platform/android/resources/location-dot.svg diff --git a/mapbox-gl-native-android/resources/location-static-dot.svg b/platform/android/resources/location-static-dot.svg similarity index 100% rename from mapbox-gl-native-android/resources/location-static-dot.svg rename to platform/android/resources/location-static-dot.svg diff --git a/mapbox-gl-native-android/scripts/exclude-activity-gen.json b/platform/android/scripts/exclude-activity-gen.json similarity index 100% rename from mapbox-gl-native-android/scripts/exclude-activity-gen.json rename to platform/android/scripts/exclude-activity-gen.json diff --git a/mapbox-gl-native-android/scripts/generate-license.py b/platform/android/scripts/generate-license.py similarity index 100% rename from mapbox-gl-native-android/scripts/generate-license.py rename to platform/android/scripts/generate-license.py diff --git a/mapbox-gl-native-android/scripts/generate-style-code.js b/platform/android/scripts/generate-style-code.js similarity index 99% rename from mapbox-gl-native-android/scripts/generate-style-code.js rename to platform/android/scripts/generate-style-code.js index 1e4315265..63b2bb1bc 100755 --- a/mapbox-gl-native-android/scripts/generate-style-code.js +++ b/platform/android/scripts/generate-style-code.js @@ -3,7 +3,7 @@ const fs = require('fs'); const ejs = require('ejs'); -const spec = require('../../mapbox-gl-native/scripts/style-spec'); +const spec = require('../../../scripts/style-spec'); const _ = require('lodash'); // FIXME: https://github.com/mapbox/mapbox-gl-native/issues/15008 @@ -11,7 +11,7 @@ const _ = require('lodash'); //delete spec.layout_line["line-sort-key"] //delete spec.layout_fill["fill-sort-key"] -require('../../mapbox-gl-native/scripts/style-code'); +require('../../../scripts/style-code'); // Specification parsing // const lightProperties = Object.keys(spec[`light`]).reduce((memo, name) => { diff --git a/mapbox-gl-native-android/scripts/generate-test-code.js b/platform/android/scripts/generate-test-code.js similarity index 100% rename from mapbox-gl-native-android/scripts/generate-test-code.js rename to platform/android/scripts/generate-test-code.js diff --git a/mapbox-gl-native-android/scripts/metrics.sh b/platform/android/scripts/metrics.sh similarity index 100% rename from mapbox-gl-native-android/scripts/metrics.sh rename to platform/android/scripts/metrics.sh diff --git a/mapbox-gl-native-android/scripts/parse-jacoco-report.py b/platform/android/scripts/parse-jacoco-report.py similarity index 100% rename from mapbox-gl-native-android/scripts/parse-jacoco-report.py rename to platform/android/scripts/parse-jacoco-report.py diff --git a/mapbox-gl-native-android/scripts/release-notes-github.md.ejs b/platform/android/scripts/release-notes-github.md.ejs similarity index 100% rename from mapbox-gl-native-android/scripts/release-notes-github.md.ejs rename to platform/android/scripts/release-notes-github.md.ejs diff --git a/mapbox-gl-native-android/scripts/release-notes.js b/platform/android/scripts/release-notes.js similarity index 100% rename from mapbox-gl-native-android/scripts/release-notes.js rename to platform/android/scripts/release-notes.js diff --git a/mapbox-gl-native-android/scripts/release.py b/platform/android/scripts/release.py similarity index 100% rename from mapbox-gl-native-android/scripts/release.py rename to platform/android/scripts/release.py diff --git a/mapbox-gl-native-android/scripts/run-render-test.py b/platform/android/scripts/run-render-test.py similarity index 92% rename from mapbox-gl-native-android/scripts/run-render-test.py rename to platform/android/scripts/run-render-test.py index 2bbf87d81..408571589 100644 --- a/mapbox-gl-native-android/scripts/run-render-test.py +++ b/platform/android/scripts/run-render-test.py @@ -9,7 +9,7 @@ testCounter = 0 for cat in os.listdir(catPath): testPath = catPath + cat + "/" for test in os.listdir(testPath): - inputPath = os.getcwd() + "../../mapbox-gl-native/mapbox-gl-js/test/integration/render-tests/" + cat + "/" + test + inputPath = os.getcwd() + "../../../mapbox-gl-js/test/integration/render-tests/" + cat + "/" + test outputPath = testPath + test expected = outputPath + "/expected.png" diff --git a/mapbox-gl-native-android/scripts/trigger-maps-documentation-deploy-steps.sh b/platform/android/scripts/trigger-maps-documentation-deploy-steps.sh similarity index 100% rename from mapbox-gl-native-android/scripts/trigger-maps-documentation-deploy-steps.sh rename to platform/android/scripts/trigger-maps-documentation-deploy-steps.sh diff --git a/mapbox-gl-native-android/scripts/upload-to-github-release.py b/platform/android/scripts/upload-to-github-release.py similarity index 100% rename from mapbox-gl-native-android/scripts/upload-to-github-release.py rename to platform/android/scripts/upload-to-github-release.py diff --git a/mapbox-gl-native-android/scripts/validate-license.py b/platform/android/scripts/validate-license.py similarity index 100% rename from mapbox-gl-native-android/scripts/validate-license.py rename to platform/android/scripts/validate-license.py diff --git a/mapbox-gl-native-android/settings.gradle b/platform/android/settings.gradle similarity index 100% rename from mapbox-gl-native-android/settings.gradle rename to platform/android/settings.gradle diff --git a/mapbox-gl-native/platform/android/src/async_task.cpp b/platform/android/src/async_task.cpp similarity index 100% rename from mapbox-gl-native/platform/android/src/async_task.cpp rename to platform/android/src/async_task.cpp diff --git a/mapbox-gl-native/platform/android/src/attach_env.cpp b/platform/android/src/attach_env.cpp similarity index 100% rename from mapbox-gl-native/platform/android/src/attach_env.cpp rename to platform/android/src/attach_env.cpp diff --git a/mapbox-gl-native/platform/android/src/attach_env.hpp b/platform/android/src/attach_env.hpp similarity index 100% rename from mapbox-gl-native/platform/android/src/attach_env.hpp rename to platform/android/src/attach_env.hpp diff --git a/mapbox-gl-native/platform/android/src/bitmap.cpp b/platform/android/src/bitmap.cpp similarity index 100% rename from mapbox-gl-native/platform/android/src/bitmap.cpp rename to platform/android/src/bitmap.cpp diff --git a/mapbox-gl-native/platform/android/src/bitmap.hpp b/platform/android/src/bitmap.hpp similarity index 100% rename from mapbox-gl-native/platform/android/src/bitmap.hpp rename to platform/android/src/bitmap.hpp diff --git a/mapbox-gl-native/platform/android/src/bitmap_factory.cpp b/platform/android/src/bitmap_factory.cpp similarity index 100% rename from mapbox-gl-native/platform/android/src/bitmap_factory.cpp rename to platform/android/src/bitmap_factory.cpp diff --git a/mapbox-gl-native/platform/android/src/bitmap_factory.hpp b/platform/android/src/bitmap_factory.hpp similarity index 100% rename from mapbox-gl-native/platform/android/src/bitmap_factory.hpp rename to platform/android/src/bitmap_factory.hpp diff --git a/mapbox-gl-native/platform/android/src/example_custom_layer.cpp b/platform/android/src/example_custom_layer.cpp similarity index 100% rename from mapbox-gl-native/platform/android/src/example_custom_layer.cpp rename to platform/android/src/example_custom_layer.cpp diff --git a/mapbox-gl-native/platform/android/src/gl_functions.cpp b/platform/android/src/gl_functions.cpp similarity index 100% rename from mapbox-gl-native/platform/android/src/gl_functions.cpp rename to platform/android/src/gl_functions.cpp diff --git a/mapbox-gl-native/platform/android/src/image.cpp b/platform/android/src/image.cpp similarity index 100% rename from mapbox-gl-native/platform/android/src/image.cpp rename to platform/android/src/image.cpp diff --git a/mapbox-gl-native/platform/android/src/jni.cpp b/platform/android/src/jni.cpp similarity index 100% rename from mapbox-gl-native/platform/android/src/jni.cpp rename to platform/android/src/jni.cpp diff --git a/mapbox-gl-native/platform/android/src/jni.hpp b/platform/android/src/jni.hpp similarity index 100% rename from mapbox-gl-native/platform/android/src/jni.hpp rename to platform/android/src/jni.hpp diff --git a/mapbox-gl-native/platform/android/src/run_loop.cpp b/platform/android/src/run_loop.cpp similarity index 100% rename from mapbox-gl-native/platform/android/src/run_loop.cpp rename to platform/android/src/run_loop.cpp diff --git a/mapbox-gl-native/platform/android/src/run_loop_impl.hpp b/platform/android/src/run_loop_impl.hpp similarity index 100% rename from mapbox-gl-native/platform/android/src/run_loop_impl.hpp rename to platform/android/src/run_loop_impl.hpp diff --git a/mapbox-gl-native/platform/android/src/string_util.cpp b/platform/android/src/string_util.cpp similarity index 100% rename from mapbox-gl-native/platform/android/src/string_util.cpp rename to platform/android/src/string_util.cpp diff --git a/mapbox-gl-native/platform/android/src/test/benchmark_runner.cpp b/platform/android/src/test/benchmark_runner.cpp similarity index 100% rename from mapbox-gl-native/platform/android/src/test/benchmark_runner.cpp rename to platform/android/src/test/benchmark_runner.cpp diff --git a/mapbox-gl-native/platform/android/src/test/collator_test_stub.cpp b/platform/android/src/test/collator_test_stub.cpp similarity index 100% rename from mapbox-gl-native/platform/android/src/test/collator_test_stub.cpp rename to platform/android/src/test/collator_test_stub.cpp diff --git a/mapbox-gl-native/platform/android/src/test/http_file_source_test_stub.cpp b/platform/android/src/test/http_file_source_test_stub.cpp similarity index 100% rename from mapbox-gl-native/platform/android/src/test/http_file_source_test_stub.cpp rename to platform/android/src/test/http_file_source_test_stub.cpp diff --git a/mapbox-gl-native/platform/android/src/test/number_format_test_stub.cpp b/platform/android/src/test/number_format_test_stub.cpp similarity index 100% rename from mapbox-gl-native/platform/android/src/test/number_format_test_stub.cpp rename to platform/android/src/test/number_format_test_stub.cpp diff --git a/mapbox-gl-native/platform/android/src/test/render_test_runner.cpp b/platform/android/src/test/render_test_runner.cpp similarity index 100% rename from mapbox-gl-native/platform/android/src/test/render_test_runner.cpp rename to platform/android/src/test/render_test_runner.cpp diff --git a/mapbox-gl-native/platform/android/src/test/runtime.cpp b/platform/android/src/test/runtime.cpp similarity index 100% rename from mapbox-gl-native/platform/android/src/test/runtime.cpp rename to platform/android/src/test/runtime.cpp diff --git a/mapbox-gl-native/platform/android/src/test/runtime.hpp b/platform/android/src/test/runtime.hpp similarity index 100% rename from mapbox-gl-native/platform/android/src/test/runtime.hpp rename to platform/android/src/test/runtime.hpp diff --git a/mapbox-gl-native/platform/android/src/test/test_runner.cpp b/platform/android/src/test/test_runner.cpp similarity index 100% rename from mapbox-gl-native/platform/android/src/test/test_runner.cpp rename to platform/android/src/test/test_runner.cpp diff --git a/mapbox-gl-native/platform/android/src/test/test_runner_common.cpp b/platform/android/src/test/test_runner_common.cpp similarity index 100% rename from mapbox-gl-native/platform/android/src/test/test_runner_common.cpp rename to platform/android/src/test/test_runner_common.cpp diff --git a/mapbox-gl-native/platform/android/src/test/test_runner_common.hpp b/platform/android/src/test/test_runner_common.hpp similarity index 100% rename from mapbox-gl-native/platform/android/src/test/test_runner_common.hpp rename to platform/android/src/test/test_runner_common.hpp diff --git a/mapbox-gl-native/platform/android/src/test/version-script b/platform/android/src/test/version-script similarity index 100% rename from mapbox-gl-native/platform/android/src/test/version-script rename to platform/android/src/test/version-script diff --git a/mapbox-gl-native/platform/android/src/thread.cpp b/platform/android/src/thread.cpp similarity index 100% rename from mapbox-gl-native/platform/android/src/thread.cpp rename to platform/android/src/thread.cpp diff --git a/mapbox-gl-native/platform/android/src/timer.cpp b/platform/android/src/timer.cpp similarity index 100% rename from mapbox-gl-native/platform/android/src/timer.cpp rename to platform/android/src/timer.cpp diff --git a/platform/android/vendor/mapbox-events-android b/platform/android/vendor/mapbox-events-android index 1136b6025..8ee3e93c3 160000 --- a/platform/android/vendor/mapbox-events-android +++ b/platform/android/vendor/mapbox-events-android @@ -1 +1 @@ -Subproject commit 1136b6025252a20af7859b063887a6015bc057d2 +Subproject commit 8ee3e93c3bcfc07af3fb2f778b804590eda2c61f diff --git a/platform/android/vendor/mapbox-java b/platform/android/vendor/mapbox-java index e9215301f..71f3a6a75 160000 --- a/platform/android/vendor/mapbox-java +++ b/platform/android/vendor/mapbox-java @@ -1 +1 @@ -Subproject commit e9215301fa627f4c49b8372c3bb4c59707b13c95 +Subproject commit 71f3a6a75d8d2afa606fb8118f6bbbc7151215b3 diff --git a/mapbox-gl-native-android/version-script b/platform/android/version-script similarity index 100% rename from mapbox-gl-native-android/version-script rename to platform/android/version-script diff --git a/mapbox-gl-native/platform/darwin/README.md b/platform/darwin/README.md similarity index 100% rename from mapbox-gl-native/platform/darwin/README.md rename to platform/darwin/README.md diff --git a/mapbox-gl-native-ios/platform/darwin/ci.xcconfig b/platform/darwin/ci.xcconfig similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/ci.xcconfig rename to platform/darwin/ci.xcconfig diff --git a/mapbox-gl-native/platform/darwin/include/mbgl/interface/native_apple_interface.h b/platform/darwin/include/mbgl/interface/native_apple_interface.h similarity index 100% rename from mapbox-gl-native/platform/darwin/include/mbgl/interface/native_apple_interface.h rename to platform/darwin/include/mbgl/interface/native_apple_interface.h diff --git a/mapbox-gl-native/platform/darwin/include/mbgl/storage/reachability.h b/platform/darwin/include/mbgl/storage/reachability.h similarity index 100% rename from mapbox-gl-native/platform/darwin/include/mbgl/storage/reachability.h rename to platform/darwin/include/mbgl/storage/reachability.h diff --git a/mapbox-gl-native-ios/platform/darwin/include/mbgl/util/image+MGLAdditions.hpp b/platform/darwin/include/mbgl/util/image+MGLAdditions.hpp similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/include/mbgl/util/image+MGLAdditions.hpp rename to platform/darwin/include/mbgl/util/image+MGLAdditions.hpp diff --git a/mapbox-gl-native-ios/platform/darwin/src/CFHandle.hpp b/platform/darwin/src/CFHandle.hpp similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/CFHandle.hpp rename to platform/darwin/src/CFHandle.hpp diff --git a/mapbox-gl-native-ios/platform/darwin/src/async_task.cpp b/platform/darwin/src/async_task.cpp similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/async_task.cpp rename to platform/darwin/src/async_task.cpp diff --git a/mapbox-gl-native/platform/darwin/src/collator.mm b/platform/darwin/src/collator.mm similarity index 100% rename from mapbox-gl-native/platform/darwin/src/collator.mm rename to platform/darwin/src/collator.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/gl_functions.cpp b/platform/darwin/src/gl_functions.cpp similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/gl_functions.cpp rename to platform/darwin/src/gl_functions.cpp diff --git a/mapbox-gl-native-ios/platform/darwin/src/headless_backend_cgl.mm b/platform/darwin/src/headless_backend_cgl.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/headless_backend_cgl.mm rename to platform/darwin/src/headless_backend_cgl.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/headless_backend_eagl.mm b/platform/darwin/src/headless_backend_eagl.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/headless_backend_eagl.mm rename to platform/darwin/src/headless_backend_eagl.mm diff --git a/mapbox-gl-native/platform/darwin/src/http_file_source.mm b/platform/darwin/src/http_file_source.mm similarity index 100% rename from mapbox-gl-native/platform/darwin/src/http_file_source.mm rename to platform/darwin/src/http_file_source.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/image.mm b/platform/darwin/src/image.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/image.mm rename to platform/darwin/src/image.mm diff --git a/mapbox-gl-native/platform/darwin/src/local_glyph_rasterizer.mm b/platform/darwin/src/local_glyph_rasterizer.mm similarity index 100% rename from mapbox-gl-native/platform/darwin/src/local_glyph_rasterizer.mm rename to platform/darwin/src/local_glyph_rasterizer.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/logging_nslog.mm b/platform/darwin/src/logging_nslog.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/logging_nslog.mm rename to platform/darwin/src/logging_nslog.mm diff --git a/mapbox-gl-native/platform/darwin/src/native_apple_interface.m b/platform/darwin/src/native_apple_interface.m similarity index 100% rename from mapbox-gl-native/platform/darwin/src/native_apple_interface.m rename to platform/darwin/src/native_apple_interface.m diff --git a/mapbox-gl-native/platform/darwin/src/nsthread.mm b/platform/darwin/src/nsthread.mm similarity index 100% rename from mapbox-gl-native/platform/darwin/src/nsthread.mm rename to platform/darwin/src/nsthread.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/number_format.mm b/platform/darwin/src/number_format.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/number_format.mm rename to platform/darwin/src/number_format.mm diff --git a/mapbox-gl-native/platform/darwin/src/reachability.m b/platform/darwin/src/reachability.m similarity index 99% rename from mapbox-gl-native/platform/darwin/src/reachability.m rename to platform/darwin/src/reachability.m index 45e21165a..737145a8a 100644 --- a/mapbox-gl-native/platform/darwin/src/reachability.m +++ b/platform/darwin/src/reachability.m @@ -25,7 +25,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#import "MGLReachability.h" +#import #import #import diff --git a/mapbox-gl-native-ios/platform/darwin/src/run_loop.cpp b/platform/darwin/src/run_loop.cpp similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/run_loop.cpp rename to platform/darwin/src/run_loop.cpp diff --git a/mapbox-gl-native-ios/platform/darwin/src/string_nsstring.mm b/platform/darwin/src/string_nsstring.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/string_nsstring.mm rename to platform/darwin/src/string_nsstring.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/timer.cpp b/platform/darwin/src/timer.cpp similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/timer.cpp rename to platform/darwin/src/timer.cpp diff --git a/mapbox-gl-native/platform/default/include/jni/string_conversion.hpp b/platform/default/include/jni/string_conversion.hpp similarity index 100% rename from mapbox-gl-native/platform/default/include/jni/string_conversion.hpp rename to platform/default/include/jni/string_conversion.hpp diff --git a/mapbox-gl-native/platform/default/include/mbgl/gfx/headless_backend.hpp b/platform/default/include/mbgl/gfx/headless_backend.hpp similarity index 100% rename from mapbox-gl-native/platform/default/include/mbgl/gfx/headless_backend.hpp rename to platform/default/include/mbgl/gfx/headless_backend.hpp diff --git a/mapbox-gl-native/platform/default/include/mbgl/gfx/headless_frontend.hpp b/platform/default/include/mbgl/gfx/headless_frontend.hpp similarity index 100% rename from mapbox-gl-native/platform/default/include/mbgl/gfx/headless_frontend.hpp rename to platform/default/include/mbgl/gfx/headless_frontend.hpp diff --git a/mapbox-gl-native/platform/default/include/mbgl/gl/headless_backend.hpp b/platform/default/include/mbgl/gl/headless_backend.hpp similarity index 100% rename from mapbox-gl-native/platform/default/include/mbgl/gl/headless_backend.hpp rename to platform/default/include/mbgl/gl/headless_backend.hpp diff --git a/mapbox-gl-native/platform/default/include/mbgl/map/map_snapshotter.hpp b/platform/default/include/mbgl/map/map_snapshotter.hpp similarity index 100% rename from mapbox-gl-native/platform/default/include/mbgl/map/map_snapshotter.hpp rename to platform/default/include/mbgl/map/map_snapshotter.hpp diff --git a/mapbox-gl-native/platform/default/include/mbgl/storage/file_source_request.hpp b/platform/default/include/mbgl/storage/file_source_request.hpp similarity index 100% rename from mapbox-gl-native/platform/default/include/mbgl/storage/file_source_request.hpp rename to platform/default/include/mbgl/storage/file_source_request.hpp diff --git a/mapbox-gl-native/platform/default/include/mbgl/storage/local_file_request.hpp b/platform/default/include/mbgl/storage/local_file_request.hpp similarity index 100% rename from mapbox-gl-native/platform/default/include/mbgl/storage/local_file_request.hpp rename to platform/default/include/mbgl/storage/local_file_request.hpp diff --git a/mapbox-gl-native/platform/default/include/mbgl/storage/merge_sideloaded.hpp b/platform/default/include/mbgl/storage/merge_sideloaded.hpp similarity index 100% rename from mapbox-gl-native/platform/default/include/mbgl/storage/merge_sideloaded.hpp rename to platform/default/include/mbgl/storage/merge_sideloaded.hpp diff --git a/mapbox-gl-native/platform/default/include/mbgl/storage/merge_sideloaded.js b/platform/default/include/mbgl/storage/merge_sideloaded.js similarity index 100% rename from mapbox-gl-native/platform/default/include/mbgl/storage/merge_sideloaded.js rename to platform/default/include/mbgl/storage/merge_sideloaded.js diff --git a/mapbox-gl-native/platform/default/include/mbgl/storage/merge_sideloaded.sql b/platform/default/include/mbgl/storage/merge_sideloaded.sql similarity index 100% rename from mapbox-gl-native/platform/default/include/mbgl/storage/merge_sideloaded.sql rename to platform/default/include/mbgl/storage/merge_sideloaded.sql diff --git a/mapbox-gl-native/platform/default/include/mbgl/storage/offline_database.hpp b/platform/default/include/mbgl/storage/offline_database.hpp similarity index 100% rename from mapbox-gl-native/platform/default/include/mbgl/storage/offline_database.hpp rename to platform/default/include/mbgl/storage/offline_database.hpp diff --git a/mapbox-gl-native/platform/default/include/mbgl/storage/offline_download.hpp b/platform/default/include/mbgl/storage/offline_download.hpp similarity index 100% rename from mapbox-gl-native/platform/default/include/mbgl/storage/offline_download.hpp rename to platform/default/include/mbgl/storage/offline_download.hpp diff --git a/mapbox-gl-native/platform/default/include/mbgl/storage/offline_schema.hpp b/platform/default/include/mbgl/storage/offline_schema.hpp similarity index 100% rename from mapbox-gl-native/platform/default/include/mbgl/storage/offline_schema.hpp rename to platform/default/include/mbgl/storage/offline_schema.hpp diff --git a/mapbox-gl-native/platform/default/include/mbgl/storage/offline_schema.js b/platform/default/include/mbgl/storage/offline_schema.js similarity index 100% rename from mapbox-gl-native/platform/default/include/mbgl/storage/offline_schema.js rename to platform/default/include/mbgl/storage/offline_schema.js diff --git a/mapbox-gl-native/platform/default/include/mbgl/storage/offline_schema.sql b/platform/default/include/mbgl/storage/offline_schema.sql similarity index 100% rename from mapbox-gl-native/platform/default/include/mbgl/storage/offline_schema.sql rename to platform/default/include/mbgl/storage/offline_schema.sql diff --git a/mapbox-gl-native/platform/default/include/mbgl/storage/sqlite3.hpp b/platform/default/include/mbgl/storage/sqlite3.hpp similarity index 100% rename from mapbox-gl-native/platform/default/include/mbgl/storage/sqlite3.hpp rename to platform/default/include/mbgl/storage/sqlite3.hpp diff --git a/mapbox-gl-native/platform/default/include/mbgl/text/unaccent.hpp b/platform/default/include/mbgl/text/unaccent.hpp similarity index 100% rename from mapbox-gl-native/platform/default/include/mbgl/text/unaccent.hpp rename to platform/default/include/mbgl/text/unaccent.hpp diff --git a/mapbox-gl-native/platform/default/resources/attribution-logo.svg b/platform/default/resources/attribution-logo.svg similarity index 100% rename from mapbox-gl-native/platform/default/resources/attribution-logo.svg rename to platform/default/resources/attribution-logo.svg diff --git a/mapbox-gl-native/platform/default/resources/default_marker.svg b/platform/default/resources/default_marker.svg similarity index 100% rename from mapbox-gl-native/platform/default/resources/default_marker.svg rename to platform/default/resources/default_marker.svg diff --git a/mapbox-gl-native/platform/default/src/mbgl/benchmark/main.cpp b/platform/default/src/mbgl/benchmark/main.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/benchmark/main.cpp rename to platform/default/src/mbgl/benchmark/main.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/gfx/headless_backend.cpp b/platform/default/src/mbgl/gfx/headless_backend.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/gfx/headless_backend.cpp rename to platform/default/src/mbgl/gfx/headless_backend.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/gfx/headless_frontend.cpp b/platform/default/src/mbgl/gfx/headless_frontend.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/gfx/headless_frontend.cpp rename to platform/default/src/mbgl/gfx/headless_frontend.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/gl/headless_backend.cpp b/platform/default/src/mbgl/gl/headless_backend.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/gl/headless_backend.cpp rename to platform/default/src/mbgl/gl/headless_backend.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/gl/headless_backend_osmesa.cpp b/platform/default/src/mbgl/gl/headless_backend_osmesa.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/gl/headless_backend_osmesa.cpp rename to platform/default/src/mbgl/gl/headless_backend_osmesa.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/i18n/collator.cpp b/platform/default/src/mbgl/i18n/collator.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/i18n/collator.cpp rename to platform/default/src/mbgl/i18n/collator.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/i18n/number_format.cpp b/platform/default/src/mbgl/i18n/number_format.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/i18n/number_format.cpp rename to platform/default/src/mbgl/i18n/number_format.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/layermanager/layer_manager.cpp b/platform/default/src/mbgl/layermanager/layer_manager.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/layermanager/layer_manager.cpp rename to platform/default/src/mbgl/layermanager/layer_manager.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/map/map_snapshotter.cpp b/platform/default/src/mbgl/map/map_snapshotter.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/map/map_snapshotter.cpp rename to platform/default/src/mbgl/map/map_snapshotter.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/platform/time.cpp b/platform/default/src/mbgl/platform/time.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/platform/time.cpp rename to platform/default/src/mbgl/platform/time.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/render-test/main.cpp b/platform/default/src/mbgl/render-test/main.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/render-test/main.cpp rename to platform/default/src/mbgl/render-test/main.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/storage/asset_file_source.cpp b/platform/default/src/mbgl/storage/asset_file_source.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/storage/asset_file_source.cpp rename to platform/default/src/mbgl/storage/asset_file_source.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/storage/database_file_source.cpp b/platform/default/src/mbgl/storage/database_file_source.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/storage/database_file_source.cpp rename to platform/default/src/mbgl/storage/database_file_source.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/storage/file_source_manager.cpp b/platform/default/src/mbgl/storage/file_source_manager.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/storage/file_source_manager.cpp rename to platform/default/src/mbgl/storage/file_source_manager.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/storage/file_source_request.cpp b/platform/default/src/mbgl/storage/file_source_request.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/storage/file_source_request.cpp rename to platform/default/src/mbgl/storage/file_source_request.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/storage/http_file_source.cpp b/platform/default/src/mbgl/storage/http_file_source.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/storage/http_file_source.cpp rename to platform/default/src/mbgl/storage/http_file_source.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/storage/local_file_request.cpp b/platform/default/src/mbgl/storage/local_file_request.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/storage/local_file_request.cpp rename to platform/default/src/mbgl/storage/local_file_request.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/storage/local_file_source.cpp b/platform/default/src/mbgl/storage/local_file_source.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/storage/local_file_source.cpp rename to platform/default/src/mbgl/storage/local_file_source.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/storage/main_resource_loader.cpp b/platform/default/src/mbgl/storage/main_resource_loader.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/storage/main_resource_loader.cpp rename to platform/default/src/mbgl/storage/main_resource_loader.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/storage/offline.cpp b/platform/default/src/mbgl/storage/offline.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/storage/offline.cpp rename to platform/default/src/mbgl/storage/offline.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/storage/offline_database.cpp b/platform/default/src/mbgl/storage/offline_database.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/storage/offline_database.cpp rename to platform/default/src/mbgl/storage/offline_database.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/storage/offline_download.cpp b/platform/default/src/mbgl/storage/offline_download.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/storage/offline_download.cpp rename to platform/default/src/mbgl/storage/offline_download.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/storage/online_file_source.cpp b/platform/default/src/mbgl/storage/online_file_source.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/storage/online_file_source.cpp rename to platform/default/src/mbgl/storage/online_file_source.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/storage/sqlite3.cpp b/platform/default/src/mbgl/storage/sqlite3.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/storage/sqlite3.cpp rename to platform/default/src/mbgl/storage/sqlite3.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/test/main.cpp b/platform/default/src/mbgl/test/main.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/test/main.cpp rename to platform/default/src/mbgl/test/main.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/text/bidi.cpp b/platform/default/src/mbgl/text/bidi.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/text/bidi.cpp rename to platform/default/src/mbgl/text/bidi.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/text/local_glyph_rasterizer.cpp b/platform/default/src/mbgl/text/local_glyph_rasterizer.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/text/local_glyph_rasterizer.cpp rename to platform/default/src/mbgl/text/local_glyph_rasterizer.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/util/async_task.cpp b/platform/default/src/mbgl/util/async_task.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/util/async_task.cpp rename to platform/default/src/mbgl/util/async_task.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/util/compression.cpp b/platform/default/src/mbgl/util/compression.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/util/compression.cpp rename to platform/default/src/mbgl/util/compression.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/util/image.cpp b/platform/default/src/mbgl/util/image.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/util/image.cpp rename to platform/default/src/mbgl/util/image.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/util/jpeg_reader.cpp b/platform/default/src/mbgl/util/jpeg_reader.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/util/jpeg_reader.cpp rename to platform/default/src/mbgl/util/jpeg_reader.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/util/logging_stderr.cpp b/platform/default/src/mbgl/util/logging_stderr.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/util/logging_stderr.cpp rename to platform/default/src/mbgl/util/logging_stderr.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/util/monotonic_timer.cpp b/platform/default/src/mbgl/util/monotonic_timer.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/util/monotonic_timer.cpp rename to platform/default/src/mbgl/util/monotonic_timer.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/util/png_reader.cpp b/platform/default/src/mbgl/util/png_reader.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/util/png_reader.cpp rename to platform/default/src/mbgl/util/png_reader.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/util/png_writer.cpp b/platform/default/src/mbgl/util/png_writer.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/util/png_writer.cpp rename to platform/default/src/mbgl/util/png_writer.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/util/run_loop.cpp b/platform/default/src/mbgl/util/run_loop.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/util/run_loop.cpp rename to platform/default/src/mbgl/util/run_loop.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/util/string_stdlib.cpp b/platform/default/src/mbgl/util/string_stdlib.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/util/string_stdlib.cpp rename to platform/default/src/mbgl/util/string_stdlib.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/util/thread.cpp b/platform/default/src/mbgl/util/thread.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/util/thread.cpp rename to platform/default/src/mbgl/util/thread.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/util/thread_local.cpp b/platform/default/src/mbgl/util/thread_local.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/util/thread_local.cpp rename to platform/default/src/mbgl/util/thread_local.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/util/timer.cpp b/platform/default/src/mbgl/util/timer.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/util/timer.cpp rename to platform/default/src/mbgl/util/timer.cpp diff --git a/mapbox-gl-native/platform/default/src/mbgl/util/utf.cpp b/platform/default/src/mbgl/util/utf.cpp similarity index 100% rename from mapbox-gl-native/platform/default/src/mbgl/util/utf.cpp rename to platform/default/src/mbgl/util/utf.cpp diff --git a/mapbox-gl-native/platform/glfw/CMakeLists.txt b/platform/glfw/CMakeLists.txt similarity index 100% rename from mapbox-gl-native/platform/glfw/CMakeLists.txt rename to platform/glfw/CMakeLists.txt diff --git a/mapbox-gl-native/platform/glfw/assets/puck.png b/platform/glfw/assets/puck.png similarity index 100% rename from mapbox-gl-native/platform/glfw/assets/puck.png rename to platform/glfw/assets/puck.png diff --git a/mapbox-gl-native/platform/glfw/assets/puck_hat.png b/platform/glfw/assets/puck_hat.png similarity index 100% rename from mapbox-gl-native/platform/glfw/assets/puck_hat.png rename to platform/glfw/assets/puck_hat.png diff --git a/mapbox-gl-native/platform/glfw/assets/puck_shadow.png b/platform/glfw/assets/puck_shadow.png similarity index 100% rename from mapbox-gl-native/platform/glfw/assets/puck_shadow.png rename to platform/glfw/assets/puck_shadow.png diff --git a/mapbox-gl-native/platform/glfw/glfw_backend.hpp b/platform/glfw/glfw_backend.hpp similarity index 100% rename from mapbox-gl-native/platform/glfw/glfw_backend.hpp rename to platform/glfw/glfw_backend.hpp diff --git a/mapbox-gl-native/platform/glfw/glfw_gl_backend.cpp b/platform/glfw/glfw_gl_backend.cpp similarity index 100% rename from mapbox-gl-native/platform/glfw/glfw_gl_backend.cpp rename to platform/glfw/glfw_gl_backend.cpp diff --git a/mapbox-gl-native/platform/glfw/glfw_gl_backend.hpp b/platform/glfw/glfw_gl_backend.hpp similarity index 100% rename from mapbox-gl-native/platform/glfw/glfw_gl_backend.hpp rename to platform/glfw/glfw_gl_backend.hpp diff --git a/mapbox-gl-native/platform/glfw/glfw_renderer_frontend.cpp b/platform/glfw/glfw_renderer_frontend.cpp similarity index 100% rename from mapbox-gl-native/platform/glfw/glfw_renderer_frontend.cpp rename to platform/glfw/glfw_renderer_frontend.cpp diff --git a/mapbox-gl-native/platform/glfw/glfw_renderer_frontend.hpp b/platform/glfw/glfw_renderer_frontend.hpp similarity index 100% rename from mapbox-gl-native/platform/glfw/glfw_renderer_frontend.hpp rename to platform/glfw/glfw_renderer_frontend.hpp diff --git a/mapbox-gl-native/platform/glfw/glfw_view.cpp b/platform/glfw/glfw_view.cpp similarity index 100% rename from mapbox-gl-native/platform/glfw/glfw_view.cpp rename to platform/glfw/glfw_view.cpp diff --git a/mapbox-gl-native/platform/glfw/glfw_view.hpp b/platform/glfw/glfw_view.hpp similarity index 100% rename from mapbox-gl-native/platform/glfw/glfw_view.hpp rename to platform/glfw/glfw_view.hpp diff --git a/mapbox-gl-native/platform/glfw/main.cpp b/platform/glfw/main.cpp similarity index 100% rename from mapbox-gl-native/platform/glfw/main.cpp rename to platform/glfw/main.cpp diff --git a/mapbox-gl-native/platform/glfw/ny_route.hpp b/platform/glfw/ny_route.hpp similarity index 100% rename from mapbox-gl-native/platform/glfw/ny_route.hpp rename to platform/glfw/ny_route.hpp diff --git a/mapbox-gl-native/platform/glfw/settings_json.cpp b/platform/glfw/settings_json.cpp similarity index 100% rename from mapbox-gl-native/platform/glfw/settings_json.cpp rename to platform/glfw/settings_json.cpp diff --git a/mapbox-gl-native/platform/glfw/settings_json.hpp b/platform/glfw/settings_json.hpp similarity index 100% rename from mapbox-gl-native/platform/glfw/settings_json.hpp rename to platform/glfw/settings_json.hpp diff --git a/mapbox-gl-native/platform/glfw/test_writer.cpp b/platform/glfw/test_writer.cpp similarity index 100% rename from mapbox-gl-native/platform/glfw/test_writer.cpp rename to platform/glfw/test_writer.cpp diff --git a/mapbox-gl-native/platform/glfw/test_writer.hpp b/platform/glfw/test_writer.hpp similarity index 100% rename from mapbox-gl-native/platform/glfw/test_writer.hpp rename to platform/glfw/test_writer.hpp diff --git a/mapbox-gl-native-ios/.clang-format b/platform/ios/.clang-format similarity index 100% rename from mapbox-gl-native-ios/.clang-format rename to platform/ios/.clang-format diff --git a/mapbox-gl-native-ios/.clang-tidy b/platform/ios/.clang-tidy similarity index 100% rename from mapbox-gl-native-ios/.clang-tidy rename to platform/ios/.clang-tidy diff --git a/mapbox-gl-native-ios/.cmake-format b/platform/ios/.cmake-format similarity index 100% rename from mapbox-gl-native-ios/.cmake-format rename to platform/ios/.cmake-format diff --git a/mapbox-gl-native-ios/.github/CODEOWNERS b/platform/ios/.github/CODEOWNERS similarity index 100% rename from mapbox-gl-native-ios/.github/CODEOWNERS rename to platform/ios/.github/CODEOWNERS diff --git a/mapbox-gl-native-ios/.github/ISSUE_TEMPLATE/darwin.md b/platform/ios/.github/ISSUE_TEMPLATE/darwin.md similarity index 100% rename from mapbox-gl-native-ios/.github/ISSUE_TEMPLATE/darwin.md rename to platform/ios/.github/ISSUE_TEMPLATE/darwin.md diff --git a/mapbox-gl-native-ios/.github/ISSUE_TEMPLATE/other.md b/platform/ios/.github/ISSUE_TEMPLATE/other.md similarity index 100% rename from mapbox-gl-native-ios/.github/ISSUE_TEMPLATE/other.md rename to platform/ios/.github/ISSUE_TEMPLATE/other.md diff --git a/mapbox-gl-native-ios/.github/PULL_REQUEST_TEMPLATE.md b/platform/ios/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from mapbox-gl-native-ios/.github/PULL_REQUEST_TEMPLATE.md rename to platform/ios/.github/PULL_REQUEST_TEMPLATE.md diff --git a/mapbox-gl-native-android/.github/stale.yml b/platform/ios/.github/stale.yml similarity index 100% rename from mapbox-gl-native-android/.github/stale.yml rename to platform/ios/.github/stale.yml diff --git a/mapbox-gl-native-ios/.gitignore b/platform/ios/.gitignore similarity index 100% rename from mapbox-gl-native-ios/.gitignore rename to platform/ios/.gitignore diff --git a/mapbox-gl-native-ios/.npmignore b/platform/ios/.npmignore similarity index 100% rename from mapbox-gl-native-ios/.npmignore rename to platform/ios/.npmignore diff --git a/mapbox-gl-native-ios/.tx/config b/platform/ios/.tx/config similarity index 100% rename from mapbox-gl-native-ios/.tx/config rename to platform/ios/.tx/config diff --git a/mapbox-gl-native-ios/CHANGELOG.md b/platform/ios/CHANGELOG.md similarity index 100% rename from mapbox-gl-native-ios/CHANGELOG.md rename to platform/ios/CHANGELOG.md diff --git a/mapbox-gl-native-ios/CMakeLists.txt b/platform/ios/CMakeLists.txt similarity index 61% rename from mapbox-gl-native-ios/CMakeLists.txt rename to platform/ios/CMakeLists.txt index 7084a2891..a5ad73c54 100644 --- a/mapbox-gl-native-ios/CMakeLists.txt +++ b/platform/ios/CMakeLists.txt @@ -2,6 +2,6 @@ cmake_minimum_required(VERSION 3.9) message(source-dir=${CMAKE_SOURCE_DIR} current-dir=${CMAKE_CURRENT_SOURCE_DIR} current-binary-dir=${CMAKE_CURRENT_BINARY_DIR}) -add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../mapbox-gl-native ${CMAKE_CURRENT_BINARY_DIR}/mapbox-gl-native ) +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../ ${CMAKE_CURRENT_BINARY_DIR}/mapbox-gl-native ) project (mbgl) \ No newline at end of file diff --git a/mapbox-gl-native/CODE-OF-CONDUCT.md b/platform/ios/CODE-OF-CONDUCT.md similarity index 100% rename from mapbox-gl-native/CODE-OF-CONDUCT.md rename to platform/ios/CODE-OF-CONDUCT.md diff --git a/mapbox-gl-native/CONTRIBUTING.md b/platform/ios/CONTRIBUTING.md similarity index 100% rename from mapbox-gl-native/CONTRIBUTING.md rename to platform/ios/CONTRIBUTING.md diff --git a/mapbox-gl-native-ios/DEVELOPING.md b/platform/ios/DEVELOPING.md similarity index 100% rename from mapbox-gl-native-ios/DEVELOPING.md rename to platform/ios/DEVELOPING.md diff --git a/mapbox-gl-native-ios/INSTALL.md b/platform/ios/INSTALL.md similarity index 100% rename from mapbox-gl-native-ios/INSTALL.md rename to platform/ios/INSTALL.md diff --git a/mapbox-gl-native-ios/LICENSE.md b/platform/ios/LICENSE.md similarity index 100% rename from mapbox-gl-native-ios/LICENSE.md rename to platform/ios/LICENSE.md diff --git a/mapbox-gl-native-ios/Makefile b/platform/ios/Makefile similarity index 97% rename from mapbox-gl-native-ios/Makefile rename to platform/ios/Makefile index 693a13a9a..1486b19d3 100644 --- a/mapbox-gl-native-ios/Makefile +++ b/platform/ios/Makefile @@ -57,7 +57,7 @@ endif .PHONY: default default: test -BUILD_DEPS += ../mapbox-gl-native/CMakeLists.txt +BUILD_DEPS += ../../CMakeLists.txt BUILD_DOCS ?= true @@ -135,7 +135,7 @@ endif $(IOS_PROJ_PATH): $(IOS_USER_DATA_PATH)/WorkspaceSettings.xcsettings $(BUILD_DEPS) mkdir -p $(IOS_OUTPUT_PATH) - (cd $(IOS_OUTPUT_PATH) && $(CMAKE) -G Xcode ../../../mapbox-gl-native \ + (cd $(IOS_OUTPUT_PATH) && $(CMAKE) -G Xcode ../../../../ \ -DCMAKE_SYSTEM_NAME=iOS ) $(IOS_USER_DATA_PATH)/WorkspaceSettings.xcsettings: platform/ios/WorkspaceSettings.xcsettings @@ -250,7 +250,7 @@ endif $(MACOS_PROJ_PATH): $(MACOS_USER_DATA_PATH)/WorkspaceSettings.xcsettings $(BUILD_DEPS) mkdir -p $(MACOS_OUTPUT_PATH) - (cd $(MACOS_OUTPUT_PATH) && $(CMAKE) -G Xcode ../../../mapbox-gl-native \ + (cd $(MACOS_OUTPUT_PATH) && $(CMAKE) -G Xcode ../../../../ \ -DCMAKE_SYSTEM_NAME=Darwin ) $(MACOS_USER_DATA_PATH)/WorkspaceSettings.xcsettings: platform/macos/WorkspaceSettings.xcsettings diff --git a/mapbox-gl-native-ios/README.md b/platform/ios/README.md similarity index 100% rename from mapbox-gl-native-ios/README.md rename to platform/ios/README.md diff --git a/mapbox-gl-native/platform/ios/ccache-c.in b/platform/ios/ccache-c.in similarity index 100% rename from mapbox-gl-native/platform/ios/ccache-c.in rename to platform/ios/ccache-c.in diff --git a/mapbox-gl-native/platform/ios/ccache-cxx.in b/platform/ios/ccache-cxx.in similarity index 100% rename from mapbox-gl-native/platform/ios/ccache-cxx.in rename to platform/ios/ccache-cxx.in diff --git a/mapbox-gl-native/platform/ios/ccache.cmake b/platform/ios/ccache.cmake similarity index 100% rename from mapbox-gl-native/platform/ios/ccache.cmake rename to platform/ios/ccache.cmake diff --git a/mapbox-gl-native-ios/circle.yml b/platform/ios/circle.yml similarity index 100% rename from mapbox-gl-native-ios/circle.yml rename to platform/ios/circle.yml diff --git a/mapbox-gl-native/cloudformation/ci.template.js b/platform/ios/cloudformation/ci.template.js similarity index 100% rename from mapbox-gl-native/cloudformation/ci.template.js rename to platform/ios/cloudformation/ci.template.js diff --git a/mapbox-gl-native-ios/codecov.yml b/platform/ios/codecov.yml similarity index 100% rename from mapbox-gl-native-ios/codecov.yml rename to platform/ios/codecov.yml diff --git a/mapbox-gl-native/platform/ios/ios-test-runners.cmake b/platform/ios/ios-test-runners.cmake similarity index 100% rename from mapbox-gl-native/platform/ios/ios-test-runners.cmake rename to platform/ios/ios-test-runners.cmake diff --git a/mapbox-gl-native/platform/ios/ios.cmake b/platform/ios/ios.cmake similarity index 100% rename from mapbox-gl-native/platform/ios/ios.cmake rename to platform/ios/ios.cmake diff --git a/mapbox-gl-native/package.json b/platform/ios/package.json similarity index 100% rename from mapbox-gl-native/package.json rename to platform/ios/package.json diff --git a/mapbox-gl-native-ios/platform/darwin/.gitignore b/platform/ios/platform/darwin/.gitignore similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/.gitignore rename to platform/ios/platform/darwin/.gitignore diff --git a/mapbox-gl-native-ios/platform/darwin/README.md b/platform/ios/platform/darwin/README.md similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/README.md rename to platform/ios/platform/darwin/README.md diff --git a/mapbox-gl-native-ios/platform/darwin/app/LimeGreenStyleLayer.h b/platform/ios/platform/darwin/app/LimeGreenStyleLayer.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/app/LimeGreenStyleLayer.h rename to platform/ios/platform/darwin/app/LimeGreenStyleLayer.h diff --git a/mapbox-gl-native-ios/platform/darwin/app/LimeGreenStyleLayer.m b/platform/ios/platform/darwin/app/LimeGreenStyleLayer.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/app/LimeGreenStyleLayer.m rename to platform/ios/platform/darwin/app/LimeGreenStyleLayer.m diff --git a/mapbox-gl-native/platform/darwin/ci.xcconfig b/platform/ios/platform/darwin/ci.xcconfig similarity index 100% rename from mapbox-gl-native/platform/darwin/ci.xcconfig rename to platform/ios/platform/darwin/ci.xcconfig diff --git a/mapbox-gl-native-ios/platform/darwin/darwin.xcconfig b/platform/ios/platform/darwin/darwin.xcconfig similarity index 84% rename from mapbox-gl-native-ios/platform/darwin/darwin.xcconfig rename to platform/ios/platform/darwin/darwin.xcconfig index 95315920a..5c0914b33 100644 --- a/mapbox-gl-native-ios/platform/darwin/darwin.xcconfig +++ b/platform/ios/platform/darwin/darwin.xcconfig @@ -58,17 +58,17 @@ GCC_WARN_UNUSED_VARIABLE = YES HEADER_SEARCH_PATHS = $(inherited) HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../platform/darwin/include" -HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../mapbox-gl-native/include" -HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../mapbox-gl-native/platform/default/include" -HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../mapbox-gl-native/platform/darwin/include" -HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/include" -HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/deps/variant/include" -HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/deps/geometry.hpp/include" -HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/deps/geojson.hpp/include" -HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/deps/optional" -HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/extras/rapidjson/include" -HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/extras/expected-lite/include" -HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/polylabel/include" +HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../../include" +HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../default/include" +HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../darwin/include" +HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../../vendor/mapbox-base/include" +HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../../vendor/mapbox-base/deps/variant/include" +HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../../vendor/mapbox-base/deps/geometry.hpp/include" +HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../../vendor/mapbox-base/deps/geojson.hpp/include" +HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../../vendor/mapbox-base/deps/optional" +HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../../vendor/mapbox-base/extras/rapidjson/include" +HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../../vendor/mapbox-base/extras/expected-lite/include" +HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) "$(PROJECT_DIR)/../../../../vendor/polylabel/include" LD_GENERATE_MAP_FILE = YES diff --git a/mapbox-gl-native-ios/platform/darwin/docs/guides/Customizing Fonts.md b/platform/ios/platform/darwin/docs/guides/Customizing Fonts.md similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/docs/guides/Customizing Fonts.md rename to platform/ios/platform/darwin/docs/guides/Customizing Fonts.md diff --git a/mapbox-gl-native-ios/platform/darwin/docs/guides/For Style Authors.md.ejs b/platform/ios/platform/darwin/docs/guides/For Style Authors.md.ejs similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/docs/guides/For Style Authors.md.ejs rename to platform/ios/platform/darwin/docs/guides/For Style Authors.md.ejs diff --git a/mapbox-gl-native-ios/platform/darwin/docs/guides/Migrating to Expressions.md.ejs b/platform/ios/platform/darwin/docs/guides/Migrating to Expressions.md.ejs similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/docs/guides/Migrating to Expressions.md.ejs rename to platform/ios/platform/darwin/docs/guides/Migrating to Expressions.md.ejs diff --git a/mapbox-gl-native-ios/platform/darwin/docs/guides/Predicates and Expressions.md b/platform/ios/platform/darwin/docs/guides/Predicates and Expressions.md similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/docs/guides/Predicates and Expressions.md rename to platform/ios/platform/darwin/docs/guides/Predicates and Expressions.md diff --git a/mapbox-gl-native-ios/platform/darwin/docs/guides/Tile URL Templates.md.ejs b/platform/ios/platform/darwin/docs/guides/Tile URL Templates.md.ejs similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/docs/guides/Tile URL Templates.md.ejs rename to platform/ios/platform/darwin/docs/guides/Tile URL Templates.md.ejs diff --git a/mapbox-gl-native-ios/platform/darwin/docs/guides/Working with GeoJSON Data.md b/platform/ios/platform/darwin/docs/guides/Working with GeoJSON Data.md similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/docs/guides/Working with GeoJSON Data.md rename to platform/ios/platform/darwin/docs/guides/Working with GeoJSON Data.md diff --git a/mapbox-gl-native-ios/platform/darwin/docs/img/data-driven-styling/cast.png b/platform/ios/platform/darwin/docs/img/data-driven-styling/cast.png similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/docs/img/data-driven-styling/cast.png rename to platform/ios/platform/darwin/docs/img/data-driven-styling/cast.png diff --git a/mapbox-gl-native-ios/platform/darwin/docs/img/data-driven-styling/exponential-function-1.png b/platform/ios/platform/darwin/docs/img/data-driven-styling/exponential-function-1.png similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/docs/img/data-driven-styling/exponential-function-1.png rename to platform/ios/platform/darwin/docs/img/data-driven-styling/exponential-function-1.png diff --git a/mapbox-gl-native-ios/platform/darwin/docs/img/data-driven-styling/exponential-function.png b/platform/ios/platform/darwin/docs/img/data-driven-styling/exponential-function.png similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/docs/img/data-driven-styling/exponential-function.png rename to platform/ios/platform/darwin/docs/img/data-driven-styling/exponential-function.png diff --git a/mapbox-gl-native-ios/platform/darwin/docs/img/data-driven-styling/identity.png b/platform/ios/platform/darwin/docs/img/data-driven-styling/identity.png similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/docs/img/data-driven-styling/identity.png rename to platform/ios/platform/darwin/docs/img/data-driven-styling/identity.png diff --git a/mapbox-gl-native-ios/platform/darwin/docs/img/data-driven-styling/multiply.png b/platform/ios/platform/darwin/docs/img/data-driven-styling/multiply.png similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/docs/img/data-driven-styling/multiply.png rename to platform/ios/platform/darwin/docs/img/data-driven-styling/multiply.png diff --git a/mapbox-gl-native/platform/darwin/include/mbgl/util/image+MGLAdditions.hpp b/platform/ios/platform/darwin/include/mbgl/util/image+MGLAdditions.hpp similarity index 100% rename from mapbox-gl-native/platform/darwin/include/mbgl/util/image+MGLAdditions.hpp rename to platform/ios/platform/darwin/include/mbgl/util/image+MGLAdditions.hpp diff --git a/mapbox-gl-native-ios/platform/darwin/loop-files.json b/platform/ios/platform/darwin/loop-files.json similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/loop-files.json rename to platform/ios/platform/darwin/loop-files.json diff --git a/mapbox-gl-native-ios/platform/darwin/resources/Base.lproj/Foundation.strings b/platform/ios/platform/darwin/resources/Base.lproj/Foundation.strings similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/Base.lproj/Foundation.strings rename to platform/ios/platform/darwin/resources/Base.lproj/Foundation.strings diff --git a/mapbox-gl-native-ios/platform/darwin/resources/ar.lproj/Foundation.stringsdict b/platform/ios/platform/darwin/resources/ar.lproj/Foundation.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/ar.lproj/Foundation.stringsdict rename to platform/ios/platform/darwin/resources/ar.lproj/Foundation.stringsdict diff --git a/mapbox-gl-native-ios/platform/darwin/resources/bg.lproj/Foundation.strings b/platform/ios/platform/darwin/resources/bg.lproj/Foundation.strings similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/bg.lproj/Foundation.strings rename to platform/ios/platform/darwin/resources/bg.lproj/Foundation.strings diff --git a/mapbox-gl-native-ios/platform/darwin/resources/bg.lproj/Foundation.stringsdict b/platform/ios/platform/darwin/resources/bg.lproj/Foundation.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/bg.lproj/Foundation.stringsdict rename to platform/ios/platform/darwin/resources/bg.lproj/Foundation.stringsdict diff --git a/mapbox-gl-native-ios/platform/darwin/resources/ca.lproj/Foundation.strings b/platform/ios/platform/darwin/resources/ca.lproj/Foundation.strings similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/ca.lproj/Foundation.strings rename to platform/ios/platform/darwin/resources/ca.lproj/Foundation.strings diff --git a/mapbox-gl-native-ios/platform/darwin/resources/ca.lproj/Foundation.stringsdict b/platform/ios/platform/darwin/resources/ca.lproj/Foundation.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/ca.lproj/Foundation.stringsdict rename to platform/ios/platform/darwin/resources/ca.lproj/Foundation.stringsdict diff --git a/mapbox-gl-native-ios/platform/darwin/resources/cs.lproj/Foundation.strings b/platform/ios/platform/darwin/resources/cs.lproj/Foundation.strings similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/cs.lproj/Foundation.strings rename to platform/ios/platform/darwin/resources/cs.lproj/Foundation.strings diff --git a/mapbox-gl-native-ios/platform/darwin/resources/cs.lproj/Foundation.stringsdict b/platform/ios/platform/darwin/resources/cs.lproj/Foundation.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/cs.lproj/Foundation.stringsdict rename to platform/ios/platform/darwin/resources/cs.lproj/Foundation.stringsdict diff --git a/mapbox-gl-native-ios/platform/darwin/resources/da.lproj/Foundation.strings b/platform/ios/platform/darwin/resources/da.lproj/Foundation.strings similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/da.lproj/Foundation.strings rename to platform/ios/platform/darwin/resources/da.lproj/Foundation.strings diff --git a/mapbox-gl-native-ios/platform/darwin/resources/da.lproj/Foundation.stringsdict b/platform/ios/platform/darwin/resources/da.lproj/Foundation.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/da.lproj/Foundation.stringsdict rename to platform/ios/platform/darwin/resources/da.lproj/Foundation.stringsdict diff --git a/mapbox-gl-native-ios/platform/darwin/resources/de.lproj/Foundation.strings b/platform/ios/platform/darwin/resources/de.lproj/Foundation.strings similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/de.lproj/Foundation.strings rename to platform/ios/platform/darwin/resources/de.lproj/Foundation.strings diff --git a/mapbox-gl-native-ios/platform/darwin/resources/de.lproj/Foundation.stringsdict b/platform/ios/platform/darwin/resources/de.lproj/Foundation.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/de.lproj/Foundation.stringsdict rename to platform/ios/platform/darwin/resources/de.lproj/Foundation.stringsdict diff --git a/mapbox-gl-native-ios/platform/darwin/resources/en.lproj/Foundation.stringsdict b/platform/ios/platform/darwin/resources/en.lproj/Foundation.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/en.lproj/Foundation.stringsdict rename to platform/ios/platform/darwin/resources/en.lproj/Foundation.stringsdict diff --git a/mapbox-gl-native-ios/platform/darwin/resources/es.lproj/Foundation.strings b/platform/ios/platform/darwin/resources/es.lproj/Foundation.strings similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/es.lproj/Foundation.strings rename to platform/ios/platform/darwin/resources/es.lproj/Foundation.strings diff --git a/mapbox-gl-native-ios/platform/darwin/resources/es.lproj/Foundation.stringsdict b/platform/ios/platform/darwin/resources/es.lproj/Foundation.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/es.lproj/Foundation.stringsdict rename to platform/ios/platform/darwin/resources/es.lproj/Foundation.stringsdict diff --git a/mapbox-gl-native-ios/platform/darwin/resources/fr.lproj/Foundation.strings b/platform/ios/platform/darwin/resources/fr.lproj/Foundation.strings similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/fr.lproj/Foundation.strings rename to platform/ios/platform/darwin/resources/fr.lproj/Foundation.strings diff --git a/mapbox-gl-native-ios/platform/darwin/resources/fr.lproj/Foundation.stringsdict b/platform/ios/platform/darwin/resources/fr.lproj/Foundation.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/fr.lproj/Foundation.stringsdict rename to platform/ios/platform/darwin/resources/fr.lproj/Foundation.stringsdict diff --git a/mapbox-gl-native-ios/platform/darwin/resources/gl.lproj/Foundation.strings b/platform/ios/platform/darwin/resources/gl.lproj/Foundation.strings similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/gl.lproj/Foundation.strings rename to platform/ios/platform/darwin/resources/gl.lproj/Foundation.strings diff --git a/mapbox-gl-native-ios/platform/darwin/resources/gl.lproj/Foundation.stringsdict b/platform/ios/platform/darwin/resources/gl.lproj/Foundation.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/gl.lproj/Foundation.stringsdict rename to platform/ios/platform/darwin/resources/gl.lproj/Foundation.stringsdict diff --git a/mapbox-gl-native-ios/platform/darwin/resources/he.lproj/Foundation.strings b/platform/ios/platform/darwin/resources/he.lproj/Foundation.strings similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/he.lproj/Foundation.strings rename to platform/ios/platform/darwin/resources/he.lproj/Foundation.strings diff --git a/mapbox-gl-native-ios/platform/darwin/resources/hu.lproj/Foundation.stringsdict b/platform/ios/platform/darwin/resources/hu.lproj/Foundation.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/hu.lproj/Foundation.stringsdict rename to platform/ios/platform/darwin/resources/hu.lproj/Foundation.stringsdict diff --git a/mapbox-gl-native-ios/platform/darwin/resources/ja.lproj/Foundation.strings b/platform/ios/platform/darwin/resources/ja.lproj/Foundation.strings similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/ja.lproj/Foundation.strings rename to platform/ios/platform/darwin/resources/ja.lproj/Foundation.strings diff --git a/mapbox-gl-native-ios/platform/darwin/resources/ko.lproj/Foundation.strings b/platform/ios/platform/darwin/resources/ko.lproj/Foundation.strings similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/ko.lproj/Foundation.strings rename to platform/ios/platform/darwin/resources/ko.lproj/Foundation.strings diff --git a/mapbox-gl-native-ios/platform/darwin/resources/ko.lproj/Foundation.stringsdict b/platform/ios/platform/darwin/resources/ko.lproj/Foundation.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/ko.lproj/Foundation.stringsdict rename to platform/ios/platform/darwin/resources/ko.lproj/Foundation.stringsdict diff --git a/mapbox-gl-native-ios/platform/darwin/resources/lt.lproj/Foundation.strings b/platform/ios/platform/darwin/resources/lt.lproj/Foundation.strings similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/lt.lproj/Foundation.strings rename to platform/ios/platform/darwin/resources/lt.lproj/Foundation.strings diff --git a/mapbox-gl-native-ios/platform/darwin/resources/lt.lproj/Foundation.stringsdict b/platform/ios/platform/darwin/resources/lt.lproj/Foundation.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/lt.lproj/Foundation.stringsdict rename to platform/ios/platform/darwin/resources/lt.lproj/Foundation.stringsdict diff --git a/mapbox-gl-native-ios/platform/darwin/resources/pl.lproj/Foundation.stringsdict b/platform/ios/platform/darwin/resources/pl.lproj/Foundation.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/pl.lproj/Foundation.stringsdict rename to platform/ios/platform/darwin/resources/pl.lproj/Foundation.stringsdict diff --git a/mapbox-gl-native-ios/platform/darwin/resources/pt-BR.lproj/Foundation.strings b/platform/ios/platform/darwin/resources/pt-BR.lproj/Foundation.strings similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/pt-BR.lproj/Foundation.strings rename to platform/ios/platform/darwin/resources/pt-BR.lproj/Foundation.strings diff --git a/mapbox-gl-native-ios/platform/darwin/resources/pt-BR.lproj/Foundation.stringsdict b/platform/ios/platform/darwin/resources/pt-BR.lproj/Foundation.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/pt-BR.lproj/Foundation.stringsdict rename to platform/ios/platform/darwin/resources/pt-BR.lproj/Foundation.stringsdict diff --git a/mapbox-gl-native-ios/platform/darwin/resources/pt-PT.lproj/Foundation.stringsdict b/platform/ios/platform/darwin/resources/pt-PT.lproj/Foundation.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/pt-PT.lproj/Foundation.stringsdict rename to platform/ios/platform/darwin/resources/pt-PT.lproj/Foundation.stringsdict diff --git a/mapbox-gl-native-ios/platform/darwin/resources/ru.lproj/Foundation.strings b/platform/ios/platform/darwin/resources/ru.lproj/Foundation.strings similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/ru.lproj/Foundation.strings rename to platform/ios/platform/darwin/resources/ru.lproj/Foundation.strings diff --git a/mapbox-gl-native-ios/platform/darwin/resources/ru.lproj/Foundation.stringsdict b/platform/ios/platform/darwin/resources/ru.lproj/Foundation.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/ru.lproj/Foundation.stringsdict rename to platform/ios/platform/darwin/resources/ru.lproj/Foundation.stringsdict diff --git a/mapbox-gl-native-ios/platform/darwin/resources/sv.lproj/Foundation.strings b/platform/ios/platform/darwin/resources/sv.lproj/Foundation.strings similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/sv.lproj/Foundation.strings rename to platform/ios/platform/darwin/resources/sv.lproj/Foundation.strings diff --git a/mapbox-gl-native-ios/platform/darwin/resources/sv.lproj/Foundation.stringsdict b/platform/ios/platform/darwin/resources/sv.lproj/Foundation.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/sv.lproj/Foundation.stringsdict rename to platform/ios/platform/darwin/resources/sv.lproj/Foundation.stringsdict diff --git a/mapbox-gl-native-ios/platform/darwin/resources/uk.lproj/Foundation.strings b/platform/ios/platform/darwin/resources/uk.lproj/Foundation.strings similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/uk.lproj/Foundation.strings rename to platform/ios/platform/darwin/resources/uk.lproj/Foundation.strings diff --git a/mapbox-gl-native-ios/platform/darwin/resources/uk.lproj/Foundation.stringsdict b/platform/ios/platform/darwin/resources/uk.lproj/Foundation.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/uk.lproj/Foundation.stringsdict rename to platform/ios/platform/darwin/resources/uk.lproj/Foundation.stringsdict diff --git a/mapbox-gl-native-ios/platform/darwin/resources/vi.lproj/Foundation.strings b/platform/ios/platform/darwin/resources/vi.lproj/Foundation.strings similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/vi.lproj/Foundation.strings rename to platform/ios/platform/darwin/resources/vi.lproj/Foundation.strings diff --git a/mapbox-gl-native-ios/platform/darwin/resources/vi.lproj/Foundation.stringsdict b/platform/ios/platform/darwin/resources/vi.lproj/Foundation.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/vi.lproj/Foundation.stringsdict rename to platform/ios/platform/darwin/resources/vi.lproj/Foundation.stringsdict diff --git a/mapbox-gl-native-ios/platform/darwin/resources/zh-Hans.lproj/Foundation.strings b/platform/ios/platform/darwin/resources/zh-Hans.lproj/Foundation.strings similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/zh-Hans.lproj/Foundation.strings rename to platform/ios/platform/darwin/resources/zh-Hans.lproj/Foundation.strings diff --git a/mapbox-gl-native-ios/platform/darwin/resources/zh-Hant.lproj/Foundation.strings b/platform/ios/platform/darwin/resources/zh-Hant.lproj/Foundation.strings similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/resources/zh-Hant.lproj/Foundation.strings rename to platform/ios/platform/darwin/resources/zh-Hant.lproj/Foundation.strings diff --git a/mapbox-gl-native-ios/platform/darwin/scripts/check-public-symbols.js b/platform/ios/platform/darwin/scripts/check-public-symbols.js similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/scripts/check-public-symbols.js rename to platform/ios/platform/darwin/scripts/check-public-symbols.js diff --git a/mapbox-gl-native-ios/platform/darwin/scripts/generate-style-code.js b/platform/ios/platform/darwin/scripts/generate-style-code.js similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/scripts/generate-style-code.js rename to platform/ios/platform/darwin/scripts/generate-style-code.js diff --git a/mapbox-gl-native-ios/platform/darwin/scripts/style-spec-cocoa-conventions-v8.json b/platform/ios/platform/darwin/scripts/style-spec-cocoa-conventions-v8.json similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/scripts/style-spec-cocoa-conventions-v8.json rename to platform/ios/platform/darwin/scripts/style-spec-cocoa-conventions-v8.json diff --git a/mapbox-gl-native-ios/platform/darwin/scripts/style-spec-overrides-v8.json b/platform/ios/platform/darwin/scripts/style-spec-overrides-v8.json similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/scripts/style-spec-overrides-v8.json rename to platform/ios/platform/darwin/scripts/style-spec-overrides-v8.json diff --git a/mapbox-gl-native-ios/platform/darwin/scripts/update-examples.js b/platform/ios/platform/darwin/scripts/update-examples.js similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/scripts/update-examples.js rename to platform/ios/platform/darwin/scripts/update-examples.js diff --git a/mapbox-gl-native/platform/darwin/src/CFHandle.hpp b/platform/ios/platform/darwin/src/CFHandle.hpp similarity index 100% rename from mapbox-gl-native/platform/darwin/src/CFHandle.hpp rename to platform/ios/platform/darwin/src/CFHandle.hpp diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLAccountManager.h b/platform/ios/platform/darwin/src/MGLAccountManager.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLAccountManager.h rename to platform/ios/platform/darwin/src/MGLAccountManager.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLAccountManager.m b/platform/ios/platform/darwin/src/MGLAccountManager.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLAccountManager.m rename to platform/ios/platform/darwin/src/MGLAccountManager.m diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLAccountManager_Private.h b/platform/ios/platform/darwin/src/MGLAccountManager_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLAccountManager_Private.h rename to platform/ios/platform/darwin/src/MGLAccountManager_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLAnnotation.h b/platform/ios/platform/darwin/src/MGLAnnotation.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLAnnotation.h rename to platform/ios/platform/darwin/src/MGLAnnotation.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLAttributedExpression.h b/platform/ios/platform/darwin/src/MGLAttributedExpression.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLAttributedExpression.h rename to platform/ios/platform/darwin/src/MGLAttributedExpression.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLAttributedExpression.m b/platform/ios/platform/darwin/src/MGLAttributedExpression.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLAttributedExpression.m rename to platform/ios/platform/darwin/src/MGLAttributedExpression.m diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLAttributionInfo.h b/platform/ios/platform/darwin/src/MGLAttributionInfo.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLAttributionInfo.h rename to platform/ios/platform/darwin/src/MGLAttributionInfo.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLAttributionInfo.mm b/platform/ios/platform/darwin/src/MGLAttributionInfo.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLAttributionInfo.mm rename to platform/ios/platform/darwin/src/MGLAttributionInfo.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLAttributionInfo_Private.h b/platform/ios/platform/darwin/src/MGLAttributionInfo_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLAttributionInfo_Private.h rename to platform/ios/platform/darwin/src/MGLAttributionInfo_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLBackgroundStyleLayer.h b/platform/ios/platform/darwin/src/MGLBackgroundStyleLayer.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLBackgroundStyleLayer.h rename to platform/ios/platform/darwin/src/MGLBackgroundStyleLayer.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLBackgroundStyleLayer.mm b/platform/ios/platform/darwin/src/MGLBackgroundStyleLayer.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLBackgroundStyleLayer.mm rename to platform/ios/platform/darwin/src/MGLBackgroundStyleLayer.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLBackgroundStyleLayer_Private.h b/platform/ios/platform/darwin/src/MGLBackgroundStyleLayer_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLBackgroundStyleLayer_Private.h rename to platform/ios/platform/darwin/src/MGLBackgroundStyleLayer_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLCircleStyleLayer.h b/platform/ios/platform/darwin/src/MGLCircleStyleLayer.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLCircleStyleLayer.h rename to platform/ios/platform/darwin/src/MGLCircleStyleLayer.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLCircleStyleLayer.mm b/platform/ios/platform/darwin/src/MGLCircleStyleLayer.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLCircleStyleLayer.mm rename to platform/ios/platform/darwin/src/MGLCircleStyleLayer.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLCircleStyleLayer_Private.h b/platform/ios/platform/darwin/src/MGLCircleStyleLayer_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLCircleStyleLayer_Private.h rename to platform/ios/platform/darwin/src/MGLCircleStyleLayer_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLClockDirectionFormatter.h b/platform/ios/platform/darwin/src/MGLClockDirectionFormatter.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLClockDirectionFormatter.h rename to platform/ios/platform/darwin/src/MGLClockDirectionFormatter.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLClockDirectionFormatter.m b/platform/ios/platform/darwin/src/MGLClockDirectionFormatter.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLClockDirectionFormatter.m rename to platform/ios/platform/darwin/src/MGLClockDirectionFormatter.m diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLCluster.h b/platform/ios/platform/darwin/src/MGLCluster.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLCluster.h rename to platform/ios/platform/darwin/src/MGLCluster.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLCompassDirectionFormatter.h b/platform/ios/platform/darwin/src/MGLCompassDirectionFormatter.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLCompassDirectionFormatter.h rename to platform/ios/platform/darwin/src/MGLCompassDirectionFormatter.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLCompassDirectionFormatter.m b/platform/ios/platform/darwin/src/MGLCompassDirectionFormatter.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLCompassDirectionFormatter.m rename to platform/ios/platform/darwin/src/MGLCompassDirectionFormatter.m diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLComputedShapeSource.h b/platform/ios/platform/darwin/src/MGLComputedShapeSource.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLComputedShapeSource.h rename to platform/ios/platform/darwin/src/MGLComputedShapeSource.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLComputedShapeSource.mm b/platform/ios/platform/darwin/src/MGLComputedShapeSource.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLComputedShapeSource.mm rename to platform/ios/platform/darwin/src/MGLComputedShapeSource.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLComputedShapeSource_Private.h b/platform/ios/platform/darwin/src/MGLComputedShapeSource_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLComputedShapeSource_Private.h rename to platform/ios/platform/darwin/src/MGLComputedShapeSource_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLConversion.h b/platform/ios/platform/darwin/src/MGLConversion.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLConversion.h rename to platform/ios/platform/darwin/src/MGLConversion.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLCoordinateFormatter.h b/platform/ios/platform/darwin/src/MGLCoordinateFormatter.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLCoordinateFormatter.h rename to platform/ios/platform/darwin/src/MGLCoordinateFormatter.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLCoordinateFormatter.m b/platform/ios/platform/darwin/src/MGLCoordinateFormatter.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLCoordinateFormatter.m rename to platform/ios/platform/darwin/src/MGLCoordinateFormatter.m diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLDistanceFormatter.h b/platform/ios/platform/darwin/src/MGLDistanceFormatter.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLDistanceFormatter.h rename to platform/ios/platform/darwin/src/MGLDistanceFormatter.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLDistanceFormatter.m b/platform/ios/platform/darwin/src/MGLDistanceFormatter.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLDistanceFormatter.m rename to platform/ios/platform/darwin/src/MGLDistanceFormatter.m diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLFeature.h b/platform/ios/platform/darwin/src/MGLFeature.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLFeature.h rename to platform/ios/platform/darwin/src/MGLFeature.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLFeature.mm b/platform/ios/platform/darwin/src/MGLFeature.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLFeature.mm rename to platform/ios/platform/darwin/src/MGLFeature.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLFeature_Private.h b/platform/ios/platform/darwin/src/MGLFeature_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLFeature_Private.h rename to platform/ios/platform/darwin/src/MGLFeature_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLFillExtrusionStyleLayer.h b/platform/ios/platform/darwin/src/MGLFillExtrusionStyleLayer.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLFillExtrusionStyleLayer.h rename to platform/ios/platform/darwin/src/MGLFillExtrusionStyleLayer.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLFillExtrusionStyleLayer.mm b/platform/ios/platform/darwin/src/MGLFillExtrusionStyleLayer.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLFillExtrusionStyleLayer.mm rename to platform/ios/platform/darwin/src/MGLFillExtrusionStyleLayer.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLFillExtrusionStyleLayer_Private.h b/platform/ios/platform/darwin/src/MGLFillExtrusionStyleLayer_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLFillExtrusionStyleLayer_Private.h rename to platform/ios/platform/darwin/src/MGLFillExtrusionStyleLayer_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLFillStyleLayer.h b/platform/ios/platform/darwin/src/MGLFillStyleLayer.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLFillStyleLayer.h rename to platform/ios/platform/darwin/src/MGLFillStyleLayer.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLFillStyleLayer.mm b/platform/ios/platform/darwin/src/MGLFillStyleLayer.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLFillStyleLayer.mm rename to platform/ios/platform/darwin/src/MGLFillStyleLayer.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLFillStyleLayer_Private.h b/platform/ios/platform/darwin/src/MGLFillStyleLayer_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLFillStyleLayer_Private.h rename to platform/ios/platform/darwin/src/MGLFillStyleLayer_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLForegroundStyleLayer.h b/platform/ios/platform/darwin/src/MGLForegroundStyleLayer.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLForegroundStyleLayer.h rename to platform/ios/platform/darwin/src/MGLForegroundStyleLayer.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLForegroundStyleLayer.mm b/platform/ios/platform/darwin/src/MGLForegroundStyleLayer.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLForegroundStyleLayer.mm rename to platform/ios/platform/darwin/src/MGLForegroundStyleLayer.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLFoundation.h b/platform/ios/platform/darwin/src/MGLFoundation.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLFoundation.h rename to platform/ios/platform/darwin/src/MGLFoundation.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLFoundation.mm b/platform/ios/platform/darwin/src/MGLFoundation.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLFoundation.mm rename to platform/ios/platform/darwin/src/MGLFoundation.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLFoundation_Private.h b/platform/ios/platform/darwin/src/MGLFoundation_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLFoundation_Private.h rename to platform/ios/platform/darwin/src/MGLFoundation_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLGeometry.h b/platform/ios/platform/darwin/src/MGLGeometry.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLGeometry.h rename to platform/ios/platform/darwin/src/MGLGeometry.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLGeometry.mm b/platform/ios/platform/darwin/src/MGLGeometry.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLGeometry.mm rename to platform/ios/platform/darwin/src/MGLGeometry.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLGeometry_Private.h b/platform/ios/platform/darwin/src/MGLGeometry_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLGeometry_Private.h rename to platform/ios/platform/darwin/src/MGLGeometry_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLHeatmapStyleLayer.h b/platform/ios/platform/darwin/src/MGLHeatmapStyleLayer.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLHeatmapStyleLayer.h rename to platform/ios/platform/darwin/src/MGLHeatmapStyleLayer.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLHeatmapStyleLayer.mm b/platform/ios/platform/darwin/src/MGLHeatmapStyleLayer.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLHeatmapStyleLayer.mm rename to platform/ios/platform/darwin/src/MGLHeatmapStyleLayer.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLHeatmapStyleLayer_Private.h b/platform/ios/platform/darwin/src/MGLHeatmapStyleLayer_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLHeatmapStyleLayer_Private.h rename to platform/ios/platform/darwin/src/MGLHeatmapStyleLayer_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLHillshadeStyleLayer.h b/platform/ios/platform/darwin/src/MGLHillshadeStyleLayer.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLHillshadeStyleLayer.h rename to platform/ios/platform/darwin/src/MGLHillshadeStyleLayer.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLHillshadeStyleLayer.mm b/platform/ios/platform/darwin/src/MGLHillshadeStyleLayer.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLHillshadeStyleLayer.mm rename to platform/ios/platform/darwin/src/MGLHillshadeStyleLayer.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLHillshadeStyleLayer_Private.h b/platform/ios/platform/darwin/src/MGLHillshadeStyleLayer_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLHillshadeStyleLayer_Private.h rename to platform/ios/platform/darwin/src/MGLHillshadeStyleLayer_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLImageSource.h b/platform/ios/platform/darwin/src/MGLImageSource.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLImageSource.h rename to platform/ios/platform/darwin/src/MGLImageSource.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLImageSource.mm b/platform/ios/platform/darwin/src/MGLImageSource.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLImageSource.mm rename to platform/ios/platform/darwin/src/MGLImageSource.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLLight.h b/platform/ios/platform/darwin/src/MGLLight.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLLight.h rename to platform/ios/platform/darwin/src/MGLLight.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLLight.h.ejs b/platform/ios/platform/darwin/src/MGLLight.h.ejs similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLLight.h.ejs rename to platform/ios/platform/darwin/src/MGLLight.h.ejs diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLLight.mm b/platform/ios/platform/darwin/src/MGLLight.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLLight.mm rename to platform/ios/platform/darwin/src/MGLLight.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLLight.mm.ejs b/platform/ios/platform/darwin/src/MGLLight.mm.ejs similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLLight.mm.ejs rename to platform/ios/platform/darwin/src/MGLLight.mm.ejs diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLLight_Private.h b/platform/ios/platform/darwin/src/MGLLight_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLLight_Private.h rename to platform/ios/platform/darwin/src/MGLLight_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLLineStyleLayer.h b/platform/ios/platform/darwin/src/MGLLineStyleLayer.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLLineStyleLayer.h rename to platform/ios/platform/darwin/src/MGLLineStyleLayer.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLLineStyleLayer.mm b/platform/ios/platform/darwin/src/MGLLineStyleLayer.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLLineStyleLayer.mm rename to platform/ios/platform/darwin/src/MGLLineStyleLayer.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLLineStyleLayer_Private.h b/platform/ios/platform/darwin/src/MGLLineStyleLayer_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLLineStyleLayer_Private.h rename to platform/ios/platform/darwin/src/MGLLineStyleLayer_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLLocationManager.h b/platform/ios/platform/darwin/src/MGLLocationManager.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLLocationManager.h rename to platform/ios/platform/darwin/src/MGLLocationManager.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLLocationManager.m b/platform/ios/platform/darwin/src/MGLLocationManager.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLLocationManager.m rename to platform/ios/platform/darwin/src/MGLLocationManager.m diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLLocationManager_Private.h b/platform/ios/platform/darwin/src/MGLLocationManager_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLLocationManager_Private.h rename to platform/ios/platform/darwin/src/MGLLocationManager_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLLoggingConfiguration.h b/platform/ios/platform/darwin/src/MGLLoggingConfiguration.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLLoggingConfiguration.h rename to platform/ios/platform/darwin/src/MGLLoggingConfiguration.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLLoggingConfiguration.mm b/platform/ios/platform/darwin/src/MGLLoggingConfiguration.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLLoggingConfiguration.mm rename to platform/ios/platform/darwin/src/MGLLoggingConfiguration.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLLoggingConfiguration_Private.h b/platform/ios/platform/darwin/src/MGLLoggingConfiguration_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLLoggingConfiguration_Private.h rename to platform/ios/platform/darwin/src/MGLLoggingConfiguration_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLMapCamera.h b/platform/ios/platform/darwin/src/MGLMapCamera.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLMapCamera.h rename to platform/ios/platform/darwin/src/MGLMapCamera.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLMapCamera.mm b/platform/ios/platform/darwin/src/MGLMapCamera.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLMapCamera.mm rename to platform/ios/platform/darwin/src/MGLMapCamera.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLMapSnapshotter.h b/platform/ios/platform/darwin/src/MGLMapSnapshotter.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLMapSnapshotter.h rename to platform/ios/platform/darwin/src/MGLMapSnapshotter.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLMapSnapshotter.mm b/platform/ios/platform/darwin/src/MGLMapSnapshotter.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLMapSnapshotter.mm rename to platform/ios/platform/darwin/src/MGLMapSnapshotter.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLMapSnapshotter_Private.h b/platform/ios/platform/darwin/src/MGLMapSnapshotter_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLMapSnapshotter_Private.h rename to platform/ios/platform/darwin/src/MGLMapSnapshotter_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLMultiPoint.h b/platform/ios/platform/darwin/src/MGLMultiPoint.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLMultiPoint.h rename to platform/ios/platform/darwin/src/MGLMultiPoint.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLMultiPoint.mm b/platform/ios/platform/darwin/src/MGLMultiPoint.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLMultiPoint.mm rename to platform/ios/platform/darwin/src/MGLMultiPoint.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLMultiPoint_Private.h b/platform/ios/platform/darwin/src/MGLMultiPoint_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLMultiPoint_Private.h rename to platform/ios/platform/darwin/src/MGLMultiPoint_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLNetworkConfiguration.h b/platform/ios/platform/darwin/src/MGLNetworkConfiguration.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLNetworkConfiguration.h rename to platform/ios/platform/darwin/src/MGLNetworkConfiguration.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLNetworkConfiguration.m b/platform/ios/platform/darwin/src/MGLNetworkConfiguration.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLNetworkConfiguration.m rename to platform/ios/platform/darwin/src/MGLNetworkConfiguration.m diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLNetworkConfiguration_Private.h b/platform/ios/platform/darwin/src/MGLNetworkConfiguration_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLNetworkConfiguration_Private.h rename to platform/ios/platform/darwin/src/MGLNetworkConfiguration_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLOfflinePack.h b/platform/ios/platform/darwin/src/MGLOfflinePack.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLOfflinePack.h rename to platform/ios/platform/darwin/src/MGLOfflinePack.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLOfflinePack.mm b/platform/ios/platform/darwin/src/MGLOfflinePack.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLOfflinePack.mm rename to platform/ios/platform/darwin/src/MGLOfflinePack.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLOfflinePack_Private.h b/platform/ios/platform/darwin/src/MGLOfflinePack_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLOfflinePack_Private.h rename to platform/ios/platform/darwin/src/MGLOfflinePack_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLOfflineRegion.h b/platform/ios/platform/darwin/src/MGLOfflineRegion.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLOfflineRegion.h rename to platform/ios/platform/darwin/src/MGLOfflineRegion.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLOfflineRegion_Private.h b/platform/ios/platform/darwin/src/MGLOfflineRegion_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLOfflineRegion_Private.h rename to platform/ios/platform/darwin/src/MGLOfflineRegion_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLOfflineStorage.h b/platform/ios/platform/darwin/src/MGLOfflineStorage.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLOfflineStorage.h rename to platform/ios/platform/darwin/src/MGLOfflineStorage.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLOfflineStorage.mm b/platform/ios/platform/darwin/src/MGLOfflineStorage.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLOfflineStorage.mm rename to platform/ios/platform/darwin/src/MGLOfflineStorage.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLOfflineStorage_Private.h b/platform/ios/platform/darwin/src/MGLOfflineStorage_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLOfflineStorage_Private.h rename to platform/ios/platform/darwin/src/MGLOfflineStorage_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLOpenGLStyleLayer.h b/platform/ios/platform/darwin/src/MGLOpenGLStyleLayer.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLOpenGLStyleLayer.h rename to platform/ios/platform/darwin/src/MGLOpenGLStyleLayer.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLOpenGLStyleLayer.mm b/platform/ios/platform/darwin/src/MGLOpenGLStyleLayer.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLOpenGLStyleLayer.mm rename to platform/ios/platform/darwin/src/MGLOpenGLStyleLayer.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLOpenGLStyleLayer_Private.h b/platform/ios/platform/darwin/src/MGLOpenGLStyleLayer_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLOpenGLStyleLayer_Private.h rename to platform/ios/platform/darwin/src/MGLOpenGLStyleLayer_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLOverlay.h b/platform/ios/platform/darwin/src/MGLOverlay.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLOverlay.h rename to platform/ios/platform/darwin/src/MGLOverlay.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLPointAnnotation.h b/platform/ios/platform/darwin/src/MGLPointAnnotation.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLPointAnnotation.h rename to platform/ios/platform/darwin/src/MGLPointAnnotation.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLPointAnnotation.mm b/platform/ios/platform/darwin/src/MGLPointAnnotation.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLPointAnnotation.mm rename to platform/ios/platform/darwin/src/MGLPointAnnotation.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLPointCollection.h b/platform/ios/platform/darwin/src/MGLPointCollection.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLPointCollection.h rename to platform/ios/platform/darwin/src/MGLPointCollection.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLPointCollection.mm b/platform/ios/platform/darwin/src/MGLPointCollection.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLPointCollection.mm rename to platform/ios/platform/darwin/src/MGLPointCollection.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLPointCollection_Private.h b/platform/ios/platform/darwin/src/MGLPointCollection_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLPointCollection_Private.h rename to platform/ios/platform/darwin/src/MGLPointCollection_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLPolygon.h b/platform/ios/platform/darwin/src/MGLPolygon.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLPolygon.h rename to platform/ios/platform/darwin/src/MGLPolygon.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLPolygon.mm b/platform/ios/platform/darwin/src/MGLPolygon.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLPolygon.mm rename to platform/ios/platform/darwin/src/MGLPolygon.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLPolygon_Private.h b/platform/ios/platform/darwin/src/MGLPolygon_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLPolygon_Private.h rename to platform/ios/platform/darwin/src/MGLPolygon_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLPolyline.h b/platform/ios/platform/darwin/src/MGLPolyline.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLPolyline.h rename to platform/ios/platform/darwin/src/MGLPolyline.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLPolyline.mm b/platform/ios/platform/darwin/src/MGLPolyline.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLPolyline.mm rename to platform/ios/platform/darwin/src/MGLPolyline.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLPolyline_Private.h b/platform/ios/platform/darwin/src/MGLPolyline_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLPolyline_Private.h rename to platform/ios/platform/darwin/src/MGLPolyline_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLRasterDEMSource.h b/platform/ios/platform/darwin/src/MGLRasterDEMSource.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLRasterDEMSource.h rename to platform/ios/platform/darwin/src/MGLRasterDEMSource.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLRasterDEMSource.mm b/platform/ios/platform/darwin/src/MGLRasterDEMSource.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLRasterDEMSource.mm rename to platform/ios/platform/darwin/src/MGLRasterDEMSource.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLRasterStyleLayer.h b/platform/ios/platform/darwin/src/MGLRasterStyleLayer.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLRasterStyleLayer.h rename to platform/ios/platform/darwin/src/MGLRasterStyleLayer.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLRasterStyleLayer.mm b/platform/ios/platform/darwin/src/MGLRasterStyleLayer.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLRasterStyleLayer.mm rename to platform/ios/platform/darwin/src/MGLRasterStyleLayer.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLRasterStyleLayer_Private.h b/platform/ios/platform/darwin/src/MGLRasterStyleLayer_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLRasterStyleLayer_Private.h rename to platform/ios/platform/darwin/src/MGLRasterStyleLayer_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLRasterTileSource.h b/platform/ios/platform/darwin/src/MGLRasterTileSource.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLRasterTileSource.h rename to platform/ios/platform/darwin/src/MGLRasterTileSource.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLRasterTileSource.mm b/platform/ios/platform/darwin/src/MGLRasterTileSource.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLRasterTileSource.mm rename to platform/ios/platform/darwin/src/MGLRasterTileSource.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLRasterTileSource_Private.h b/platform/ios/platform/darwin/src/MGLRasterTileSource_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLRasterTileSource_Private.h rename to platform/ios/platform/darwin/src/MGLRasterTileSource_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLReachability.h b/platform/ios/platform/darwin/src/MGLReachability.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLReachability.h rename to platform/ios/platform/darwin/src/MGLReachability.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLReachability.m b/platform/ios/platform/darwin/src/MGLReachability.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLReachability.m rename to platform/ios/platform/darwin/src/MGLReachability.m diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLRendererConfiguration.h b/platform/ios/platform/darwin/src/MGLRendererConfiguration.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLRendererConfiguration.h rename to platform/ios/platform/darwin/src/MGLRendererConfiguration.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLRendererConfiguration.m b/platform/ios/platform/darwin/src/MGLRendererConfiguration.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLRendererConfiguration.m rename to platform/ios/platform/darwin/src/MGLRendererConfiguration.m diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLRendererFrontend.h b/platform/ios/platform/darwin/src/MGLRendererFrontend.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLRendererFrontend.h rename to platform/ios/platform/darwin/src/MGLRendererFrontend.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLSDKMetricsManager.h b/platform/ios/platform/darwin/src/MGLSDKMetricsManager.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLSDKMetricsManager.h rename to platform/ios/platform/darwin/src/MGLSDKMetricsManager.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLSDKMetricsManager.m b/platform/ios/platform/darwin/src/MGLSDKMetricsManager.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLSDKMetricsManager.m rename to platform/ios/platform/darwin/src/MGLSDKMetricsManager.m diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLSDKMetricsManager_Private.h b/platform/ios/platform/darwin/src/MGLSDKMetricsManager_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLSDKMetricsManager_Private.h rename to platform/ios/platform/darwin/src/MGLSDKMetricsManager_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLShape.h b/platform/ios/platform/darwin/src/MGLShape.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLShape.h rename to platform/ios/platform/darwin/src/MGLShape.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLShape.mm b/platform/ios/platform/darwin/src/MGLShape.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLShape.mm rename to platform/ios/platform/darwin/src/MGLShape.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLShapeCollection.h b/platform/ios/platform/darwin/src/MGLShapeCollection.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLShapeCollection.h rename to platform/ios/platform/darwin/src/MGLShapeCollection.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLShapeCollection.mm b/platform/ios/platform/darwin/src/MGLShapeCollection.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLShapeCollection.mm rename to platform/ios/platform/darwin/src/MGLShapeCollection.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLShapeOfflineRegion.h b/platform/ios/platform/darwin/src/MGLShapeOfflineRegion.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLShapeOfflineRegion.h rename to platform/ios/platform/darwin/src/MGLShapeOfflineRegion.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLShapeOfflineRegion.mm b/platform/ios/platform/darwin/src/MGLShapeOfflineRegion.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLShapeOfflineRegion.mm rename to platform/ios/platform/darwin/src/MGLShapeOfflineRegion.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLShapeOfflineRegion_Private.h b/platform/ios/platform/darwin/src/MGLShapeOfflineRegion_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLShapeOfflineRegion_Private.h rename to platform/ios/platform/darwin/src/MGLShapeOfflineRegion_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLShapeSource.h b/platform/ios/platform/darwin/src/MGLShapeSource.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLShapeSource.h rename to platform/ios/platform/darwin/src/MGLShapeSource.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLShapeSource.mm b/platform/ios/platform/darwin/src/MGLShapeSource.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLShapeSource.mm rename to platform/ios/platform/darwin/src/MGLShapeSource.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLShapeSource_Private.h b/platform/ios/platform/darwin/src/MGLShapeSource_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLShapeSource_Private.h rename to platform/ios/platform/darwin/src/MGLShapeSource_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLShape_Private.h b/platform/ios/platform/darwin/src/MGLShape_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLShape_Private.h rename to platform/ios/platform/darwin/src/MGLShape_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLSource.h b/platform/ios/platform/darwin/src/MGLSource.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLSource.h rename to platform/ios/platform/darwin/src/MGLSource.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLSource.mm b/platform/ios/platform/darwin/src/MGLSource.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLSource.mm rename to platform/ios/platform/darwin/src/MGLSource.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLSource_Private.h b/platform/ios/platform/darwin/src/MGLSource_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLSource_Private.h rename to platform/ios/platform/darwin/src/MGLSource_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLStyle.h b/platform/ios/platform/darwin/src/MGLStyle.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLStyle.h rename to platform/ios/platform/darwin/src/MGLStyle.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLStyle.mm b/platform/ios/platform/darwin/src/MGLStyle.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLStyle.mm rename to platform/ios/platform/darwin/src/MGLStyle.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLStyleLayer.h b/platform/ios/platform/darwin/src/MGLStyleLayer.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLStyleLayer.h rename to platform/ios/platform/darwin/src/MGLStyleLayer.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLStyleLayer.h.ejs b/platform/ios/platform/darwin/src/MGLStyleLayer.h.ejs similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLStyleLayer.h.ejs rename to platform/ios/platform/darwin/src/MGLStyleLayer.h.ejs diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLStyleLayer.mm b/platform/ios/platform/darwin/src/MGLStyleLayer.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLStyleLayer.mm rename to platform/ios/platform/darwin/src/MGLStyleLayer.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLStyleLayer.mm.ejs b/platform/ios/platform/darwin/src/MGLStyleLayer.mm.ejs similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLStyleLayer.mm.ejs rename to platform/ios/platform/darwin/src/MGLStyleLayer.mm.ejs diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLStyleLayerManager.h b/platform/ios/platform/darwin/src/MGLStyleLayerManager.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLStyleLayerManager.h rename to platform/ios/platform/darwin/src/MGLStyleLayerManager.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLStyleLayerManager.mm b/platform/ios/platform/darwin/src/MGLStyleLayerManager.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLStyleLayerManager.mm rename to platform/ios/platform/darwin/src/MGLStyleLayerManager.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLStyleLayer_Private.h b/platform/ios/platform/darwin/src/MGLStyleLayer_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLStyleLayer_Private.h rename to platform/ios/platform/darwin/src/MGLStyleLayer_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLStyleLayer_Private.h.ejs b/platform/ios/platform/darwin/src/MGLStyleLayer_Private.h.ejs similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLStyleLayer_Private.h.ejs rename to platform/ios/platform/darwin/src/MGLStyleLayer_Private.h.ejs diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLStyleValue.h b/platform/ios/platform/darwin/src/MGLStyleValue.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLStyleValue.h rename to platform/ios/platform/darwin/src/MGLStyleValue.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLStyleValue.mm b/platform/ios/platform/darwin/src/MGLStyleValue.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLStyleValue.mm rename to platform/ios/platform/darwin/src/MGLStyleValue.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLStyleValue_Private.h b/platform/ios/platform/darwin/src/MGLStyleValue_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLStyleValue_Private.h rename to platform/ios/platform/darwin/src/MGLStyleValue_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLStyle_Private.h b/platform/ios/platform/darwin/src/MGLStyle_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLStyle_Private.h rename to platform/ios/platform/darwin/src/MGLStyle_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLSymbolStyleLayer.h b/platform/ios/platform/darwin/src/MGLSymbolStyleLayer.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLSymbolStyleLayer.h rename to platform/ios/platform/darwin/src/MGLSymbolStyleLayer.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLSymbolStyleLayer.mm b/platform/ios/platform/darwin/src/MGLSymbolStyleLayer.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLSymbolStyleLayer.mm rename to platform/ios/platform/darwin/src/MGLSymbolStyleLayer.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLSymbolStyleLayer_Private.h b/platform/ios/platform/darwin/src/MGLSymbolStyleLayer_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLSymbolStyleLayer_Private.h rename to platform/ios/platform/darwin/src/MGLSymbolStyleLayer_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLTilePyramidOfflineRegion.h b/platform/ios/platform/darwin/src/MGLTilePyramidOfflineRegion.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLTilePyramidOfflineRegion.h rename to platform/ios/platform/darwin/src/MGLTilePyramidOfflineRegion.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLTilePyramidOfflineRegion.mm b/platform/ios/platform/darwin/src/MGLTilePyramidOfflineRegion.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLTilePyramidOfflineRegion.mm rename to platform/ios/platform/darwin/src/MGLTilePyramidOfflineRegion.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLTilePyramidOfflineRegion_Private.h b/platform/ios/platform/darwin/src/MGLTilePyramidOfflineRegion_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLTilePyramidOfflineRegion_Private.h rename to platform/ios/platform/darwin/src/MGLTilePyramidOfflineRegion_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLTileSource.h b/platform/ios/platform/darwin/src/MGLTileSource.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLTileSource.h rename to platform/ios/platform/darwin/src/MGLTileSource.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLTileSource.mm b/platform/ios/platform/darwin/src/MGLTileSource.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLTileSource.mm rename to platform/ios/platform/darwin/src/MGLTileSource.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLTileSource_Private.h b/platform/ios/platform/darwin/src/MGLTileSource_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLTileSource_Private.h rename to platform/ios/platform/darwin/src/MGLTileSource_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLTypes.h b/platform/ios/platform/darwin/src/MGLTypes.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLTypes.h rename to platform/ios/platform/darwin/src/MGLTypes.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLTypes.m b/platform/ios/platform/darwin/src/MGLTypes.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLTypes.m rename to platform/ios/platform/darwin/src/MGLTypes.m diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLValueEvaluator.h b/platform/ios/platform/darwin/src/MGLValueEvaluator.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLValueEvaluator.h rename to platform/ios/platform/darwin/src/MGLValueEvaluator.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLVectorStyleLayer.h b/platform/ios/platform/darwin/src/MGLVectorStyleLayer.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLVectorStyleLayer.h rename to platform/ios/platform/darwin/src/MGLVectorStyleLayer.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLVectorStyleLayer.mm b/platform/ios/platform/darwin/src/MGLVectorStyleLayer.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLVectorStyleLayer.mm rename to platform/ios/platform/darwin/src/MGLVectorStyleLayer.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLVectorTileSource.h b/platform/ios/platform/darwin/src/MGLVectorTileSource.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLVectorTileSource.h rename to platform/ios/platform/darwin/src/MGLVectorTileSource.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLVectorTileSource.mm b/platform/ios/platform/darwin/src/MGLVectorTileSource.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLVectorTileSource.mm rename to platform/ios/platform/darwin/src/MGLVectorTileSource.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/MGLVectorTileSource_Private.h b/platform/ios/platform/darwin/src/MGLVectorTileSource_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/MGLVectorTileSource_Private.h rename to platform/ios/platform/darwin/src/MGLVectorTileSource_Private.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/NSArray+MGLAdditions.h b/platform/ios/platform/darwin/src/NSArray+MGLAdditions.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/NSArray+MGLAdditions.h rename to platform/ios/platform/darwin/src/NSArray+MGLAdditions.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/NSArray+MGLAdditions.mm b/platform/ios/platform/darwin/src/NSArray+MGLAdditions.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/NSArray+MGLAdditions.mm rename to platform/ios/platform/darwin/src/NSArray+MGLAdditions.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/NSBundle+MGLAdditions.h b/platform/ios/platform/darwin/src/NSBundle+MGLAdditions.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/NSBundle+MGLAdditions.h rename to platform/ios/platform/darwin/src/NSBundle+MGLAdditions.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/NSBundle+MGLAdditions.m b/platform/ios/platform/darwin/src/NSBundle+MGLAdditions.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/NSBundle+MGLAdditions.m rename to platform/ios/platform/darwin/src/NSBundle+MGLAdditions.m diff --git a/mapbox-gl-native-ios/platform/darwin/src/NSCoder+MGLAdditions.h b/platform/ios/platform/darwin/src/NSCoder+MGLAdditions.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/NSCoder+MGLAdditions.h rename to platform/ios/platform/darwin/src/NSCoder+MGLAdditions.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/NSCoder+MGLAdditions.mm b/platform/ios/platform/darwin/src/NSCoder+MGLAdditions.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/NSCoder+MGLAdditions.mm rename to platform/ios/platform/darwin/src/NSCoder+MGLAdditions.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/NSComparisonPredicate+MGLAdditions.h b/platform/ios/platform/darwin/src/NSComparisonPredicate+MGLAdditions.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/NSComparisonPredicate+MGLAdditions.h rename to platform/ios/platform/darwin/src/NSComparisonPredicate+MGLAdditions.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/NSComparisonPredicate+MGLAdditions.mm b/platform/ios/platform/darwin/src/NSComparisonPredicate+MGLAdditions.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/NSComparisonPredicate+MGLAdditions.mm rename to platform/ios/platform/darwin/src/NSComparisonPredicate+MGLAdditions.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/NSCompoundPredicate+MGLAdditions.h b/platform/ios/platform/darwin/src/NSCompoundPredicate+MGLAdditions.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/NSCompoundPredicate+MGLAdditions.h rename to platform/ios/platform/darwin/src/NSCompoundPredicate+MGLAdditions.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/NSCompoundPredicate+MGLAdditions.mm b/platform/ios/platform/darwin/src/NSCompoundPredicate+MGLAdditions.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/NSCompoundPredicate+MGLAdditions.mm rename to platform/ios/platform/darwin/src/NSCompoundPredicate+MGLAdditions.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/NSDate+MGLAdditions.h b/platform/ios/platform/darwin/src/NSDate+MGLAdditions.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/NSDate+MGLAdditions.h rename to platform/ios/platform/darwin/src/NSDate+MGLAdditions.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/NSDate+MGLAdditions.mm b/platform/ios/platform/darwin/src/NSDate+MGLAdditions.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/NSDate+MGLAdditions.mm rename to platform/ios/platform/darwin/src/NSDate+MGLAdditions.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/NSDictionary+MGLAdditions.h b/platform/ios/platform/darwin/src/NSDictionary+MGLAdditions.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/NSDictionary+MGLAdditions.h rename to platform/ios/platform/darwin/src/NSDictionary+MGLAdditions.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/NSDictionary+MGLAdditions.mm b/platform/ios/platform/darwin/src/NSDictionary+MGLAdditions.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/NSDictionary+MGLAdditions.mm rename to platform/ios/platform/darwin/src/NSDictionary+MGLAdditions.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/NSException+MGLAdditions.h b/platform/ios/platform/darwin/src/NSException+MGLAdditions.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/NSException+MGLAdditions.h rename to platform/ios/platform/darwin/src/NSException+MGLAdditions.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/NSExpression+MGLAdditions.h b/platform/ios/platform/darwin/src/NSExpression+MGLAdditions.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/NSExpression+MGLAdditions.h rename to platform/ios/platform/darwin/src/NSExpression+MGLAdditions.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/NSExpression+MGLAdditions.mm b/platform/ios/platform/darwin/src/NSExpression+MGLAdditions.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/NSExpression+MGLAdditions.mm rename to platform/ios/platform/darwin/src/NSExpression+MGLAdditions.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/NSExpression+MGLPrivateAdditions.h b/platform/ios/platform/darwin/src/NSExpression+MGLPrivateAdditions.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/NSExpression+MGLPrivateAdditions.h rename to platform/ios/platform/darwin/src/NSExpression+MGLPrivateAdditions.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/NSPredicate+MGLAdditions.h b/platform/ios/platform/darwin/src/NSPredicate+MGLAdditions.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/NSPredicate+MGLAdditions.h rename to platform/ios/platform/darwin/src/NSPredicate+MGLAdditions.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/NSPredicate+MGLAdditions.mm b/platform/ios/platform/darwin/src/NSPredicate+MGLAdditions.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/NSPredicate+MGLAdditions.mm rename to platform/ios/platform/darwin/src/NSPredicate+MGLAdditions.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/NSPredicate+MGLPrivateAdditions.h b/platform/ios/platform/darwin/src/NSPredicate+MGLPrivateAdditions.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/NSPredicate+MGLPrivateAdditions.h rename to platform/ios/platform/darwin/src/NSPredicate+MGLPrivateAdditions.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/NSString+MGLAdditions.h b/platform/ios/platform/darwin/src/NSString+MGLAdditions.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/NSString+MGLAdditions.h rename to platform/ios/platform/darwin/src/NSString+MGLAdditions.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/NSString+MGLAdditions.m b/platform/ios/platform/darwin/src/NSString+MGLAdditions.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/NSString+MGLAdditions.m rename to platform/ios/platform/darwin/src/NSString+MGLAdditions.m diff --git a/mapbox-gl-native-ios/platform/darwin/src/NSURL+MGLAdditions.h b/platform/ios/platform/darwin/src/NSURL+MGLAdditions.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/NSURL+MGLAdditions.h rename to platform/ios/platform/darwin/src/NSURL+MGLAdditions.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/NSURL+MGLAdditions.m b/platform/ios/platform/darwin/src/NSURL+MGLAdditions.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/NSURL+MGLAdditions.m rename to platform/ios/platform/darwin/src/NSURL+MGLAdditions.m diff --git a/mapbox-gl-native-ios/platform/darwin/src/NSValue+MGLAdditions.h b/platform/ios/platform/darwin/src/NSValue+MGLAdditions.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/NSValue+MGLAdditions.h rename to platform/ios/platform/darwin/src/NSValue+MGLAdditions.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/NSValue+MGLAdditions.m b/platform/ios/platform/darwin/src/NSValue+MGLAdditions.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/NSValue+MGLAdditions.m rename to platform/ios/platform/darwin/src/NSValue+MGLAdditions.m diff --git a/mapbox-gl-native-ios/platform/darwin/src/NSValue+MGLStyleAttributeAdditions.h b/platform/ios/platform/darwin/src/NSValue+MGLStyleAttributeAdditions.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/NSValue+MGLStyleAttributeAdditions.h rename to platform/ios/platform/darwin/src/NSValue+MGLStyleAttributeAdditions.h diff --git a/mapbox-gl-native-ios/platform/darwin/src/NSValue+MGLStyleAttributeAdditions.mm b/platform/ios/platform/darwin/src/NSValue+MGLStyleAttributeAdditions.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/NSValue+MGLStyleAttributeAdditions.mm rename to platform/ios/platform/darwin/src/NSValue+MGLStyleAttributeAdditions.mm diff --git a/mapbox-gl-native/platform/darwin/src/async_task.cpp b/platform/ios/platform/darwin/src/async_task.cpp similarity index 100% rename from mapbox-gl-native/platform/darwin/src/async_task.cpp rename to platform/ios/platform/darwin/src/async_task.cpp diff --git a/mapbox-gl-native-ios/platform/darwin/src/collator.mm b/platform/ios/platform/darwin/src/collator.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/collator.mm rename to platform/ios/platform/darwin/src/collator.mm diff --git a/mapbox-gl-native/platform/darwin/src/gl_functions.cpp b/platform/ios/platform/darwin/src/gl_functions.cpp similarity index 100% rename from mapbox-gl-native/platform/darwin/src/gl_functions.cpp rename to platform/ios/platform/darwin/src/gl_functions.cpp diff --git a/mapbox-gl-native/platform/darwin/src/headless_backend_cgl.mm b/platform/ios/platform/darwin/src/headless_backend_cgl.mm similarity index 100% rename from mapbox-gl-native/platform/darwin/src/headless_backend_cgl.mm rename to platform/ios/platform/darwin/src/headless_backend_cgl.mm diff --git a/mapbox-gl-native/platform/darwin/src/headless_backend_eagl.mm b/platform/ios/platform/darwin/src/headless_backend_eagl.mm similarity index 100% rename from mapbox-gl-native/platform/darwin/src/headless_backend_eagl.mm rename to platform/ios/platform/darwin/src/headless_backend_eagl.mm diff --git a/mapbox-gl-native/platform/darwin/src/image.mm b/platform/ios/platform/darwin/src/image.mm similarity index 100% rename from mapbox-gl-native/platform/darwin/src/image.mm rename to platform/ios/platform/darwin/src/image.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/local_glyph_rasterizer.mm b/platform/ios/platform/darwin/src/local_glyph_rasterizer.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/local_glyph_rasterizer.mm rename to platform/ios/platform/darwin/src/local_glyph_rasterizer.mm diff --git a/mapbox-gl-native/platform/darwin/src/logging_nslog.mm b/platform/ios/platform/darwin/src/logging_nslog.mm similarity index 100% rename from mapbox-gl-native/platform/darwin/src/logging_nslog.mm rename to platform/ios/platform/darwin/src/logging_nslog.mm diff --git a/mapbox-gl-native-ios/platform/darwin/src/nsthread.mm b/platform/ios/platform/darwin/src/nsthread.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/src/nsthread.mm rename to platform/ios/platform/darwin/src/nsthread.mm diff --git a/mapbox-gl-native/platform/darwin/src/number_format.mm b/platform/ios/platform/darwin/src/number_format.mm similarity index 100% rename from mapbox-gl-native/platform/darwin/src/number_format.mm rename to platform/ios/platform/darwin/src/number_format.mm diff --git a/mapbox-gl-native/platform/darwin/src/run_loop.cpp b/platform/ios/platform/darwin/src/run_loop.cpp similarity index 100% rename from mapbox-gl-native/platform/darwin/src/run_loop.cpp rename to platform/ios/platform/darwin/src/run_loop.cpp diff --git a/mapbox-gl-native/platform/darwin/src/string_nsstring.mm b/platform/ios/platform/darwin/src/string_nsstring.mm similarity index 100% rename from mapbox-gl-native/platform/darwin/src/string_nsstring.mm rename to platform/ios/platform/darwin/src/string_nsstring.mm diff --git a/mapbox-gl-native/platform/darwin/src/timer.cpp b/platform/ios/platform/darwin/src/timer.cpp similarity index 100% rename from mapbox-gl-native/platform/darwin/src/timer.cpp rename to platform/ios/platform/darwin/src/timer.cpp diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLAttributionInfoTests.m b/platform/ios/platform/darwin/test/MGLAttributionInfoTests.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLAttributionInfoTests.m rename to platform/ios/platform/darwin/test/MGLAttributionInfoTests.m diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLBackgroundStyleLayerTests.mm b/platform/ios/platform/darwin/test/MGLBackgroundStyleLayerTests.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLBackgroundStyleLayerTests.mm rename to platform/ios/platform/darwin/test/MGLBackgroundStyleLayerTests.mm diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLCircleStyleLayerTests.mm b/platform/ios/platform/darwin/test/MGLCircleStyleLayerTests.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLCircleStyleLayerTests.mm rename to platform/ios/platform/darwin/test/MGLCircleStyleLayerTests.mm diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLClockDirectionFormatterTests.m b/platform/ios/platform/darwin/test/MGLClockDirectionFormatterTests.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLClockDirectionFormatterTests.m rename to platform/ios/platform/darwin/test/MGLClockDirectionFormatterTests.m diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLCodingTests.mm b/platform/ios/platform/darwin/test/MGLCodingTests.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLCodingTests.mm rename to platform/ios/platform/darwin/test/MGLCodingTests.mm diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLCompassDirectionFormatterTests.m b/platform/ios/platform/darwin/test/MGLCompassDirectionFormatterTests.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLCompassDirectionFormatterTests.m rename to platform/ios/platform/darwin/test/MGLCompassDirectionFormatterTests.m diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLComputedShapeSourceTests.m b/platform/ios/platform/darwin/test/MGLComputedShapeSourceTests.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLComputedShapeSourceTests.m rename to platform/ios/platform/darwin/test/MGLComputedShapeSourceTests.m diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLCoordinateFormatterTests.m b/platform/ios/platform/darwin/test/MGLCoordinateFormatterTests.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLCoordinateFormatterTests.m rename to platform/ios/platform/darwin/test/MGLCoordinateFormatterTests.m diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLDistanceFormatterTests.m b/platform/ios/platform/darwin/test/MGLDistanceFormatterTests.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLDistanceFormatterTests.m rename to platform/ios/platform/darwin/test/MGLDistanceFormatterTests.m diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLDocumentationExampleTests.swift b/platform/ios/platform/darwin/test/MGLDocumentationExampleTests.swift similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLDocumentationExampleTests.swift rename to platform/ios/platform/darwin/test/MGLDocumentationExampleTests.swift diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLDocumentationGuideTests.swift b/platform/ios/platform/darwin/test/MGLDocumentationGuideTests.swift similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLDocumentationGuideTests.swift rename to platform/ios/platform/darwin/test/MGLDocumentationGuideTests.swift diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLExpressionTests.mm b/platform/ios/platform/darwin/test/MGLExpressionTests.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLExpressionTests.mm rename to platform/ios/platform/darwin/test/MGLExpressionTests.mm diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLFeatureTests.mm b/platform/ios/platform/darwin/test/MGLFeatureTests.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLFeatureTests.mm rename to platform/ios/platform/darwin/test/MGLFeatureTests.mm diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLFillExtrusionStyleLayerTests.mm b/platform/ios/platform/darwin/test/MGLFillExtrusionStyleLayerTests.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLFillExtrusionStyleLayerTests.mm rename to platform/ios/platform/darwin/test/MGLFillExtrusionStyleLayerTests.mm diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLFillStyleLayerTests.mm b/platform/ios/platform/darwin/test/MGLFillStyleLayerTests.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLFillStyleLayerTests.mm rename to platform/ios/platform/darwin/test/MGLFillStyleLayerTests.mm diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLGeometryTests.mm b/platform/ios/platform/darwin/test/MGLGeometryTests.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLGeometryTests.mm rename to platform/ios/platform/darwin/test/MGLGeometryTests.mm diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLHeatmapColorTests.mm b/platform/ios/platform/darwin/test/MGLHeatmapColorTests.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLHeatmapColorTests.mm rename to platform/ios/platform/darwin/test/MGLHeatmapColorTests.mm diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLHeatmapStyleLayerTests.mm b/platform/ios/platform/darwin/test/MGLHeatmapStyleLayerTests.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLHeatmapStyleLayerTests.mm rename to platform/ios/platform/darwin/test/MGLHeatmapStyleLayerTests.mm diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLHillshadeStyleLayerTests.mm b/platform/ios/platform/darwin/test/MGLHillshadeStyleLayerTests.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLHillshadeStyleLayerTests.mm rename to platform/ios/platform/darwin/test/MGLHillshadeStyleLayerTests.mm diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLImageSourceTests.m b/platform/ios/platform/darwin/test/MGLImageSourceTests.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLImageSourceTests.m rename to platform/ios/platform/darwin/test/MGLImageSourceTests.m diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLImageTests.mm b/platform/ios/platform/darwin/test/MGLImageTests.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLImageTests.mm rename to platform/ios/platform/darwin/test/MGLImageTests.mm diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLLightTest.mm b/platform/ios/platform/darwin/test/MGLLightTest.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLLightTest.mm rename to platform/ios/platform/darwin/test/MGLLightTest.mm diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLLightTest.mm.ejs b/platform/ios/platform/darwin/test/MGLLightTest.mm.ejs similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLLightTest.mm.ejs rename to platform/ios/platform/darwin/test/MGLLightTest.mm.ejs diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLLineStyleLayerTests.mm b/platform/ios/platform/darwin/test/MGLLineStyleLayerTests.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLLineStyleLayerTests.mm rename to platform/ios/platform/darwin/test/MGLLineStyleLayerTests.mm diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLMapCameraTests.m b/platform/ios/platform/darwin/test/MGLMapCameraTests.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLMapCameraTests.m rename to platform/ios/platform/darwin/test/MGLMapCameraTests.m diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLMapSnapshotterTests.m b/platform/ios/platform/darwin/test/MGLMapSnapshotterTests.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLMapSnapshotterTests.m rename to platform/ios/platform/darwin/test/MGLMapSnapshotterTests.m diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLMapViewTests.m b/platform/ios/platform/darwin/test/MGLMapViewTests.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLMapViewTests.m rename to platform/ios/platform/darwin/test/MGLMapViewTests.m diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLNSDateAdditionsTests.mm b/platform/ios/platform/darwin/test/MGLNSDateAdditionsTests.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLNSDateAdditionsTests.mm rename to platform/ios/platform/darwin/test/MGLNSDateAdditionsTests.mm diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLNSStringAdditionsTests.m b/platform/ios/platform/darwin/test/MGLNSStringAdditionsTests.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLNSStringAdditionsTests.m rename to platform/ios/platform/darwin/test/MGLNSStringAdditionsTests.m diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLOfflinePackTests.mm b/platform/ios/platform/darwin/test/MGLOfflinePackTests.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLOfflinePackTests.mm rename to platform/ios/platform/darwin/test/MGLOfflinePackTests.mm diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLOfflineRegionTests.m b/platform/ios/platform/darwin/test/MGLOfflineRegionTests.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLOfflineRegionTests.m rename to platform/ios/platform/darwin/test/MGLOfflineRegionTests.m diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLOfflineStorageTests.mm b/platform/ios/platform/darwin/test/MGLOfflineStorageTests.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLOfflineStorageTests.mm rename to platform/ios/platform/darwin/test/MGLOfflineStorageTests.mm diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLPredicateTests.mm b/platform/ios/platform/darwin/test/MGLPredicateTests.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLPredicateTests.mm rename to platform/ios/platform/darwin/test/MGLPredicateTests.mm diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLRasterStyleLayerTests.mm b/platform/ios/platform/darwin/test/MGLRasterStyleLayerTests.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLRasterStyleLayerTests.mm rename to platform/ios/platform/darwin/test/MGLRasterStyleLayerTests.mm diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLRendererConfigurationTests.m b/platform/ios/platform/darwin/test/MGLRendererConfigurationTests.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLRendererConfigurationTests.m rename to platform/ios/platform/darwin/test/MGLRendererConfigurationTests.m diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLResourceTests.mm b/platform/ios/platform/darwin/test/MGLResourceTests.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLResourceTests.mm rename to platform/ios/platform/darwin/test/MGLResourceTests.mm diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLSDKTestHelpers.swift b/platform/ios/platform/darwin/test/MGLSDKTestHelpers.swift similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLSDKTestHelpers.swift rename to platform/ios/platform/darwin/test/MGLSDKTestHelpers.swift diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLShapeSourceTests.mm b/platform/ios/platform/darwin/test/MGLShapeSourceTests.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLShapeSourceTests.mm rename to platform/ios/platform/darwin/test/MGLShapeSourceTests.mm diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLSourceQueryTests.m b/platform/ios/platform/darwin/test/MGLSourceQueryTests.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLSourceQueryTests.m rename to platform/ios/platform/darwin/test/MGLSourceQueryTests.m diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLStyleLayerTests.h b/platform/ios/platform/darwin/test/MGLStyleLayerTests.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLStyleLayerTests.h rename to platform/ios/platform/darwin/test/MGLStyleLayerTests.h diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLStyleLayerTests.m b/platform/ios/platform/darwin/test/MGLStyleLayerTests.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLStyleLayerTests.m rename to platform/ios/platform/darwin/test/MGLStyleLayerTests.m diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLStyleLayerTests.mm.ejs b/platform/ios/platform/darwin/test/MGLStyleLayerTests.mm.ejs similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLStyleLayerTests.mm.ejs rename to platform/ios/platform/darwin/test/MGLStyleLayerTests.mm.ejs diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLStyleTests.mm b/platform/ios/platform/darwin/test/MGLStyleTests.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLStyleTests.mm rename to platform/ios/platform/darwin/test/MGLStyleTests.mm diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLSymbolStyleLayerTests.mm b/platform/ios/platform/darwin/test/MGLSymbolStyleLayerTests.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLSymbolStyleLayerTests.mm rename to platform/ios/platform/darwin/test/MGLSymbolStyleLayerTests.mm diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLTestAssertionHandler.h b/platform/ios/platform/darwin/test/MGLTestAssertionHandler.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLTestAssertionHandler.h rename to platform/ios/platform/darwin/test/MGLTestAssertionHandler.h diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLTestAssertionHandler.m b/platform/ios/platform/darwin/test/MGLTestAssertionHandler.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLTestAssertionHandler.m rename to platform/ios/platform/darwin/test/MGLTestAssertionHandler.m diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLTestUtility.h b/platform/ios/platform/darwin/test/MGLTestUtility.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLTestUtility.h rename to platform/ios/platform/darwin/test/MGLTestUtility.h diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLTileSetTests.mm b/platform/ios/platform/darwin/test/MGLTileSetTests.mm similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLTileSetTests.mm rename to platform/ios/platform/darwin/test/MGLTileSetTests.mm diff --git a/mapbox-gl-native-ios/platform/darwin/test/MGLVersionNumber.m b/platform/ios/platform/darwin/test/MGLVersionNumber.m similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/MGLVersionNumber.m rename to platform/ios/platform/darwin/test/MGLVersionNumber.m diff --git a/mapbox-gl-native-ios/platform/darwin/test/Media.xcassets/Contents.json b/platform/ios/platform/darwin/test/Media.xcassets/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/Media.xcassets/Contents.json rename to platform/ios/platform/darwin/test/Media.xcassets/Contents.json diff --git a/mapbox-gl-native-ios/platform/darwin/test/Media.xcassets/Fixtures/Contents.json b/platform/ios/platform/darwin/test/Media.xcassets/Fixtures/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/Media.xcassets/Fixtures/Contents.json rename to platform/ios/platform/darwin/test/Media.xcassets/Fixtures/Contents.json diff --git a/mapbox-gl-native-ios/platform/darwin/test/Media.xcassets/Fixtures/MGLMapSnapshotterTests/Contents.json b/platform/ios/platform/darwin/test/Media.xcassets/Fixtures/MGLMapSnapshotterTests/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/Media.xcassets/Fixtures/MGLMapSnapshotterTests/Contents.json rename to platform/ios/platform/darwin/test/Media.xcassets/Fixtures/MGLMapSnapshotterTests/Contents.json diff --git a/mapbox-gl-native-ios/platform/darwin/test/Media.xcassets/Fixtures/MGLMapSnapshotterTests/PingFang.imageset/Contents.json b/platform/ios/platform/darwin/test/Media.xcassets/Fixtures/MGLMapSnapshotterTests/PingFang.imageset/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/Media.xcassets/Fixtures/MGLMapSnapshotterTests/PingFang.imageset/Contents.json rename to platform/ios/platform/darwin/test/Media.xcassets/Fixtures/MGLMapSnapshotterTests/PingFang.imageset/Contents.json diff --git a/mapbox-gl-native-ios/platform/darwin/test/Media.xcassets/Fixtures/MGLMapSnapshotterTests/PingFang.imageset/actualImage.png b/platform/ios/platform/darwin/test/Media.xcassets/Fixtures/MGLMapSnapshotterTests/PingFang.imageset/actualImage.png similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/Media.xcassets/Fixtures/MGLMapSnapshotterTests/PingFang.imageset/actualImage.png rename to platform/ios/platform/darwin/test/Media.xcassets/Fixtures/MGLMapSnapshotterTests/PingFang.imageset/actualImage.png diff --git a/mapbox-gl-native-ios/platform/darwin/test/Media.xcassets/Fixtures/MGLMapSnapshotterTests/PingFang.imageset/expected.png b/platform/ios/platform/darwin/test/Media.xcassets/Fixtures/MGLMapSnapshotterTests/PingFang.imageset/expected.png similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/Media.xcassets/Fixtures/MGLMapSnapshotterTests/PingFang.imageset/expected.png rename to platform/ios/platform/darwin/test/Media.xcassets/Fixtures/MGLMapSnapshotterTests/PingFang.imageset/expected.png diff --git a/mapbox-gl-native-ios/platform/darwin/test/Media.xcassets/Fixtures/MGLMapSnapshotterTests/background.imageset/Contents.json b/platform/ios/platform/darwin/test/Media.xcassets/Fixtures/MGLMapSnapshotterTests/background.imageset/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/Media.xcassets/Fixtures/MGLMapSnapshotterTests/background.imageset/Contents.json rename to platform/ios/platform/darwin/test/Media.xcassets/Fixtures/MGLMapSnapshotterTests/background.imageset/Contents.json diff --git a/mapbox-gl-native-ios/platform/darwin/test/Media.xcassets/Fixtures/MGLMapSnapshotterTests/background.imageset/background.png b/platform/ios/platform/darwin/test/Media.xcassets/Fixtures/MGLMapSnapshotterTests/background.imageset/background.png similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/Media.xcassets/Fixtures/MGLMapSnapshotterTests/background.imageset/background.png rename to platform/ios/platform/darwin/test/Media.xcassets/Fixtures/MGLMapSnapshotterTests/background.imageset/background.png diff --git a/mapbox-gl-native-ios/platform/darwin/test/Media.xcassets/RadarImage.imageset/Contents.json b/platform/ios/platform/darwin/test/Media.xcassets/RadarImage.imageset/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/Media.xcassets/RadarImage.imageset/Contents.json rename to platform/ios/platform/darwin/test/Media.xcassets/RadarImage.imageset/Contents.json diff --git a/mapbox-gl-native-ios/platform/darwin/test/Media.xcassets/RadarImage.imageset/radar.png b/platform/ios/platform/darwin/test/Media.xcassets/RadarImage.imageset/radar.png similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/Media.xcassets/RadarImage.imageset/radar.png rename to platform/ios/platform/darwin/test/Media.xcassets/RadarImage.imageset/radar.png diff --git a/mapbox-gl-native-ios/platform/darwin/test/Media.xcassets/TrackingLocationMask.imageset/Contents.json b/platform/ios/platform/darwin/test/Media.xcassets/TrackingLocationMask.imageset/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/Media.xcassets/TrackingLocationMask.imageset/Contents.json rename to platform/ios/platform/darwin/test/Media.xcassets/TrackingLocationMask.imageset/Contents.json diff --git a/mapbox-gl-native-ios/platform/darwin/test/Media.xcassets/TrackingLocationMask.imageset/TrackingLocationMask.png b/platform/ios/platform/darwin/test/Media.xcassets/TrackingLocationMask.imageset/TrackingLocationMask.png similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/Media.xcassets/TrackingLocationMask.imageset/TrackingLocationMask.png rename to platform/ios/platform/darwin/test/Media.xcassets/TrackingLocationMask.imageset/TrackingLocationMask.png diff --git a/mapbox-gl-native-ios/platform/darwin/test/Media.xcassets/TrackingLocationMask.imageset/TrackingLocationMask@2x.png b/platform/ios/platform/darwin/test/Media.xcassets/TrackingLocationMask.imageset/TrackingLocationMask@2x.png similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/Media.xcassets/TrackingLocationMask.imageset/TrackingLocationMask@2x.png rename to platform/ios/platform/darwin/test/Media.xcassets/TrackingLocationMask.imageset/TrackingLocationMask@2x.png diff --git a/mapbox-gl-native-ios/platform/darwin/test/Media.xcassets/TrackingLocationMask.imageset/TrackingLocationMask@3x.png b/platform/ios/platform/darwin/test/Media.xcassets/TrackingLocationMask.imageset/TrackingLocationMask@3x.png similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/Media.xcassets/TrackingLocationMask.imageset/TrackingLocationMask@3x.png rename to platform/ios/platform/darwin/test/Media.xcassets/TrackingLocationMask.imageset/TrackingLocationMask@3x.png diff --git a/mapbox-gl-native-ios/platform/darwin/test/amsterdam.geojson b/platform/ios/platform/darwin/test/amsterdam.geojson similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/amsterdam.geojson rename to platform/ios/platform/darwin/test/amsterdam.geojson diff --git a/mapbox-gl-native-ios/platform/darwin/test/one-liner.json b/platform/ios/platform/darwin/test/one-liner.json similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/one-liner.json rename to platform/ios/platform/darwin/test/one-liner.json diff --git a/mapbox-gl-native-ios/platform/darwin/test/test-Bridging-Header.h b/platform/ios/platform/darwin/test/test-Bridging-Header.h similarity index 100% rename from mapbox-gl-native-ios/platform/darwin/test/test-Bridging-Header.h rename to platform/ios/platform/darwin/test/test-Bridging-Header.h diff --git a/mapbox-gl-native-ios/platform/default/src/mbgl/render-test/main.cpp b/platform/ios/platform/default/src/mbgl/render-test/main.cpp similarity index 100% rename from mapbox-gl-native-ios/platform/default/src/mbgl/render-test/main.cpp rename to platform/ios/platform/default/src/mbgl/render-test/main.cpp diff --git a/mapbox-gl-native-ios/platform/ios/CHANGELOG.md b/platform/ios/platform/ios/CHANGELOG.md similarity index 100% rename from mapbox-gl-native-ios/platform/ios/CHANGELOG.md rename to platform/ios/platform/ios/CHANGELOG.md diff --git a/mapbox-gl-native-ios/platform/ios/DEVELOPING.md b/platform/ios/platform/ios/DEVELOPING.md similarity index 100% rename from mapbox-gl-native-ios/platform/ios/DEVELOPING.md rename to platform/ios/platform/ios/DEVELOPING.md diff --git a/mapbox-gl-native-ios/platform/ios/INSTALL.md b/platform/ios/platform/ios/INSTALL.md similarity index 100% rename from mapbox-gl-native-ios/platform/ios/INSTALL.md rename to platform/ios/platform/ios/INSTALL.md diff --git a/mapbox-gl-native-ios/platform/ios/Integration Test Harness/AppDelegate.h b/platform/ios/platform/ios/Integration Test Harness/AppDelegate.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/Integration Test Harness/AppDelegate.h rename to platform/ios/platform/ios/Integration Test Harness/AppDelegate.h diff --git a/mapbox-gl-native-ios/platform/ios/Integration Test Harness/AppDelegate.m b/platform/ios/platform/ios/Integration Test Harness/AppDelegate.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/Integration Test Harness/AppDelegate.m rename to platform/ios/platform/ios/Integration Test Harness/AppDelegate.m diff --git a/mapbox-gl-native-ios/platform/ios/Integration Test Harness/Assets.xcassets/AppIcon.appiconset/Contents.json b/platform/ios/platform/ios/Integration Test Harness/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/ios/Integration Test Harness/Assets.xcassets/AppIcon.appiconset/Contents.json rename to platform/ios/platform/ios/Integration Test Harness/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/mapbox-gl-native-ios/platform/ios/Integration Test Harness/Base.lproj/LaunchScreen.storyboard b/platform/ios/platform/ios/Integration Test Harness/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from mapbox-gl-native-ios/platform/ios/Integration Test Harness/Base.lproj/LaunchScreen.storyboard rename to platform/ios/platform/ios/Integration Test Harness/Base.lproj/LaunchScreen.storyboard diff --git a/mapbox-gl-native-ios/platform/ios/Integration Test Harness/Info.plist b/platform/ios/platform/ios/Integration Test Harness/Info.plist similarity index 100% rename from mapbox-gl-native-ios/platform/ios/Integration Test Harness/Info.plist rename to platform/ios/platform/ios/Integration Test Harness/Info.plist diff --git a/mapbox-gl-native-ios/platform/ios/Integration Test Harness/main.m b/platform/ios/platform/ios/Integration Test Harness/main.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/Integration Test Harness/main.m rename to platform/ios/platform/ios/Integration Test Harness/main.m diff --git a/mapbox-gl-native-ios/platform/ios/Integration Tests/Annotation Tests/MGLAnnotationViewIntegrationTests.mm b/platform/ios/platform/ios/Integration Tests/Annotation Tests/MGLAnnotationViewIntegrationTests.mm similarity index 100% rename from mapbox-gl-native-ios/platform/ios/Integration Tests/Annotation Tests/MGLAnnotationViewIntegrationTests.mm rename to platform/ios/platform/ios/Integration Tests/Annotation Tests/MGLAnnotationViewIntegrationTests.mm diff --git a/mapbox-gl-native-ios/platform/ios/Integration Tests/Camera Tests/MGLCameraTransitionFinishTests.mm b/platform/ios/platform/ios/Integration Tests/Camera Tests/MGLCameraTransitionFinishTests.mm similarity index 100% rename from mapbox-gl-native-ios/platform/ios/Integration Tests/Camera Tests/MGLCameraTransitionFinishTests.mm rename to platform/ios/platform/ios/Integration Tests/Camera Tests/MGLCameraTransitionFinishTests.mm diff --git a/mapbox-gl-native-ios/platform/ios/Integration Tests/Camera Tests/MGLCameraTransitionTests.mm b/platform/ios/platform/ios/Integration Tests/Camera Tests/MGLCameraTransitionTests.mm similarity index 100% rename from mapbox-gl-native-ios/platform/ios/Integration Tests/Camera Tests/MGLCameraTransitionTests.mm rename to platform/ios/platform/ios/Integration Tests/Camera Tests/MGLCameraTransitionTests.mm diff --git a/mapbox-gl-native-ios/platform/ios/Integration Tests/Info.plist b/platform/ios/platform/ios/Integration Tests/Info.plist similarity index 100% rename from mapbox-gl-native-ios/platform/ios/Integration Tests/Info.plist rename to platform/ios/platform/ios/Integration Tests/Info.plist diff --git a/mapbox-gl-native-ios/platform/ios/Integration Tests/MBGLIntegrationTests.mm b/platform/ios/platform/ios/Integration Tests/MBGLIntegrationTests.mm similarity index 100% rename from mapbox-gl-native-ios/platform/ios/Integration Tests/MBGLIntegrationTests.mm rename to platform/ios/platform/ios/Integration Tests/MBGLIntegrationTests.mm diff --git a/mapbox-gl-native-ios/platform/ios/Integration Tests/MGLIntegrationTestCase.h b/platform/ios/platform/ios/Integration Tests/MGLIntegrationTestCase.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/Integration Tests/MGLIntegrationTestCase.h rename to platform/ios/platform/ios/Integration Tests/MGLIntegrationTestCase.h diff --git a/mapbox-gl-native-ios/platform/ios/Integration Tests/MGLIntegrationTestCase.m b/platform/ios/platform/ios/Integration Tests/MGLIntegrationTestCase.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/Integration Tests/MGLIntegrationTestCase.m rename to platform/ios/platform/ios/Integration Tests/MGLIntegrationTestCase.m diff --git a/mapbox-gl-native-ios/platform/ios/Integration Tests/MGLMapViewIntegrationTest.h b/platform/ios/platform/ios/Integration Tests/MGLMapViewIntegrationTest.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/Integration Tests/MGLMapViewIntegrationTest.h rename to platform/ios/platform/ios/Integration Tests/MGLMapViewIntegrationTest.h diff --git a/mapbox-gl-native-ios/platform/ios/Integration Tests/MGLMapViewIntegrationTest.m b/platform/ios/platform/ios/Integration Tests/MGLMapViewIntegrationTest.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/Integration Tests/MGLMapViewIntegrationTest.m rename to platform/ios/platform/ios/Integration Tests/MGLMapViewIntegrationTest.m diff --git a/mapbox-gl-native-ios/platform/ios/Integration Tests/MGLMapViewPendingBlockTests.m b/platform/ios/platform/ios/Integration Tests/MGLMapViewPendingBlockTests.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/Integration Tests/MGLMapViewPendingBlockTests.m rename to platform/ios/platform/ios/Integration Tests/MGLMapViewPendingBlockTests.m diff --git a/mapbox-gl-native-ios/platform/ios/Integration Tests/MGLNetworkConfigurationIntegrationTests.mm b/platform/ios/platform/ios/Integration Tests/MGLNetworkConfigurationIntegrationTests.mm similarity index 100% rename from mapbox-gl-native-ios/platform/ios/Integration Tests/MGLNetworkConfigurationIntegrationTests.mm rename to platform/ios/platform/ios/Integration Tests/MGLNetworkConfigurationIntegrationTests.mm diff --git a/mapbox-gl-native-ios/platform/ios/Integration Tests/MGLShapeSourceTests.m b/platform/ios/platform/ios/Integration Tests/MGLShapeSourceTests.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/Integration Tests/MGLShapeSourceTests.m rename to platform/ios/platform/ios/Integration Tests/MGLShapeSourceTests.m diff --git a/mapbox-gl-native-ios/platform/ios/Integration Tests/MGLSourceTests.swift b/platform/ios/platform/ios/Integration Tests/MGLSourceTests.swift similarity index 100% rename from mapbox-gl-native-ios/platform/ios/Integration Tests/MGLSourceTests.swift rename to platform/ios/platform/ios/Integration Tests/MGLSourceTests.swift diff --git a/mapbox-gl-native-ios/platform/ios/Integration Tests/MGLStyleLayerIntegrationTests.m b/platform/ios/platform/ios/Integration Tests/MGLStyleLayerIntegrationTests.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/Integration Tests/MGLStyleLayerIntegrationTests.m rename to platform/ios/platform/ios/Integration Tests/MGLStyleLayerIntegrationTests.m diff --git a/mapbox-gl-native-ios/platform/ios/Integration Tests/MGLStyleURLIntegrationTest.m b/platform/ios/platform/ios/Integration Tests/MGLStyleURLIntegrationTest.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/Integration Tests/MGLStyleURLIntegrationTest.m rename to platform/ios/platform/ios/Integration Tests/MGLStyleURLIntegrationTest.m diff --git a/mapbox-gl-native-ios/platform/ios/Integration Tests/MGLTestLocationManager.h b/platform/ios/platform/ios/Integration Tests/MGLTestLocationManager.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/Integration Tests/MGLTestLocationManager.h rename to platform/ios/platform/ios/Integration Tests/MGLTestLocationManager.h diff --git a/mapbox-gl-native-ios/platform/ios/Integration Tests/MGLTestLocationManager.m b/platform/ios/platform/ios/Integration Tests/MGLTestLocationManager.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/Integration Tests/MGLTestLocationManager.m rename to platform/ios/platform/ios/Integration Tests/MGLTestLocationManager.m diff --git a/mapbox-gl-native-ios/platform/ios/Integration Tests/Snapshotter Tests/MGLMapSnapshotterSwiftTests.swift b/platform/ios/platform/ios/Integration Tests/Snapshotter Tests/MGLMapSnapshotterSwiftTests.swift similarity index 100% rename from mapbox-gl-native-ios/platform/ios/Integration Tests/Snapshotter Tests/MGLMapSnapshotterSwiftTests.swift rename to platform/ios/platform/ios/Integration Tests/Snapshotter Tests/MGLMapSnapshotterSwiftTests.swift diff --git a/mapbox-gl-native-ios/platform/ios/Integration Tests/Snapshotter Tests/MGLMapSnapshotterTest.m b/platform/ios/platform/ios/Integration Tests/Snapshotter Tests/MGLMapSnapshotterTest.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/Integration Tests/Snapshotter Tests/MGLMapSnapshotterTest.m rename to platform/ios/platform/ios/Integration Tests/Snapshotter Tests/MGLMapSnapshotterTest.m diff --git a/mapbox-gl-native-ios/platform/ios/Integration Tests/integration-Bridging-Header.h b/platform/ios/platform/ios/Integration Tests/integration-Bridging-Header.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/Integration Tests/integration-Bridging-Header.h rename to platform/ios/platform/ios/Integration Tests/integration-Bridging-Header.h diff --git a/mapbox-gl-native-ios/platform/ios/Mapbox-iOS-SDK-snapshot-dynamic.podspec b/platform/ios/platform/ios/Mapbox-iOS-SDK-snapshot-dynamic.podspec similarity index 100% rename from mapbox-gl-native-ios/platform/ios/Mapbox-iOS-SDK-snapshot-dynamic.podspec rename to platform/ios/platform/ios/Mapbox-iOS-SDK-snapshot-dynamic.podspec diff --git a/mapbox-gl-native-ios/platform/ios/Mapbox-iOS-SDK-stripped.podspec b/platform/ios/platform/ios/Mapbox-iOS-SDK-stripped.podspec similarity index 100% rename from mapbox-gl-native-ios/platform/ios/Mapbox-iOS-SDK-stripped.podspec rename to platform/ios/platform/ios/Mapbox-iOS-SDK-stripped.podspec diff --git a/mapbox-gl-native-ios/platform/ios/Mapbox-iOS-SDK.podspec b/platform/ios/platform/ios/Mapbox-iOS-SDK.podspec similarity index 100% rename from mapbox-gl-native-ios/platform/ios/Mapbox-iOS-SDK.podspec rename to platform/ios/platform/ios/Mapbox-iOS-SDK.podspec diff --git a/mapbox-gl-native-ios/platform/ios/Mapbox.playground/Contents.swift b/platform/ios/platform/ios/Mapbox.playground/Contents.swift similarity index 100% rename from mapbox-gl-native-ios/platform/ios/Mapbox.playground/Contents.swift rename to platform/ios/platform/ios/Mapbox.playground/Contents.swift diff --git a/mapbox-gl-native-ios/platform/ios/Mapbox.playground/contents.xcplayground b/platform/ios/platform/ios/Mapbox.playground/contents.xcplayground similarity index 100% rename from mapbox-gl-native-ios/platform/ios/Mapbox.playground/contents.xcplayground rename to platform/ios/platform/ios/Mapbox.playground/contents.xcplayground diff --git a/mapbox-gl-native-ios/platform/ios/README.md b/platform/ios/platform/ios/README.md similarity index 100% rename from mapbox-gl-native-ios/platform/ios/README.md rename to platform/ios/platform/ios/README.md diff --git a/mapbox-gl-native-ios/platform/ios/WorkspaceSettings.xcsettings b/platform/ios/platform/ios/WorkspaceSettings.xcsettings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/WorkspaceSettings.xcsettings rename to platform/ios/platform/ios/WorkspaceSettings.xcsettings diff --git a/mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Contents.json b/platform/ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Contents.json rename to platform/ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-1024.png b/platform/ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-1024.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-1024.png rename to platform/ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-1024.png diff --git a/mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-29@2x-1.png b/platform/ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-29@2x-1.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-29@2x-1.png rename to platform/ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-29@2x-1.png diff --git a/mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png b/platform/ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png rename to platform/ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png diff --git a/mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png b/platform/ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png rename to platform/ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png diff --git a/mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-40.png b/platform/ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-40.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-40.png rename to platform/ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-40.png diff --git a/mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-40@2x-1.png b/platform/ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-40@2x-1.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-40@2x-1.png rename to platform/ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-40@2x-1.png diff --git a/mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png b/platform/ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png rename to platform/ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png diff --git a/mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png b/platform/ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png rename to platform/ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png diff --git a/mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png b/platform/ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png rename to platform/ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png diff --git a/mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-76.png b/platform/ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-76.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-76.png rename to platform/ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-76.png diff --git a/mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png b/platform/ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png rename to platform/ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png diff --git a/mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png b/platform/ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png rename to platform/ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png diff --git a/mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-Small.png b/platform/ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-Small.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-Small.png rename to platform/ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-Small.png diff --git a/mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-Spotlight-40@3x.png b/platform/ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-Spotlight-40@3x.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-Spotlight-40@3x.png rename to platform/ios/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Icon-Spotlight-40@3x.png diff --git a/mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/Contents.json b/platform/ios/platform/ios/app/Assets.xcassets/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/Contents.json rename to platform/ios/platform/ios/app/Assets.xcassets/Contents.json diff --git a/mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/TrackingHeadingMask.imageset/Contents.json b/platform/ios/platform/ios/app/Assets.xcassets/TrackingHeadingMask.imageset/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/TrackingHeadingMask.imageset/Contents.json rename to platform/ios/platform/ios/app/Assets.xcassets/TrackingHeadingMask.imageset/Contents.json diff --git a/mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/TrackingHeadingMask.imageset/TrackingHeadingMask.png b/platform/ios/platform/ios/app/Assets.xcassets/TrackingHeadingMask.imageset/TrackingHeadingMask.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/TrackingHeadingMask.imageset/TrackingHeadingMask.png rename to platform/ios/platform/ios/app/Assets.xcassets/TrackingHeadingMask.imageset/TrackingHeadingMask.png diff --git a/mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/TrackingHeadingMask.imageset/TrackingHeadingMask@2x.png b/platform/ios/platform/ios/app/Assets.xcassets/TrackingHeadingMask.imageset/TrackingHeadingMask@2x.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/TrackingHeadingMask.imageset/TrackingHeadingMask@2x.png rename to platform/ios/platform/ios/app/Assets.xcassets/TrackingHeadingMask.imageset/TrackingHeadingMask@2x.png diff --git a/mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/TrackingHeadingMask.imageset/TrackingHeadingMask@3x.png b/platform/ios/platform/ios/app/Assets.xcassets/TrackingHeadingMask.imageset/TrackingHeadingMask@3x.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/TrackingHeadingMask.imageset/TrackingHeadingMask@3x.png rename to platform/ios/platform/ios/app/Assets.xcassets/TrackingHeadingMask.imageset/TrackingHeadingMask@3x.png diff --git a/mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/TrackingLocationMask.imageset/Contents.json b/platform/ios/platform/ios/app/Assets.xcassets/TrackingLocationMask.imageset/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/TrackingLocationMask.imageset/Contents.json rename to platform/ios/platform/ios/app/Assets.xcassets/TrackingLocationMask.imageset/Contents.json diff --git a/mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/TrackingLocationMask.imageset/TrackingLocationMask.png b/platform/ios/platform/ios/app/Assets.xcassets/TrackingLocationMask.imageset/TrackingLocationMask.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/TrackingLocationMask.imageset/TrackingLocationMask.png rename to platform/ios/platform/ios/app/Assets.xcassets/TrackingLocationMask.imageset/TrackingLocationMask.png diff --git a/mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/TrackingLocationMask.imageset/TrackingLocationMask@2x.png b/platform/ios/platform/ios/app/Assets.xcassets/TrackingLocationMask.imageset/TrackingLocationMask@2x.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/TrackingLocationMask.imageset/TrackingLocationMask@2x.png rename to platform/ios/platform/ios/app/Assets.xcassets/TrackingLocationMask.imageset/TrackingLocationMask@2x.png diff --git a/mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/TrackingLocationMask.imageset/TrackingLocationMask@3x.png b/platform/ios/platform/ios/app/Assets.xcassets/TrackingLocationMask.imageset/TrackingLocationMask@3x.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/TrackingLocationMask.imageset/TrackingLocationMask@3x.png rename to platform/ios/platform/ios/app/Assets.xcassets/TrackingLocationMask.imageset/TrackingLocationMask@3x.png diff --git a/mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/TrackingLocationOffMask.imageset/Contents.json b/platform/ios/platform/ios/app/Assets.xcassets/TrackingLocationOffMask.imageset/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/TrackingLocationOffMask.imageset/Contents.json rename to platform/ios/platform/ios/app/Assets.xcassets/TrackingLocationOffMask.imageset/Contents.json diff --git a/mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/TrackingLocationOffMask.imageset/TrackingLocationOffMask.png b/platform/ios/platform/ios/app/Assets.xcassets/TrackingLocationOffMask.imageset/TrackingLocationOffMask.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/TrackingLocationOffMask.imageset/TrackingLocationOffMask.png rename to platform/ios/platform/ios/app/Assets.xcassets/TrackingLocationOffMask.imageset/TrackingLocationOffMask.png diff --git a/mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/TrackingLocationOffMask.imageset/TrackingLocationOffMask@2x.png b/platform/ios/platform/ios/app/Assets.xcassets/TrackingLocationOffMask.imageset/TrackingLocationOffMask@2x.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/TrackingLocationOffMask.imageset/TrackingLocationOffMask@2x.png rename to platform/ios/platform/ios/app/Assets.xcassets/TrackingLocationOffMask.imageset/TrackingLocationOffMask@2x.png diff --git a/mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/TrackingLocationOffMask.imageset/TrackingLocationOffMask@3x.png b/platform/ios/platform/ios/app/Assets.xcassets/TrackingLocationOffMask.imageset/TrackingLocationOffMask@3x.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/TrackingLocationOffMask.imageset/TrackingLocationOffMask@3x.png rename to platform/ios/platform/ios/app/Assets.xcassets/TrackingLocationOffMask.imageset/TrackingLocationOffMask@3x.png diff --git a/mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/settings.imageset/Contents.json b/platform/ios/platform/ios/app/Assets.xcassets/settings.imageset/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/settings.imageset/Contents.json rename to platform/ios/platform/ios/app/Assets.xcassets/settings.imageset/Contents.json diff --git a/mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/settings.imageset/settings.pdf b/platform/ios/platform/ios/app/Assets.xcassets/settings.imageset/settings.pdf similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Assets.xcassets/settings.imageset/settings.pdf rename to platform/ios/platform/ios/app/Assets.xcassets/settings.imageset/settings.pdf diff --git a/mapbox-gl-native-ios/platform/ios/app/Base.lproj/Localizable.strings b/platform/ios/platform/ios/app/Base.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Base.lproj/Localizable.strings rename to platform/ios/platform/ios/app/Base.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/Info.plist b/platform/ios/platform/ios/app/Info.plist similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Info.plist rename to platform/ios/platform/ios/app/Info.plist diff --git a/mapbox-gl-native-ios/platform/ios/app/LaunchScreen.storyboard b/platform/ios/platform/ios/app/LaunchScreen.storyboard similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/LaunchScreen.storyboard rename to platform/ios/platform/ios/app/LaunchScreen.storyboard diff --git a/mapbox-gl-native-ios/platform/ios/app/MBXAnnotationView.h b/platform/ios/platform/ios/app/MBXAnnotationView.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/MBXAnnotationView.h rename to platform/ios/platform/ios/app/MBXAnnotationView.h diff --git a/mapbox-gl-native-ios/platform/ios/app/MBXAnnotationView.m b/platform/ios/platform/ios/app/MBXAnnotationView.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/MBXAnnotationView.m rename to platform/ios/platform/ios/app/MBXAnnotationView.m diff --git a/mapbox-gl-native-ios/platform/ios/app/MBXAppDelegate.h b/platform/ios/platform/ios/app/MBXAppDelegate.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/MBXAppDelegate.h rename to platform/ios/platform/ios/app/MBXAppDelegate.h diff --git a/mapbox-gl-native-ios/platform/ios/app/MBXAppDelegate.m b/platform/ios/platform/ios/app/MBXAppDelegate.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/MBXAppDelegate.m rename to platform/ios/platform/ios/app/MBXAppDelegate.m diff --git a/mapbox-gl-native-ios/platform/ios/app/MBXCustomCalloutView.h b/platform/ios/platform/ios/app/MBXCustomCalloutView.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/MBXCustomCalloutView.h rename to platform/ios/platform/ios/app/MBXCustomCalloutView.h diff --git a/mapbox-gl-native-ios/platform/ios/app/MBXCustomCalloutView.m b/platform/ios/platform/ios/app/MBXCustomCalloutView.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/MBXCustomCalloutView.m rename to platform/ios/platform/ios/app/MBXCustomCalloutView.m diff --git a/mapbox-gl-native-ios/platform/ios/app/MBXCustomLocationViewController.h b/platform/ios/platform/ios/app/MBXCustomLocationViewController.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/MBXCustomLocationViewController.h rename to platform/ios/platform/ios/app/MBXCustomLocationViewController.h diff --git a/mapbox-gl-native-ios/platform/ios/app/MBXCustomLocationViewController.m b/platform/ios/platform/ios/app/MBXCustomLocationViewController.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/MBXCustomLocationViewController.m rename to platform/ios/platform/ios/app/MBXCustomLocationViewController.m diff --git a/mapbox-gl-native-ios/platform/ios/app/MBXEmbeddedMapViewController.h b/platform/ios/platform/ios/app/MBXEmbeddedMapViewController.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/MBXEmbeddedMapViewController.h rename to platform/ios/platform/ios/app/MBXEmbeddedMapViewController.h diff --git a/mapbox-gl-native-ios/platform/ios/app/MBXEmbeddedMapViewController.m b/platform/ios/platform/ios/app/MBXEmbeddedMapViewController.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/MBXEmbeddedMapViewController.m rename to platform/ios/platform/ios/app/MBXEmbeddedMapViewController.m diff --git a/mapbox-gl-native-ios/platform/ios/app/MBXFrameTimeGraphView.h b/platform/ios/platform/ios/app/MBXFrameTimeGraphView.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/MBXFrameTimeGraphView.h rename to platform/ios/platform/ios/app/MBXFrameTimeGraphView.h diff --git a/mapbox-gl-native-ios/platform/ios/app/MBXFrameTimeGraphView.m b/platform/ios/platform/ios/app/MBXFrameTimeGraphView.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/MBXFrameTimeGraphView.m rename to platform/ios/platform/ios/app/MBXFrameTimeGraphView.m diff --git a/mapbox-gl-native-ios/platform/ios/app/MBXOfflinePacksTableViewController.h b/platform/ios/platform/ios/app/MBXOfflinePacksTableViewController.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/MBXOfflinePacksTableViewController.h rename to platform/ios/platform/ios/app/MBXOfflinePacksTableViewController.h diff --git a/mapbox-gl-native-ios/platform/ios/app/MBXOfflinePacksTableViewController.m b/platform/ios/platform/ios/app/MBXOfflinePacksTableViewController.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/MBXOfflinePacksTableViewController.m rename to platform/ios/platform/ios/app/MBXOfflinePacksTableViewController.m diff --git a/mapbox-gl-native-ios/platform/ios/app/MBXOrnamentsViewController.h b/platform/ios/platform/ios/app/MBXOrnamentsViewController.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/MBXOrnamentsViewController.h rename to platform/ios/platform/ios/app/MBXOrnamentsViewController.h diff --git a/mapbox-gl-native-ios/platform/ios/app/MBXOrnamentsViewController.m b/platform/ios/platform/ios/app/MBXOrnamentsViewController.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/MBXOrnamentsViewController.m rename to platform/ios/platform/ios/app/MBXOrnamentsViewController.m diff --git a/mapbox-gl-native-ios/platform/ios/app/MBXSnapshotsViewController.h b/platform/ios/platform/ios/app/MBXSnapshotsViewController.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/MBXSnapshotsViewController.h rename to platform/ios/platform/ios/app/MBXSnapshotsViewController.h diff --git a/mapbox-gl-native-ios/platform/ios/app/MBXSnapshotsViewController.m b/platform/ios/platform/ios/app/MBXSnapshotsViewController.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/MBXSnapshotsViewController.m rename to platform/ios/platform/ios/app/MBXSnapshotsViewController.m diff --git a/mapbox-gl-native-ios/platform/ios/app/MBXState.h b/platform/ios/platform/ios/app/MBXState.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/MBXState.h rename to platform/ios/platform/ios/app/MBXState.h diff --git a/mapbox-gl-native-ios/platform/ios/app/MBXState.m b/platform/ios/platform/ios/app/MBXState.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/MBXState.m rename to platform/ios/platform/ios/app/MBXState.m diff --git a/mapbox-gl-native-ios/platform/ios/app/MBXStateManager.h b/platform/ios/platform/ios/app/MBXStateManager.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/MBXStateManager.h rename to platform/ios/platform/ios/app/MBXStateManager.h diff --git a/mapbox-gl-native-ios/platform/ios/app/MBXStateManager.m b/platform/ios/platform/ios/app/MBXStateManager.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/MBXStateManager.m rename to platform/ios/platform/ios/app/MBXStateManager.m diff --git a/mapbox-gl-native-ios/platform/ios/app/MBXUserLocationAnnotationView.h b/platform/ios/platform/ios/app/MBXUserLocationAnnotationView.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/MBXUserLocationAnnotationView.h rename to platform/ios/platform/ios/app/MBXUserLocationAnnotationView.h diff --git a/mapbox-gl-native-ios/platform/ios/app/MBXUserLocationAnnotationView.m b/platform/ios/platform/ios/app/MBXUserLocationAnnotationView.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/MBXUserLocationAnnotationView.m rename to platform/ios/platform/ios/app/MBXUserLocationAnnotationView.m diff --git a/mapbox-gl-native-ios/platform/ios/app/MBXViewController.h b/platform/ios/platform/ios/app/MBXViewController.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/MBXViewController.h rename to platform/ios/platform/ios/app/MBXViewController.h diff --git a/mapbox-gl-native-ios/platform/ios/app/MBXViewController.m b/platform/ios/platform/ios/app/MBXViewController.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/MBXViewController.m rename to platform/ios/platform/ios/app/MBXViewController.m diff --git a/mapbox-gl-native-ios/platform/ios/app/Main.storyboard b/platform/ios/platform/ios/app/Main.storyboard similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Main.storyboard rename to platform/ios/platform/ios/app/Main.storyboard diff --git a/mapbox-gl-native-ios/platform/ios/app/Settings.bundle/Base.lproj/Root.strings b/platform/ios/platform/ios/app/Settings.bundle/Base.lproj/Root.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Settings.bundle/Base.lproj/Root.strings rename to platform/ios/platform/ios/app/Settings.bundle/Base.lproj/Root.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/Settings.bundle/Root.plist b/platform/ios/platform/ios/app/Settings.bundle/Root.plist similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Settings.bundle/Root.plist rename to platform/ios/platform/ios/app/Settings.bundle/Root.plist diff --git a/mapbox-gl-native-ios/platform/ios/app/Settings.bundle/ar.lproj/Root.strings b/platform/ios/platform/ios/app/Settings.bundle/ar.lproj/Root.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Settings.bundle/ar.lproj/Root.strings rename to platform/ios/platform/ios/app/Settings.bundle/ar.lproj/Root.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/Settings.bundle/bg.lproj/Root.strings b/platform/ios/platform/ios/app/Settings.bundle/bg.lproj/Root.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Settings.bundle/bg.lproj/Root.strings rename to platform/ios/platform/ios/app/Settings.bundle/bg.lproj/Root.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/Settings.bundle/ca.lproj/Root.strings b/platform/ios/platform/ios/app/Settings.bundle/ca.lproj/Root.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Settings.bundle/ca.lproj/Root.strings rename to platform/ios/platform/ios/app/Settings.bundle/ca.lproj/Root.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/Settings.bundle/cs.lproj/Root.strings b/platform/ios/platform/ios/app/Settings.bundle/cs.lproj/Root.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Settings.bundle/cs.lproj/Root.strings rename to platform/ios/platform/ios/app/Settings.bundle/cs.lproj/Root.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/Settings.bundle/da.lproj/Root.strings b/platform/ios/platform/ios/app/Settings.bundle/da.lproj/Root.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Settings.bundle/da.lproj/Root.strings rename to platform/ios/platform/ios/app/Settings.bundle/da.lproj/Root.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/Settings.bundle/de.lproj/Root.strings b/platform/ios/platform/ios/app/Settings.bundle/de.lproj/Root.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Settings.bundle/de.lproj/Root.strings rename to platform/ios/platform/ios/app/Settings.bundle/de.lproj/Root.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/Settings.bundle/en.lproj/Root.strings b/platform/ios/platform/ios/app/Settings.bundle/en.lproj/Root.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Settings.bundle/en.lproj/Root.strings rename to platform/ios/platform/ios/app/Settings.bundle/en.lproj/Root.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/Settings.bundle/es.lproj/Root.strings b/platform/ios/platform/ios/app/Settings.bundle/es.lproj/Root.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Settings.bundle/es.lproj/Root.strings rename to platform/ios/platform/ios/app/Settings.bundle/es.lproj/Root.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/Settings.bundle/fi.lproj/Root.strings b/platform/ios/platform/ios/app/Settings.bundle/fi.lproj/Root.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Settings.bundle/fi.lproj/Root.strings rename to platform/ios/platform/ios/app/Settings.bundle/fi.lproj/Root.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/Settings.bundle/fr.lproj/Root.strings b/platform/ios/platform/ios/app/Settings.bundle/fr.lproj/Root.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Settings.bundle/fr.lproj/Root.strings rename to platform/ios/platform/ios/app/Settings.bundle/fr.lproj/Root.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/Settings.bundle/gl.lproj/Root.strings b/platform/ios/platform/ios/app/Settings.bundle/gl.lproj/Root.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Settings.bundle/gl.lproj/Root.strings rename to platform/ios/platform/ios/app/Settings.bundle/gl.lproj/Root.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/Settings.bundle/he.lproj/Root.strings b/platform/ios/platform/ios/app/Settings.bundle/he.lproj/Root.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Settings.bundle/he.lproj/Root.strings rename to platform/ios/platform/ios/app/Settings.bundle/he.lproj/Root.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/Settings.bundle/hu.lproj/Root.strings b/platform/ios/platform/ios/app/Settings.bundle/hu.lproj/Root.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Settings.bundle/hu.lproj/Root.strings rename to platform/ios/platform/ios/app/Settings.bundle/hu.lproj/Root.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/Settings.bundle/it.lproj/Root.strings b/platform/ios/platform/ios/app/Settings.bundle/it.lproj/Root.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Settings.bundle/it.lproj/Root.strings rename to platform/ios/platform/ios/app/Settings.bundle/it.lproj/Root.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/Settings.bundle/ko.lproj/Root.strings b/platform/ios/platform/ios/app/Settings.bundle/ko.lproj/Root.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Settings.bundle/ko.lproj/Root.strings rename to platform/ios/platform/ios/app/Settings.bundle/ko.lproj/Root.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/Settings.bundle/lt.lproj/Root.strings b/platform/ios/platform/ios/app/Settings.bundle/lt.lproj/Root.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Settings.bundle/lt.lproj/Root.strings rename to platform/ios/platform/ios/app/Settings.bundle/lt.lproj/Root.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/Settings.bundle/nl.lproj/Root.strings b/platform/ios/platform/ios/app/Settings.bundle/nl.lproj/Root.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Settings.bundle/nl.lproj/Root.strings rename to platform/ios/platform/ios/app/Settings.bundle/nl.lproj/Root.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/Settings.bundle/pl.lproj/Root.strings b/platform/ios/platform/ios/app/Settings.bundle/pl.lproj/Root.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Settings.bundle/pl.lproj/Root.strings rename to platform/ios/platform/ios/app/Settings.bundle/pl.lproj/Root.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/Settings.bundle/pt-BR.lproj/Root.strings b/platform/ios/platform/ios/app/Settings.bundle/pt-BR.lproj/Root.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Settings.bundle/pt-BR.lproj/Root.strings rename to platform/ios/platform/ios/app/Settings.bundle/pt-BR.lproj/Root.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/Settings.bundle/pt-PT.lproj/Root.strings b/platform/ios/platform/ios/app/Settings.bundle/pt-PT.lproj/Root.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Settings.bundle/pt-PT.lproj/Root.strings rename to platform/ios/platform/ios/app/Settings.bundle/pt-PT.lproj/Root.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/Settings.bundle/ru.lproj/Root.strings b/platform/ios/platform/ios/app/Settings.bundle/ru.lproj/Root.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Settings.bundle/ru.lproj/Root.strings rename to platform/ios/platform/ios/app/Settings.bundle/ru.lproj/Root.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/Settings.bundle/sv.lproj/Root.strings b/platform/ios/platform/ios/app/Settings.bundle/sv.lproj/Root.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Settings.bundle/sv.lproj/Root.strings rename to platform/ios/platform/ios/app/Settings.bundle/sv.lproj/Root.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/Settings.bundle/uk.lproj/Root.strings b/platform/ios/platform/ios/app/Settings.bundle/uk.lproj/Root.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Settings.bundle/uk.lproj/Root.strings rename to platform/ios/platform/ios/app/Settings.bundle/uk.lproj/Root.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/Settings.bundle/vi.lproj/Root.strings b/platform/ios/platform/ios/app/Settings.bundle/vi.lproj/Root.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Settings.bundle/vi.lproj/Root.strings rename to platform/ios/platform/ios/app/Settings.bundle/vi.lproj/Root.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/Settings.bundle/zh-Hans.lproj/Root.strings b/platform/ios/platform/ios/app/Settings.bundle/zh-Hans.lproj/Root.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Settings.bundle/zh-Hans.lproj/Root.strings rename to platform/ios/platform/ios/app/Settings.bundle/zh-Hans.lproj/Root.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/Settings.bundle/zh-Hant.lproj/Root.strings b/platform/ios/platform/ios/app/Settings.bundle/zh-Hant.lproj/Root.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/Settings.bundle/zh-Hant.lproj/Root.strings rename to platform/ios/platform/ios/app/Settings.bundle/zh-Hant.lproj/Root.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/ar.lproj/Localizable.strings b/platform/ios/platform/ios/app/ar.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/ar.lproj/Localizable.strings rename to platform/ios/platform/ios/app/ar.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/bg.lproj/Localizable.strings b/platform/ios/platform/ios/app/bg.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/bg.lproj/Localizable.strings rename to platform/ios/platform/ios/app/bg.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/ca.lproj/Localizable.strings b/platform/ios/platform/ios/app/ca.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/ca.lproj/Localizable.strings rename to platform/ios/platform/ios/app/ca.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/cs.lproj/Localizable.strings b/platform/ios/platform/ios/app/cs.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/cs.lproj/Localizable.strings rename to platform/ios/platform/ios/app/cs.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/da.lproj/Localizable.strings b/platform/ios/platform/ios/app/da.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/da.lproj/Localizable.strings rename to platform/ios/platform/ios/app/da.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/de.lproj/Localizable.strings b/platform/ios/platform/ios/app/de.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/de.lproj/Localizable.strings rename to platform/ios/platform/ios/app/de.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/es.lproj/Localizable.strings b/platform/ios/platform/ios/app/es.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/es.lproj/Localizable.strings rename to platform/ios/platform/ios/app/es.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/fi.lproj/Localizable.strings b/platform/ios/platform/ios/app/fi.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/fi.lproj/Localizable.strings rename to platform/ios/platform/ios/app/fi.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/fill_filter_style.json b/platform/ios/platform/ios/app/fill_filter_style.json similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/fill_filter_style.json rename to platform/ios/platform/ios/app/fill_filter_style.json diff --git a/mapbox-gl-native-ios/platform/ios/app/fr.lproj/Localizable.strings b/platform/ios/platform/ios/app/fr.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/fr.lproj/Localizable.strings rename to platform/ios/platform/ios/app/fr.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/gl.lproj/Localizable.strings b/platform/ios/platform/ios/app/gl.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/gl.lproj/Localizable.strings rename to platform/ios/platform/ios/app/gl.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/he.lproj/Localizable.strings b/platform/ios/platform/ios/app/he.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/he.lproj/Localizable.strings rename to platform/ios/platform/ios/app/he.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/hu.lproj/Localizable.strings b/platform/ios/platform/ios/app/hu.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/hu.lproj/Localizable.strings rename to platform/ios/platform/ios/app/hu.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/insert_access_token.sh b/platform/ios/platform/ios/app/insert_access_token.sh similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/insert_access_token.sh rename to platform/ios/platform/ios/app/insert_access_token.sh diff --git a/mapbox-gl-native-ios/platform/ios/app/ja.lproj/Localizable.strings b/platform/ios/platform/ios/app/ja.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/ja.lproj/Localizable.strings rename to platform/ios/platform/ios/app/ja.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/ko.lproj/Localizable.strings b/platform/ios/platform/ios/app/ko.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/ko.lproj/Localizable.strings rename to platform/ios/platform/ios/app/ko.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/line_filter_style.json b/platform/ios/platform/ios/app/line_filter_style.json similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/line_filter_style.json rename to platform/ios/platform/ios/app/line_filter_style.json diff --git a/mapbox-gl-native-ios/platform/ios/app/lt.lproj/Localizable.strings b/platform/ios/platform/ios/app/lt.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/lt.lproj/Localizable.strings rename to platform/ios/platform/ios/app/lt.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/main.m b/platform/ios/platform/ios/app/main.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/main.m rename to platform/ios/platform/ios/app/main.m diff --git a/mapbox-gl-native-ios/platform/ios/app/missing_icon.json b/platform/ios/platform/ios/app/missing_icon.json similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/missing_icon.json rename to platform/ios/platform/ios/app/missing_icon.json diff --git a/mapbox-gl-native-ios/platform/ios/app/nl.lproj/Localizable.strings b/platform/ios/platform/ios/app/nl.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/nl.lproj/Localizable.strings rename to platform/ios/platform/ios/app/nl.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/numeric_filter_style.json b/platform/ios/platform/ios/app/numeric_filter_style.json similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/numeric_filter_style.json rename to platform/ios/platform/ios/app/numeric_filter_style.json diff --git a/mapbox-gl-native-ios/platform/ios/app/pl.lproj/Localizable.strings b/platform/ios/platform/ios/app/pl.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/pl.lproj/Localizable.strings rename to platform/ios/platform/ios/app/pl.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/points.geojson b/platform/ios/platform/ios/app/points.geojson similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/points.geojson rename to platform/ios/platform/ios/app/points.geojson diff --git a/mapbox-gl-native-ios/platform/ios/app/polyline.geojson b/platform/ios/platform/ios/app/polyline.geojson similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/polyline.geojson rename to platform/ios/platform/ios/app/polyline.geojson diff --git a/mapbox-gl-native-ios/platform/ios/app/pt-BR.lproj/Localizable.strings b/platform/ios/platform/ios/app/pt-BR.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/pt-BR.lproj/Localizable.strings rename to platform/ios/platform/ios/app/pt-BR.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/pt-PT.lproj/Localizable.strings b/platform/ios/platform/ios/app/pt-PT.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/pt-PT.lproj/Localizable.strings rename to platform/ios/platform/ios/app/pt-PT.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/ru.lproj/Localizable.strings b/platform/ios/platform/ios/app/ru.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/ru.lproj/Localizable.strings rename to platform/ios/platform/ios/app/ru.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/simple_route.json b/platform/ios/platform/ios/app/simple_route.json similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/simple_route.json rename to platform/ios/platform/ios/app/simple_route.json diff --git a/mapbox-gl-native-ios/platform/ios/app/sv.lproj/Localizable.strings b/platform/ios/platform/ios/app/sv.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/sv.lproj/Localizable.strings rename to platform/ios/platform/ios/app/sv.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/threestates.geojson b/platform/ios/platform/ios/app/threestates.geojson similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/threestates.geojson rename to platform/ios/platform/ios/app/threestates.geojson diff --git a/mapbox-gl-native-ios/platform/ios/app/uk.lproj/Localizable.strings b/platform/ios/platform/ios/app/uk.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/uk.lproj/Localizable.strings rename to platform/ios/platform/ios/app/uk.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/vi.lproj/Localizable.strings b/platform/ios/platform/ios/app/vi.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/vi.lproj/Localizable.strings rename to platform/ios/platform/ios/app/vi.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/zh-Hans.lproj/Localizable.strings b/platform/ios/platform/ios/app/zh-Hans.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/zh-Hans.lproj/Localizable.strings rename to platform/ios/platform/ios/app/zh-Hans.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/app/zh-Hant.lproj/Localizable.strings b/platform/ios/platform/ios/app/zh-Hant.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/app/zh-Hant.lproj/Localizable.strings rename to platform/ios/platform/ios/app/zh-Hant.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Contents.json b/platform/ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Contents.json rename to platform/ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-1.png b/platform/ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-1.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-1.png rename to platform/ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-1.png diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-2.png b/platform/ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-2.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-2.png rename to platform/ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-2.png diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-3.png b/platform/ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-3.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-3.png rename to platform/ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-3.png diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-4.png b/platform/ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-4.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-4.png rename to platform/ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-4.png diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-40.png b/platform/ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-40.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-40.png rename to platform/ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-40.png diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png b/platform/ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png rename to platform/ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png b/platform/ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png rename to platform/ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-76.png b/platform/ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-76.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-76.png rename to platform/ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-76.png diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png b/platform/ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png rename to platform/ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-Small.png b/platform/ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-Small.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-Small.png rename to platform/ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-Small.png diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png b/platform/ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png rename to platform/ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png b/platform/ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png rename to platform/ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon.png b/platform/ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon.png rename to platform/ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon.png diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/iTunesArtwork.png b/platform/ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/iTunesArtwork.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/iTunesArtwork.png rename to platform/ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/iTunesArtwork.png diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png b/platform/ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png rename to platform/ios/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/Base.lproj/LaunchScreen.storyboard b/platform/ios/platform/ios/benchmark/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/Base.lproj/LaunchScreen.storyboard rename to platform/ios/platform/ios/benchmark/Base.lproj/LaunchScreen.storyboard diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/Info.plist b/platform/ios/platform/ios/benchmark/Info.plist similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/Info.plist rename to platform/ios/platform/ios/benchmark/Info.plist diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/MBXBenchAppDelegate.h b/platform/ios/platform/ios/benchmark/MBXBenchAppDelegate.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/MBXBenchAppDelegate.h rename to platform/ios/platform/ios/benchmark/MBXBenchAppDelegate.h diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/MBXBenchAppDelegate.m b/platform/ios/platform/ios/benchmark/MBXBenchAppDelegate.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/MBXBenchAppDelegate.m rename to platform/ios/platform/ios/benchmark/MBXBenchAppDelegate.m diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/MBXBenchViewController.h b/platform/ios/platform/ios/benchmark/MBXBenchViewController.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/MBXBenchViewController.h rename to platform/ios/platform/ios/benchmark/MBXBenchViewController.h diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/MBXBenchViewController.mm b/platform/ios/platform/ios/benchmark/MBXBenchViewController.mm similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/MBXBenchViewController.mm rename to platform/ios/platform/ios/benchmark/MBXBenchViewController.mm diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/assets/glyphs/download.sh b/platform/ios/platform/ios/benchmark/assets/glyphs/download.sh similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/assets/glyphs/download.sh rename to platform/ios/platform/ios/benchmark/assets/glyphs/download.sh diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/assets/sprites/mapbox-streets.json b/platform/ios/platform/ios/benchmark/assets/sprites/mapbox-streets.json similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/assets/sprites/mapbox-streets.json rename to platform/ios/platform/ios/benchmark/assets/sprites/mapbox-streets.json diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/assets/sprites/mapbox-streets.png b/platform/ios/platform/ios/benchmark/assets/sprites/mapbox-streets.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/assets/sprites/mapbox-streets.png rename to platform/ios/platform/ios/benchmark/assets/sprites/mapbox-streets.png diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/assets/sprites/mapbox-streets@2x.json b/platform/ios/platform/ios/benchmark/assets/sprites/mapbox-streets@2x.json similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/assets/sprites/mapbox-streets@2x.json rename to platform/ios/platform/ios/benchmark/assets/sprites/mapbox-streets@2x.json diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/assets/sprites/mapbox-streets@2x.png b/platform/ios/platform/ios/benchmark/assets/sprites/mapbox-streets@2x.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/assets/sprites/mapbox-streets@2x.png rename to platform/ios/platform/ios/benchmark/assets/sprites/mapbox-streets@2x.png diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/assets/styles/streets-v8.json b/platform/ios/platform/ios/benchmark/assets/styles/streets-v8.json similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/assets/styles/streets-v8.json rename to platform/ios/platform/ios/benchmark/assets/styles/streets-v8.json diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/assets/tiles/download.sh b/platform/ios/platform/ios/benchmark/assets/tiles/download.sh similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/assets/tiles/download.sh rename to platform/ios/platform/ios/benchmark/assets/tiles/download.sh diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/assets/tiles/mapbox.mapbox-terrain-v2,mapbox.mapbox-streets-v6.json b/platform/ios/platform/ios/benchmark/assets/tiles/mapbox.mapbox-terrain-v2,mapbox.mapbox-streets-v6.json similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/assets/tiles/mapbox.mapbox-terrain-v2,mapbox.mapbox-streets-v6.json rename to platform/ios/platform/ios/benchmark/assets/tiles/mapbox.mapbox-terrain-v2,mapbox.mapbox-streets-v6.json diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/locations.cpp b/platform/ios/platform/ios/benchmark/locations.cpp similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/locations.cpp rename to platform/ios/platform/ios/benchmark/locations.cpp diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/locations.hpp b/platform/ios/platform/ios/benchmark/locations.hpp similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/locations.hpp rename to platform/ios/platform/ios/benchmark/locations.hpp diff --git a/mapbox-gl-native-ios/platform/ios/benchmark/main.m b/platform/ios/platform/ios/benchmark/main.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/benchmark/main.m rename to platform/ios/platform/ios/benchmark/main.m diff --git a/mapbox-gl-native-ios/platform/ios/config.cmake b/platform/ios/platform/ios/config.cmake similarity index 100% rename from mapbox-gl-native-ios/platform/ios/config.cmake rename to platform/ios/platform/ios/config.cmake diff --git a/mapbox-gl-native-ios/platform/ios/core-files.json b/platform/ios/platform/ios/core-files.json similarity index 100% rename from mapbox-gl-native-ios/platform/ios/core-files.json rename to platform/ios/platform/ios/core-files.json diff --git a/mapbox-gl-native-ios/platform/ios/docs/guides/For Style Authors.md b/platform/ios/platform/ios/docs/guides/For Style Authors.md similarity index 100% rename from mapbox-gl-native-ios/platform/ios/docs/guides/For Style Authors.md rename to platform/ios/platform/ios/docs/guides/For Style Authors.md diff --git a/mapbox-gl-native-ios/platform/ios/docs/guides/Gesture Recognizers.md b/platform/ios/platform/ios/docs/guides/Gesture Recognizers.md similarity index 100% rename from mapbox-gl-native-ios/platform/ios/docs/guides/Gesture Recognizers.md rename to platform/ios/platform/ios/docs/guides/Gesture Recognizers.md diff --git a/mapbox-gl-native-ios/platform/ios/docs/guides/Info.plist Keys.md b/platform/ios/platform/ios/docs/guides/Info.plist Keys.md similarity index 100% rename from mapbox-gl-native-ios/platform/ios/docs/guides/Info.plist Keys.md rename to platform/ios/platform/ios/docs/guides/Info.plist Keys.md diff --git a/mapbox-gl-native-ios/platform/ios/docs/guides/Migrating to Expressions.md b/platform/ios/platform/ios/docs/guides/Migrating to Expressions.md similarity index 100% rename from mapbox-gl-native-ios/platform/ios/docs/guides/Migrating to Expressions.md rename to platform/ios/platform/ios/docs/guides/Migrating to Expressions.md diff --git a/mapbox-gl-native-ios/platform/ios/docs/guides/Tile URL Templates.md b/platform/ios/platform/ios/docs/guides/Tile URL Templates.md similarity index 100% rename from mapbox-gl-native-ios/platform/ios/docs/guides/Tile URL Templates.md rename to platform/ios/platform/ios/docs/guides/Tile URL Templates.md diff --git a/mapbox-gl-native-ios/platform/ios/docs/img/screenshot.png b/platform/ios/platform/ios/docs/img/screenshot.png similarity index 100% rename from mapbox-gl-native-ios/platform/ios/docs/img/screenshot.png rename to platform/ios/platform/ios/docs/img/screenshot.png diff --git a/mapbox-gl-native-ios/platform/ios/docs/img/user-interaction/RotateSydney.gif b/platform/ios/platform/ios/docs/img/user-interaction/RotateSydney.gif similarity index 100% rename from mapbox-gl-native-ios/platform/ios/docs/img/user-interaction/RotateSydney.gif rename to platform/ios/platform/ios/docs/img/user-interaction/RotateSydney.gif diff --git a/mapbox-gl-native-ios/platform/ios/docs/img/user-interaction/quickzoom.gif b/platform/ios/platform/ios/docs/img/user-interaction/quickzoom.gif similarity index 100% rename from mapbox-gl-native-ios/platform/ios/docs/img/user-interaction/quickzoom.gif rename to platform/ios/platform/ios/docs/img/user-interaction/quickzoom.gif diff --git a/mapbox-gl-native-ios/platform/ios/docs/pod-README.md b/platform/ios/platform/ios/docs/pod-README.md similarity index 100% rename from mapbox-gl-native-ios/platform/ios/docs/pod-README.md rename to platform/ios/platform/ios/docs/pod-README.md diff --git a/mapbox-gl-native-ios/platform/ios/framework/Info-static.plist b/platform/ios/platform/ios/framework/Info-static.plist similarity index 100% rename from mapbox-gl-native-ios/platform/ios/framework/Info-static.plist rename to platform/ios/platform/ios/framework/Info-static.plist diff --git a/mapbox-gl-native-ios/platform/ios/framework/Info.plist b/platform/ios/platform/ios/framework/Info.plist similarity index 100% rename from mapbox-gl-native-ios/platform/ios/framework/Info.plist rename to platform/ios/platform/ios/framework/Info.plist diff --git a/mapbox-gl-native-ios/platform/ios/framework/Mapbox-static.h b/platform/ios/platform/ios/framework/Mapbox-static.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/framework/Mapbox-static.h rename to platform/ios/platform/ios/framework/Mapbox-static.h diff --git a/mapbox-gl-native-ios/platform/ios/framework/modulemap b/platform/ios/platform/ios/framework/modulemap similarity index 100% rename from mapbox-gl-native-ios/platform/ios/framework/modulemap rename to platform/ios/platform/ios/framework/modulemap diff --git a/mapbox-gl-native-ios/platform/ios/framework/strip-frameworks.sh b/platform/ios/platform/ios/framework/strip-frameworks.sh similarity index 100% rename from mapbox-gl-native-ios/platform/ios/framework/strip-frameworks.sh rename to platform/ios/platform/ios/framework/strip-frameworks.sh diff --git a/mapbox-gl-native-ios/platform/ios/ios.xcconfig b/platform/ios/platform/ios/ios.xcconfig similarity index 100% rename from mapbox-gl-native-ios/platform/ios/ios.xcconfig rename to platform/ios/platform/ios/ios.xcconfig diff --git a/mapbox-gl-native-ios/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/platform/ios/ios.xcodeproj/project.pbxproj similarity index 98% rename from mapbox-gl-native-ios/platform/ios/ios.xcodeproj/project.pbxproj rename to platform/ios/platform/ios/ios.xcodeproj/project.pbxproj index 22578ad62..b2c6db5c7 100644 --- a/mapbox-gl-native-ios/platform/ios/ios.xcodeproj/project.pbxproj +++ b/platform/ios/platform/ios/ios.xcodeproj/project.pbxproj @@ -821,7 +821,7 @@ 1F7454A61ED08AB400021D39 /* MGLLightTest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLLightTest.mm; path = ../../darwin/test/MGLLightTest.mm; sourceTree = ""; }; 1F78399D235AA1E600D4D606 /* libmbgl-core.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libmbgl-core.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 1F7839A3235E11FC00D4D606 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/usr/lib/libz.tbd; sourceTree = DEVELOPER_DIR; }; - 1F7839A5235E137000D4D606 /* sideload_sat.db */ = {isa = PBXFileReference; lastKnownFileType = file; name = sideload_sat.db; path = "../../../mapbox-gl-native/test/fixtures/offline_database/sideload_sat.db"; sourceTree = ""; }; + 1F7839A5235E137000D4D606 /* sideload_sat.db */ = {isa = PBXFileReference; lastKnownFileType = file; name = sideload_sat.db; path = "../../../../test/fixtures/offline_database/sideload_sat.db"; sourceTree = ""; }; 1F8E8A80233A9FD9009B51ED /* MGLMapViewGestureRecognizerTests.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLMapViewGestureRecognizerTests.mm; sourceTree = ""; }; 1F95931C1E6DE2E900D5B294 /* MGLNSDateAdditionsTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLNSDateAdditionsTests.mm; path = ../../darwin/test/MGLNSDateAdditionsTests.mm; sourceTree = ""; }; 1FC4817B2098CBC0000D09B4 /* NSPredicate+MGLPrivateAdditions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSPredicate+MGLPrivateAdditions.h"; sourceTree = ""; }; @@ -1283,8 +1283,8 @@ DAC49C621CD07D74009E1AA3 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = en; path = en.lproj/Localizable.stringsdict; sourceTree = ""; }; DAC832642404AF9000A61BF8 /* darwin.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = darwin.xcconfig; path = ../darwin/darwin.xcconfig; sourceTree = ""; }; DAC832672404AFBB00A61BF8 /* ci.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = ci.xcconfig; path = ../darwin/ci.xcconfig; sourceTree = ""; }; - DAC8A47F24527EDB00C795BB /* glyphs.pbf */ = {isa = PBXFileReference; lastKnownFileType = file; name = glyphs.pbf; path = "../../../../mapbox-gl-native/test/fixtures/resources/glyphs.pbf"; sourceTree = ""; }; - DAC8A4812452971B00C795BB /* mixed.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = mixed.json; path = "../../../../mapbox-gl-native/test/fixtures/local_glyphs/mixed.json"; sourceTree = ""; }; + DAC8A47F24527EDB00C795BB /* glyphs.pbf */ = {isa = PBXFileReference; lastKnownFileType = file; name = glyphs.pbf; path = "../../../../../test/fixtures/resources/glyphs.pbf"; sourceTree = ""; }; + DAC8A4812452971B00C795BB /* mixed.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = mixed.json; path = "../../../../../test/fixtures/local_glyphs/mixed.json"; sourceTree = ""; }; DACA86242019218500E9693A /* MGLRasterDEMSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLRasterDEMSource.h; sourceTree = ""; }; DACA86252019218500E9693A /* MGLRasterDEMSource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLRasterDEMSource.mm; sourceTree = ""; }; DACBC60B20118ABE00C4D7E2 /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/Localizable.strings; sourceTree = ""; }; @@ -3639,19 +3639,19 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; DEVELOPMENT_TEAM = GJZR2MEM28; HEADER_SEARCH_PATHS = ( - "$(PROJECT_DIR)/../../../mapbox-gl-native/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/platform/default/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/variant/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/geometry.hpp/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/value/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/geojson.hpp/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/optional", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/typewrapper/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/weak/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/extras/rapidjson/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/polylabel/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/expected/include", - "$(PROJECT_DIR)/../../platform/darwin/include", + "$(PROJECT_DIR)/../../../../include", + "$(PROJECT_DIR)/../../../default/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/variant/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/geometry.hpp/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/value/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/geojson.hpp/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/optional", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/typewrapper/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/weak/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/extras/rapidjson/include", + "$(PROJECT_DIR)/../../../../vendor/polylabel/include", + "$(PROJECT_DIR)/../../../../vendor/expected/include", + "$(PROJECT_DIR)/../../../darwin/include", ); INFOPLIST_FILE = benchmark/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -3690,19 +3690,19 @@ DEFINES_MODULE = YES; DYLIB_CURRENT_VERSION = 15256; HEADER_SEARCH_PATHS = ( - "$(PROJECT_DIR)/../../../mapbox-gl-native/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/platform/default/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/variant/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/geometry.hpp/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/value/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/geojson.hpp/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/optional", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/typewrapper/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/weak/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/extras/rapidjson/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/extras/expected-lite/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/polylabel/include", - "$(PROJECT_DIR)/../../platform/darwin/include", + "$(PROJECT_DIR)/../../../../include", + "$(PROJECT_DIR)/../../../default/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/variant/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/geometry.hpp/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/value/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/geojson.hpp/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/optional", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/typewrapper/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/weak/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/extras/rapidjson/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/extras/expected-lite/include", + "$(PROJECT_DIR)/../../../../vendor/polylabel/include", + "$(PROJECT_DIR)/../../../platform/darwin/include", ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -4019,19 +4019,19 @@ DEFINES_MODULE = YES; DYLIB_CURRENT_VERSION = 15256; HEADER_SEARCH_PATHS = ( - "$(PROJECT_DIR)/../../../mapbox-gl-native/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/platform/default/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/variant/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/geometry.hpp/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/value/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/geojson.hpp/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/optional", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/typewrapper/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/weak/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/extras/rapidjson/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/extras/expected-lite/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/polylabel/include", - "$(PROJECT_DIR)/../../platform/darwin/include", + "$(PROJECT_DIR)/../../../../include", + "$(PROJECT_DIR)/../../../default/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/variant/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/geometry.hpp/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/value/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/geojson.hpp/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/optional", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/typewrapper/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/weak/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/extras/rapidjson/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/extras/expected-lite/include", + "$(PROJECT_DIR)/../../../../vendor/polylabel/include", + "$(PROJECT_DIR)/../../../platform/darwin/include", ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -4059,19 +4059,19 @@ DEPLOYMENT_POSTPROCESSING = YES; DYLIB_CURRENT_VERSION = 15256; HEADER_SEARCH_PATHS = ( - "$(PROJECT_DIR)/../../../mapbox-gl-native/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/platform/default/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/variant/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/geometry.hpp/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/value/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/geojson.hpp/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/optional", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/typewrapper/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/weak/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/extras/rapidjson/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/extras/expected-lite/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/polylabel/include", - "$(PROJECT_DIR)/../../platform/darwin/include", + "$(PROJECT_DIR)/../../../../include", + "$(PROJECT_DIR)/../../../default/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/variant/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/geometry.hpp/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/value/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/geojson.hpp/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/optional", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/typewrapper/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/weak/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/extras/rapidjson/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/extras/expected-lite/include", + "$(PROJECT_DIR)/../../../../vendor/polylabel/include", + "$(PROJECT_DIR)/../../../platform/darwin/include", ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -4098,19 +4098,19 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; DEVELOPMENT_TEAM = GJZR2MEM28; HEADER_SEARCH_PATHS = ( - "$(PROJECT_DIR)/../../../mapbox-gl-native/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/platform/default/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/variant/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/geometry.hpp/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/value/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/geojson.hpp/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/optional", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/typewrapper/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/weak/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/extras/rapidjson/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/polylabel/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/expected/include", - "$(PROJECT_DIR)/../../platform/darwin/include", + "$(PROJECT_DIR)/../../../../include", + "$(PROJECT_DIR)/../../../default/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/variant/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/geometry.hpp/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/value/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/geojson.hpp/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/optional", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/typewrapper/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/weak/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/extras/rapidjson/include", + "$(PROJECT_DIR)/../../../../vendor/polylabel/include", + "$(PROJECT_DIR)/../../../../vendor/expected/include", + "$(PROJECT_DIR)/../../../platform/darwin/include", ); INFOPLIST_FILE = benchmark/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -4125,19 +4125,19 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; DEVELOPMENT_TEAM = GJZR2MEM28; HEADER_SEARCH_PATHS = ( - "$(PROJECT_DIR)/../../../mapbox-gl-native/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/platform/default/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/variant/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/geometry.hpp/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/value/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/geojson.hpp/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/optional", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/typewrapper/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/mapbox/weak/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/mapbox-base/extras/rapidjson/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/polylabel/include", - "$(PROJECT_DIR)/../../../mapbox-gl-native/vendor/expected/include", - "$(PROJECT_DIR)/../../platform/darwin/include", + "$(PROJECT_DIR)/../../../../include", + "$(PROJECT_DIR)/../../../default/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/variant/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/geometry.hpp/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/value/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/geojson.hpp/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/optional", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/typewrapper/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/weak/include", + "$(PROJECT_DIR)/../../../../vendor/mapbox-base/extras/rapidjson/include", + "$(PROJECT_DIR)/../../../../vendor/polylabel/include", + "$(PROJECT_DIR)/../../../../vendor/expected/include", + "$(PROJECT_DIR)/../../../platform/darwin/include", ); INFOPLIST_FILE = benchmark/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; diff --git a/mapbox-gl-native-ios/platform/ios/ios.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/platform/ios/platform/ios/ios.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from mapbox-gl-native-ios/platform/ios/ios.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to platform/ios/platform/ios/ios.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/mapbox-gl-native-ios/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/CI.xcscheme b/platform/ios/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/CI.xcscheme similarity index 100% rename from mapbox-gl-native-ios/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/CI.xcscheme rename to platform/ios/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/CI.xcscheme diff --git a/mapbox-gl-native-ios/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/Integration Test Harness.xcscheme b/platform/ios/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/Integration Test Harness.xcscheme similarity index 100% rename from mapbox-gl-native-ios/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/Integration Test Harness.xcscheme rename to platform/ios/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/Integration Test Harness.xcscheme diff --git a/mapbox-gl-native-ios/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/bench.xcscheme b/platform/ios/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/bench.xcscheme similarity index 100% rename from mapbox-gl-native-ios/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/bench.xcscheme rename to platform/ios/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/bench.xcscheme diff --git a/mapbox-gl-native-ios/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/dynamic+static.xcscheme b/platform/ios/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/dynamic+static.xcscheme similarity index 100% rename from mapbox-gl-native-ios/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/dynamic+static.xcscheme rename to platform/ios/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/dynamic+static.xcscheme diff --git a/mapbox-gl-native-ios/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/dynamic.xcscheme b/platform/ios/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/dynamic.xcscheme similarity index 100% rename from mapbox-gl-native-ios/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/dynamic.xcscheme rename to platform/ios/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/dynamic.xcscheme diff --git a/mapbox-gl-native-ios/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/iosapp.xcscheme b/platform/ios/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/iosapp.xcscheme similarity index 100% rename from mapbox-gl-native-ios/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/iosapp.xcscheme rename to platform/ios/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/iosapp.xcscheme diff --git a/mapbox-gl-native-ios/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/static.xcscheme b/platform/ios/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/static.xcscheme similarity index 100% rename from mapbox-gl-native-ios/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/static.xcscheme rename to platform/ios/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/static.xcscheme diff --git a/mapbox-gl-native-ios/platform/ios/ios.xcworkspace/contents.xcworkspacedata b/platform/ios/platform/ios/ios.xcworkspace/contents.xcworkspacedata similarity index 100% rename from mapbox-gl-native-ios/platform/ios/ios.xcworkspace/contents.xcworkspacedata rename to platform/ios/platform/ios/ios.xcworkspace/contents.xcworkspacedata diff --git a/mapbox-gl-native-ios/platform/ios/ios.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/platform/ios/platform/ios/ios.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from mapbox-gl-native-ios/platform/ios/ios.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to platform/ios/platform/ios/ios.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/mapbox-gl-native-ios/platform/ios/ios.xcworkspace/xcshareddata/xcdebugger/Breakpoints_v2.xcbkptlist b/platform/ios/platform/ios/ios.xcworkspace/xcshareddata/xcdebugger/Breakpoints_v2.xcbkptlist similarity index 100% rename from mapbox-gl-native-ios/platform/ios/ios.xcworkspace/xcshareddata/xcdebugger/Breakpoints_v2.xcbkptlist rename to platform/ios/platform/ios/ios.xcworkspace/xcshareddata/xcdebugger/Breakpoints_v2.xcbkptlist diff --git a/mapbox-gl-native-ios/platform/ios/jazzy.yml b/platform/ios/platform/ios/jazzy.yml similarity index 100% rename from mapbox-gl-native-ios/platform/ios/jazzy.yml rename to platform/ios/platform/ios/jazzy.yml diff --git a/mapbox-gl-native-ios/platform/ios/originals/compass.sketch b/platform/ios/platform/ios/originals/compass.sketch similarity index 100% rename from mapbox-gl-native-ios/platform/ios/originals/compass.sketch rename to platform/ios/platform/ios/originals/compass.sketch diff --git a/mapbox-gl-native-ios/platform/ios/originals/screenshot.sketch b/platform/ios/platform/ios/originals/screenshot.sketch similarity index 100% rename from mapbox-gl-native-ios/platform/ios/originals/screenshot.sketch rename to platform/ios/platform/ios/originals/screenshot.sketch diff --git a/mapbox-gl-native-ios/platform/ios/resources/Base.lproj/Localizable.strings b/platform/ios/platform/ios/resources/Base.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/Base.lproj/Localizable.strings rename to platform/ios/platform/ios/resources/Base.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/resources/Images.xcassets/Compass.imageset/Contents.json b/platform/ios/platform/ios/resources/Images.xcassets/Compass.imageset/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/Images.xcassets/Compass.imageset/Contents.json rename to platform/ios/platform/ios/resources/Images.xcassets/Compass.imageset/Contents.json diff --git a/mapbox-gl-native-ios/platform/ios/resources/Images.xcassets/Compass.imageset/compass.pdf b/platform/ios/platform/ios/resources/Images.xcassets/Compass.imageset/compass.pdf similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/Images.xcassets/Compass.imageset/compass.pdf rename to platform/ios/platform/ios/resources/Images.xcassets/Compass.imageset/compass.pdf diff --git a/mapbox-gl-native-ios/platform/ios/resources/Images.xcassets/Contents.json b/platform/ios/platform/ios/resources/Images.xcassets/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/Images.xcassets/Contents.json rename to platform/ios/platform/ios/resources/Images.xcassets/Contents.json diff --git a/mapbox-gl-native-ios/platform/ios/resources/Images.xcassets/default_marker.imageset/Contents.json b/platform/ios/platform/ios/resources/Images.xcassets/default_marker.imageset/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/Images.xcassets/default_marker.imageset/Contents.json rename to platform/ios/platform/ios/resources/Images.xcassets/default_marker.imageset/Contents.json diff --git a/mapbox-gl-native-ios/platform/ios/resources/Images.xcassets/default_marker.imageset/default_marker.pdf b/platform/ios/platform/ios/resources/Images.xcassets/default_marker.imageset/default_marker.pdf similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/Images.xcassets/default_marker.imageset/default_marker.pdf rename to platform/ios/platform/ios/resources/Images.xcassets/default_marker.imageset/default_marker.pdf diff --git a/mapbox-gl-native-ios/platform/ios/resources/Images.xcassets/mapbox.imageset/Contents.json b/platform/ios/platform/ios/resources/Images.xcassets/mapbox.imageset/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/Images.xcassets/mapbox.imageset/Contents.json rename to platform/ios/platform/ios/resources/Images.xcassets/mapbox.imageset/Contents.json diff --git a/mapbox-gl-native-ios/platform/ios/resources/Images.xcassets/mapbox.imageset/mapbox.pdf b/platform/ios/platform/ios/resources/Images.xcassets/mapbox.imageset/mapbox.pdf similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/Images.xcassets/mapbox.imageset/mapbox.pdf rename to platform/ios/platform/ios/resources/Images.xcassets/mapbox.imageset/mapbox.pdf diff --git a/mapbox-gl-native-ios/platform/ios/resources/Images.xcassets/mapbox_helmet.imageset/Contents.json b/platform/ios/platform/ios/resources/Images.xcassets/mapbox_helmet.imageset/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/Images.xcassets/mapbox_helmet.imageset/Contents.json rename to platform/ios/platform/ios/resources/Images.xcassets/mapbox_helmet.imageset/Contents.json diff --git a/mapbox-gl-native-ios/platform/ios/resources/Images.xcassets/mapbox_helmet.imageset/mapbox_helmet.pdf b/platform/ios/platform/ios/resources/Images.xcassets/mapbox_helmet.imageset/mapbox_helmet.pdf similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/Images.xcassets/mapbox_helmet.imageset/mapbox_helmet.pdf rename to platform/ios/platform/ios/resources/Images.xcassets/mapbox_helmet.imageset/mapbox_helmet.pdf diff --git a/mapbox-gl-native-ios/platform/ios/resources/README b/platform/ios/platform/ios/resources/README similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/README rename to platform/ios/platform/ios/resources/README diff --git a/mapbox-gl-native-ios/platform/ios/resources/ar.lproj/Localizable.stringsdict b/platform/ios/platform/ios/resources/ar.lproj/Localizable.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/ar.lproj/Localizable.stringsdict rename to platform/ios/platform/ios/resources/ar.lproj/Localizable.stringsdict diff --git a/mapbox-gl-native-ios/platform/ios/resources/bg.lproj/Localizable.strings b/platform/ios/platform/ios/resources/bg.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/bg.lproj/Localizable.strings rename to platform/ios/platform/ios/resources/bg.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/resources/bg.lproj/Localizable.stringsdict b/platform/ios/platform/ios/resources/bg.lproj/Localizable.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/bg.lproj/Localizable.stringsdict rename to platform/ios/platform/ios/resources/bg.lproj/Localizable.stringsdict diff --git a/mapbox-gl-native-ios/platform/ios/resources/ca.lproj/Localizable.strings b/platform/ios/platform/ios/resources/ca.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/ca.lproj/Localizable.strings rename to platform/ios/platform/ios/resources/ca.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/resources/ca.lproj/Localizable.stringsdict b/platform/ios/platform/ios/resources/ca.lproj/Localizable.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/ca.lproj/Localizable.stringsdict rename to platform/ios/platform/ios/resources/ca.lproj/Localizable.stringsdict diff --git a/mapbox-gl-native-ios/platform/ios/resources/cs.lproj/Localizable.strings b/platform/ios/platform/ios/resources/cs.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/cs.lproj/Localizable.strings rename to platform/ios/platform/ios/resources/cs.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/resources/cs.lproj/Localizable.stringsdict b/platform/ios/platform/ios/resources/cs.lproj/Localizable.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/cs.lproj/Localizable.stringsdict rename to platform/ios/platform/ios/resources/cs.lproj/Localizable.stringsdict diff --git a/mapbox-gl-native-ios/platform/ios/resources/da.lproj/Localizable.strings b/platform/ios/platform/ios/resources/da.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/da.lproj/Localizable.strings rename to platform/ios/platform/ios/resources/da.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/resources/da.lproj/Localizable.stringsdict b/platform/ios/platform/ios/resources/da.lproj/Localizable.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/da.lproj/Localizable.stringsdict rename to platform/ios/platform/ios/resources/da.lproj/Localizable.stringsdict diff --git a/mapbox-gl-native-ios/platform/ios/resources/de.lproj/Localizable.strings b/platform/ios/platform/ios/resources/de.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/de.lproj/Localizable.strings rename to platform/ios/platform/ios/resources/de.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/resources/de.lproj/Localizable.stringsdict b/platform/ios/platform/ios/resources/de.lproj/Localizable.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/de.lproj/Localizable.stringsdict rename to platform/ios/platform/ios/resources/de.lproj/Localizable.stringsdict diff --git a/mapbox-gl-native-ios/platform/ios/resources/en.lproj/Localizable.stringsdict b/platform/ios/platform/ios/resources/en.lproj/Localizable.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/en.lproj/Localizable.stringsdict rename to platform/ios/platform/ios/resources/en.lproj/Localizable.stringsdict diff --git a/mapbox-gl-native-ios/platform/ios/resources/es.lproj/Localizable.strings b/platform/ios/platform/ios/resources/es.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/es.lproj/Localizable.strings rename to platform/ios/platform/ios/resources/es.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/resources/es.lproj/Localizable.stringsdict b/platform/ios/platform/ios/resources/es.lproj/Localizable.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/es.lproj/Localizable.stringsdict rename to platform/ios/platform/ios/resources/es.lproj/Localizable.stringsdict diff --git a/mapbox-gl-native-ios/platform/ios/resources/fr.lproj/Localizable.strings b/platform/ios/platform/ios/resources/fr.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/fr.lproj/Localizable.strings rename to platform/ios/platform/ios/resources/fr.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/resources/fr.lproj/Localizable.stringsdict b/platform/ios/platform/ios/resources/fr.lproj/Localizable.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/fr.lproj/Localizable.stringsdict rename to platform/ios/platform/ios/resources/fr.lproj/Localizable.stringsdict diff --git a/mapbox-gl-native-ios/platform/ios/resources/gl.lproj/Localizable.strings b/platform/ios/platform/ios/resources/gl.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/gl.lproj/Localizable.strings rename to platform/ios/platform/ios/resources/gl.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/resources/gl.lproj/Localizable.stringsdict b/platform/ios/platform/ios/resources/gl.lproj/Localizable.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/gl.lproj/Localizable.stringsdict rename to platform/ios/platform/ios/resources/gl.lproj/Localizable.stringsdict diff --git a/mapbox-gl-native-ios/platform/ios/resources/he.lproj/Localizable.strings b/platform/ios/platform/ios/resources/he.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/he.lproj/Localizable.strings rename to platform/ios/platform/ios/resources/he.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/resources/hu.lproj/Localizable.strings b/platform/ios/platform/ios/resources/hu.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/hu.lproj/Localizable.strings rename to platform/ios/platform/ios/resources/hu.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/resources/hu.lproj/Localizable.stringsdict b/platform/ios/platform/ios/resources/hu.lproj/Localizable.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/hu.lproj/Localizable.stringsdict rename to platform/ios/platform/ios/resources/hu.lproj/Localizable.stringsdict diff --git a/mapbox-gl-native-ios/platform/ios/resources/ja.lproj/Localizable.strings b/platform/ios/platform/ios/resources/ja.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/ja.lproj/Localizable.strings rename to platform/ios/platform/ios/resources/ja.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/resources/ko.lproj/Localizable.strings b/platform/ios/platform/ios/resources/ko.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/ko.lproj/Localizable.strings rename to platform/ios/platform/ios/resources/ko.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/resources/ko.lproj/Localizable.stringsdict b/platform/ios/platform/ios/resources/ko.lproj/Localizable.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/ko.lproj/Localizable.stringsdict rename to platform/ios/platform/ios/resources/ko.lproj/Localizable.stringsdict diff --git a/mapbox-gl-native-ios/platform/ios/resources/lt.lproj/Localizable.strings b/platform/ios/platform/ios/resources/lt.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/lt.lproj/Localizable.strings rename to platform/ios/platform/ios/resources/lt.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/resources/lt.lproj/Localizable.stringsdict b/platform/ios/platform/ios/resources/lt.lproj/Localizable.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/lt.lproj/Localizable.stringsdict rename to platform/ios/platform/ios/resources/lt.lproj/Localizable.stringsdict diff --git a/mapbox-gl-native-ios/platform/ios/resources/pt-BR.lproj/Localizable.strings b/platform/ios/platform/ios/resources/pt-BR.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/pt-BR.lproj/Localizable.strings rename to platform/ios/platform/ios/resources/pt-BR.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/resources/pt-BR.lproj/Localizable.stringsdict b/platform/ios/platform/ios/resources/pt-BR.lproj/Localizable.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/pt-BR.lproj/Localizable.stringsdict rename to platform/ios/platform/ios/resources/pt-BR.lproj/Localizable.stringsdict diff --git a/mapbox-gl-native-ios/platform/ios/resources/pt-PT.lproj/Localizable.strings b/platform/ios/platform/ios/resources/pt-PT.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/pt-PT.lproj/Localizable.strings rename to platform/ios/platform/ios/resources/pt-PT.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/resources/pt-PT.lproj/Localizable.stringsdict b/platform/ios/platform/ios/resources/pt-PT.lproj/Localizable.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/pt-PT.lproj/Localizable.stringsdict rename to platform/ios/platform/ios/resources/pt-PT.lproj/Localizable.stringsdict diff --git a/mapbox-gl-native-ios/platform/ios/resources/ru.lproj/Localizable.strings b/platform/ios/platform/ios/resources/ru.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/ru.lproj/Localizable.strings rename to platform/ios/platform/ios/resources/ru.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/resources/ru.lproj/Localizable.stringsdict b/platform/ios/platform/ios/resources/ru.lproj/Localizable.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/ru.lproj/Localizable.stringsdict rename to platform/ios/platform/ios/resources/ru.lproj/Localizable.stringsdict diff --git a/mapbox-gl-native-ios/platform/ios/resources/sv.lproj/Localizable.strings b/platform/ios/platform/ios/resources/sv.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/sv.lproj/Localizable.strings rename to platform/ios/platform/ios/resources/sv.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/resources/sv.lproj/Localizable.stringsdict b/platform/ios/platform/ios/resources/sv.lproj/Localizable.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/sv.lproj/Localizable.stringsdict rename to platform/ios/platform/ios/resources/sv.lproj/Localizable.stringsdict diff --git a/mapbox-gl-native-ios/platform/ios/resources/uk.lproj/Localizable.strings b/platform/ios/platform/ios/resources/uk.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/uk.lproj/Localizable.strings rename to platform/ios/platform/ios/resources/uk.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/resources/uk.lproj/Localizable.stringsdict b/platform/ios/platform/ios/resources/uk.lproj/Localizable.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/uk.lproj/Localizable.stringsdict rename to platform/ios/platform/ios/resources/uk.lproj/Localizable.stringsdict diff --git a/mapbox-gl-native-ios/platform/ios/resources/vi.lproj/Localizable.strings b/platform/ios/platform/ios/resources/vi.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/vi.lproj/Localizable.strings rename to platform/ios/platform/ios/resources/vi.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/resources/vi.lproj/Localizable.stringsdict b/platform/ios/platform/ios/resources/vi.lproj/Localizable.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/vi.lproj/Localizable.stringsdict rename to platform/ios/platform/ios/resources/vi.lproj/Localizable.stringsdict diff --git a/mapbox-gl-native-ios/platform/ios/resources/zh-Hans.lproj/Localizable.strings b/platform/ios/platform/ios/resources/zh-Hans.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/zh-Hans.lproj/Localizable.strings rename to platform/ios/platform/ios/resources/zh-Hans.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/resources/zh-Hant.lproj/Localizable.strings b/platform/ios/platform/ios/resources/zh-Hant.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/zh-Hant.lproj/Localizable.strings rename to platform/ios/platform/ios/resources/zh-Hant.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/ios/resources/zh-Hant.lproj/Localizable.stringsdict b/platform/ios/platform/ios/resources/zh-Hant.lproj/Localizable.stringsdict similarity index 100% rename from mapbox-gl-native-ios/platform/ios/resources/zh-Hant.lproj/Localizable.stringsdict rename to platform/ios/platform/ios/resources/zh-Hant.lproj/Localizable.stringsdict diff --git a/mapbox-gl-native-ios/platform/ios/scripts/deploy-packages.sh b/platform/ios/platform/ios/scripts/deploy-packages.sh similarity index 100% rename from mapbox-gl-native-ios/platform/ios/scripts/deploy-packages.sh rename to platform/ios/platform/ios/scripts/deploy-packages.sh diff --git a/mapbox-gl-native-ios/platform/ios/scripts/deploy-snapshot.sh b/platform/ios/platform/ios/scripts/deploy-snapshot.sh similarity index 100% rename from mapbox-gl-native-ios/platform/ios/scripts/deploy-snapshot.sh rename to platform/ios/platform/ios/scripts/deploy-snapshot.sh diff --git a/mapbox-gl-native-ios/platform/ios/scripts/deploy-swift-package.sh b/platform/ios/platform/ios/scripts/deploy-swift-package.sh similarity index 100% rename from mapbox-gl-native-ios/platform/ios/scripts/deploy-swift-package.sh rename to platform/ios/platform/ios/scripts/deploy-swift-package.sh diff --git a/mapbox-gl-native-ios/platform/ios/scripts/deploy-to-cocoapods.sh b/platform/ios/platform/ios/scripts/deploy-to-cocoapods.sh similarity index 100% rename from mapbox-gl-native-ios/platform/ios/scripts/deploy-to-cocoapods.sh rename to platform/ios/platform/ios/scripts/deploy-to-cocoapods.sh diff --git a/mapbox-gl-native-ios/platform/ios/scripts/document.sh b/platform/ios/platform/ios/scripts/document.sh similarity index 100% rename from mapbox-gl-native-ios/platform/ios/scripts/document.sh rename to platform/ios/platform/ios/scripts/document.sh diff --git a/mapbox-gl-native-ios/platform/ios/scripts/install-packaging-dependencies.sh b/platform/ios/platform/ios/scripts/install-packaging-dependencies.sh similarity index 100% rename from mapbox-gl-native-ios/platform/ios/scripts/install-packaging-dependencies.sh rename to platform/ios/platform/ios/scripts/install-packaging-dependencies.sh diff --git a/mapbox-gl-native-ios/platform/ios/scripts/ios-code-coverage.sh b/platform/ios/platform/ios/scripts/ios-code-coverage.sh similarity index 100% rename from mapbox-gl-native-ios/platform/ios/scripts/ios-code-coverage.sh rename to platform/ios/platform/ios/scripts/ios-code-coverage.sh diff --git a/mapbox-gl-native-ios/platform/ios/scripts/lint-podspecs.js b/platform/ios/platform/ios/scripts/lint-podspecs.js similarity index 100% rename from mapbox-gl-native-ios/platform/ios/scripts/lint-podspecs.js rename to platform/ios/platform/ios/scripts/lint-podspecs.js diff --git a/mapbox-gl-native-ios/platform/ios/scripts/metrics.sh b/platform/ios/platform/ios/scripts/metrics.sh similarity index 100% rename from mapbox-gl-native-ios/platform/ios/scripts/metrics.sh rename to platform/ios/platform/ios/scripts/metrics.sh diff --git a/mapbox-gl-native-ios/platform/ios/scripts/package.sh b/platform/ios/platform/ios/scripts/package.sh similarity index 100% rename from mapbox-gl-native-ios/platform/ios/scripts/package.sh rename to platform/ios/platform/ios/scripts/package.sh diff --git a/mapbox-gl-native-ios/platform/ios/scripts/publish.sh b/platform/ios/platform/ios/scripts/publish.sh similarity index 100% rename from mapbox-gl-native-ios/platform/ios/scripts/publish.sh rename to platform/ios/platform/ios/scripts/publish.sh diff --git a/mapbox-gl-native-ios/platform/ios/scripts/release-notes-github.md.ejs b/platform/ios/platform/ios/scripts/release-notes-github.md.ejs similarity index 100% rename from mapbox-gl-native-ios/platform/ios/scripts/release-notes-github.md.ejs rename to platform/ios/platform/ios/scripts/release-notes-github.md.ejs diff --git a/mapbox-gl-native-ios/platform/ios/scripts/release-notes-jazzy.md.ejs b/platform/ios/platform/ios/scripts/release-notes-jazzy.md.ejs similarity index 100% rename from mapbox-gl-native-ios/platform/ios/scripts/release-notes-jazzy.md.ejs rename to platform/ios/platform/ios/scripts/release-notes-jazzy.md.ejs diff --git a/mapbox-gl-native-ios/platform/ios/scripts/release-notes.js b/platform/ios/platform/ios/scripts/release-notes.js similarity index 100% rename from mapbox-gl-native-ios/platform/ios/scripts/release-notes.js rename to platform/ios/platform/ios/scripts/release-notes.js diff --git a/mapbox-gl-native-ios/platform/ios/scripts/swift_package_template.swift b/platform/ios/platform/ios/scripts/swift_package_template.swift similarity index 100% rename from mapbox-gl-native-ios/platform/ios/scripts/swift_package_template.swift rename to platform/ios/platform/ios/scripts/swift_package_template.swift diff --git a/mapbox-gl-native-ios/platform/ios/scripts/update-version.sh b/platform/ios/platform/ios/scripts/update-version.sh similarity index 100% rename from mapbox-gl-native-ios/platform/ios/scripts/update-version.sh rename to platform/ios/platform/ios/scripts/update-version.sh diff --git a/mapbox-gl-native-ios/platform/ios/scripts/validate-framework-zip.sh b/platform/ios/platform/ios/scripts/validate-framework-zip.sh similarity index 100% rename from mapbox-gl-native-ios/platform/ios/scripts/validate-framework-zip.sh rename to platform/ios/platform/ios/scripts/validate-framework-zip.sh diff --git a/mapbox-gl-native-ios/platform/ios/scripts/xcpackage.sh b/platform/ios/platform/ios/scripts/xcpackage.sh similarity index 100% rename from mapbox-gl-native-ios/platform/ios/scripts/xcpackage.sh rename to platform/ios/platform/ios/scripts/xcpackage.sh diff --git a/mapbox-gl-native-ios/platform/ios/sdk-files.json b/platform/ios/platform/ios/sdk-files.json similarity index 100% rename from mapbox-gl-native-ios/platform/ios/sdk-files.json rename to platform/ios/platform/ios/sdk-files.json diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLAnnotationContainerView.h b/platform/ios/platform/ios/src/MGLAnnotationContainerView.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLAnnotationContainerView.h rename to platform/ios/platform/ios/src/MGLAnnotationContainerView.h diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLAnnotationContainerView.m b/platform/ios/platform/ios/src/MGLAnnotationContainerView.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLAnnotationContainerView.m rename to platform/ios/platform/ios/src/MGLAnnotationContainerView.m diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLAnnotationContainerView_Private.h b/platform/ios/platform/ios/src/MGLAnnotationContainerView_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLAnnotationContainerView_Private.h rename to platform/ios/platform/ios/src/MGLAnnotationContainerView_Private.h diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLAnnotationImage.h b/platform/ios/platform/ios/src/MGLAnnotationImage.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLAnnotationImage.h rename to platform/ios/platform/ios/src/MGLAnnotationImage.h diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLAnnotationImage.m b/platform/ios/platform/ios/src/MGLAnnotationImage.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLAnnotationImage.m rename to platform/ios/platform/ios/src/MGLAnnotationImage.m diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLAnnotationImage_Private.h b/platform/ios/platform/ios/src/MGLAnnotationImage_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLAnnotationImage_Private.h rename to platform/ios/platform/ios/src/MGLAnnotationImage_Private.h diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLAnnotationView.h b/platform/ios/platform/ios/src/MGLAnnotationView.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLAnnotationView.h rename to platform/ios/platform/ios/src/MGLAnnotationView.h diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLAnnotationView.mm b/platform/ios/platform/ios/src/MGLAnnotationView.mm similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLAnnotationView.mm rename to platform/ios/platform/ios/src/MGLAnnotationView.mm diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLAnnotationView_Private.h b/platform/ios/platform/ios/src/MGLAnnotationView_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLAnnotationView_Private.h rename to platform/ios/platform/ios/src/MGLAnnotationView_Private.h diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLCalloutView.h b/platform/ios/platform/ios/src/MGLCalloutView.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLCalloutView.h rename to platform/ios/platform/ios/src/MGLCalloutView.h diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLCameraChangeReason.h b/platform/ios/platform/ios/src/MGLCameraChangeReason.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLCameraChangeReason.h rename to platform/ios/platform/ios/src/MGLCameraChangeReason.h diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLCompactCalloutView.h b/platform/ios/platform/ios/src/MGLCompactCalloutView.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLCompactCalloutView.h rename to platform/ios/platform/ios/src/MGLCompactCalloutView.h diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLCompactCalloutView.m b/platform/ios/platform/ios/src/MGLCompactCalloutView.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLCompactCalloutView.m rename to platform/ios/platform/ios/src/MGLCompactCalloutView.m diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLCompassButton.h b/platform/ios/platform/ios/src/MGLCompassButton.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLCompassButton.h rename to platform/ios/platform/ios/src/MGLCompassButton.h diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLCompassButton.mm b/platform/ios/platform/ios/src/MGLCompassButton.mm similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLCompassButton.mm rename to platform/ios/platform/ios/src/MGLCompassButton.mm diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLCompassButton_Private.h b/platform/ios/platform/ios/src/MGLCompassButton_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLCompassButton_Private.h rename to platform/ios/platform/ios/src/MGLCompassButton_Private.h diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLFaux3DUserLocationAnnotationView.h b/platform/ios/platform/ios/src/MGLFaux3DUserLocationAnnotationView.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLFaux3DUserLocationAnnotationView.h rename to platform/ios/platform/ios/src/MGLFaux3DUserLocationAnnotationView.h diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLFaux3DUserLocationAnnotationView.m b/platform/ios/platform/ios/src/MGLFaux3DUserLocationAnnotationView.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLFaux3DUserLocationAnnotationView.m rename to platform/ios/platform/ios/src/MGLFaux3DUserLocationAnnotationView.m diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLMapAccessibilityElement.h b/platform/ios/platform/ios/src/MGLMapAccessibilityElement.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLMapAccessibilityElement.h rename to platform/ios/platform/ios/src/MGLMapAccessibilityElement.h diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLMapAccessibilityElement.mm b/platform/ios/platform/ios/src/MGLMapAccessibilityElement.mm similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLMapAccessibilityElement.mm rename to platform/ios/platform/ios/src/MGLMapAccessibilityElement.mm diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLMapView+IBAdditions.h b/platform/ios/platform/ios/src/MGLMapView+IBAdditions.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLMapView+IBAdditions.h rename to platform/ios/platform/ios/src/MGLMapView+IBAdditions.h diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLMapView+Impl.h b/platform/ios/platform/ios/src/MGLMapView+Impl.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLMapView+Impl.h rename to platform/ios/platform/ios/src/MGLMapView+Impl.h diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLMapView+Impl.mm b/platform/ios/platform/ios/src/MGLMapView+Impl.mm similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLMapView+Impl.mm rename to platform/ios/platform/ios/src/MGLMapView+Impl.mm diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLMapView+OpenGL.h b/platform/ios/platform/ios/src/MGLMapView+OpenGL.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLMapView+OpenGL.h rename to platform/ios/platform/ios/src/MGLMapView+OpenGL.h diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLMapView+OpenGL.mm b/platform/ios/platform/ios/src/MGLMapView+OpenGL.mm similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLMapView+OpenGL.mm rename to platform/ios/platform/ios/src/MGLMapView+OpenGL.mm diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLMapView.h b/platform/ios/platform/ios/src/MGLMapView.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLMapView.h rename to platform/ios/platform/ios/src/MGLMapView.h diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLMapView.mm b/platform/ios/platform/ios/src/MGLMapView.mm similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLMapView.mm rename to platform/ios/platform/ios/src/MGLMapView.mm diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLMapViewDelegate.h b/platform/ios/platform/ios/src/MGLMapViewDelegate.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLMapViewDelegate.h rename to platform/ios/platform/ios/src/MGLMapViewDelegate.h diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLMapView_Experimental.h b/platform/ios/platform/ios/src/MGLMapView_Experimental.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLMapView_Experimental.h rename to platform/ios/platform/ios/src/MGLMapView_Experimental.h diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLMapView_Private.h b/platform/ios/platform/ios/src/MGLMapView_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLMapView_Private.h rename to platform/ios/platform/ios/src/MGLMapView_Private.h diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLMapboxEvents.h b/platform/ios/platform/ios/src/MGLMapboxEvents.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLMapboxEvents.h rename to platform/ios/platform/ios/src/MGLMapboxEvents.h diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLMapboxEvents.m b/platform/ios/platform/ios/src/MGLMapboxEvents.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLMapboxEvents.m rename to platform/ios/platform/ios/src/MGLMapboxEvents.m diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLSDKUpdateChecker.h b/platform/ios/platform/ios/src/MGLSDKUpdateChecker.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLSDKUpdateChecker.h rename to platform/ios/platform/ios/src/MGLSDKUpdateChecker.h diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLSDKUpdateChecker.mm b/platform/ios/platform/ios/src/MGLSDKUpdateChecker.mm similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLSDKUpdateChecker.mm rename to platform/ios/platform/ios/src/MGLSDKUpdateChecker.mm diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLScaleBar.h b/platform/ios/platform/ios/src/MGLScaleBar.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLScaleBar.h rename to platform/ios/platform/ios/src/MGLScaleBar.h diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLScaleBar.mm b/platform/ios/platform/ios/src/MGLScaleBar.mm similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLScaleBar.mm rename to platform/ios/platform/ios/src/MGLScaleBar.mm diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLTelemetryConfig.h b/platform/ios/platform/ios/src/MGLTelemetryConfig.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLTelemetryConfig.h rename to platform/ios/platform/ios/src/MGLTelemetryConfig.h diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLTelemetryConfig.m b/platform/ios/platform/ios/src/MGLTelemetryConfig.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLTelemetryConfig.m rename to platform/ios/platform/ios/src/MGLTelemetryConfig.m diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLUserLocation.h b/platform/ios/platform/ios/src/MGLUserLocation.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLUserLocation.h rename to platform/ios/platform/ios/src/MGLUserLocation.h diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLUserLocation.m b/platform/ios/platform/ios/src/MGLUserLocation.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLUserLocation.m rename to platform/ios/platform/ios/src/MGLUserLocation.m diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLUserLocationAnnotationView.h b/platform/ios/platform/ios/src/MGLUserLocationAnnotationView.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLUserLocationAnnotationView.h rename to platform/ios/platform/ios/src/MGLUserLocationAnnotationView.h diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLUserLocationAnnotationView.m b/platform/ios/platform/ios/src/MGLUserLocationAnnotationView.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLUserLocationAnnotationView.m rename to platform/ios/platform/ios/src/MGLUserLocationAnnotationView.m diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLUserLocationAnnotationView_Private.h b/platform/ios/platform/ios/src/MGLUserLocationAnnotationView_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLUserLocationAnnotationView_Private.h rename to platform/ios/platform/ios/src/MGLUserLocationAnnotationView_Private.h diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLUserLocationHeadingArrowLayer.h b/platform/ios/platform/ios/src/MGLUserLocationHeadingArrowLayer.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLUserLocationHeadingArrowLayer.h rename to platform/ios/platform/ios/src/MGLUserLocationHeadingArrowLayer.h diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLUserLocationHeadingArrowLayer.m b/platform/ios/platform/ios/src/MGLUserLocationHeadingArrowLayer.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLUserLocationHeadingArrowLayer.m rename to platform/ios/platform/ios/src/MGLUserLocationHeadingArrowLayer.m diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLUserLocationHeadingBeamLayer.h b/platform/ios/platform/ios/src/MGLUserLocationHeadingBeamLayer.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLUserLocationHeadingBeamLayer.h rename to platform/ios/platform/ios/src/MGLUserLocationHeadingBeamLayer.h diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLUserLocationHeadingBeamLayer.m b/platform/ios/platform/ios/src/MGLUserLocationHeadingBeamLayer.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLUserLocationHeadingBeamLayer.m rename to platform/ios/platform/ios/src/MGLUserLocationHeadingBeamLayer.m diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLUserLocationHeadingIndicator.h b/platform/ios/platform/ios/src/MGLUserLocationHeadingIndicator.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLUserLocationHeadingIndicator.h rename to platform/ios/platform/ios/src/MGLUserLocationHeadingIndicator.h diff --git a/mapbox-gl-native-ios/platform/ios/src/MGLUserLocation_Private.h b/platform/ios/platform/ios/src/MGLUserLocation_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/MGLUserLocation_Private.h rename to platform/ios/platform/ios/src/MGLUserLocation_Private.h diff --git a/mapbox-gl-native-ios/platform/ios/src/Mapbox.h b/platform/ios/platform/ios/src/Mapbox.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/Mapbox.h rename to platform/ios/platform/ios/src/Mapbox.h diff --git a/mapbox-gl-native-ios/platform/ios/src/NSOrthography+MGLAdditions.h b/platform/ios/platform/ios/src/NSOrthography+MGLAdditions.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/NSOrthography+MGLAdditions.h rename to platform/ios/platform/ios/src/NSOrthography+MGLAdditions.h diff --git a/mapbox-gl-native-ios/platform/ios/src/NSOrthography+MGLAdditions.m b/platform/ios/platform/ios/src/NSOrthography+MGLAdditions.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/NSOrthography+MGLAdditions.m rename to platform/ios/platform/ios/src/NSOrthography+MGLAdditions.m diff --git a/mapbox-gl-native-ios/platform/ios/src/UIColor+MGLAdditions.h b/platform/ios/platform/ios/src/UIColor+MGLAdditions.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/UIColor+MGLAdditions.h rename to platform/ios/platform/ios/src/UIColor+MGLAdditions.h diff --git a/mapbox-gl-native-ios/platform/ios/src/UIColor+MGLAdditions.mm b/platform/ios/platform/ios/src/UIColor+MGLAdditions.mm similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/UIColor+MGLAdditions.mm rename to platform/ios/platform/ios/src/UIColor+MGLAdditions.mm diff --git a/mapbox-gl-native-ios/platform/ios/src/UIDevice+MGLAdditions.h b/platform/ios/platform/ios/src/UIDevice+MGLAdditions.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/UIDevice+MGLAdditions.h rename to platform/ios/platform/ios/src/UIDevice+MGLAdditions.h diff --git a/mapbox-gl-native-ios/platform/ios/src/UIDevice+MGLAdditions.m b/platform/ios/platform/ios/src/UIDevice+MGLAdditions.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/UIDevice+MGLAdditions.m rename to platform/ios/platform/ios/src/UIDevice+MGLAdditions.m diff --git a/mapbox-gl-native-ios/platform/ios/src/UIImage+MGLAdditions.h b/platform/ios/platform/ios/src/UIImage+MGLAdditions.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/UIImage+MGLAdditions.h rename to platform/ios/platform/ios/src/UIImage+MGLAdditions.h diff --git a/mapbox-gl-native-ios/platform/ios/src/UIImage+MGLAdditions.mm b/platform/ios/platform/ios/src/UIImage+MGLAdditions.mm similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/UIImage+MGLAdditions.mm rename to platform/ios/platform/ios/src/UIImage+MGLAdditions.mm diff --git a/mapbox-gl-native-ios/platform/ios/src/UIView+MGLAdditions.h b/platform/ios/platform/ios/src/UIView+MGLAdditions.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/UIView+MGLAdditions.h rename to platform/ios/platform/ios/src/UIView+MGLAdditions.h diff --git a/mapbox-gl-native-ios/platform/ios/src/UIView+MGLAdditions.m b/platform/ios/platform/ios/src/UIView+MGLAdditions.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/UIView+MGLAdditions.m rename to platform/ios/platform/ios/src/UIView+MGLAdditions.m diff --git a/mapbox-gl-native-ios/platform/ios/src/UIViewController+MGLAdditions.h b/platform/ios/platform/ios/src/UIViewController+MGLAdditions.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/UIViewController+MGLAdditions.h rename to platform/ios/platform/ios/src/UIViewController+MGLAdditions.h diff --git a/mapbox-gl-native-ios/platform/ios/src/UIViewController+MGLAdditions.m b/platform/ios/platform/ios/src/UIViewController+MGLAdditions.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/src/UIViewController+MGLAdditions.m rename to platform/ios/platform/ios/src/UIViewController+MGLAdditions.m diff --git a/mapbox-gl-native-ios/platform/ios/test/Info.plist b/platform/ios/platform/ios/test/Info.plist similarity index 100% rename from mapbox-gl-native-ios/platform/ios/test/Info.plist rename to platform/ios/platform/ios/test/Info.plist diff --git a/mapbox-gl-native-ios/platform/ios/test/MGLAccountManagerTests.m b/platform/ios/platform/ios/test/MGLAccountManagerTests.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/test/MGLAccountManagerTests.m rename to platform/ios/platform/ios/test/MGLAccountManagerTests.m diff --git a/mapbox-gl-native-ios/platform/ios/test/MGLAnnotationViewIntegrationTests.swift b/platform/ios/platform/ios/test/MGLAnnotationViewIntegrationTests.swift similarity index 100% rename from mapbox-gl-native-ios/platform/ios/test/MGLAnnotationViewIntegrationTests.swift rename to platform/ios/platform/ios/test/MGLAnnotationViewIntegrationTests.swift diff --git a/mapbox-gl-native-ios/platform/ios/test/MGLAnnotationViewTests.m b/platform/ios/platform/ios/test/MGLAnnotationViewTests.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/test/MGLAnnotationViewTests.m rename to platform/ios/platform/ios/test/MGLAnnotationViewTests.m diff --git a/mapbox-gl-native-ios/platform/ios/test/MGLMapAccessibilityElementTests.m b/platform/ios/platform/ios/test/MGLMapAccessibilityElementTests.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/test/MGLMapAccessibilityElementTests.m rename to platform/ios/platform/ios/test/MGLMapAccessibilityElementTests.m diff --git a/mapbox-gl-native-ios/platform/ios/test/MGLMapViewCompassViewTests.mm b/platform/ios/platform/ios/test/MGLMapViewCompassViewTests.mm similarity index 100% rename from mapbox-gl-native-ios/platform/ios/test/MGLMapViewCompassViewTests.mm rename to platform/ios/platform/ios/test/MGLMapViewCompassViewTests.mm diff --git a/mapbox-gl-native-ios/platform/ios/test/MGLMapViewContentInsetTests.m b/platform/ios/platform/ios/test/MGLMapViewContentInsetTests.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/test/MGLMapViewContentInsetTests.m rename to platform/ios/platform/ios/test/MGLMapViewContentInsetTests.m diff --git a/mapbox-gl-native-ios/platform/ios/test/MGLMapViewDelegateIntegrationTests.swift b/platform/ios/platform/ios/test/MGLMapViewDelegateIntegrationTests.swift similarity index 100% rename from mapbox-gl-native-ios/platform/ios/test/MGLMapViewDelegateIntegrationTests.swift rename to platform/ios/platform/ios/test/MGLMapViewDelegateIntegrationTests.swift diff --git a/mapbox-gl-native-ios/platform/ios/test/MGLMapViewDirectionTests.mm b/platform/ios/platform/ios/test/MGLMapViewDirectionTests.mm similarity index 100% rename from mapbox-gl-native-ios/platform/ios/test/MGLMapViewDirectionTests.mm rename to platform/ios/platform/ios/test/MGLMapViewDirectionTests.mm diff --git a/mapbox-gl-native-ios/platform/ios/test/MGLMapViewGestureRecognizerTests.mm b/platform/ios/platform/ios/test/MGLMapViewGestureRecognizerTests.mm similarity index 100% rename from mapbox-gl-native-ios/platform/ios/test/MGLMapViewGestureRecognizerTests.mm rename to platform/ios/platform/ios/test/MGLMapViewGestureRecognizerTests.mm diff --git a/mapbox-gl-native-ios/platform/ios/test/MGLMapViewLayoutTests.m b/platform/ios/platform/ios/test/MGLMapViewLayoutTests.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/test/MGLMapViewLayoutTests.m rename to platform/ios/platform/ios/test/MGLMapViewLayoutTests.m diff --git a/mapbox-gl-native-ios/platform/ios/test/MGLMapViewPitchTests.m b/platform/ios/platform/ios/test/MGLMapViewPitchTests.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/test/MGLMapViewPitchTests.m rename to platform/ios/platform/ios/test/MGLMapViewPitchTests.m diff --git a/mapbox-gl-native-ios/platform/ios/test/MGLMapViewScaleBarTests.m b/platform/ios/platform/ios/test/MGLMapViewScaleBarTests.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/test/MGLMapViewScaleBarTests.m rename to platform/ios/platform/ios/test/MGLMapViewScaleBarTests.m diff --git a/mapbox-gl-native-ios/platform/ios/test/MGLMapViewZoomTests.mm b/platform/ios/platform/ios/test/MGLMapViewZoomTests.mm similarity index 100% rename from mapbox-gl-native-ios/platform/ios/test/MGLMapViewZoomTests.mm rename to platform/ios/platform/ios/test/MGLMapViewZoomTests.mm diff --git a/mapbox-gl-native-ios/platform/ios/test/MGLMockGestureRecognizers.h b/platform/ios/platform/ios/test/MGLMockGestureRecognizers.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/test/MGLMockGestureRecognizers.h rename to platform/ios/platform/ios/test/MGLMockGestureRecognizers.h diff --git a/mapbox-gl-native-ios/platform/ios/test/MGLMockGestureRecognizers.m b/platform/ios/platform/ios/test/MGLMockGestureRecognizers.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/test/MGLMockGestureRecognizers.m rename to platform/ios/platform/ios/test/MGLMockGestureRecognizers.m diff --git a/mapbox-gl-native-ios/platform/ios/test/MGLNSOrthographyAdditionsTests.m b/platform/ios/platform/ios/test/MGLNSOrthographyAdditionsTests.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/test/MGLNSOrthographyAdditionsTests.m rename to platform/ios/platform/ios/test/MGLNSOrthographyAdditionsTests.m diff --git a/mapbox-gl-native-ios/platform/ios/test/MGLNetworkConfigurationTests.m b/platform/ios/platform/ios/test/MGLNetworkConfigurationTests.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/test/MGLNetworkConfigurationTests.m rename to platform/ios/platform/ios/test/MGLNetworkConfigurationTests.m diff --git a/mapbox-gl-native-ios/platform/ios/toolchain.cmake b/platform/ios/platform/ios/toolchain.cmake similarity index 100% rename from mapbox-gl-native-ios/platform/ios/toolchain.cmake rename to platform/ios/platform/ios/toolchain.cmake diff --git a/mapbox-gl-native-ios/platform/ios/vendor/SMCalloutView/SMCalloutView.h b/platform/ios/platform/ios/vendor/SMCalloutView/SMCalloutView.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/vendor/SMCalloutView/SMCalloutView.h rename to platform/ios/platform/ios/vendor/SMCalloutView/SMCalloutView.h diff --git a/mapbox-gl-native-ios/platform/ios/vendor/SMCalloutView/SMCalloutView.m b/platform/ios/platform/ios/vendor/SMCalloutView/SMCalloutView.m similarity index 100% rename from mapbox-gl-native-ios/platform/ios/vendor/SMCalloutView/SMCalloutView.m rename to platform/ios/platform/ios/vendor/SMCalloutView/SMCalloutView.m diff --git a/mapbox-gl-native-ios/platform/ios/vendor/mapbox-accounts-ios/MBXSKUToken.h b/platform/ios/platform/ios/vendor/mapbox-accounts-ios/MBXSKUToken.h similarity index 100% rename from mapbox-gl-native-ios/platform/ios/vendor/mapbox-accounts-ios/MBXSKUToken.h rename to platform/ios/platform/ios/vendor/mapbox-accounts-ios/MBXSKUToken.h diff --git a/mapbox-gl-native-ios/platform/ios/vendor/mapbox-accounts-ios/libmbxaccounts.a b/platform/ios/platform/ios/vendor/mapbox-accounts-ios/libmbxaccounts.a similarity index 100% rename from mapbox-gl-native-ios/platform/ios/vendor/mapbox-accounts-ios/libmbxaccounts.a rename to platform/ios/platform/ios/vendor/mapbox-accounts-ios/libmbxaccounts.a diff --git a/platform/ios/platform/ios/vendor/mapbox-events-ios b/platform/ios/platform/ios/vendor/mapbox-events-ios index 889aaa721..5c955a030 160000 --- a/platform/ios/platform/ios/vendor/mapbox-events-ios +++ b/platform/ios/platform/ios/vendor/mapbox-events-ios @@ -1 +1 @@ -Subproject commit 889aaa7214b5f432cf566b83dfa89359c78c26a9 +Subproject commit 5c955a030d0dad8b55c89a33d8502c49f001f72f diff --git a/mapbox-gl-native-ios/platform/macos/CHANGELOG.md b/platform/ios/platform/macos/CHANGELOG.md similarity index 100% rename from mapbox-gl-native-ios/platform/macos/CHANGELOG.md rename to platform/ios/platform/macos/CHANGELOG.md diff --git a/mapbox-gl-native-ios/platform/macos/DEVELOPING.md b/platform/ios/platform/macos/DEVELOPING.md similarity index 100% rename from mapbox-gl-native-ios/platform/macos/DEVELOPING.md rename to platform/ios/platform/macos/DEVELOPING.md diff --git a/mapbox-gl-native-ios/platform/macos/ExportOptions.plist b/platform/ios/platform/macos/ExportOptions.plist similarity index 100% rename from mapbox-gl-native-ios/platform/macos/ExportOptions.plist rename to platform/ios/platform/macos/ExportOptions.plist diff --git a/mapbox-gl-native-ios/platform/macos/INSTALL.md b/platform/ios/platform/macos/INSTALL.md similarity index 100% rename from mapbox-gl-native-ios/platform/macos/INSTALL.md rename to platform/ios/platform/macos/INSTALL.md diff --git a/mapbox-gl-native-ios/platform/macos/Mapbox-macOS-SDK-symbols.podspec b/platform/ios/platform/macos/Mapbox-macOS-SDK-symbols.podspec similarity index 100% rename from mapbox-gl-native-ios/platform/macos/Mapbox-macOS-SDK-symbols.podspec rename to platform/ios/platform/macos/Mapbox-macOS-SDK-symbols.podspec diff --git a/mapbox-gl-native-ios/platform/macos/Mapbox-macOS-SDK.podspec b/platform/ios/platform/macos/Mapbox-macOS-SDK.podspec similarity index 100% rename from mapbox-gl-native-ios/platform/macos/Mapbox-macOS-SDK.podspec rename to platform/ios/platform/macos/Mapbox-macOS-SDK.podspec diff --git a/mapbox-gl-native-ios/platform/macos/README.md b/platform/ios/platform/macos/README.md similarity index 100% rename from mapbox-gl-native-ios/platform/macos/README.md rename to platform/ios/platform/macos/README.md diff --git a/mapbox-gl-native-ios/platform/macos/WorkspaceSettings.xcsettings b/platform/ios/platform/macos/WorkspaceSettings.xcsettings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/WorkspaceSettings.xcsettings rename to platform/ios/platform/macos/WorkspaceSettings.xcsettings diff --git a/mapbox-gl-native-ios/platform/macos/app/AppDelegate.h b/platform/ios/platform/macos/app/AppDelegate.h similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/AppDelegate.h rename to platform/ios/platform/macos/app/AppDelegate.h diff --git a/mapbox-gl-native-ios/platform/macos/app/AppDelegate.m b/platform/ios/platform/macos/app/AppDelegate.m similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/AppDelegate.m rename to platform/ios/platform/macos/app/AppDelegate.m diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon128x128.png b/platform/ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon128x128.png similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon128x128.png rename to platform/ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon128x128.png diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon128x128@2x.png b/platform/ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon128x128@2x.png similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon128x128@2x.png rename to platform/ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon128x128@2x.png diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon16x16.png b/platform/ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon16x16.png similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon16x16.png rename to platform/ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon16x16.png diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon16x16@2x.png b/platform/ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon16x16@2x.png similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon16x16@2x.png rename to platform/ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon16x16@2x.png diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon256x256.png b/platform/ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon256x256.png similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon256x256.png rename to platform/ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon256x256.png diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon256x256@2x.png b/platform/ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon256x256@2x.png similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon256x256@2x.png rename to platform/ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon256x256@2x.png diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon32x32.png b/platform/ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon32x32.png similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon32x32.png rename to platform/ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon32x32.png diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon32x32@2x.png b/platform/ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon32x32@2x.png similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon32x32@2x.png rename to platform/ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon32x32@2x.png diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon512x512.png b/platform/ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon512x512.png similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon512x512.png rename to platform/ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon512x512.png diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon512x512@2x.png b/platform/ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon512x512@2x.png similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon512x512@2x.png rename to platform/ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon512x512@2x.png diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/Contents.json b/platform/ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/Contents.json rename to platform/ios/platform/macos/app/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Contents.json b/platform/ios/platform/macos/app/Assets.xcassets/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Contents.json rename to platform/ios/platform/macos/app/Assets.xcassets/Contents.json diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Layers/Contents.json b/platform/ios/platform/macos/app/Assets.xcassets/Layers/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Layers/Contents.json rename to platform/ios/platform/macos/app/Assets.xcassets/Layers/Contents.json diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Layers/background.imageset/Contents.json b/platform/ios/platform/macos/app/Assets.xcassets/Layers/background.imageset/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Layers/background.imageset/Contents.json rename to platform/ios/platform/macos/app/Assets.xcassets/Layers/background.imageset/Contents.json diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Layers/background.imageset/background.pdf b/platform/ios/platform/macos/app/Assets.xcassets/Layers/background.imageset/background.pdf similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Layers/background.imageset/background.pdf rename to platform/ios/platform/macos/app/Assets.xcassets/Layers/background.imageset/background.pdf diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Layers/circle.imageset/Contents.json b/platform/ios/platform/macos/app/Assets.xcassets/Layers/circle.imageset/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Layers/circle.imageset/Contents.json rename to platform/ios/platform/macos/app/Assets.xcassets/Layers/circle.imageset/Contents.json diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Layers/circle.imageset/circle.pdf b/platform/ios/platform/macos/app/Assets.xcassets/Layers/circle.imageset/circle.pdf similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Layers/circle.imageset/circle.pdf rename to platform/ios/platform/macos/app/Assets.xcassets/Layers/circle.imageset/circle.pdf diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Layers/fill-extrusion.imageset/Contents.json b/platform/ios/platform/macos/app/Assets.xcassets/Layers/fill-extrusion.imageset/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Layers/fill-extrusion.imageset/Contents.json rename to platform/ios/platform/macos/app/Assets.xcassets/Layers/fill-extrusion.imageset/Contents.json diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Layers/fill-extrusion.imageset/fill-extrusion.pdf b/platform/ios/platform/macos/app/Assets.xcassets/Layers/fill-extrusion.imageset/fill-extrusion.pdf similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Layers/fill-extrusion.imageset/fill-extrusion.pdf rename to platform/ios/platform/macos/app/Assets.xcassets/Layers/fill-extrusion.imageset/fill-extrusion.pdf diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Layers/fill.imageset/Contents.json b/platform/ios/platform/macos/app/Assets.xcassets/Layers/fill.imageset/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Layers/fill.imageset/Contents.json rename to platform/ios/platform/macos/app/Assets.xcassets/Layers/fill.imageset/Contents.json diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Layers/fill.imageset/fill.pdf b/platform/ios/platform/macos/app/Assets.xcassets/Layers/fill.imageset/fill.pdf similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Layers/fill.imageset/fill.pdf rename to platform/ios/platform/macos/app/Assets.xcassets/Layers/fill.imageset/fill.pdf diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Layers/heatmap.imageset/Contents.json b/platform/ios/platform/macos/app/Assets.xcassets/Layers/heatmap.imageset/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Layers/heatmap.imageset/Contents.json rename to platform/ios/platform/macos/app/Assets.xcassets/Layers/heatmap.imageset/Contents.json diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Layers/heatmap.imageset/heatmap.pdf b/platform/ios/platform/macos/app/Assets.xcassets/Layers/heatmap.imageset/heatmap.pdf similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Layers/heatmap.imageset/heatmap.pdf rename to platform/ios/platform/macos/app/Assets.xcassets/Layers/heatmap.imageset/heatmap.pdf diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Layers/hillshade.imageset/Contents.json b/platform/ios/platform/macos/app/Assets.xcassets/Layers/hillshade.imageset/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Layers/hillshade.imageset/Contents.json rename to platform/ios/platform/macos/app/Assets.xcassets/Layers/hillshade.imageset/Contents.json diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Layers/hillshade.imageset/hillshade.pdf b/platform/ios/platform/macos/app/Assets.xcassets/Layers/hillshade.imageset/hillshade.pdf similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Layers/hillshade.imageset/hillshade.pdf rename to platform/ios/platform/macos/app/Assets.xcassets/Layers/hillshade.imageset/hillshade.pdf diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Layers/symbol.imageset/Contents.json b/platform/ios/platform/macos/app/Assets.xcassets/Layers/symbol.imageset/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Layers/symbol.imageset/Contents.json rename to platform/ios/platform/macos/app/Assets.xcassets/Layers/symbol.imageset/Contents.json diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Layers/symbol.imageset/symbol.pdf b/platform/ios/platform/macos/app/Assets.xcassets/Layers/symbol.imageset/symbol.pdf similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Layers/symbol.imageset/symbol.pdf rename to platform/ios/platform/macos/app/Assets.xcassets/Layers/symbol.imageset/symbol.pdf diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Radar/Contents.json b/platform/ios/platform/macos/app/Assets.xcassets/Radar/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Radar/Contents.json rename to platform/ios/platform/macos/app/Assets.xcassets/Radar/Contents.json diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Radar/southeast_0.imageset/Contents.json b/platform/ios/platform/macos/app/Assets.xcassets/Radar/southeast_0.imageset/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Radar/southeast_0.imageset/Contents.json rename to platform/ios/platform/macos/app/Assets.xcassets/Radar/southeast_0.imageset/Contents.json diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Radar/southeast_0.imageset/southeast_radar_0.png b/platform/ios/platform/macos/app/Assets.xcassets/Radar/southeast_0.imageset/southeast_radar_0.png similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Radar/southeast_0.imageset/southeast_radar_0.png rename to platform/ios/platform/macos/app/Assets.xcassets/Radar/southeast_0.imageset/southeast_radar_0.png diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Radar/southeast_1.imageset/Contents.json b/platform/ios/platform/macos/app/Assets.xcassets/Radar/southeast_1.imageset/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Radar/southeast_1.imageset/Contents.json rename to platform/ios/platform/macos/app/Assets.xcassets/Radar/southeast_1.imageset/Contents.json diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Radar/southeast_1.imageset/southeast_radar_1.png b/platform/ios/platform/macos/app/Assets.xcassets/Radar/southeast_1.imageset/southeast_radar_1.png similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Radar/southeast_1.imageset/southeast_radar_1.png rename to platform/ios/platform/macos/app/Assets.xcassets/Radar/southeast_1.imageset/southeast_radar_1.png diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Radar/southeast_2.imageset/Contents.json b/platform/ios/platform/macos/app/Assets.xcassets/Radar/southeast_2.imageset/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Radar/southeast_2.imageset/Contents.json rename to platform/ios/platform/macos/app/Assets.xcassets/Radar/southeast_2.imageset/Contents.json diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Radar/southeast_2.imageset/southeast_radar_2.png b/platform/ios/platform/macos/app/Assets.xcassets/Radar/southeast_2.imageset/southeast_radar_2.png similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Radar/southeast_2.imageset/southeast_radar_2.png rename to platform/ios/platform/macos/app/Assets.xcassets/Radar/southeast_2.imageset/southeast_radar_2.png diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Radar/southeast_3.imageset/Contents.json b/platform/ios/platform/macos/app/Assets.xcassets/Radar/southeast_3.imageset/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Radar/southeast_3.imageset/Contents.json rename to platform/ios/platform/macos/app/Assets.xcassets/Radar/southeast_3.imageset/Contents.json diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Radar/southeast_3.imageset/southeast_radar_3.png b/platform/ios/platform/macos/app/Assets.xcassets/Radar/southeast_3.imageset/southeast_radar_3.png similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/Radar/southeast_3.imageset/southeast_radar_3.png rename to platform/ios/platform/macos/app/Assets.xcassets/Radar/southeast_3.imageset/southeast_radar_3.png diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/ohio.imageset/Contents.json b/platform/ios/platform/macos/app/Assets.xcassets/ohio.imageset/Contents.json similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/ohio.imageset/Contents.json rename to platform/ios/platform/macos/app/Assets.xcassets/ohio.imageset/Contents.json diff --git a/mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/ohio.imageset/ohio.pdf b/platform/ios/platform/macos/app/Assets.xcassets/ohio.imageset/ohio.pdf similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Assets.xcassets/ohio.imageset/ohio.pdf rename to platform/ios/platform/macos/app/Assets.xcassets/ohio.imageset/ohio.pdf diff --git a/mapbox-gl-native-ios/platform/macos/app/Base.lproj/Localizable.strings b/platform/ios/platform/macos/app/Base.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Base.lproj/Localizable.strings rename to platform/ios/platform/macos/app/Base.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/app/Base.lproj/MainMenu.xib b/platform/ios/platform/macos/app/Base.lproj/MainMenu.xib similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Base.lproj/MainMenu.xib rename to platform/ios/platform/macos/app/Base.lproj/MainMenu.xib diff --git a/mapbox-gl-native-ios/platform/macos/app/Base.lproj/MapDocument.xib b/platform/ios/platform/macos/app/Base.lproj/MapDocument.xib similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Base.lproj/MapDocument.xib rename to platform/ios/platform/macos/app/Base.lproj/MapDocument.xib diff --git a/mapbox-gl-native-ios/platform/macos/app/Credits.rtf b/platform/ios/platform/macos/app/Credits.rtf similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Credits.rtf rename to platform/ios/platform/macos/app/Credits.rtf diff --git a/mapbox-gl-native-ios/platform/macos/app/DroppedPinAnnotation.h b/platform/ios/platform/macos/app/DroppedPinAnnotation.h similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/DroppedPinAnnotation.h rename to platform/ios/platform/macos/app/DroppedPinAnnotation.h diff --git a/mapbox-gl-native-ios/platform/macos/app/DroppedPinAnnotation.m b/platform/ios/platform/macos/app/DroppedPinAnnotation.m similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/DroppedPinAnnotation.m rename to platform/ios/platform/macos/app/DroppedPinAnnotation.m diff --git a/mapbox-gl-native-ios/platform/macos/app/Info.plist b/platform/ios/platform/macos/app/Info.plist similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/Info.plist rename to platform/ios/platform/macos/app/Info.plist diff --git a/mapbox-gl-native-ios/platform/macos/app/LocationCoordinate2DTransformer.h b/platform/ios/platform/macos/app/LocationCoordinate2DTransformer.h similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/LocationCoordinate2DTransformer.h rename to platform/ios/platform/macos/app/LocationCoordinate2DTransformer.h diff --git a/mapbox-gl-native-ios/platform/macos/app/LocationCoordinate2DTransformer.m b/platform/ios/platform/macos/app/LocationCoordinate2DTransformer.m similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/LocationCoordinate2DTransformer.m rename to platform/ios/platform/macos/app/LocationCoordinate2DTransformer.m diff --git a/mapbox-gl-native-ios/platform/macos/app/MGLStyle+MBXAdditions.h b/platform/ios/platform/macos/app/MGLStyle+MBXAdditions.h similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/MGLStyle+MBXAdditions.h rename to platform/ios/platform/macos/app/MGLStyle+MBXAdditions.h diff --git a/mapbox-gl-native-ios/platform/macos/app/MGLStyle+MBXAdditions.m b/platform/ios/platform/macos/app/MGLStyle+MBXAdditions.m similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/MGLStyle+MBXAdditions.m rename to platform/ios/platform/macos/app/MGLStyle+MBXAdditions.m diff --git a/mapbox-gl-native-ios/platform/macos/app/MapDocument.h b/platform/ios/platform/macos/app/MapDocument.h similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/MapDocument.h rename to platform/ios/platform/macos/app/MapDocument.h diff --git a/mapbox-gl-native-ios/platform/macos/app/MapDocument.m b/platform/ios/platform/macos/app/MapDocument.m similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/MapDocument.m rename to platform/ios/platform/macos/app/MapDocument.m diff --git a/mapbox-gl-native-ios/platform/macos/app/OfflinePackNameValueTransformer.h b/platform/ios/platform/macos/app/OfflinePackNameValueTransformer.h similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/OfflinePackNameValueTransformer.h rename to platform/ios/platform/macos/app/OfflinePackNameValueTransformer.h diff --git a/mapbox-gl-native-ios/platform/macos/app/OfflinePackNameValueTransformer.m b/platform/ios/platform/macos/app/OfflinePackNameValueTransformer.m similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/OfflinePackNameValueTransformer.m rename to platform/ios/platform/macos/app/OfflinePackNameValueTransformer.m diff --git a/mapbox-gl-native-ios/platform/macos/app/StyleLayerIconTransformer.h b/platform/ios/platform/macos/app/StyleLayerIconTransformer.h similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/StyleLayerIconTransformer.h rename to platform/ios/platform/macos/app/StyleLayerIconTransformer.h diff --git a/mapbox-gl-native-ios/platform/macos/app/StyleLayerIconTransformer.m b/platform/ios/platform/macos/app/StyleLayerIconTransformer.m similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/StyleLayerIconTransformer.m rename to platform/ios/platform/macos/app/StyleLayerIconTransformer.m diff --git a/mapbox-gl-native-ios/platform/macos/app/TimeIntervalTransformer.h b/platform/ios/platform/macos/app/TimeIntervalTransformer.h similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/TimeIntervalTransformer.h rename to platform/ios/platform/macos/app/TimeIntervalTransformer.h diff --git a/mapbox-gl-native-ios/platform/macos/app/TimeIntervalTransformer.m b/platform/ios/platform/macos/app/TimeIntervalTransformer.m similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/TimeIntervalTransformer.m rename to platform/ios/platform/macos/app/TimeIntervalTransformer.m diff --git a/mapbox-gl-native-ios/platform/macos/app/ar.lproj/Localizable.strings b/platform/ios/platform/macos/app/ar.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/ar.lproj/Localizable.strings rename to platform/ios/platform/macos/app/ar.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/app/bg.lproj/Localizable.strings b/platform/ios/platform/macos/app/bg.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/bg.lproj/Localizable.strings rename to platform/ios/platform/macos/app/bg.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/app/ca.lproj/Localizable.strings b/platform/ios/platform/macos/app/ca.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/ca.lproj/Localizable.strings rename to platform/ios/platform/macos/app/ca.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/app/cs.lproj/Localizable.strings b/platform/ios/platform/macos/app/cs.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/cs.lproj/Localizable.strings rename to platform/ios/platform/macos/app/cs.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/app/da.lproj/Localizable.strings b/platform/ios/platform/macos/app/da.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/da.lproj/Localizable.strings rename to platform/ios/platform/macos/app/da.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/app/de.lproj/Localizable.strings b/platform/ios/platform/macos/app/de.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/de.lproj/Localizable.strings rename to platform/ios/platform/macos/app/de.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/app/es.lproj/Localizable.strings b/platform/ios/platform/macos/app/es.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/es.lproj/Localizable.strings rename to platform/ios/platform/macos/app/es.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/app/fi.lproj/Localizable.strings b/platform/ios/platform/macos/app/fi.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/fi.lproj/Localizable.strings rename to platform/ios/platform/macos/app/fi.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/app/fr.lproj/Localizable.strings b/platform/ios/platform/macos/app/fr.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/fr.lproj/Localizable.strings rename to platform/ios/platform/macos/app/fr.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/app/gl.lproj/Localizable.strings b/platform/ios/platform/macos/app/gl.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/gl.lproj/Localizable.strings rename to platform/ios/platform/macos/app/gl.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/app/he.lproj/Localizable.strings b/platform/ios/platform/macos/app/he.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/he.lproj/Localizable.strings rename to platform/ios/platform/macos/app/he.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/app/heatmap.json b/platform/ios/platform/macos/app/heatmap.json similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/heatmap.json rename to platform/ios/platform/macos/app/heatmap.json diff --git a/mapbox-gl-native-ios/platform/macos/app/hu.lproj/Localizable.strings b/platform/ios/platform/macos/app/hu.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/hu.lproj/Localizable.strings rename to platform/ios/platform/macos/app/hu.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/app/ja.lproj/Localizable.strings b/platform/ios/platform/macos/app/ja.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/ja.lproj/Localizable.strings rename to platform/ios/platform/macos/app/ja.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/app/ko.lproj/Localizable.strings b/platform/ios/platform/macos/app/ko.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/ko.lproj/Localizable.strings rename to platform/ios/platform/macos/app/ko.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/app/lt.lproj/Localizable.strings b/platform/ios/platform/macos/app/lt.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/lt.lproj/Localizable.strings rename to platform/ios/platform/macos/app/lt.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/app/main.m b/platform/ios/platform/macos/app/main.m similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/main.m rename to platform/ios/platform/macos/app/main.m diff --git a/mapbox-gl-native-ios/platform/macos/app/nl.lproj/Localizable.strings b/platform/ios/platform/macos/app/nl.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/nl.lproj/Localizable.strings rename to platform/ios/platform/macos/app/nl.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/app/pl.lproj/Localizable.strings b/platform/ios/platform/macos/app/pl.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/pl.lproj/Localizable.strings rename to platform/ios/platform/macos/app/pl.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/app/pt-BR.lproj/Localizable.strings b/platform/ios/platform/macos/app/pt-BR.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/pt-BR.lproj/Localizable.strings rename to platform/ios/platform/macos/app/pt-BR.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/app/pt-PT.lproj/Localizable.strings b/platform/ios/platform/macos/app/pt-PT.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/pt-PT.lproj/Localizable.strings rename to platform/ios/platform/macos/app/pt-PT.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/app/resources/background.svg b/platform/ios/platform/macos/app/resources/background.svg similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/resources/background.svg rename to platform/ios/platform/macos/app/resources/background.svg diff --git a/mapbox-gl-native-ios/platform/macos/app/resources/circle.svg b/platform/ios/platform/macos/app/resources/circle.svg similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/resources/circle.svg rename to platform/ios/platform/macos/app/resources/circle.svg diff --git a/mapbox-gl-native-ios/platform/macos/app/resources/fill-extrusion.svg b/platform/ios/platform/macos/app/resources/fill-extrusion.svg similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/resources/fill-extrusion.svg rename to platform/ios/platform/macos/app/resources/fill-extrusion.svg diff --git a/mapbox-gl-native-ios/platform/macos/app/resources/fill.svg b/platform/ios/platform/macos/app/resources/fill.svg similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/resources/fill.svg rename to platform/ios/platform/macos/app/resources/fill.svg diff --git a/mapbox-gl-native-ios/platform/macos/app/resources/heatmap.svg b/platform/ios/platform/macos/app/resources/heatmap.svg similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/resources/heatmap.svg rename to platform/ios/platform/macos/app/resources/heatmap.svg diff --git a/mapbox-gl-native-ios/platform/macos/app/resources/hillshade.svg b/platform/ios/platform/macos/app/resources/hillshade.svg similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/resources/hillshade.svg rename to platform/ios/platform/macos/app/resources/hillshade.svg diff --git a/mapbox-gl-native-ios/platform/macos/app/resources/symbol.svg b/platform/ios/platform/macos/app/resources/symbol.svg similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/resources/symbol.svg rename to platform/ios/platform/macos/app/resources/symbol.svg diff --git a/mapbox-gl-native-ios/platform/macos/app/ru.lproj/Localizable.strings b/platform/ios/platform/macos/app/ru.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/ru.lproj/Localizable.strings rename to platform/ios/platform/macos/app/ru.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/app/sv.lproj/Localizable.strings b/platform/ios/platform/macos/app/sv.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/sv.lproj/Localizable.strings rename to platform/ios/platform/macos/app/sv.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/app/uk.lproj/Localizable.strings b/platform/ios/platform/macos/app/uk.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/uk.lproj/Localizable.strings rename to platform/ios/platform/macos/app/uk.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/app/vi.lproj/Localizable.strings b/platform/ios/platform/macos/app/vi.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/vi.lproj/Localizable.strings rename to platform/ios/platform/macos/app/vi.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/app/wms.json b/platform/ios/platform/macos/app/wms.json similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/wms.json rename to platform/ios/platform/macos/app/wms.json diff --git a/mapbox-gl-native-ios/platform/macos/app/zh-Hans.lproj/Localizable.strings b/platform/ios/platform/macos/app/zh-Hans.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/zh-Hans.lproj/Localizable.strings rename to platform/ios/platform/macos/app/zh-Hans.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/app/zh-Hant.lproj/Localizable.strings b/platform/ios/platform/macos/app/zh-Hant.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/app/zh-Hant.lproj/Localizable.strings rename to platform/ios/platform/macos/app/zh-Hant.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/config.cmake b/platform/ios/platform/macos/config.cmake similarity index 100% rename from mapbox-gl-native-ios/platform/macos/config.cmake rename to platform/ios/platform/macos/config.cmake diff --git a/mapbox-gl-native-ios/platform/macos/core-files.json b/platform/ios/platform/macos/core-files.json similarity index 100% rename from mapbox-gl-native-ios/platform/macos/core-files.json rename to platform/ios/platform/macos/core-files.json diff --git a/mapbox-gl-native-ios/platform/macos/docs/doc-README.md b/platform/ios/platform/macos/docs/doc-README.md similarity index 100% rename from mapbox-gl-native-ios/platform/macos/docs/doc-README.md rename to platform/ios/platform/macos/docs/doc-README.md diff --git a/mapbox-gl-native-ios/platform/macos/docs/guides/For Style Authors.md b/platform/ios/platform/macos/docs/guides/For Style Authors.md similarity index 100% rename from mapbox-gl-native-ios/platform/macos/docs/guides/For Style Authors.md rename to platform/ios/platform/macos/docs/guides/For Style Authors.md diff --git a/mapbox-gl-native-ios/platform/macos/docs/guides/Info.plist Keys.md b/platform/ios/platform/macos/docs/guides/Info.plist Keys.md similarity index 100% rename from mapbox-gl-native-ios/platform/macos/docs/guides/Info.plist Keys.md rename to platform/ios/platform/macos/docs/guides/Info.plist Keys.md diff --git a/mapbox-gl-native-ios/platform/macos/docs/guides/Migrating to Expressions.md b/platform/ios/platform/macos/docs/guides/Migrating to Expressions.md similarity index 100% rename from mapbox-gl-native-ios/platform/macos/docs/guides/Migrating to Expressions.md rename to platform/ios/platform/macos/docs/guides/Migrating to Expressions.md diff --git a/mapbox-gl-native-ios/platform/macos/docs/guides/Tile URL Templates.md b/platform/ios/platform/macos/docs/guides/Tile URL Templates.md similarity index 100% rename from mapbox-gl-native-ios/platform/macos/docs/guides/Tile URL Templates.md rename to platform/ios/platform/macos/docs/guides/Tile URL Templates.md diff --git a/mapbox-gl-native-ios/platform/macos/docs/img/screenshot.jpg b/platform/ios/platform/macos/docs/img/screenshot.jpg similarity index 100% rename from mapbox-gl-native-ios/platform/macos/docs/img/screenshot.jpg rename to platform/ios/platform/macos/docs/img/screenshot.jpg diff --git a/mapbox-gl-native-ios/platform/macos/docs/pod-README.md b/platform/ios/platform/macos/docs/pod-README.md similarity index 100% rename from mapbox-gl-native-ios/platform/macos/docs/pod-README.md rename to platform/ios/platform/macos/docs/pod-README.md diff --git a/mapbox-gl-native-ios/platform/macos/jazzy.yml b/platform/ios/platform/macos/jazzy.yml similarity index 100% rename from mapbox-gl-native-ios/platform/macos/jazzy.yml rename to platform/ios/platform/macos/jazzy.yml diff --git a/mapbox-gl-native-ios/platform/macos/macos.xcconfig b/platform/ios/platform/macos/macos.xcconfig similarity index 100% rename from mapbox-gl-native-ios/platform/macos/macos.xcconfig rename to platform/ios/platform/macos/macos.xcconfig diff --git a/mapbox-gl-native-ios/platform/macos/macos.xcodeproj/project.pbxproj b/platform/ios/platform/macos/macos.xcodeproj/project.pbxproj similarity index 99% rename from mapbox-gl-native-ios/platform/macos/macos.xcodeproj/project.pbxproj rename to platform/ios/platform/macos/macos.xcodeproj/project.pbxproj index b4810b1ad..318b40272 100644 --- a/mapbox-gl-native-ios/platform/macos/macos.xcodeproj/project.pbxproj +++ b/platform/ios/platform/macos/macos.xcodeproj/project.pbxproj @@ -354,7 +354,7 @@ 1F7454A11ECFB00300021D39 /* MGLLight.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLLight.h; sourceTree = ""; }; 1F7454A21ECFB00300021D39 /* MGLLight.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLLight.mm; sourceTree = ""; }; 1F7454AA1ED1DDBD00021D39 /* MGLLightTest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLLightTest.mm; sourceTree = ""; }; - 1F8A59F921653483004DFE75 /* sideload_sat.db */ = {isa = PBXFileReference; lastKnownFileType = file; name = sideload_sat.db; path = "../../../../mapbox-gl-native/test/fixtures/offline_database/sideload_sat.db"; sourceTree = ""; }; + 1F8A59F921653483004DFE75 /* sideload_sat.db */ = {isa = PBXFileReference; lastKnownFileType = file; name = sideload_sat.db; path = "../../../../../test/fixtures/offline_database/sideload_sat.db"; sourceTree = ""; }; 1F8A5A01216D4695004DFE75 /* MGLLoggingConfiguration_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLLoggingConfiguration_Private.h; sourceTree = ""; }; 1F8A5A03216D4696004DFE75 /* MGLLoggingConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLLoggingConfiguration.h; sourceTree = ""; }; 1F95931A1E6DE2B600D5B294 /* MGLNSDateAdditionsTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLNSDateAdditionsTests.mm; path = ../../darwin/test/MGLNSDateAdditionsTests.mm; sourceTree = ""; }; @@ -617,8 +617,8 @@ DAC832652404AF9E00A61BF8 /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; name = Makefile; path = ../../Makefile; sourceTree = ""; }; DAC832662404AFB400A61BF8 /* ci.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = ci.xcconfig; path = ../darwin/ci.xcconfig; sourceTree = ""; }; DAC832682404B26400A61BF8 /* jazzy.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; path = jazzy.yml; sourceTree = ""; }; - DAC8A47D24527EBB00C795BB /* glyphs.pbf */ = {isa = PBXFileReference; lastKnownFileType = file; name = glyphs.pbf; path = "../../../../mapbox-gl-native/test/fixtures/resources/glyphs.pbf"; sourceTree = ""; }; - DAC8A4832452972F00C795BB /* mixed.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = mixed.json; path = "../../../../mapbox-gl-native/test/fixtures/local_glyphs/mixed.json"; sourceTree = ""; }; + DAC8A47D24527EBB00C795BB /* glyphs.pbf */ = {isa = PBXFileReference; lastKnownFileType = file; name = glyphs.pbf; path = "../../../../../test/fixtures/resources/glyphs.pbf"; sourceTree = ""; }; + DAC8A4832452972F00C795BB /* mixed.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = mixed.json; path = "../../../../../test/fixtures/local_glyphs/mixed.json"; sourceTree = ""; }; DACA8620201920BE00E9693A /* MGLRasterDEMSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MGLRasterDEMSource.h; sourceTree = ""; }; DACA8621201920BE00E9693A /* MGLRasterDEMSource.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLRasterDEMSource.mm; sourceTree = ""; }; DACB0C371E18DFFD005DDBEA /* MGLStyle+MBXAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MGLStyle+MBXAdditions.h"; sourceTree = ""; }; diff --git a/mapbox-gl-native-ios/platform/macos/macos.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/platform/ios/platform/macos/macos.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from mapbox-gl-native-ios/platform/macos/macos.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to platform/ios/platform/macos/macos.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/mapbox-gl-native-ios/platform/macos/macos.xcodeproj/xcshareddata/xcschemes/CI.xcscheme b/platform/ios/platform/macos/macos.xcodeproj/xcshareddata/xcschemes/CI.xcscheme similarity index 100% rename from mapbox-gl-native-ios/platform/macos/macos.xcodeproj/xcshareddata/xcschemes/CI.xcscheme rename to platform/ios/platform/macos/macos.xcodeproj/xcshareddata/xcschemes/CI.xcscheme diff --git a/mapbox-gl-native-ios/platform/macos/macos.xcodeproj/xcshareddata/xcschemes/dynamic.xcscheme b/platform/ios/platform/macos/macos.xcodeproj/xcshareddata/xcschemes/dynamic.xcscheme similarity index 100% rename from mapbox-gl-native-ios/platform/macos/macos.xcodeproj/xcshareddata/xcschemes/dynamic.xcscheme rename to platform/ios/platform/macos/macos.xcodeproj/xcshareddata/xcschemes/dynamic.xcscheme diff --git a/mapbox-gl-native-ios/platform/macos/macos.xcodeproj/xcshareddata/xcschemes/macosapp.xcscheme b/platform/ios/platform/macos/macos.xcodeproj/xcshareddata/xcschemes/macosapp.xcscheme similarity index 100% rename from mapbox-gl-native-ios/platform/macos/macos.xcodeproj/xcshareddata/xcschemes/macosapp.xcscheme rename to platform/ios/platform/macos/macos.xcodeproj/xcshareddata/xcschemes/macosapp.xcscheme diff --git a/mapbox-gl-native-ios/platform/macos/macos.xcworkspace/contents.xcworkspacedata b/platform/ios/platform/macos/macos.xcworkspace/contents.xcworkspacedata similarity index 100% rename from mapbox-gl-native-ios/platform/macos/macos.xcworkspace/contents.xcworkspacedata rename to platform/ios/platform/macos/macos.xcworkspace/contents.xcworkspacedata diff --git a/mapbox-gl-native-ios/platform/macos/macos.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/platform/ios/platform/macos/macos.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from mapbox-gl-native-ios/platform/macos/macos.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to platform/ios/platform/macos/macos.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/mapbox-gl-native-ios/platform/macos/macos.xcworkspace/xcshareddata/xcdebugger/Breakpoints_v2.xcbkptlist b/platform/ios/platform/macos/macos.xcworkspace/xcshareddata/xcdebugger/Breakpoints_v2.xcbkptlist similarity index 100% rename from mapbox-gl-native-ios/platform/macos/macos.xcworkspace/xcshareddata/xcdebugger/Breakpoints_v2.xcbkptlist rename to platform/ios/platform/macos/macos.xcworkspace/xcshareddata/xcdebugger/Breakpoints_v2.xcbkptlist diff --git a/mapbox-gl-native-ios/platform/macos/ninja b/platform/ios/platform/macos/ninja similarity index 100% rename from mapbox-gl-native-ios/platform/macos/ninja rename to platform/ios/platform/macos/ninja diff --git a/mapbox-gl-native-ios/platform/macos/scripts/deploy-packages.sh b/platform/ios/platform/macos/scripts/deploy-packages.sh similarity index 100% rename from mapbox-gl-native-ios/platform/macos/scripts/deploy-packages.sh rename to platform/ios/platform/macos/scripts/deploy-packages.sh diff --git a/mapbox-gl-native-ios/platform/macos/scripts/document.sh b/platform/ios/platform/macos/scripts/document.sh similarity index 100% rename from mapbox-gl-native-ios/platform/macos/scripts/document.sh rename to platform/ios/platform/macos/scripts/document.sh diff --git a/mapbox-gl-native-ios/platform/macos/scripts/metrics.sh b/platform/ios/platform/macos/scripts/metrics.sh similarity index 100% rename from mapbox-gl-native-ios/platform/macos/scripts/metrics.sh rename to platform/ios/platform/macos/scripts/metrics.sh diff --git a/mapbox-gl-native-ios/platform/macos/scripts/package.sh b/platform/ios/platform/macos/scripts/package.sh similarity index 100% rename from mapbox-gl-native-ios/platform/macos/scripts/package.sh rename to platform/ios/platform/macos/scripts/package.sh diff --git a/mapbox-gl-native-ios/platform/macos/scripts/update-version.sh b/platform/ios/platform/macos/scripts/update-version.sh similarity index 100% rename from mapbox-gl-native-ios/platform/macos/scripts/update-version.sh rename to platform/ios/platform/macos/scripts/update-version.sh diff --git a/mapbox-gl-native-ios/platform/macos/sdk-files.json b/platform/ios/platform/macos/sdk-files.json similarity index 100% rename from mapbox-gl-native-ios/platform/macos/sdk-files.json rename to platform/ios/platform/macos/sdk-files.json diff --git a/mapbox-gl-native-ios/platform/macos/sdk/Base.lproj/Localizable.strings b/platform/ios/platform/macos/sdk/Base.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/sdk/Base.lproj/Localizable.strings rename to platform/ios/platform/macos/sdk/Base.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/sdk/Base.lproj/MGLAnnotationCallout.xib b/platform/ios/platform/macos/sdk/Base.lproj/MGLAnnotationCallout.xib similarity index 100% rename from mapbox-gl-native-ios/platform/macos/sdk/Base.lproj/MGLAnnotationCallout.xib rename to platform/ios/platform/macos/sdk/Base.lproj/MGLAnnotationCallout.xib diff --git a/mapbox-gl-native-ios/platform/macos/sdk/Info.plist b/platform/ios/platform/macos/sdk/Info.plist similarity index 100% rename from mapbox-gl-native-ios/platform/macos/sdk/Info.plist rename to platform/ios/platform/macos/sdk/Info.plist diff --git a/mapbox-gl-native-ios/platform/macos/sdk/ar.lproj/Localizable.strings b/platform/ios/platform/macos/sdk/ar.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/sdk/ar.lproj/Localizable.strings rename to platform/ios/platform/macos/sdk/ar.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/sdk/bg.lproj/Localizable.strings b/platform/ios/platform/macos/sdk/bg.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/sdk/bg.lproj/Localizable.strings rename to platform/ios/platform/macos/sdk/bg.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/sdk/ca.lproj/Localizable.strings b/platform/ios/platform/macos/sdk/ca.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/sdk/ca.lproj/Localizable.strings rename to platform/ios/platform/macos/sdk/ca.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/sdk/cs.lproj/Localizable.strings b/platform/ios/platform/macos/sdk/cs.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/sdk/cs.lproj/Localizable.strings rename to platform/ios/platform/macos/sdk/cs.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/sdk/da.lproj/Localizable.strings b/platform/ios/platform/macos/sdk/da.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/sdk/da.lproj/Localizable.strings rename to platform/ios/platform/macos/sdk/da.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/sdk/de.lproj/Localizable.strings b/platform/ios/platform/macos/sdk/de.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/sdk/de.lproj/Localizable.strings rename to platform/ios/platform/macos/sdk/de.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/sdk/default_marker.pdf b/platform/ios/platform/macos/sdk/default_marker.pdf similarity index 100% rename from mapbox-gl-native-ios/platform/macos/sdk/default_marker.pdf rename to platform/ios/platform/macos/sdk/default_marker.pdf diff --git a/mapbox-gl-native-ios/platform/macos/sdk/es.lproj/Localizable.strings b/platform/ios/platform/macos/sdk/es.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/sdk/es.lproj/Localizable.strings rename to platform/ios/platform/macos/sdk/es.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/sdk/fi.lproj/Localizable.strings b/platform/ios/platform/macos/sdk/fi.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/sdk/fi.lproj/Localizable.strings rename to platform/ios/platform/macos/sdk/fi.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/sdk/fr.lproj/Localizable.strings b/platform/ios/platform/macos/sdk/fr.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/sdk/fr.lproj/Localizable.strings rename to platform/ios/platform/macos/sdk/fr.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/sdk/gl.lproj/Localizable.strings b/platform/ios/platform/macos/sdk/gl.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/sdk/gl.lproj/Localizable.strings rename to platform/ios/platform/macos/sdk/gl.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/sdk/he.lproj/Localizable.strings b/platform/ios/platform/macos/sdk/he.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/sdk/he.lproj/Localizable.strings rename to platform/ios/platform/macos/sdk/he.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/sdk/hu.lproj/Localizable.strings b/platform/ios/platform/macos/sdk/hu.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/sdk/hu.lproj/Localizable.strings rename to platform/ios/platform/macos/sdk/hu.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/sdk/ja.lproj/Localizable.strings b/platform/ios/platform/macos/sdk/ja.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/sdk/ja.lproj/Localizable.strings rename to platform/ios/platform/macos/sdk/ja.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/sdk/lt.lproj/Localizable.strings b/platform/ios/platform/macos/sdk/lt.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/sdk/lt.lproj/Localizable.strings rename to platform/ios/platform/macos/sdk/lt.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/sdk/mapbox.pdf b/platform/ios/platform/macos/sdk/mapbox.pdf similarity index 100% rename from mapbox-gl-native-ios/platform/macos/sdk/mapbox.pdf rename to platform/ios/platform/macos/sdk/mapbox.pdf diff --git a/mapbox-gl-native-ios/platform/macos/sdk/mapbox_helmet.pdf b/platform/ios/platform/macos/sdk/mapbox_helmet.pdf similarity index 100% rename from mapbox-gl-native-ios/platform/macos/sdk/mapbox_helmet.pdf rename to platform/ios/platform/macos/sdk/mapbox_helmet.pdf diff --git a/mapbox-gl-native-ios/platform/macos/sdk/nl.lproj/Localizable.strings b/platform/ios/platform/macos/sdk/nl.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/sdk/nl.lproj/Localizable.strings rename to platform/ios/platform/macos/sdk/nl.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/sdk/pl.lproj/Localizable.strings b/platform/ios/platform/macos/sdk/pl.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/sdk/pl.lproj/Localizable.strings rename to platform/ios/platform/macos/sdk/pl.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/sdk/pt-BR.lproj/Localizable.strings b/platform/ios/platform/macos/sdk/pt-BR.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/sdk/pt-BR.lproj/Localizable.strings rename to platform/ios/platform/macos/sdk/pt-BR.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/sdk/pt-PT.lproj/Localizable.strings b/platform/ios/platform/macos/sdk/pt-PT.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/sdk/pt-PT.lproj/Localizable.strings rename to platform/ios/platform/macos/sdk/pt-PT.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/sdk/ru.lproj/Localizable.strings b/platform/ios/platform/macos/sdk/ru.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/sdk/ru.lproj/Localizable.strings rename to platform/ios/platform/macos/sdk/ru.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/sdk/sv.lproj/Localizable.strings b/platform/ios/platform/macos/sdk/sv.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/sdk/sv.lproj/Localizable.strings rename to platform/ios/platform/macos/sdk/sv.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/sdk/uk.lproj/Localizable.strings b/platform/ios/platform/macos/sdk/uk.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/sdk/uk.lproj/Localizable.strings rename to platform/ios/platform/macos/sdk/uk.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/sdk/vi.lproj/Localizable.strings b/platform/ios/platform/macos/sdk/vi.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/sdk/vi.lproj/Localizable.strings rename to platform/ios/platform/macos/sdk/vi.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/sdk/zh-Hans.lproj/Localizable.strings b/platform/ios/platform/macos/sdk/zh-Hans.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/sdk/zh-Hans.lproj/Localizable.strings rename to platform/ios/platform/macos/sdk/zh-Hans.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/sdk/zh-Hant.lproj/Localizable.strings b/platform/ios/platform/macos/sdk/zh-Hant.lproj/Localizable.strings similarity index 100% rename from mapbox-gl-native-ios/platform/macos/sdk/zh-Hant.lproj/Localizable.strings rename to platform/ios/platform/macos/sdk/zh-Hant.lproj/Localizable.strings diff --git a/mapbox-gl-native-ios/platform/macos/src/MGLAnnotationImage.h b/platform/ios/platform/macos/src/MGLAnnotationImage.h similarity index 100% rename from mapbox-gl-native-ios/platform/macos/src/MGLAnnotationImage.h rename to platform/ios/platform/macos/src/MGLAnnotationImage.h diff --git a/mapbox-gl-native-ios/platform/macos/src/MGLAnnotationImage.m b/platform/ios/platform/macos/src/MGLAnnotationImage.m similarity index 100% rename from mapbox-gl-native-ios/platform/macos/src/MGLAnnotationImage.m rename to platform/ios/platform/macos/src/MGLAnnotationImage.m diff --git a/mapbox-gl-native-ios/platform/macos/src/MGLAnnotationImage_Private.h b/platform/ios/platform/macos/src/MGLAnnotationImage_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/macos/src/MGLAnnotationImage_Private.h rename to platform/ios/platform/macos/src/MGLAnnotationImage_Private.h diff --git a/mapbox-gl-native-ios/platform/macos/src/MGLAttributionButton.h b/platform/ios/platform/macos/src/MGLAttributionButton.h similarity index 100% rename from mapbox-gl-native-ios/platform/macos/src/MGLAttributionButton.h rename to platform/ios/platform/macos/src/MGLAttributionButton.h diff --git a/mapbox-gl-native-ios/platform/macos/src/MGLAttributionButton.mm b/platform/ios/platform/macos/src/MGLAttributionButton.mm similarity index 100% rename from mapbox-gl-native-ios/platform/macos/src/MGLAttributionButton.mm rename to platform/ios/platform/macos/src/MGLAttributionButton.mm diff --git a/mapbox-gl-native-ios/platform/macos/src/MGLCompassCell.h b/platform/ios/platform/macos/src/MGLCompassCell.h similarity index 100% rename from mapbox-gl-native-ios/platform/macos/src/MGLCompassCell.h rename to platform/ios/platform/macos/src/MGLCompassCell.h diff --git a/mapbox-gl-native-ios/platform/macos/src/MGLCompassCell.m b/platform/ios/platform/macos/src/MGLCompassCell.m similarity index 100% rename from mapbox-gl-native-ios/platform/macos/src/MGLCompassCell.m rename to platform/ios/platform/macos/src/MGLCompassCell.m diff --git a/mapbox-gl-native-ios/platform/macos/src/MGLMapView+IBAdditions.h b/platform/ios/platform/macos/src/MGLMapView+IBAdditions.h similarity index 100% rename from mapbox-gl-native-ios/platform/macos/src/MGLMapView+IBAdditions.h rename to platform/ios/platform/macos/src/MGLMapView+IBAdditions.h diff --git a/mapbox-gl-native-ios/platform/macos/src/MGLMapView+IBAdditions.mm b/platform/ios/platform/macos/src/MGLMapView+IBAdditions.mm similarity index 100% rename from mapbox-gl-native-ios/platform/macos/src/MGLMapView+IBAdditions.mm rename to platform/ios/platform/macos/src/MGLMapView+IBAdditions.mm diff --git a/mapbox-gl-native-ios/platform/macos/src/MGLMapView+Impl.h b/platform/ios/platform/macos/src/MGLMapView+Impl.h similarity index 100% rename from mapbox-gl-native-ios/platform/macos/src/MGLMapView+Impl.h rename to platform/ios/platform/macos/src/MGLMapView+Impl.h diff --git a/mapbox-gl-native-ios/platform/macos/src/MGLMapView+Impl.mm b/platform/ios/platform/macos/src/MGLMapView+Impl.mm similarity index 100% rename from mapbox-gl-native-ios/platform/macos/src/MGLMapView+Impl.mm rename to platform/ios/platform/macos/src/MGLMapView+Impl.mm diff --git a/mapbox-gl-native-ios/platform/macos/src/MGLMapView+OpenGL.h b/platform/ios/platform/macos/src/MGLMapView+OpenGL.h similarity index 100% rename from mapbox-gl-native-ios/platform/macos/src/MGLMapView+OpenGL.h rename to platform/ios/platform/macos/src/MGLMapView+OpenGL.h diff --git a/mapbox-gl-native-ios/platform/macos/src/MGLMapView+OpenGL.mm b/platform/ios/platform/macos/src/MGLMapView+OpenGL.mm similarity index 100% rename from mapbox-gl-native-ios/platform/macos/src/MGLMapView+OpenGL.mm rename to platform/ios/platform/macos/src/MGLMapView+OpenGL.mm diff --git a/mapbox-gl-native-ios/platform/macos/src/MGLMapView.h b/platform/ios/platform/macos/src/MGLMapView.h similarity index 100% rename from mapbox-gl-native-ios/platform/macos/src/MGLMapView.h rename to platform/ios/platform/macos/src/MGLMapView.h diff --git a/mapbox-gl-native-ios/platform/macos/src/MGLMapView.mm b/platform/ios/platform/macos/src/MGLMapView.mm similarity index 100% rename from mapbox-gl-native-ios/platform/macos/src/MGLMapView.mm rename to platform/ios/platform/macos/src/MGLMapView.mm diff --git a/mapbox-gl-native-ios/platform/macos/src/MGLMapViewDelegate.h b/platform/ios/platform/macos/src/MGLMapViewDelegate.h similarity index 100% rename from mapbox-gl-native-ios/platform/macos/src/MGLMapViewDelegate.h rename to platform/ios/platform/macos/src/MGLMapViewDelegate.h diff --git a/mapbox-gl-native-ios/platform/macos/src/MGLMapView_Private.h b/platform/ios/platform/macos/src/MGLMapView_Private.h similarity index 100% rename from mapbox-gl-native-ios/platform/macos/src/MGLMapView_Private.h rename to platform/ios/platform/macos/src/MGLMapView_Private.h diff --git a/mapbox-gl-native-ios/platform/macos/src/MGLOpenGLLayer.h b/platform/ios/platform/macos/src/MGLOpenGLLayer.h similarity index 100% rename from mapbox-gl-native-ios/platform/macos/src/MGLOpenGLLayer.h rename to platform/ios/platform/macos/src/MGLOpenGLLayer.h diff --git a/mapbox-gl-native-ios/platform/macos/src/MGLOpenGLLayer.mm b/platform/ios/platform/macos/src/MGLOpenGLLayer.mm similarity index 100% rename from mapbox-gl-native-ios/platform/macos/src/MGLOpenGLLayer.mm rename to platform/ios/platform/macos/src/MGLOpenGLLayer.mm diff --git a/mapbox-gl-native-ios/platform/macos/src/Mapbox.h b/platform/ios/platform/macos/src/Mapbox.h similarity index 100% rename from mapbox-gl-native-ios/platform/macos/src/Mapbox.h rename to platform/ios/platform/macos/src/Mapbox.h diff --git a/mapbox-gl-native-ios/platform/macos/src/NSColor+MGLAdditions.h b/platform/ios/platform/macos/src/NSColor+MGLAdditions.h similarity index 100% rename from mapbox-gl-native-ios/platform/macos/src/NSColor+MGLAdditions.h rename to platform/ios/platform/macos/src/NSColor+MGLAdditions.h diff --git a/mapbox-gl-native-ios/platform/macos/src/NSColor+MGLAdditions.mm b/platform/ios/platform/macos/src/NSColor+MGLAdditions.mm similarity index 100% rename from mapbox-gl-native-ios/platform/macos/src/NSColor+MGLAdditions.mm rename to platform/ios/platform/macos/src/NSColor+MGLAdditions.mm diff --git a/mapbox-gl-native-ios/platform/macos/src/NSImage+MGLAdditions.h b/platform/ios/platform/macos/src/NSImage+MGLAdditions.h similarity index 100% rename from mapbox-gl-native-ios/platform/macos/src/NSImage+MGLAdditions.h rename to platform/ios/platform/macos/src/NSImage+MGLAdditions.h diff --git a/mapbox-gl-native-ios/platform/macos/src/NSImage+MGLAdditions.mm b/platform/ios/platform/macos/src/NSImage+MGLAdditions.mm similarity index 100% rename from mapbox-gl-native-ios/platform/macos/src/NSImage+MGLAdditions.mm rename to platform/ios/platform/macos/src/NSImage+MGLAdditions.mm diff --git a/mapbox-gl-native-ios/platform/macos/src/NSProcessInfo+MGLAdditions.h b/platform/ios/platform/macos/src/NSProcessInfo+MGLAdditions.h similarity index 100% rename from mapbox-gl-native-ios/platform/macos/src/NSProcessInfo+MGLAdditions.h rename to platform/ios/platform/macos/src/NSProcessInfo+MGLAdditions.h diff --git a/mapbox-gl-native-ios/platform/macos/src/NSProcessInfo+MGLAdditions.m b/platform/ios/platform/macos/src/NSProcessInfo+MGLAdditions.m similarity index 100% rename from mapbox-gl-native-ios/platform/macos/src/NSProcessInfo+MGLAdditions.m rename to platform/ios/platform/macos/src/NSProcessInfo+MGLAdditions.m diff --git a/mapbox-gl-native-ios/platform/macos/test/Info.plist b/platform/ios/platform/macos/test/Info.plist similarity index 100% rename from mapbox-gl-native-ios/platform/macos/test/Info.plist rename to platform/ios/platform/macos/test/Info.plist diff --git a/mapbox-gl-native-ios/platform/macos/test/MGLAnnotationTests.m b/platform/ios/platform/macos/test/MGLAnnotationTests.m similarity index 100% rename from mapbox-gl-native-ios/platform/macos/test/MGLAnnotationTests.m rename to platform/ios/platform/macos/test/MGLAnnotationTests.m diff --git a/mapbox-gl-native-ios/platform/macos/test/MGLAttributionButtonTests.m b/platform/ios/platform/macos/test/MGLAttributionButtonTests.m similarity index 100% rename from mapbox-gl-native-ios/platform/macos/test/MGLAttributionButtonTests.m rename to platform/ios/platform/macos/test/MGLAttributionButtonTests.m diff --git a/mapbox-gl-native-ios/platform/macos/test/MGLMapViewDelegateIntegrationTests.swift b/platform/ios/platform/macos/test/MGLMapViewDelegateIntegrationTests.swift similarity index 100% rename from mapbox-gl-native-ios/platform/macos/test/MGLMapViewDelegateIntegrationTests.swift rename to platform/ios/platform/macos/test/MGLMapViewDelegateIntegrationTests.swift diff --git a/mapbox-gl-native-ios/scripts/changelog_staging/idle-event.json b/platform/ios/scripts/changelog_staging/idle-event.json similarity index 100% rename from mapbox-gl-native-ios/scripts/changelog_staging/idle-event.json rename to platform/ios/scripts/changelog_staging/idle-event.json diff --git a/mapbox-gl-native-ios/scripts/changelog_staging/no-offline-cjk.json b/platform/ios/scripts/changelog_staging/no-offline-cjk.json similarity index 100% rename from mapbox-gl-native-ios/scripts/changelog_staging/no-offline-cjk.json rename to platform/ios/scripts/changelog_staging/no-offline-cjk.json diff --git a/mapbox-gl-native-ios/scripts/changelog_staging/tile-is-child.json b/platform/ios/scripts/changelog_staging/tile-is-child.json similarity index 100% rename from mapbox-gl-native-ios/scripts/changelog_staging/tile-is-child.json rename to platform/ios/scripts/changelog_staging/tile-is-child.json diff --git a/mapbox-gl-native-ios/scripts/check-ci-job-skippability.js b/platform/ios/scripts/check-ci-job-skippability.js similarity index 100% rename from mapbox-gl-native-ios/scripts/check-ci-job-skippability.js rename to platform/ios/scripts/check-ci-job-skippability.js diff --git a/mapbox-gl-native-ios/scripts/check-qt.sh b/platform/ios/scripts/check-qt.sh similarity index 100% rename from mapbox-gl-native-ios/scripts/check-qt.sh rename to platform/ios/scripts/check-qt.sh diff --git a/mapbox-gl-native-ios/scripts/check-sha256.ps1 b/platform/ios/scripts/check-sha256.ps1 similarity index 100% rename from mapbox-gl-native-ios/scripts/check-sha256.ps1 rename to platform/ios/scripts/check-sha256.ps1 diff --git a/mapbox-gl-native-ios/scripts/check_binary_size.js b/platform/ios/scripts/check_binary_size.js similarity index 100% rename from mapbox-gl-native-ios/scripts/check_binary_size.js rename to platform/ios/scripts/check_binary_size.js diff --git a/mapbox-gl-native-ios/scripts/ci/Dockerfile b/platform/ios/scripts/ci/Dockerfile similarity index 100% rename from mapbox-gl-native-ios/scripts/ci/Dockerfile rename to platform/ios/scripts/ci/Dockerfile diff --git a/mapbox-gl-native-ios/scripts/ci/etc/apt/sources.list b/platform/ios/scripts/ci/etc/apt/sources.list similarity index 100% rename from mapbox-gl-native-ios/scripts/ci/etc/apt/sources.list rename to platform/ios/scripts/ci/etc/apt/sources.list diff --git a/mapbox-gl-native-ios/scripts/clang-tidy-diff.py b/platform/ios/scripts/clang-tidy-diff.py similarity index 100% rename from mapbox-gl-native-ios/scripts/clang-tidy-diff.py rename to platform/ios/scripts/clang-tidy-diff.py diff --git a/mapbox-gl-native-ios/scripts/clang-tools.sh b/platform/ios/scripts/clang-tools.sh similarity index 100% rename from mapbox-gl-native-ios/scripts/clang-tools.sh rename to platform/ios/scripts/clang-tools.sh diff --git a/mapbox-gl-native-ios/scripts/code-coverage.sh b/platform/ios/scripts/code-coverage.sh similarity index 100% rename from mapbox-gl-native-ios/scripts/code-coverage.sh rename to platform/ios/scripts/code-coverage.sh diff --git a/mapbox-gl-native-ios/scripts/codestyle.sh b/platform/ios/scripts/codestyle.sh similarity index 100% rename from mapbox-gl-native-ios/scripts/codestyle.sh rename to platform/ios/scripts/codestyle.sh diff --git a/mapbox-gl-native-ios/scripts/collect-coverage.sh b/platform/ios/scripts/collect-coverage.sh similarity index 100% rename from mapbox-gl-native-ios/scripts/collect-coverage.sh rename to platform/ios/scripts/collect-coverage.sh diff --git a/mapbox-gl-native-ios/scripts/config.xcconfig.in b/platform/ios/scripts/config.xcconfig.in similarity index 100% rename from mapbox-gl-native-ios/scripts/config.xcconfig.in rename to platform/ios/scripts/config.xcconfig.in diff --git a/mapbox-gl-native-ios/scripts/doxy-coverage.py b/platform/ios/scripts/doxy-coverage.py similarity index 100% rename from mapbox-gl-native-ios/scripts/doxy-coverage.py rename to platform/ios/scripts/doxy-coverage.py diff --git a/mapbox-gl-native-ios/scripts/environment.js b/platform/ios/scripts/environment.js similarity index 100% rename from mapbox-gl-native-ios/scripts/environment.js rename to platform/ios/scripts/environment.js diff --git a/mapbox-gl-native-ios/scripts/generate-file-lists.js b/platform/ios/scripts/generate-file-lists.js similarity index 100% rename from mapbox-gl-native-ios/scripts/generate-file-lists.js rename to platform/ios/scripts/generate-file-lists.js diff --git a/mapbox-gl-native-ios/scripts/generate-shaders.js b/platform/ios/scripts/generate-shaders.js similarity index 100% rename from mapbox-gl-native-ios/scripts/generate-shaders.js rename to platform/ios/scripts/generate-shaders.js diff --git a/mapbox-gl-native-ios/scripts/generate-style-code.js b/platform/ios/scripts/generate-style-code.js similarity index 100% rename from mapbox-gl-native-ios/scripts/generate-style-code.js rename to platform/ios/scripts/generate-style-code.js diff --git a/mapbox-gl-native-ios/scripts/launch-c-xcode.in b/platform/ios/scripts/launch-c-xcode.in similarity index 100% rename from mapbox-gl-native-ios/scripts/launch-c-xcode.in rename to platform/ios/scripts/launch-c-xcode.in diff --git a/mapbox-gl-native-ios/scripts/launch-c.in b/platform/ios/scripts/launch-c.in similarity index 100% rename from mapbox-gl-native-ios/scripts/launch-c.in rename to platform/ios/scripts/launch-c.in diff --git a/mapbox-gl-native-ios/scripts/launch-cxx-xcode.in b/platform/ios/scripts/launch-cxx-xcode.in similarity index 100% rename from mapbox-gl-native-ios/scripts/launch-cxx-xcode.in rename to platform/ios/scripts/launch-cxx-xcode.in diff --git a/mapbox-gl-native-ios/scripts/launch-cxx.in b/platform/ios/scripts/launch-cxx.in similarity index 100% rename from mapbox-gl-native-ios/scripts/launch-cxx.in rename to platform/ios/scripts/launch-cxx.in diff --git a/mapbox-gl-native-ios/scripts/lldb-types b/platform/ios/scripts/lldb-types similarity index 100% rename from mapbox-gl-native-ios/scripts/lldb-types rename to platform/ios/scripts/lldb-types diff --git a/mapbox-gl-native-ios/scripts/log_memory_benchmarks.sh b/platform/ios/scripts/log_memory_benchmarks.sh similarity index 100% rename from mapbox-gl-native-ios/scripts/log_memory_benchmarks.sh rename to platform/ios/scripts/log_memory_benchmarks.sh diff --git a/mapbox-gl-native-ios/scripts/mason.sh b/platform/ios/scripts/mason.sh similarity index 100% rename from mapbox-gl-native-ios/scripts/mason.sh rename to platform/ios/scripts/mason.sh diff --git a/mapbox-gl-native-ios/scripts/nitpick/generated-code.js b/platform/ios/scripts/nitpick/generated-code.js similarity index 100% rename from mapbox-gl-native-ios/scripts/nitpick/generated-code.js rename to platform/ios/scripts/nitpick/generated-code.js diff --git a/mapbox-gl-native-ios/scripts/nitpick/index.js b/platform/ios/scripts/nitpick/index.js similarity index 100% rename from mapbox-gl-native-ios/scripts/nitpick/index.js rename to platform/ios/scripts/nitpick/index.js diff --git a/mapbox-gl-native-ios/scripts/nitpick/submodule-pin.js b/platform/ios/scripts/nitpick/submodule-pin.js similarity index 100% rename from mapbox-gl-native-ios/scripts/nitpick/submodule-pin.js rename to platform/ios/scripts/nitpick/submodule-pin.js diff --git a/mapbox-gl-native-ios/scripts/notify-slack.sh b/platform/ios/scripts/notify-slack.sh similarity index 100% rename from mapbox-gl-native-ios/scripts/notify-slack.sh rename to platform/ios/scripts/notify-slack.sh diff --git a/mapbox-gl-native-ios/scripts/publish_binary_size.js b/platform/ios/scripts/publish_binary_size.js similarity index 100% rename from mapbox-gl-native-ios/scripts/publish_binary_size.js rename to platform/ios/scripts/publish_binary_size.js diff --git a/mapbox-gl-native-ios/scripts/publish_core_codecoverage.js b/platform/ios/scripts/publish_core_codecoverage.js similarity index 100% rename from mapbox-gl-native-ios/scripts/publish_core_codecoverage.js rename to platform/ios/scripts/publish_core_codecoverage.js diff --git a/mapbox-gl-native-ios/scripts/publish_doxygen_coverage.js b/platform/ios/scripts/publish_doxygen_coverage.js similarity index 100% rename from mapbox-gl-native-ios/scripts/publish_doxygen_coverage.js rename to platform/ios/scripts/publish_doxygen_coverage.js diff --git a/mapbox-gl-native-ios/scripts/publish_github_stats.js b/platform/ios/scripts/publish_github_stats.js similarity index 100% rename from mapbox-gl-native-ios/scripts/publish_github_stats.js rename to platform/ios/scripts/publish_github_stats.js diff --git a/mapbox-gl-native-ios/scripts/standalone.cmake b/platform/ios/scripts/standalone.cmake similarity index 100% rename from mapbox-gl-native-ios/scripts/standalone.cmake rename to platform/ios/scripts/standalone.cmake diff --git a/mapbox-gl-native-ios/scripts/standalone.sh b/platform/ios/scripts/standalone.sh similarity index 100% rename from mapbox-gl-native-ios/scripts/standalone.sh rename to platform/ios/scripts/standalone.sh diff --git a/mapbox-gl-native-ios/scripts/style-code.js b/platform/ios/scripts/style-code.js similarity index 100% rename from mapbox-gl-native-ios/scripts/style-code.js rename to platform/ios/scripts/style-code.js diff --git a/mapbox-gl-native-ios/scripts/style-spec.js b/platform/ios/scripts/style-spec.js similarity index 100% rename from mapbox-gl-native-ios/scripts/style-spec.js rename to platform/ios/scripts/style-spec.js diff --git a/mapbox-gl-native-ios/scripts/trigger-maps-documentation-deploy-steps.sh b/platform/ios/scripts/trigger-maps-documentation-deploy-steps.sh similarity index 100% rename from mapbox-gl-native-ios/scripts/trigger-maps-documentation-deploy-steps.sh rename to platform/ios/scripts/trigger-maps-documentation-deploy-steps.sh diff --git a/mapbox-gl-native-ios/scripts/update-boost.sh b/platform/ios/scripts/update-boost.sh similarity index 100% rename from mapbox-gl-native-ios/scripts/update-boost.sh rename to platform/ios/scripts/update-boost.sh diff --git a/mapbox-gl-native-ios/scripts/update_ca_bundle.sh b/platform/ios/scripts/update_ca_bundle.sh similarity index 100% rename from mapbox-gl-native-ios/scripts/update_ca_bundle.sh rename to platform/ios/scripts/update_ca_bundle.sh diff --git a/mapbox-gl-native-ios/scripts/valgrind.sh b/platform/ios/scripts/valgrind.sh similarity index 100% rename from mapbox-gl-native-ios/scripts/valgrind.sh rename to platform/ios/scripts/valgrind.sh diff --git a/mapbox-gl-native-ios/scripts/valgrind.sup b/platform/ios/scripts/valgrind.sup similarity index 100% rename from mapbox-gl-native-ios/scripts/valgrind.sup rename to platform/ios/scripts/valgrind.sup diff --git a/mapbox-gl-native-ios/scripts/vendor/common.sh b/platform/ios/scripts/vendor/common.sh similarity index 100% rename from mapbox-gl-native-ios/scripts/vendor/common.sh rename to platform/ios/scripts/vendor/common.sh diff --git a/mapbox-gl-native-ios/scripts/vendor/expected.sh b/platform/ios/scripts/vendor/expected.sh similarity index 100% rename from mapbox-gl-native-ios/scripts/vendor/expected.sh rename to platform/ios/scripts/vendor/expected.sh diff --git a/mapbox-gl-native-ios/scripts/vendor/icu.sh b/platform/ios/scripts/vendor/icu.sh similarity index 100% rename from mapbox-gl-native-ios/scripts/vendor/icu.sh rename to platform/ios/scripts/vendor/icu.sh diff --git a/mapbox-gl-native-ios/scripts/vendor/nunicode.sh b/platform/ios/scripts/vendor/nunicode.sh similarity index 100% rename from mapbox-gl-native-ios/scripts/vendor/nunicode.sh rename to platform/ios/scripts/vendor/nunicode.sh diff --git a/mapbox-gl-native-ios/scripts/vendor/sqlite.sh b/platform/ios/scripts/vendor/sqlite.sh similarity index 100% rename from mapbox-gl-native-ios/scripts/vendor/sqlite.sh rename to platform/ios/scripts/vendor/sqlite.sh diff --git a/mapbox-gl-native/platform/ios/test/common/AppDelegate.h b/platform/ios/test/common/AppDelegate.h similarity index 100% rename from mapbox-gl-native/platform/ios/test/common/AppDelegate.h rename to platform/ios/test/common/AppDelegate.h diff --git a/mapbox-gl-native/platform/ios/test/common/AppDelegate.m b/platform/ios/test/common/AppDelegate.m similarity index 100% rename from mapbox-gl-native/platform/ios/test/common/AppDelegate.m rename to platform/ios/test/common/AppDelegate.m diff --git a/mapbox-gl-native/platform/ios/test/common/LaunchScreen.storyboard b/platform/ios/test/common/LaunchScreen.storyboard similarity index 100% rename from mapbox-gl-native/platform/ios/test/common/LaunchScreen.storyboard rename to platform/ios/test/common/LaunchScreen.storyboard diff --git a/mapbox-gl-native/platform/ios/test/common/Main.storyboard b/platform/ios/test/common/Main.storyboard similarity index 100% rename from mapbox-gl-native/platform/ios/test/common/Main.storyboard rename to platform/ios/test/common/Main.storyboard diff --git a/mapbox-gl-native/platform/ios/test/common/Tests.m b/platform/ios/test/common/Tests.m similarity index 100% rename from mapbox-gl-native/platform/ios/test/common/Tests.m rename to platform/ios/test/common/Tests.m diff --git a/mapbox-gl-native/platform/ios/test/common/iosTestRunner.mm b/platform/ios/test/common/iosTestRunner.mm similarity index 100% rename from mapbox-gl-native/platform/ios/test/common/iosTestRunner.mm rename to platform/ios/test/common/iosTestRunner.mm diff --git a/mapbox-gl-native/platform/ios/test/common/ios_test_runner.hpp b/platform/ios/test/common/ios_test_runner.hpp similarity index 100% rename from mapbox-gl-native/platform/ios/test/common/ios_test_runner.hpp rename to platform/ios/test/common/ios_test_runner.hpp diff --git a/mapbox-gl-native/platform/ios/test/common/main.m b/platform/ios/test/common/main.m similarity index 100% rename from mapbox-gl-native/platform/ios/test/common/main.m rename to platform/ios/test/common/main.m diff --git a/mapbox-gl-native/platform/linux/README.md b/platform/linux/README.md similarity index 100% rename from mapbox-gl-native/platform/linux/README.md rename to platform/linux/README.md diff --git a/mapbox-gl-native/platform/linux/linux.cmake b/platform/linux/linux.cmake similarity index 100% rename from mapbox-gl-native/platform/linux/linux.cmake rename to platform/linux/linux.cmake diff --git a/mapbox-gl-native/platform/linux/ninja b/platform/linux/ninja similarity index 100% rename from mapbox-gl-native/platform/linux/ninja rename to platform/linux/ninja diff --git a/mapbox-gl-native/platform/linux/scripts/after_script.sh b/platform/linux/scripts/after_script.sh similarity index 100% rename from mapbox-gl-native/platform/linux/scripts/after_script.sh rename to platform/linux/scripts/after_script.sh diff --git a/mapbox-gl-native/platform/linux/scripts/after_success.sh b/platform/linux/scripts/after_success.sh similarity index 100% rename from mapbox-gl-native/platform/linux/scripts/after_success.sh rename to platform/linux/scripts/after_success.sh diff --git a/mapbox-gl-native/platform/linux/scripts/metrics.sh b/platform/linux/scripts/metrics.sh similarity index 100% rename from mapbox-gl-native/platform/linux/scripts/metrics.sh rename to platform/linux/scripts/metrics.sh diff --git a/mapbox-gl-native/platform/linux/src/gl_functions.cpp b/platform/linux/src/gl_functions.cpp similarity index 100% rename from mapbox-gl-native/platform/linux/src/gl_functions.cpp rename to platform/linux/src/gl_functions.cpp diff --git a/mapbox-gl-native/platform/linux/src/headless_backend_egl.cpp b/platform/linux/src/headless_backend_egl.cpp similarity index 100% rename from mapbox-gl-native/platform/linux/src/headless_backend_egl.cpp rename to platform/linux/src/headless_backend_egl.cpp diff --git a/mapbox-gl-native/platform/linux/src/headless_backend_glx.cpp b/platform/linux/src/headless_backend_glx.cpp similarity index 100% rename from mapbox-gl-native/platform/linux/src/headless_backend_glx.cpp rename to platform/linux/src/headless_backend_glx.cpp diff --git a/mapbox-gl-native/platform/linux/tsan_suppress.txt b/platform/linux/tsan_suppress.txt similarity index 100% rename from mapbox-gl-native/platform/linux/tsan_suppress.txt rename to platform/linux/tsan_suppress.txt diff --git a/mapbox-gl-native/platform/macos/CHANGELOG.md b/platform/macos/CHANGELOG.md similarity index 100% rename from mapbox-gl-native/platform/macos/CHANGELOG.md rename to platform/macos/CHANGELOG.md diff --git a/mapbox-gl-native/platform/macos/DEVELOPING.md b/platform/macos/DEVELOPING.md similarity index 100% rename from mapbox-gl-native/platform/macos/DEVELOPING.md rename to platform/macos/DEVELOPING.md diff --git a/mapbox-gl-native/platform/macos/INSTALL.md b/platform/macos/INSTALL.md similarity index 100% rename from mapbox-gl-native/platform/macos/INSTALL.md rename to platform/macos/INSTALL.md diff --git a/mapbox-gl-native/platform/macos/README.md b/platform/macos/README.md similarity index 100% rename from mapbox-gl-native/platform/macos/README.md rename to platform/macos/README.md diff --git a/mapbox-gl-native/platform/macos/macos.cmake b/platform/macos/macos.cmake similarity index 100% rename from mapbox-gl-native/platform/macos/macos.cmake rename to platform/macos/macos.cmake diff --git a/mapbox-gl-native/platform/macos/ninja b/platform/macos/ninja similarity index 100% rename from mapbox-gl-native/platform/macos/ninja rename to platform/macos/ninja diff --git a/mapbox-gl-native/platform/node/CHANGELOG.md b/platform/node/CHANGELOG.md similarity index 100% rename from mapbox-gl-native/platform/node/CHANGELOG.md rename to platform/node/CHANGELOG.md diff --git a/mapbox-gl-native/platform/node/CMakeLists.txt b/platform/node/CMakeLists.txt similarity index 100% rename from mapbox-gl-native/platform/node/CMakeLists.txt rename to platform/node/CMakeLists.txt diff --git a/mapbox-gl-native/platform/node/DEVELOPING.md b/platform/node/DEVELOPING.md similarity index 100% rename from mapbox-gl-native/platform/node/DEVELOPING.md rename to platform/node/DEVELOPING.md diff --git a/mapbox-gl-native/platform/node/README.md b/platform/node/README.md similarity index 100% rename from mapbox-gl-native/platform/node/README.md rename to platform/node/README.md diff --git a/mapbox-gl-native/platform/node/index.js b/platform/node/index.js similarity index 100% rename from mapbox-gl-native/platform/node/index.js rename to platform/node/index.js diff --git a/mapbox-gl-native/platform/node/scripts/publish.sh b/platform/node/scripts/publish.sh similarity index 100% rename from mapbox-gl-native/platform/node/scripts/publish.sh rename to platform/node/scripts/publish.sh diff --git a/mapbox-gl-native/platform/node/src/node_conversion.hpp b/platform/node/src/node_conversion.hpp similarity index 100% rename from mapbox-gl-native/platform/node/src/node_conversion.hpp rename to platform/node/src/node_conversion.hpp diff --git a/mapbox-gl-native/platform/node/src/node_expression.cpp b/platform/node/src/node_expression.cpp similarity index 100% rename from mapbox-gl-native/platform/node/src/node_expression.cpp rename to platform/node/src/node_expression.cpp diff --git a/mapbox-gl-native/platform/node/src/node_expression.hpp b/platform/node/src/node_expression.hpp similarity index 100% rename from mapbox-gl-native/platform/node/src/node_expression.hpp rename to platform/node/src/node_expression.hpp diff --git a/mapbox-gl-native/platform/node/src/node_feature.cpp b/platform/node/src/node_feature.cpp similarity index 100% rename from mapbox-gl-native/platform/node/src/node_feature.cpp rename to platform/node/src/node_feature.cpp diff --git a/mapbox-gl-native/platform/node/src/node_feature.hpp b/platform/node/src/node_feature.hpp similarity index 100% rename from mapbox-gl-native/platform/node/src/node_feature.hpp rename to platform/node/src/node_feature.hpp diff --git a/mapbox-gl-native/platform/node/src/node_logging.cpp b/platform/node/src/node_logging.cpp similarity index 100% rename from mapbox-gl-native/platform/node/src/node_logging.cpp rename to platform/node/src/node_logging.cpp diff --git a/mapbox-gl-native/platform/node/src/node_logging.hpp b/platform/node/src/node_logging.hpp similarity index 100% rename from mapbox-gl-native/platform/node/src/node_logging.hpp rename to platform/node/src/node_logging.hpp diff --git a/mapbox-gl-native/platform/node/src/node_map.cpp b/platform/node/src/node_map.cpp similarity index 100% rename from mapbox-gl-native/platform/node/src/node_map.cpp rename to platform/node/src/node_map.cpp diff --git a/mapbox-gl-native/platform/node/src/node_map.hpp b/platform/node/src/node_map.hpp similarity index 100% rename from mapbox-gl-native/platform/node/src/node_map.hpp rename to platform/node/src/node_map.hpp diff --git a/mapbox-gl-native/platform/node/src/node_mapbox_gl_native.cpp b/platform/node/src/node_mapbox_gl_native.cpp similarity index 100% rename from mapbox-gl-native/platform/node/src/node_mapbox_gl_native.cpp rename to platform/node/src/node_mapbox_gl_native.cpp diff --git a/mapbox-gl-native/platform/node/src/node_request.cpp b/platform/node/src/node_request.cpp similarity index 100% rename from mapbox-gl-native/platform/node/src/node_request.cpp rename to platform/node/src/node_request.cpp diff --git a/mapbox-gl-native/platform/node/src/node_request.hpp b/platform/node/src/node_request.hpp similarity index 100% rename from mapbox-gl-native/platform/node/src/node_request.hpp rename to platform/node/src/node_request.hpp diff --git a/mapbox-gl-native/platform/node/src/util/async_queue.hpp b/platform/node/src/util/async_queue.hpp similarity index 100% rename from mapbox-gl-native/platform/node/src/util/async_queue.hpp rename to platform/node/src/util/async_queue.hpp diff --git a/mapbox-gl-native/platform/node/symbol-list b/platform/node/symbol-list similarity index 100% rename from mapbox-gl-native/platform/node/symbol-list rename to platform/node/symbol-list diff --git a/mapbox-gl-native/platform/node/test/benchmark.js b/platform/node/test/benchmark.js similarity index 100% rename from mapbox-gl-native/platform/node/test/benchmark.js rename to platform/node/test/benchmark.js diff --git a/mapbox-gl-native/platform/node/test/expression.test.js b/platform/node/test/expression.test.js similarity index 100% rename from mapbox-gl-native/platform/node/test/expression.test.js rename to platform/node/test/expression.test.js diff --git a/mapbox-gl-native/platform/node/test/fixtures/style.json b/platform/node/test/fixtures/style.json similarity index 100% rename from mapbox-gl-native/platform/node/test/fixtures/style.json rename to platform/node/test/fixtures/style.json diff --git a/mapbox-gl-native/platform/node/test/fixtures/tiles/0-0-0.vector.pbf b/platform/node/test/fixtures/tiles/0-0-0.vector.pbf similarity index 100% rename from mapbox-gl-native/platform/node/test/fixtures/tiles/0-0-0.vector.pbf rename to platform/node/test/fixtures/tiles/0-0-0.vector.pbf diff --git a/mapbox-gl-native/platform/node/test/fixtures/zoom-center/expected.png b/platform/node/test/fixtures/zoom-center/expected.png similarity index 100% rename from mapbox-gl-native/platform/node/test/fixtures/zoom-center/expected.png rename to platform/node/test/fixtures/zoom-center/expected.png diff --git a/mapbox-gl-native/platform/node/test/js/cancel.test.js b/platform/node/test/js/cancel.test.js similarity index 100% rename from mapbox-gl-native/platform/node/test/js/cancel.test.js rename to platform/node/test/js/cancel.test.js diff --git a/mapbox-gl-native/platform/node/test/js/map.test.js b/platform/node/test/js/map.test.js similarity index 100% rename from mapbox-gl-native/platform/node/test/js/map.test.js rename to platform/node/test/js/map.test.js diff --git a/mapbox-gl-native/platform/node/test/js/request.test.js b/platform/node/test/js/request.test.js similarity index 100% rename from mapbox-gl-native/platform/node/test/js/request.test.js rename to platform/node/test/js/request.test.js diff --git a/mapbox-gl-native/platform/node/test/js/require.js b/platform/node/test/js/require.js similarity index 100% rename from mapbox-gl-native/platform/node/test/js/require.js rename to platform/node/test/js/require.js diff --git a/mapbox-gl-native/platform/node/test/memory.test.js b/platform/node/test/memory.test.js similarity index 100% rename from mapbox-gl-native/platform/node/test/memory.test.js rename to platform/node/test/memory.test.js diff --git a/mapbox-gl-native/platform/node/test/mockfs.js b/platform/node/test/mockfs.js similarity index 100% rename from mapbox-gl-native/platform/node/test/mockfs.js rename to platform/node/test/mockfs.js diff --git a/mapbox-gl-native/platform/node/test/query.test.js b/platform/node/test/query.test.js similarity index 100% rename from mapbox-gl-native/platform/node/test/query.test.js rename to platform/node/test/query.test.js diff --git a/mapbox-gl-native/platform/node/test/render.test.js b/platform/node/test/render.test.js similarity index 100% rename from mapbox-gl-native/platform/node/test/render.test.js rename to platform/node/test/render.test.js diff --git a/mapbox-gl-native/platform/node/test/suite_implementation.js b/platform/node/test/suite_implementation.js similarity index 100% rename from mapbox-gl-native/platform/node/test/suite_implementation.js rename to platform/node/test/suite_implementation.js diff --git a/mapbox-gl-native/platform/node/version-script b/platform/node/version-script similarity index 100% rename from mapbox-gl-native/platform/node/version-script rename to platform/node/version-script diff --git a/mapbox-gl-native/platform/qt/README.md b/platform/qt/README.md similarity index 100% rename from mapbox-gl-native/platform/qt/README.md rename to platform/qt/README.md diff --git a/mapbox-gl-native/platform/qt/app/main.cpp b/platform/qt/app/main.cpp similarity index 100% rename from mapbox-gl-native/platform/qt/app/main.cpp rename to platform/qt/app/main.cpp diff --git a/mapbox-gl-native/platform/qt/app/mapwindow.cpp b/platform/qt/app/mapwindow.cpp similarity index 100% rename from mapbox-gl-native/platform/qt/app/mapwindow.cpp rename to platform/qt/app/mapwindow.cpp diff --git a/mapbox-gl-native/platform/qt/app/mapwindow.hpp b/platform/qt/app/mapwindow.hpp similarity index 100% rename from mapbox-gl-native/platform/qt/app/mapwindow.hpp rename to platform/qt/app/mapwindow.hpp diff --git a/mapbox-gl-native/platform/qt/config.qdocconf b/platform/qt/config.qdocconf similarity index 100% rename from mapbox-gl-native/platform/qt/config.qdocconf rename to platform/qt/config.qdocconf diff --git a/mapbox-gl-native/platform/qt/include/QMapbox b/platform/qt/include/QMapbox similarity index 100% rename from mapbox-gl-native/platform/qt/include/QMapbox rename to platform/qt/include/QMapbox diff --git a/mapbox-gl-native/platform/qt/include/QMapboxGL b/platform/qt/include/QMapboxGL similarity index 100% rename from mapbox-gl-native/platform/qt/include/QMapboxGL rename to platform/qt/include/QMapboxGL diff --git a/mapbox-gl-native/platform/qt/include/qmapbox.hpp b/platform/qt/include/qmapbox.hpp similarity index 100% rename from mapbox-gl-native/platform/qt/include/qmapbox.hpp rename to platform/qt/include/qmapbox.hpp diff --git a/mapbox-gl-native/platform/qt/include/qmapboxgl.hpp b/platform/qt/include/qmapboxgl.hpp similarity index 100% rename from mapbox-gl-native/platform/qt/include/qmapboxgl.hpp rename to platform/qt/include/qmapboxgl.hpp diff --git a/mapbox-gl-native/platform/qt/ninja.exe b/platform/qt/ninja.exe similarity index 100% rename from mapbox-gl-native/platform/qt/ninja.exe rename to platform/qt/ninja.exe diff --git a/mapbox-gl-native/platform/qt/qt.cmake b/platform/qt/qt.cmake similarity index 100% rename from mapbox-gl-native/platform/qt/qt.cmake rename to platform/qt/qt.cmake diff --git a/mapbox-gl-native/platform/qt/resources/common.qrc b/platform/qt/resources/common.qrc similarity index 100% rename from mapbox-gl-native/platform/qt/resources/common.qrc rename to platform/qt/resources/common.qrc diff --git a/mapbox-gl-native/platform/qt/resources/label-arrow.svg b/platform/qt/resources/label-arrow.svg similarity index 100% rename from mapbox-gl-native/platform/qt/resources/label-arrow.svg rename to platform/qt/resources/label-arrow.svg diff --git a/mapbox-gl-native/platform/qt/resources/label-background.svg b/platform/qt/resources/label-background.svg similarity index 100% rename from mapbox-gl-native/platform/qt/resources/label-background.svg rename to platform/qt/resources/label-background.svg diff --git a/mapbox-gl-native/platform/qt/resources/source1.geojson b/platform/qt/resources/source1.geojson similarity index 100% rename from mapbox-gl-native/platform/qt/resources/source1.geojson rename to platform/qt/resources/source1.geojson diff --git a/mapbox-gl-native/platform/qt/resources/source2.geojson b/platform/qt/resources/source2.geojson similarity index 100% rename from mapbox-gl-native/platform/qt/resources/source2.geojson rename to platform/qt/resources/source2.geojson diff --git a/mapbox-gl-native/platform/qt/src/async_task.cpp b/platform/qt/src/async_task.cpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/async_task.cpp rename to platform/qt/src/async_task.cpp diff --git a/mapbox-gl-native/platform/qt/src/async_task_impl.hpp b/platform/qt/src/async_task_impl.hpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/async_task_impl.hpp rename to platform/qt/src/async_task_impl.hpp diff --git a/mapbox-gl-native/platform/qt/src/bidi.cpp b/platform/qt/src/bidi.cpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/bidi.cpp rename to platform/qt/src/bidi.cpp diff --git a/mapbox-gl-native/platform/qt/src/gl_functions.cpp b/platform/qt/src/gl_functions.cpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/gl_functions.cpp rename to platform/qt/src/gl_functions.cpp diff --git a/mapbox-gl-native/platform/qt/src/headless_backend_qt.cpp b/platform/qt/src/headless_backend_qt.cpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/headless_backend_qt.cpp rename to platform/qt/src/headless_backend_qt.cpp diff --git a/mapbox-gl-native/platform/qt/src/http_file_source.cpp b/platform/qt/src/http_file_source.cpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/http_file_source.cpp rename to platform/qt/src/http_file_source.cpp diff --git a/mapbox-gl-native/platform/qt/src/http_file_source.hpp b/platform/qt/src/http_file_source.hpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/http_file_source.hpp rename to platform/qt/src/http_file_source.hpp diff --git a/mapbox-gl-native/platform/qt/src/http_request.cpp b/platform/qt/src/http_request.cpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/http_request.cpp rename to platform/qt/src/http_request.cpp diff --git a/mapbox-gl-native/platform/qt/src/http_request.hpp b/platform/qt/src/http_request.hpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/http_request.hpp rename to platform/qt/src/http_request.hpp diff --git a/mapbox-gl-native/platform/qt/src/local_glyph_rasterizer.cpp b/platform/qt/src/local_glyph_rasterizer.cpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/local_glyph_rasterizer.cpp rename to platform/qt/src/local_glyph_rasterizer.cpp diff --git a/mapbox-gl-native/platform/qt/src/number_format.cpp b/platform/qt/src/number_format.cpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/number_format.cpp rename to platform/qt/src/number_format.cpp diff --git a/mapbox-gl-native/platform/qt/src/qmapbox.cpp b/platform/qt/src/qmapbox.cpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/qmapbox.cpp rename to platform/qt/src/qmapbox.cpp diff --git a/mapbox-gl-native/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/qmapboxgl.cpp rename to platform/qt/src/qmapboxgl.cpp diff --git a/mapbox-gl-native/platform/qt/src/qmapboxgl_map_observer.cpp b/platform/qt/src/qmapboxgl_map_observer.cpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/qmapboxgl_map_observer.cpp rename to platform/qt/src/qmapboxgl_map_observer.cpp diff --git a/mapbox-gl-native/platform/qt/src/qmapboxgl_map_observer.hpp b/platform/qt/src/qmapboxgl_map_observer.hpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/qmapboxgl_map_observer.hpp rename to platform/qt/src/qmapboxgl_map_observer.hpp diff --git a/mapbox-gl-native/platform/qt/src/qmapboxgl_map_renderer.cpp b/platform/qt/src/qmapboxgl_map_renderer.cpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/qmapboxgl_map_renderer.cpp rename to platform/qt/src/qmapboxgl_map_renderer.cpp diff --git a/mapbox-gl-native/platform/qt/src/qmapboxgl_map_renderer.hpp b/platform/qt/src/qmapboxgl_map_renderer.hpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/qmapboxgl_map_renderer.hpp rename to platform/qt/src/qmapboxgl_map_renderer.hpp diff --git a/mapbox-gl-native/platform/qt/src/qmapboxgl_p.hpp b/platform/qt/src/qmapboxgl_p.hpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/qmapboxgl_p.hpp rename to platform/qt/src/qmapboxgl_p.hpp diff --git a/mapbox-gl-native/platform/qt/src/qmapboxgl_renderer_backend.cpp b/platform/qt/src/qmapboxgl_renderer_backend.cpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/qmapboxgl_renderer_backend.cpp rename to platform/qt/src/qmapboxgl_renderer_backend.cpp diff --git a/mapbox-gl-native/platform/qt/src/qmapboxgl_renderer_backend.hpp b/platform/qt/src/qmapboxgl_renderer_backend.hpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/qmapboxgl_renderer_backend.hpp rename to platform/qt/src/qmapboxgl_renderer_backend.hpp diff --git a/mapbox-gl-native/platform/qt/src/qmapboxgl_renderer_observer.hpp b/platform/qt/src/qmapboxgl_renderer_observer.hpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/qmapboxgl_renderer_observer.hpp rename to platform/qt/src/qmapboxgl_renderer_observer.hpp diff --git a/mapbox-gl-native/platform/qt/src/qmapboxgl_scheduler.cpp b/platform/qt/src/qmapboxgl_scheduler.cpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/qmapboxgl_scheduler.cpp rename to platform/qt/src/qmapboxgl_scheduler.cpp diff --git a/mapbox-gl-native/platform/qt/src/qmapboxgl_scheduler.hpp b/platform/qt/src/qmapboxgl_scheduler.hpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/qmapboxgl_scheduler.hpp rename to platform/qt/src/qmapboxgl_scheduler.hpp diff --git a/mapbox-gl-native/platform/qt/src/qt_conversion.hpp b/platform/qt/src/qt_conversion.hpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/qt_conversion.hpp rename to platform/qt/src/qt_conversion.hpp diff --git a/mapbox-gl-native/platform/qt/src/qt_geojson.cpp b/platform/qt/src/qt_geojson.cpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/qt_geojson.cpp rename to platform/qt/src/qt_geojson.cpp diff --git a/mapbox-gl-native/platform/qt/src/qt_geojson.hpp b/platform/qt/src/qt_geojson.hpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/qt_geojson.hpp rename to platform/qt/src/qt_geojson.hpp diff --git a/mapbox-gl-native/platform/qt/src/qt_image.cpp b/platform/qt/src/qt_image.cpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/qt_image.cpp rename to platform/qt/src/qt_image.cpp diff --git a/mapbox-gl-native/platform/qt/src/qt_logging.cpp b/platform/qt/src/qt_logging.cpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/qt_logging.cpp rename to platform/qt/src/qt_logging.cpp diff --git a/mapbox-gl-native/platform/qt/src/run_loop.cpp b/platform/qt/src/run_loop.cpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/run_loop.cpp rename to platform/qt/src/run_loop.cpp diff --git a/mapbox-gl-native/platform/qt/src/run_loop_impl.hpp b/platform/qt/src/run_loop_impl.hpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/run_loop_impl.hpp rename to platform/qt/src/run_loop_impl.hpp diff --git a/mapbox-gl-native/platform/qt/src/sqlite3.cpp b/platform/qt/src/sqlite3.cpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/sqlite3.cpp rename to platform/qt/src/sqlite3.cpp diff --git a/mapbox-gl-native/platform/qt/src/string_stdlib.cpp b/platform/qt/src/string_stdlib.cpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/string_stdlib.cpp rename to platform/qt/src/string_stdlib.cpp diff --git a/mapbox-gl-native/platform/qt/src/thread.cpp b/platform/qt/src/thread.cpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/thread.cpp rename to platform/qt/src/thread.cpp diff --git a/mapbox-gl-native/platform/qt/src/thread_local.cpp b/platform/qt/src/thread_local.cpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/thread_local.cpp rename to platform/qt/src/thread_local.cpp diff --git a/mapbox-gl-native/platform/qt/src/timer.cpp b/platform/qt/src/timer.cpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/timer.cpp rename to platform/qt/src/timer.cpp diff --git a/mapbox-gl-native/platform/qt/src/timer_impl.hpp b/platform/qt/src/timer_impl.hpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/timer_impl.hpp rename to platform/qt/src/timer_impl.hpp diff --git a/mapbox-gl-native/platform/qt/src/utf.cpp b/platform/qt/src/utf.cpp similarity index 100% rename from mapbox-gl-native/platform/qt/src/utf.cpp rename to platform/qt/src/utf.cpp diff --git a/mapbox-gl-native/platform/qt/test/main.cpp b/platform/qt/test/main.cpp similarity index 100% rename from mapbox-gl-native/platform/qt/test/main.cpp rename to platform/qt/test/main.cpp diff --git a/mapbox-gl-native/platform/qt/test/qmapboxgl.test.cpp b/platform/qt/test/qmapboxgl.test.cpp similarity index 100% rename from mapbox-gl-native/platform/qt/test/qmapboxgl.test.cpp rename to platform/qt/test/qmapboxgl.test.cpp diff --git a/mapbox-gl-native/platform/qt/test/qmapboxgl.test.hpp b/platform/qt/test/qmapboxgl.test.hpp similarity index 100% rename from mapbox-gl-native/platform/qt/test/qmapboxgl.test.hpp rename to platform/qt/test/qmapboxgl.test.hpp diff --git a/mapbox-gl-native/render-test/CMakeLists.txt b/render-test/CMakeLists.txt similarity index 100% rename from mapbox-gl-native/render-test/CMakeLists.txt rename to render-test/CMakeLists.txt diff --git a/mapbox-gl-native/render-test/allocation_index.cpp b/render-test/allocation_index.cpp similarity index 100% rename from mapbox-gl-native/render-test/allocation_index.cpp rename to render-test/allocation_index.cpp diff --git a/mapbox-gl-native/render-test/allocation_index.hpp b/render-test/allocation_index.hpp similarity index 100% rename from mapbox-gl-native/render-test/allocation_index.hpp rename to render-test/allocation_index.hpp diff --git a/mapbox-gl-native/render-test/android/README.md b/render-test/android/README.md similarity index 100% rename from mapbox-gl-native/render-test/android/README.md rename to render-test/android/README.md diff --git a/mapbox-gl-native/render-test/android/app/build.gradle b/render-test/android/app/build.gradle similarity index 100% rename from mapbox-gl-native/render-test/android/app/build.gradle rename to render-test/android/app/build.gradle diff --git a/mapbox-gl-native/render-test/android/app/src/androidTest/java/android/app/NativeActivityTest.java b/render-test/android/app/src/androidTest/java/android/app/NativeActivityTest.java similarity index 100% rename from mapbox-gl-native/render-test/android/app/src/androidTest/java/android/app/NativeActivityTest.java rename to render-test/android/app/src/androidTest/java/android/app/NativeActivityTest.java diff --git a/mapbox-gl-native/render-test/android/app/src/androidTest/java/android/app/TestState.java b/render-test/android/app/src/androidTest/java/android/app/TestState.java similarity index 100% rename from mapbox-gl-native/render-test/android/app/src/androidTest/java/android/app/TestState.java rename to render-test/android/app/src/androidTest/java/android/app/TestState.java diff --git a/mapbox-gl-native/render-test/android/app/src/main/AndroidManifest.xml b/render-test/android/app/src/main/AndroidManifest.xml similarity index 100% rename from mapbox-gl-native/render-test/android/app/src/main/AndroidManifest.xml rename to render-test/android/app/src/main/AndroidManifest.xml diff --git a/mapbox-gl-native/render-test/android/app/src/main/assets/to_zip.txt b/render-test/android/app/src/main/assets/to_zip.txt similarity index 100% rename from mapbox-gl-native/render-test/android/app/src/main/assets/to_zip.txt rename to render-test/android/app/src/main/assets/to_zip.txt diff --git a/mapbox-gl-native/render-test/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/render-test/android/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from mapbox-gl-native/render-test/android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to render-test/android/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/mapbox-gl-native/render-test/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/render-test/android/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from mapbox-gl-native/render-test/android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to render-test/android/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/mapbox-gl-native/render-test/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/render-test/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from mapbox-gl-native/render-test/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to render-test/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/mapbox-gl-native/render-test/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/render-test/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from mapbox-gl-native/render-test/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to render-test/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/mapbox-gl-native/render-test/android/app/src/main/res/values/strings.xml b/render-test/android/app/src/main/res/values/strings.xml similarity index 100% rename from mapbox-gl-native/render-test/android/app/src/main/res/values/strings.xml rename to render-test/android/app/src/main/res/values/strings.xml diff --git a/mapbox-gl-native/render-test/android/build.gradle b/render-test/android/build.gradle similarity index 100% rename from mapbox-gl-native/render-test/android/build.gradle rename to render-test/android/build.gradle diff --git a/mapbox-gl-native/render-test/android/gradle.properties b/render-test/android/gradle.properties similarity index 100% rename from mapbox-gl-native/render-test/android/gradle.properties rename to render-test/android/gradle.properties diff --git a/mapbox-gl-native/render-test/android/gradle/wrapper/gradle-wrapper.jar b/render-test/android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from mapbox-gl-native/render-test/android/gradle/wrapper/gradle-wrapper.jar rename to render-test/android/gradle/wrapper/gradle-wrapper.jar diff --git a/mapbox-gl-native/render-test/android/gradle/wrapper/gradle-wrapper.properties b/render-test/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from mapbox-gl-native/render-test/android/gradle/wrapper/gradle-wrapper.properties rename to render-test/android/gradle/wrapper/gradle-wrapper.properties diff --git a/mapbox-gl-native/render-test/android/gradlew b/render-test/android/gradlew similarity index 100% rename from mapbox-gl-native/render-test/android/gradlew rename to render-test/android/gradlew diff --git a/mapbox-gl-native/render-test/android/gradlew.bat b/render-test/android/gradlew.bat similarity index 100% rename from mapbox-gl-native/render-test/android/gradlew.bat rename to render-test/android/gradlew.bat diff --git a/mapbox-gl-native/render-test/android/settings.gradle b/render-test/android/settings.gradle similarity index 100% rename from mapbox-gl-native/render-test/android/settings.gradle rename to render-test/android/settings.gradle diff --git a/mapbox-gl-native/render-test/file_source.cpp b/render-test/file_source.cpp similarity index 100% rename from mapbox-gl-native/render-test/file_source.cpp rename to render-test/file_source.cpp diff --git a/mapbox-gl-native/render-test/file_source.hpp b/render-test/file_source.hpp similarity index 100% rename from mapbox-gl-native/render-test/file_source.hpp rename to render-test/file_source.hpp diff --git a/mapbox-gl-native/render-test/filesystem.hpp b/render-test/filesystem.hpp similarity index 100% rename from mapbox-gl-native/render-test/filesystem.hpp rename to render-test/filesystem.hpp diff --git a/mapbox-gl-native/render-test/include/mbgl/render_test.hpp b/render-test/include/mbgl/render_test.hpp similarity index 100% rename from mapbox-gl-native/render-test/include/mbgl/render_test.hpp rename to render-test/include/mbgl/render_test.hpp diff --git a/mapbox-gl-native/render-test/ios/Info.plist b/render-test/ios/Info.plist similarity index 100% rename from mapbox-gl-native/render-test/ios/Info.plist rename to render-test/ios/Info.plist diff --git a/mapbox-gl-native/render-test/ios/README.md b/render-test/ios/README.md similarity index 100% rename from mapbox-gl-native/render-test/ios/README.md rename to render-test/ios/README.md diff --git a/mapbox-gl-native/render-test/ios/RenderTestApp_iphoneos13.2-arm64e-debug.xctestrun b/render-test/ios/RenderTestApp_iphoneos13.2-arm64e-debug.xctestrun similarity index 100% rename from mapbox-gl-native/render-test/ios/RenderTestApp_iphoneos13.2-arm64e-debug.xctestrun rename to render-test/ios/RenderTestApp_iphoneos13.2-arm64e-debug.xctestrun diff --git a/mapbox-gl-native/render-test/ios/RenderTestApp_iphoneos13.2-arm64e-release.xctestrun b/render-test/ios/RenderTestApp_iphoneos13.2-arm64e-release.xctestrun similarity index 100% rename from mapbox-gl-native/render-test/ios/RenderTestApp_iphoneos13.2-arm64e-release.xctestrun rename to render-test/ios/RenderTestApp_iphoneos13.2-arm64e-release.xctestrun diff --git a/mapbox-gl-native/render-test/ios/codesigning/RenderTestApp.app.xcent.template b/render-test/ios/codesigning/RenderTestApp.app.xcent.template similarity index 100% rename from mapbox-gl-native/render-test/ios/codesigning/RenderTestApp.app.xcent.template rename to render-test/ios/codesigning/RenderTestApp.app.xcent.template diff --git a/mapbox-gl-native/render-test/ios/codesigning/RenderTestAppTests.xctest.xcent.template b/render-test/ios/codesigning/RenderTestAppTests.xctest.xcent.template similarity index 100% rename from mapbox-gl-native/render-test/ios/codesigning/RenderTestAppTests.xctest.xcent.template rename to render-test/ios/codesigning/RenderTestAppTests.xctest.xcent.template diff --git a/mapbox-gl-native/render-test/ios/codesigning/XCTAutomationSupport.framework.xcent.template b/render-test/ios/codesigning/XCTAutomationSupport.framework.xcent.template similarity index 100% rename from mapbox-gl-native/render-test/ios/codesigning/XCTAutomationSupport.framework.xcent.template rename to render-test/ios/codesigning/XCTAutomationSupport.framework.xcent.template diff --git a/mapbox-gl-native/render-test/ios/codesigning/XCTest.framework.xcent.template b/render-test/ios/codesigning/XCTest.framework.xcent.template similarity index 100% rename from mapbox-gl-native/render-test/ios/codesigning/XCTest.framework.xcent.template rename to render-test/ios/codesigning/XCTest.framework.xcent.template diff --git a/mapbox-gl-native/render-test/ios/codesigning/codesign_all.sh b/render-test/ios/codesigning/codesign_all.sh similarity index 100% rename from mapbox-gl-native/render-test/ios/codesigning/codesign_all.sh rename to render-test/ios/codesigning/codesign_all.sh diff --git a/mapbox-gl-native/render-test/ios/codesigning/generate-entitlements.swift b/render-test/ios/codesigning/generate-entitlements.swift similarity index 100% rename from mapbox-gl-native/render-test/ios/codesigning/generate-entitlements.swift rename to render-test/ios/codesigning/generate-entitlements.swift diff --git a/mapbox-gl-native/render-test/ios/codesigning/libXCTestSwiftSupport.dylib.xcent.template b/render-test/ios/codesigning/libXCTestSwiftSupport.dylib.xcent.template similarity index 100% rename from mapbox-gl-native/render-test/ios/codesigning/libXCTestSwiftSupport.dylib.xcent.template rename to render-test/ios/codesigning/libXCTestSwiftSupport.dylib.xcent.template diff --git a/mapbox-gl-native/render-test/ios/fastlane/Appfile b/render-test/ios/fastlane/Appfile similarity index 100% rename from mapbox-gl-native/render-test/ios/fastlane/Appfile rename to render-test/ios/fastlane/Appfile diff --git a/mapbox-gl-native/render-test/ios/fastlane/Matchfile b/render-test/ios/fastlane/Matchfile similarity index 100% rename from mapbox-gl-native/render-test/ios/fastlane/Matchfile rename to render-test/ios/fastlane/Matchfile diff --git a/mapbox-gl-native/render-test/ios/iosTestRunner.h b/render-test/ios/iosTestRunner.h similarity index 100% rename from mapbox-gl-native/render-test/ios/iosTestRunner.h rename to render-test/ios/iosTestRunner.h diff --git a/mapbox-gl-native/render-test/ios/iosTestRunner.mm b/render-test/ios/iosTestRunner.mm similarity index 100% rename from mapbox-gl-native/render-test/ios/iosTestRunner.mm rename to render-test/ios/iosTestRunner.mm diff --git a/mapbox-gl-native/render-test/ios/ios_test_runner.cpp b/render-test/ios/ios_test_runner.cpp similarity index 100% rename from mapbox-gl-native/render-test/ios/ios_test_runner.cpp rename to render-test/ios/ios_test_runner.cpp diff --git a/mapbox-gl-native/render-test/ios/setup_test_data.sh b/render-test/ios/setup_test_data.sh similarity index 100% rename from mapbox-gl-native/render-test/ios/setup_test_data.sh rename to render-test/ios/setup_test_data.sh diff --git a/mapbox-gl-native/render-test/ios/tests/Info.plist b/render-test/ios/tests/Info.plist similarity index 100% rename from mapbox-gl-native/render-test/ios/tests/Info.plist rename to render-test/ios/tests/Info.plist diff --git a/mapbox-gl-native/render-test/ios/tests/Tests.m b/render-test/ios/tests/Tests.m similarity index 100% rename from mapbox-gl-native/render-test/ios/tests/Tests.m rename to render-test/ios/tests/Tests.m diff --git a/mapbox-gl-native/render-test/manifest_parser.cpp b/render-test/manifest_parser.cpp similarity index 100% rename from mapbox-gl-native/render-test/manifest_parser.cpp rename to render-test/manifest_parser.cpp diff --git a/mapbox-gl-native/render-test/manifest_parser.hpp b/render-test/manifest_parser.hpp similarity index 100% rename from mapbox-gl-native/render-test/manifest_parser.hpp rename to render-test/manifest_parser.hpp diff --git a/mapbox-gl-native/render-test/metadata.hpp b/render-test/metadata.hpp similarity index 100% rename from mapbox-gl-native/render-test/metadata.hpp rename to render-test/metadata.hpp diff --git a/mapbox-gl-native/render-test/parser.cpp b/render-test/parser.cpp similarity index 100% rename from mapbox-gl-native/render-test/parser.cpp rename to render-test/parser.cpp diff --git a/mapbox-gl-native/render-test/parser.hpp b/render-test/parser.hpp similarity index 100% rename from mapbox-gl-native/render-test/parser.hpp rename to render-test/parser.hpp diff --git a/mapbox-gl-native/render-test/render_test.cpp b/render-test/render_test.cpp similarity index 100% rename from mapbox-gl-native/render-test/render_test.cpp rename to render-test/render_test.cpp diff --git a/mapbox-gl-native/render-test/runner.cpp b/render-test/runner.cpp similarity index 100% rename from mapbox-gl-native/render-test/runner.cpp rename to render-test/runner.cpp diff --git a/mapbox-gl-native/render-test/runner.hpp b/render-test/runner.hpp similarity index 100% rename from mapbox-gl-native/render-test/runner.hpp rename to render-test/runner.hpp diff --git a/mapbox-gl-native/scripts/changelog_staging/idle-event.json b/scripts/changelog_staging/idle-event.json similarity index 100% rename from mapbox-gl-native/scripts/changelog_staging/idle-event.json rename to scripts/changelog_staging/idle-event.json diff --git a/mapbox-gl-native/scripts/changelog_staging/no-offline-cjk.json b/scripts/changelog_staging/no-offline-cjk.json similarity index 100% rename from mapbox-gl-native/scripts/changelog_staging/no-offline-cjk.json rename to scripts/changelog_staging/no-offline-cjk.json diff --git a/mapbox-gl-native/scripts/changelog_staging/tile-is-child.json b/scripts/changelog_staging/tile-is-child.json similarity index 100% rename from mapbox-gl-native/scripts/changelog_staging/tile-is-child.json rename to scripts/changelog_staging/tile-is-child.json diff --git a/mapbox-gl-native/scripts/check-ci-job-skippability.js b/scripts/check-ci-job-skippability.js similarity index 100% rename from mapbox-gl-native/scripts/check-ci-job-skippability.js rename to scripts/check-ci-job-skippability.js diff --git a/mapbox-gl-native/scripts/check-qt.sh b/scripts/check-qt.sh similarity index 100% rename from mapbox-gl-native/scripts/check-qt.sh rename to scripts/check-qt.sh diff --git a/mapbox-gl-native/scripts/check-sha256.ps1 b/scripts/check-sha256.ps1 similarity index 100% rename from mapbox-gl-native/scripts/check-sha256.ps1 rename to scripts/check-sha256.ps1 diff --git a/mapbox-gl-native/scripts/check_benchmark_results.sh b/scripts/check_benchmark_results.sh similarity index 100% rename from mapbox-gl-native/scripts/check_benchmark_results.sh rename to scripts/check_benchmark_results.sh diff --git a/mapbox-gl-native/scripts/check_binary_size.js b/scripts/check_binary_size.js similarity index 100% rename from mapbox-gl-native/scripts/check_binary_size.js rename to scripts/check_binary_size.js diff --git a/mapbox-gl-native/scripts/ci-circleci-start-pipeline.py b/scripts/ci-circleci-start-pipeline.py similarity index 100% rename from mapbox-gl-native/scripts/ci-circleci-start-pipeline.py rename to scripts/ci-circleci-start-pipeline.py diff --git a/mapbox-gl-native/scripts/ci/Dockerfile b/scripts/ci/Dockerfile similarity index 100% rename from mapbox-gl-native/scripts/ci/Dockerfile rename to scripts/ci/Dockerfile diff --git a/mapbox-gl-native/scripts/ci/etc/apt/sources.list b/scripts/ci/etc/apt/sources.list similarity index 100% rename from mapbox-gl-native/scripts/ci/etc/apt/sources.list rename to scripts/ci/etc/apt/sources.list diff --git a/mapbox-gl-native/scripts/clang-tidy-diff.py b/scripts/clang-tidy-diff.py similarity index 100% rename from mapbox-gl-native/scripts/clang-tidy-diff.py rename to scripts/clang-tidy-diff.py diff --git a/mapbox-gl-native/scripts/clang-tools.sh b/scripts/clang-tools.sh similarity index 100% rename from mapbox-gl-native/scripts/clang-tools.sh rename to scripts/clang-tools.sh diff --git a/mapbox-gl-native/scripts/code-coverage.sh b/scripts/code-coverage.sh similarity index 100% rename from mapbox-gl-native/scripts/code-coverage.sh rename to scripts/code-coverage.sh diff --git a/mapbox-gl-native/scripts/codestyle.sh b/scripts/codestyle.sh similarity index 100% rename from mapbox-gl-native/scripts/codestyle.sh rename to scripts/codestyle.sh diff --git a/mapbox-gl-native/scripts/collect-coverage.sh b/scripts/collect-coverage.sh similarity index 100% rename from mapbox-gl-native/scripts/collect-coverage.sh rename to scripts/collect-coverage.sh diff --git a/mapbox-gl-native/scripts/config.xcconfig.in b/scripts/config.xcconfig.in similarity index 100% rename from mapbox-gl-native/scripts/config.xcconfig.in rename to scripts/config.xcconfig.in diff --git a/mapbox-gl-native/scripts/doxy-coverage.py b/scripts/doxy-coverage.py similarity index 100% rename from mapbox-gl-native/scripts/doxy-coverage.py rename to scripts/doxy-coverage.py diff --git a/mapbox-gl-native/scripts/environment.js b/scripts/environment.js similarity index 100% rename from mapbox-gl-native/scripts/environment.js rename to scripts/environment.js diff --git a/mapbox-gl-native/scripts/generate-shaders.js b/scripts/generate-shaders.js similarity index 100% rename from mapbox-gl-native/scripts/generate-shaders.js rename to scripts/generate-shaders.js diff --git a/mapbox-gl-native/scripts/generate-style-code.js b/scripts/generate-style-code.js similarity index 100% rename from mapbox-gl-native/scripts/generate-style-code.js rename to scripts/generate-style-code.js diff --git a/mapbox-gl-native/scripts/launch-c-xcode.in b/scripts/launch-c-xcode.in similarity index 100% rename from mapbox-gl-native/scripts/launch-c-xcode.in rename to scripts/launch-c-xcode.in diff --git a/mapbox-gl-native/scripts/launch-c.in b/scripts/launch-c.in similarity index 100% rename from mapbox-gl-native/scripts/launch-c.in rename to scripts/launch-c.in diff --git a/mapbox-gl-native/scripts/launch-cxx-xcode.in b/scripts/launch-cxx-xcode.in similarity index 100% rename from mapbox-gl-native/scripts/launch-cxx-xcode.in rename to scripts/launch-cxx-xcode.in diff --git a/mapbox-gl-native/scripts/launch-cxx.in b/scripts/launch-cxx.in similarity index 100% rename from mapbox-gl-native/scripts/launch-cxx.in rename to scripts/launch-cxx.in diff --git a/mapbox-gl-native/scripts/license.cmake b/scripts/license.cmake similarity index 100% rename from mapbox-gl-native/scripts/license.cmake rename to scripts/license.cmake diff --git a/mapbox-gl-native/scripts/lldb-types b/scripts/lldb-types similarity index 100% rename from mapbox-gl-native/scripts/lldb-types rename to scripts/lldb-types diff --git a/mapbox-gl-native/scripts/log_memory_benchmarks.sh b/scripts/log_memory_benchmarks.sh similarity index 100% rename from mapbox-gl-native/scripts/log_memory_benchmarks.sh rename to scripts/log_memory_benchmarks.sh diff --git a/mapbox-gl-native/scripts/mason.sh b/scripts/mason.sh similarity index 100% rename from mapbox-gl-native/scripts/mason.sh rename to scripts/mason.sh diff --git a/mapbox-gl-native/scripts/nitpick/generated-code.js b/scripts/nitpick/generated-code.js similarity index 100% rename from mapbox-gl-native/scripts/nitpick/generated-code.js rename to scripts/nitpick/generated-code.js diff --git a/mapbox-gl-native/scripts/nitpick/index.js b/scripts/nitpick/index.js similarity index 100% rename from mapbox-gl-native/scripts/nitpick/index.js rename to scripts/nitpick/index.js diff --git a/mapbox-gl-native/scripts/nitpick/submodule-pin.js b/scripts/nitpick/submodule-pin.js similarity index 100% rename from mapbox-gl-native/scripts/nitpick/submodule-pin.js rename to scripts/nitpick/submodule-pin.js diff --git a/mapbox-gl-native/scripts/notify-slack.sh b/scripts/notify-slack.sh similarity index 100% rename from mapbox-gl-native/scripts/notify-slack.sh rename to scripts/notify-slack.sh diff --git a/mapbox-gl-native/scripts/publish_binary_size.js b/scripts/publish_binary_size.js similarity index 100% rename from mapbox-gl-native/scripts/publish_binary_size.js rename to scripts/publish_binary_size.js diff --git a/mapbox-gl-native/scripts/publish_core_codecoverage.js b/scripts/publish_core_codecoverage.js similarity index 100% rename from mapbox-gl-native/scripts/publish_core_codecoverage.js rename to scripts/publish_core_codecoverage.js diff --git a/mapbox-gl-native/scripts/publish_doxygen_coverage.js b/scripts/publish_doxygen_coverage.js similarity index 100% rename from mapbox-gl-native/scripts/publish_doxygen_coverage.js rename to scripts/publish_doxygen_coverage.js diff --git a/mapbox-gl-native/scripts/publish_github_stats.js b/scripts/publish_github_stats.js similarity index 100% rename from mapbox-gl-native/scripts/publish_github_stats.js rename to scripts/publish_github_stats.js diff --git a/mapbox-gl-native/scripts/standalone.sh b/scripts/standalone.sh similarity index 100% rename from mapbox-gl-native/scripts/standalone.sh rename to scripts/standalone.sh diff --git a/mapbox-gl-native/scripts/style-code.js b/scripts/style-code.js similarity index 100% rename from mapbox-gl-native/scripts/style-code.js rename to scripts/style-code.js diff --git a/mapbox-gl-native/scripts/style-spec.js b/scripts/style-spec.js similarity index 100% rename from mapbox-gl-native/scripts/style-spec.js rename to scripts/style-spec.js diff --git a/mapbox-gl-native/scripts/trigger-maps-documentation-deploy-steps.sh b/scripts/trigger-maps-documentation-deploy-steps.sh similarity index 100% rename from mapbox-gl-native/scripts/trigger-maps-documentation-deploy-steps.sh rename to scripts/trigger-maps-documentation-deploy-steps.sh diff --git a/mapbox-gl-native/scripts/ubsan.blacklist b/scripts/ubsan.blacklist similarity index 100% rename from mapbox-gl-native/scripts/ubsan.blacklist rename to scripts/ubsan.blacklist diff --git a/mapbox-gl-native/scripts/update-boost.sh b/scripts/update-boost.sh similarity index 100% rename from mapbox-gl-native/scripts/update-boost.sh rename to scripts/update-boost.sh diff --git a/mapbox-gl-native/scripts/valgrind.sh b/scripts/valgrind.sh similarity index 100% rename from mapbox-gl-native/scripts/valgrind.sh rename to scripts/valgrind.sh diff --git a/mapbox-gl-native/scripts/valgrind.sup b/scripts/valgrind.sup similarity index 100% rename from mapbox-gl-native/scripts/valgrind.sup rename to scripts/valgrind.sup diff --git a/mapbox-gl-native/scripts/vendor/common.sh b/scripts/vendor/common.sh similarity index 100% rename from mapbox-gl-native/scripts/vendor/common.sh rename to scripts/vendor/common.sh diff --git a/mapbox-gl-native/scripts/vendor/expected.sh b/scripts/vendor/expected.sh similarity index 100% rename from mapbox-gl-native/scripts/vendor/expected.sh rename to scripts/vendor/expected.sh diff --git a/mapbox-gl-native/scripts/vendor/icu.sh b/scripts/vendor/icu.sh similarity index 100% rename from mapbox-gl-native/scripts/vendor/icu.sh rename to scripts/vendor/icu.sh diff --git a/mapbox-gl-native/scripts/vendor/nunicode.sh b/scripts/vendor/nunicode.sh similarity index 100% rename from mapbox-gl-native/scripts/vendor/nunicode.sh rename to scripts/vendor/nunicode.sh diff --git a/mapbox-gl-native/scripts/vendor/sqlite.sh b/scripts/vendor/sqlite.sh similarity index 100% rename from mapbox-gl-native/scripts/vendor/sqlite.sh rename to scripts/vendor/sqlite.sh diff --git a/mapbox-gl-native/src/mbgl/actor/mailbox.cpp b/src/mbgl/actor/mailbox.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/actor/mailbox.cpp rename to src/mbgl/actor/mailbox.cpp diff --git a/mapbox-gl-native/src/mbgl/actor/scheduler.cpp b/src/mbgl/actor/scheduler.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/actor/scheduler.cpp rename to src/mbgl/actor/scheduler.cpp diff --git a/mapbox-gl-native/src/mbgl/algorithm/update_renderables.hpp b/src/mbgl/algorithm/update_renderables.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/algorithm/update_renderables.hpp rename to src/mbgl/algorithm/update_renderables.hpp diff --git a/mapbox-gl-native/src/mbgl/algorithm/update_tile_masks.hpp b/src/mbgl/algorithm/update_tile_masks.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/algorithm/update_tile_masks.hpp rename to src/mbgl/algorithm/update_tile_masks.hpp diff --git a/mapbox-gl-native/src/mbgl/annotation/annotation_manager.cpp b/src/mbgl/annotation/annotation_manager.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/annotation/annotation_manager.cpp rename to src/mbgl/annotation/annotation_manager.cpp diff --git a/mapbox-gl-native/src/mbgl/annotation/annotation_manager.hpp b/src/mbgl/annotation/annotation_manager.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/annotation/annotation_manager.hpp rename to src/mbgl/annotation/annotation_manager.hpp diff --git a/mapbox-gl-native/src/mbgl/annotation/annotation_source.cpp b/src/mbgl/annotation/annotation_source.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/annotation/annotation_source.cpp rename to src/mbgl/annotation/annotation_source.cpp diff --git a/mapbox-gl-native/src/mbgl/annotation/annotation_source.hpp b/src/mbgl/annotation/annotation_source.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/annotation/annotation_source.hpp rename to src/mbgl/annotation/annotation_source.hpp diff --git a/mapbox-gl-native/src/mbgl/annotation/annotation_tile.cpp b/src/mbgl/annotation/annotation_tile.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/annotation/annotation_tile.cpp rename to src/mbgl/annotation/annotation_tile.cpp diff --git a/mapbox-gl-native/src/mbgl/annotation/annotation_tile.hpp b/src/mbgl/annotation/annotation_tile.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/annotation/annotation_tile.hpp rename to src/mbgl/annotation/annotation_tile.hpp diff --git a/mapbox-gl-native/src/mbgl/annotation/fill_annotation_impl.cpp b/src/mbgl/annotation/fill_annotation_impl.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/annotation/fill_annotation_impl.cpp rename to src/mbgl/annotation/fill_annotation_impl.cpp diff --git a/mapbox-gl-native/src/mbgl/annotation/fill_annotation_impl.hpp b/src/mbgl/annotation/fill_annotation_impl.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/annotation/fill_annotation_impl.hpp rename to src/mbgl/annotation/fill_annotation_impl.hpp diff --git a/mapbox-gl-native/src/mbgl/annotation/line_annotation_impl.cpp b/src/mbgl/annotation/line_annotation_impl.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/annotation/line_annotation_impl.cpp rename to src/mbgl/annotation/line_annotation_impl.cpp diff --git a/mapbox-gl-native/src/mbgl/annotation/line_annotation_impl.hpp b/src/mbgl/annotation/line_annotation_impl.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/annotation/line_annotation_impl.hpp rename to src/mbgl/annotation/line_annotation_impl.hpp diff --git a/mapbox-gl-native/src/mbgl/annotation/render_annotation_source.cpp b/src/mbgl/annotation/render_annotation_source.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/annotation/render_annotation_source.cpp rename to src/mbgl/annotation/render_annotation_source.cpp diff --git a/mapbox-gl-native/src/mbgl/annotation/render_annotation_source.hpp b/src/mbgl/annotation/render_annotation_source.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/annotation/render_annotation_source.hpp rename to src/mbgl/annotation/render_annotation_source.hpp diff --git a/mapbox-gl-native/src/mbgl/annotation/shape_annotation_impl.cpp b/src/mbgl/annotation/shape_annotation_impl.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/annotation/shape_annotation_impl.cpp rename to src/mbgl/annotation/shape_annotation_impl.cpp diff --git a/mapbox-gl-native/src/mbgl/annotation/shape_annotation_impl.hpp b/src/mbgl/annotation/shape_annotation_impl.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/annotation/shape_annotation_impl.hpp rename to src/mbgl/annotation/shape_annotation_impl.hpp diff --git a/mapbox-gl-native/src/mbgl/annotation/symbol_annotation_impl.cpp b/src/mbgl/annotation/symbol_annotation_impl.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/annotation/symbol_annotation_impl.cpp rename to src/mbgl/annotation/symbol_annotation_impl.cpp diff --git a/mapbox-gl-native/src/mbgl/annotation/symbol_annotation_impl.hpp b/src/mbgl/annotation/symbol_annotation_impl.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/annotation/symbol_annotation_impl.hpp rename to src/mbgl/annotation/symbol_annotation_impl.hpp diff --git a/mapbox-gl-native/src/mbgl/geometry/anchor.hpp b/src/mbgl/geometry/anchor.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/geometry/anchor.hpp rename to src/mbgl/geometry/anchor.hpp diff --git a/mapbox-gl-native/src/mbgl/geometry/debug_font_data.hpp b/src/mbgl/geometry/debug_font_data.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/geometry/debug_font_data.hpp rename to src/mbgl/geometry/debug_font_data.hpp diff --git a/mapbox-gl-native/src/mbgl/geometry/dem_data.cpp b/src/mbgl/geometry/dem_data.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/geometry/dem_data.cpp rename to src/mbgl/geometry/dem_data.cpp diff --git a/mapbox-gl-native/src/mbgl/geometry/dem_data.hpp b/src/mbgl/geometry/dem_data.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/geometry/dem_data.hpp rename to src/mbgl/geometry/dem_data.hpp diff --git a/mapbox-gl-native/src/mbgl/geometry/feature_index.cpp b/src/mbgl/geometry/feature_index.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/geometry/feature_index.cpp rename to src/mbgl/geometry/feature_index.cpp diff --git a/mapbox-gl-native/src/mbgl/geometry/feature_index.hpp b/src/mbgl/geometry/feature_index.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/geometry/feature_index.hpp rename to src/mbgl/geometry/feature_index.hpp diff --git a/mapbox-gl-native/src/mbgl/geometry/line_atlas.cpp b/src/mbgl/geometry/line_atlas.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/geometry/line_atlas.cpp rename to src/mbgl/geometry/line_atlas.cpp diff --git a/mapbox-gl-native/src/mbgl/geometry/line_atlas.hpp b/src/mbgl/geometry/line_atlas.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/geometry/line_atlas.hpp rename to src/mbgl/geometry/line_atlas.hpp diff --git a/mapbox-gl-native/src/mbgl/gfx/attribute.cpp b/src/mbgl/gfx/attribute.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gfx/attribute.cpp rename to src/mbgl/gfx/attribute.cpp diff --git a/mapbox-gl-native/src/mbgl/gfx/attribute.hpp b/src/mbgl/gfx/attribute.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gfx/attribute.hpp rename to src/mbgl/gfx/attribute.hpp diff --git a/mapbox-gl-native/src/mbgl/gfx/color_mode.hpp b/src/mbgl/gfx/color_mode.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gfx/color_mode.hpp rename to src/mbgl/gfx/color_mode.hpp diff --git a/mapbox-gl-native/src/mbgl/gfx/command_encoder.hpp b/src/mbgl/gfx/command_encoder.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gfx/command_encoder.hpp rename to src/mbgl/gfx/command_encoder.hpp diff --git a/mapbox-gl-native/src/mbgl/gfx/context.hpp b/src/mbgl/gfx/context.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gfx/context.hpp rename to src/mbgl/gfx/context.hpp diff --git a/mapbox-gl-native/src/mbgl/gfx/cull_face_mode.hpp b/src/mbgl/gfx/cull_face_mode.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gfx/cull_face_mode.hpp rename to src/mbgl/gfx/cull_face_mode.hpp diff --git a/mapbox-gl-native/src/mbgl/gfx/debug_group.hpp b/src/mbgl/gfx/debug_group.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gfx/debug_group.hpp rename to src/mbgl/gfx/debug_group.hpp diff --git a/mapbox-gl-native/src/mbgl/gfx/depth_mode.hpp b/src/mbgl/gfx/depth_mode.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gfx/depth_mode.hpp rename to src/mbgl/gfx/depth_mode.hpp diff --git a/mapbox-gl-native/src/mbgl/gfx/draw_mode.hpp b/src/mbgl/gfx/draw_mode.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gfx/draw_mode.hpp rename to src/mbgl/gfx/draw_mode.hpp diff --git a/mapbox-gl-native/src/mbgl/gfx/draw_scope.hpp b/src/mbgl/gfx/draw_scope.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gfx/draw_scope.hpp rename to src/mbgl/gfx/draw_scope.hpp diff --git a/mapbox-gl-native/src/mbgl/gfx/index_buffer.hpp b/src/mbgl/gfx/index_buffer.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gfx/index_buffer.hpp rename to src/mbgl/gfx/index_buffer.hpp diff --git a/mapbox-gl-native/src/mbgl/gfx/index_vector.hpp b/src/mbgl/gfx/index_vector.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gfx/index_vector.hpp rename to src/mbgl/gfx/index_vector.hpp diff --git a/mapbox-gl-native/src/mbgl/gfx/offscreen_texture.hpp b/src/mbgl/gfx/offscreen_texture.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gfx/offscreen_texture.hpp rename to src/mbgl/gfx/offscreen_texture.hpp diff --git a/mapbox-gl-native/src/mbgl/gfx/program.hpp b/src/mbgl/gfx/program.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gfx/program.hpp rename to src/mbgl/gfx/program.hpp diff --git a/mapbox-gl-native/src/mbgl/gfx/render_pass.hpp b/src/mbgl/gfx/render_pass.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gfx/render_pass.hpp rename to src/mbgl/gfx/render_pass.hpp diff --git a/mapbox-gl-native/src/mbgl/gfx/renderbuffer.hpp b/src/mbgl/gfx/renderbuffer.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gfx/renderbuffer.hpp rename to src/mbgl/gfx/renderbuffer.hpp diff --git a/mapbox-gl-native/src/mbgl/gfx/renderer_backend.cpp b/src/mbgl/gfx/renderer_backend.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gfx/renderer_backend.cpp rename to src/mbgl/gfx/renderer_backend.cpp diff --git a/mapbox-gl-native/src/mbgl/gfx/rendering_stats.cpp b/src/mbgl/gfx/rendering_stats.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gfx/rendering_stats.cpp rename to src/mbgl/gfx/rendering_stats.cpp diff --git a/mapbox-gl-native/src/mbgl/gfx/stencil_mode.hpp b/src/mbgl/gfx/stencil_mode.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gfx/stencil_mode.hpp rename to src/mbgl/gfx/stencil_mode.hpp diff --git a/mapbox-gl-native/src/mbgl/gfx/texture.hpp b/src/mbgl/gfx/texture.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gfx/texture.hpp rename to src/mbgl/gfx/texture.hpp diff --git a/mapbox-gl-native/src/mbgl/gfx/types.hpp b/src/mbgl/gfx/types.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gfx/types.hpp rename to src/mbgl/gfx/types.hpp diff --git a/mapbox-gl-native/src/mbgl/gfx/uniform.hpp b/src/mbgl/gfx/uniform.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gfx/uniform.hpp rename to src/mbgl/gfx/uniform.hpp diff --git a/mapbox-gl-native/src/mbgl/gfx/upload_pass.hpp b/src/mbgl/gfx/upload_pass.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gfx/upload_pass.hpp rename to src/mbgl/gfx/upload_pass.hpp diff --git a/mapbox-gl-native/src/mbgl/gfx/vertex_buffer.hpp b/src/mbgl/gfx/vertex_buffer.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gfx/vertex_buffer.hpp rename to src/mbgl/gfx/vertex_buffer.hpp diff --git a/mapbox-gl-native/src/mbgl/gfx/vertex_vector.hpp b/src/mbgl/gfx/vertex_vector.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gfx/vertex_vector.hpp rename to src/mbgl/gfx/vertex_vector.hpp diff --git a/mapbox-gl-native/src/mbgl/gl/attribute.cpp b/src/mbgl/gl/attribute.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/attribute.cpp rename to src/mbgl/gl/attribute.cpp diff --git a/mapbox-gl-native/src/mbgl/gl/attribute.hpp b/src/mbgl/gl/attribute.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/attribute.hpp rename to src/mbgl/gl/attribute.hpp diff --git a/mapbox-gl-native/src/mbgl/gl/command_encoder.cpp b/src/mbgl/gl/command_encoder.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/command_encoder.cpp rename to src/mbgl/gl/command_encoder.cpp diff --git a/mapbox-gl-native/src/mbgl/gl/command_encoder.hpp b/src/mbgl/gl/command_encoder.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/command_encoder.hpp rename to src/mbgl/gl/command_encoder.hpp diff --git a/mapbox-gl-native/src/mbgl/gl/context.cpp b/src/mbgl/gl/context.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/context.cpp rename to src/mbgl/gl/context.cpp diff --git a/mapbox-gl-native/src/mbgl/gl/context.hpp b/src/mbgl/gl/context.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/context.hpp rename to src/mbgl/gl/context.hpp diff --git a/mapbox-gl-native/src/mbgl/gl/custom_layer.cpp b/src/mbgl/gl/custom_layer.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/custom_layer.cpp rename to src/mbgl/gl/custom_layer.cpp diff --git a/mapbox-gl-native/src/mbgl/gl/custom_layer_factory.cpp b/src/mbgl/gl/custom_layer_factory.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/custom_layer_factory.cpp rename to src/mbgl/gl/custom_layer_factory.cpp diff --git a/mapbox-gl-native/src/mbgl/gl/custom_layer_impl.cpp b/src/mbgl/gl/custom_layer_impl.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/custom_layer_impl.cpp rename to src/mbgl/gl/custom_layer_impl.cpp diff --git a/mapbox-gl-native/src/mbgl/gl/custom_layer_impl.hpp b/src/mbgl/gl/custom_layer_impl.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/custom_layer_impl.hpp rename to src/mbgl/gl/custom_layer_impl.hpp diff --git a/mapbox-gl-native/src/mbgl/gl/debugging_extension.cpp b/src/mbgl/gl/debugging_extension.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/debugging_extension.cpp rename to src/mbgl/gl/debugging_extension.cpp diff --git a/mapbox-gl-native/src/mbgl/gl/debugging_extension.hpp b/src/mbgl/gl/debugging_extension.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/debugging_extension.hpp rename to src/mbgl/gl/debugging_extension.hpp diff --git a/mapbox-gl-native/src/mbgl/gl/defines.hpp b/src/mbgl/gl/defines.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/defines.hpp rename to src/mbgl/gl/defines.hpp diff --git a/mapbox-gl-native/src/mbgl/gl/draw_scope_resource.hpp b/src/mbgl/gl/draw_scope_resource.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/draw_scope_resource.hpp rename to src/mbgl/gl/draw_scope_resource.hpp diff --git a/mapbox-gl-native/src/mbgl/gl/enum.cpp b/src/mbgl/gl/enum.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/enum.cpp rename to src/mbgl/gl/enum.cpp diff --git a/mapbox-gl-native/src/mbgl/gl/enum.hpp b/src/mbgl/gl/enum.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/enum.hpp rename to src/mbgl/gl/enum.hpp diff --git a/mapbox-gl-native/src/mbgl/gl/extension.hpp b/src/mbgl/gl/extension.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/extension.hpp rename to src/mbgl/gl/extension.hpp diff --git a/mapbox-gl-native/src/mbgl/gl/framebuffer.hpp b/src/mbgl/gl/framebuffer.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/framebuffer.hpp rename to src/mbgl/gl/framebuffer.hpp diff --git a/mapbox-gl-native/src/mbgl/gl/index_buffer_resource.cpp b/src/mbgl/gl/index_buffer_resource.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/index_buffer_resource.cpp rename to src/mbgl/gl/index_buffer_resource.cpp diff --git a/mapbox-gl-native/src/mbgl/gl/index_buffer_resource.hpp b/src/mbgl/gl/index_buffer_resource.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/index_buffer_resource.hpp rename to src/mbgl/gl/index_buffer_resource.hpp diff --git a/mapbox-gl-native/src/mbgl/gl/object.cpp b/src/mbgl/gl/object.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/object.cpp rename to src/mbgl/gl/object.cpp diff --git a/mapbox-gl-native/src/mbgl/gl/object.hpp b/src/mbgl/gl/object.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/object.hpp rename to src/mbgl/gl/object.hpp diff --git a/mapbox-gl-native/src/mbgl/gl/offscreen_texture.cpp b/src/mbgl/gl/offscreen_texture.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/offscreen_texture.cpp rename to src/mbgl/gl/offscreen_texture.cpp diff --git a/mapbox-gl-native/src/mbgl/gl/offscreen_texture.hpp b/src/mbgl/gl/offscreen_texture.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/offscreen_texture.hpp rename to src/mbgl/gl/offscreen_texture.hpp diff --git a/mapbox-gl-native/src/mbgl/gl/program.hpp b/src/mbgl/gl/program.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/program.hpp rename to src/mbgl/gl/program.hpp diff --git a/mapbox-gl-native/src/mbgl/gl/render_custom_layer.cpp b/src/mbgl/gl/render_custom_layer.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/render_custom_layer.cpp rename to src/mbgl/gl/render_custom_layer.cpp diff --git a/mapbox-gl-native/src/mbgl/gl/render_custom_layer.hpp b/src/mbgl/gl/render_custom_layer.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/render_custom_layer.hpp rename to src/mbgl/gl/render_custom_layer.hpp diff --git a/mapbox-gl-native/src/mbgl/gl/render_pass.cpp b/src/mbgl/gl/render_pass.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/render_pass.cpp rename to src/mbgl/gl/render_pass.cpp diff --git a/mapbox-gl-native/src/mbgl/gl/render_pass.hpp b/src/mbgl/gl/render_pass.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/render_pass.hpp rename to src/mbgl/gl/render_pass.hpp diff --git a/mapbox-gl-native/src/mbgl/gl/renderbuffer_resource.hpp b/src/mbgl/gl/renderbuffer_resource.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/renderbuffer_resource.hpp rename to src/mbgl/gl/renderbuffer_resource.hpp diff --git a/mapbox-gl-native/src/mbgl/gl/renderer_backend.cpp b/src/mbgl/gl/renderer_backend.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/renderer_backend.cpp rename to src/mbgl/gl/renderer_backend.cpp diff --git a/mapbox-gl-native/src/mbgl/gl/state.hpp b/src/mbgl/gl/state.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/state.hpp rename to src/mbgl/gl/state.hpp diff --git a/mapbox-gl-native/src/mbgl/gl/texture.cpp b/src/mbgl/gl/texture.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/texture.cpp rename to src/mbgl/gl/texture.cpp diff --git a/mapbox-gl-native/src/mbgl/gl/texture.hpp b/src/mbgl/gl/texture.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/texture.hpp rename to src/mbgl/gl/texture.hpp diff --git a/mapbox-gl-native/src/mbgl/gl/texture_resource.cpp b/src/mbgl/gl/texture_resource.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/texture_resource.cpp rename to src/mbgl/gl/texture_resource.cpp diff --git a/mapbox-gl-native/src/mbgl/gl/texture_resource.hpp b/src/mbgl/gl/texture_resource.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/texture_resource.hpp rename to src/mbgl/gl/texture_resource.hpp diff --git a/mapbox-gl-native/src/mbgl/gl/types.hpp b/src/mbgl/gl/types.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/types.hpp rename to src/mbgl/gl/types.hpp diff --git a/mapbox-gl-native/src/mbgl/gl/uniform.cpp b/src/mbgl/gl/uniform.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/uniform.cpp rename to src/mbgl/gl/uniform.cpp diff --git a/mapbox-gl-native/src/mbgl/gl/uniform.hpp b/src/mbgl/gl/uniform.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/uniform.hpp rename to src/mbgl/gl/uniform.hpp diff --git a/mapbox-gl-native/src/mbgl/gl/upload_pass.cpp b/src/mbgl/gl/upload_pass.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/upload_pass.cpp rename to src/mbgl/gl/upload_pass.cpp diff --git a/mapbox-gl-native/src/mbgl/gl/upload_pass.hpp b/src/mbgl/gl/upload_pass.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/upload_pass.hpp rename to src/mbgl/gl/upload_pass.hpp diff --git a/mapbox-gl-native/src/mbgl/gl/value.cpp b/src/mbgl/gl/value.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/value.cpp rename to src/mbgl/gl/value.cpp diff --git a/mapbox-gl-native/src/mbgl/gl/value.hpp b/src/mbgl/gl/value.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/value.hpp rename to src/mbgl/gl/value.hpp diff --git a/mapbox-gl-native/src/mbgl/gl/vertex_array.cpp b/src/mbgl/gl/vertex_array.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/vertex_array.cpp rename to src/mbgl/gl/vertex_array.cpp diff --git a/mapbox-gl-native/src/mbgl/gl/vertex_array.hpp b/src/mbgl/gl/vertex_array.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/vertex_array.hpp rename to src/mbgl/gl/vertex_array.hpp diff --git a/mapbox-gl-native/src/mbgl/gl/vertex_array_extension.hpp b/src/mbgl/gl/vertex_array_extension.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/vertex_array_extension.hpp rename to src/mbgl/gl/vertex_array_extension.hpp diff --git a/mapbox-gl-native/src/mbgl/gl/vertex_buffer_resource.cpp b/src/mbgl/gl/vertex_buffer_resource.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/vertex_buffer_resource.cpp rename to src/mbgl/gl/vertex_buffer_resource.cpp diff --git a/mapbox-gl-native/src/mbgl/gl/vertex_buffer_resource.hpp b/src/mbgl/gl/vertex_buffer_resource.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/gl/vertex_buffer_resource.hpp rename to src/mbgl/gl/vertex_buffer_resource.hpp diff --git a/mapbox-gl-native/src/mbgl/layermanager/background_layer_factory.cpp b/src/mbgl/layermanager/background_layer_factory.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/layermanager/background_layer_factory.cpp rename to src/mbgl/layermanager/background_layer_factory.cpp diff --git a/mapbox-gl-native/src/mbgl/layermanager/circle_layer_factory.cpp b/src/mbgl/layermanager/circle_layer_factory.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/layermanager/circle_layer_factory.cpp rename to src/mbgl/layermanager/circle_layer_factory.cpp diff --git a/mapbox-gl-native/src/mbgl/layermanager/fill_extrusion_layer_factory.cpp b/src/mbgl/layermanager/fill_extrusion_layer_factory.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/layermanager/fill_extrusion_layer_factory.cpp rename to src/mbgl/layermanager/fill_extrusion_layer_factory.cpp diff --git a/mapbox-gl-native/src/mbgl/layermanager/fill_layer_factory.cpp b/src/mbgl/layermanager/fill_layer_factory.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/layermanager/fill_layer_factory.cpp rename to src/mbgl/layermanager/fill_layer_factory.cpp diff --git a/mapbox-gl-native/src/mbgl/layermanager/heatmap_layer_factory.cpp b/src/mbgl/layermanager/heatmap_layer_factory.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/layermanager/heatmap_layer_factory.cpp rename to src/mbgl/layermanager/heatmap_layer_factory.cpp diff --git a/mapbox-gl-native/src/mbgl/layermanager/hillshade_layer_factory.cpp b/src/mbgl/layermanager/hillshade_layer_factory.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/layermanager/hillshade_layer_factory.cpp rename to src/mbgl/layermanager/hillshade_layer_factory.cpp diff --git a/mapbox-gl-native/src/mbgl/layermanager/layer_factory.cpp b/src/mbgl/layermanager/layer_factory.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/layermanager/layer_factory.cpp rename to src/mbgl/layermanager/layer_factory.cpp diff --git a/mapbox-gl-native/src/mbgl/layermanager/layer_manager.cpp b/src/mbgl/layermanager/layer_manager.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/layermanager/layer_manager.cpp rename to src/mbgl/layermanager/layer_manager.cpp diff --git a/mapbox-gl-native/src/mbgl/layermanager/line_layer_factory.cpp b/src/mbgl/layermanager/line_layer_factory.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/layermanager/line_layer_factory.cpp rename to src/mbgl/layermanager/line_layer_factory.cpp diff --git a/mapbox-gl-native/src/mbgl/layermanager/location_indicator_layer_factory.cpp b/src/mbgl/layermanager/location_indicator_layer_factory.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/layermanager/location_indicator_layer_factory.cpp rename to src/mbgl/layermanager/location_indicator_layer_factory.cpp diff --git a/mapbox-gl-native/src/mbgl/layermanager/raster_layer_factory.cpp b/src/mbgl/layermanager/raster_layer_factory.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/layermanager/raster_layer_factory.cpp rename to src/mbgl/layermanager/raster_layer_factory.cpp diff --git a/mapbox-gl-native/src/mbgl/layermanager/symbol_layer_factory.cpp b/src/mbgl/layermanager/symbol_layer_factory.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/layermanager/symbol_layer_factory.cpp rename to src/mbgl/layermanager/symbol_layer_factory.cpp diff --git a/mapbox-gl-native/src/mbgl/layout/circle_layout.hpp b/src/mbgl/layout/circle_layout.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/layout/circle_layout.hpp rename to src/mbgl/layout/circle_layout.hpp diff --git a/mapbox-gl-native/src/mbgl/layout/clip_lines.cpp b/src/mbgl/layout/clip_lines.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/layout/clip_lines.cpp rename to src/mbgl/layout/clip_lines.cpp diff --git a/mapbox-gl-native/src/mbgl/layout/clip_lines.hpp b/src/mbgl/layout/clip_lines.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/layout/clip_lines.hpp rename to src/mbgl/layout/clip_lines.hpp diff --git a/mapbox-gl-native/src/mbgl/layout/layout.hpp b/src/mbgl/layout/layout.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/layout/layout.hpp rename to src/mbgl/layout/layout.hpp diff --git a/mapbox-gl-native/src/mbgl/layout/merge_lines.cpp b/src/mbgl/layout/merge_lines.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/layout/merge_lines.cpp rename to src/mbgl/layout/merge_lines.cpp diff --git a/mapbox-gl-native/src/mbgl/layout/merge_lines.hpp b/src/mbgl/layout/merge_lines.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/layout/merge_lines.hpp rename to src/mbgl/layout/merge_lines.hpp diff --git a/mapbox-gl-native/src/mbgl/layout/pattern_layout.hpp b/src/mbgl/layout/pattern_layout.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/layout/pattern_layout.hpp rename to src/mbgl/layout/pattern_layout.hpp diff --git a/mapbox-gl-native/src/mbgl/layout/symbol_feature.hpp b/src/mbgl/layout/symbol_feature.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/layout/symbol_feature.hpp rename to src/mbgl/layout/symbol_feature.hpp diff --git a/mapbox-gl-native/src/mbgl/layout/symbol_instance.cpp b/src/mbgl/layout/symbol_instance.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/layout/symbol_instance.cpp rename to src/mbgl/layout/symbol_instance.cpp diff --git a/mapbox-gl-native/src/mbgl/layout/symbol_instance.hpp b/src/mbgl/layout/symbol_instance.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/layout/symbol_instance.hpp rename to src/mbgl/layout/symbol_instance.hpp diff --git a/mapbox-gl-native/src/mbgl/layout/symbol_layout.cpp b/src/mbgl/layout/symbol_layout.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/layout/symbol_layout.cpp rename to src/mbgl/layout/symbol_layout.cpp diff --git a/mapbox-gl-native/src/mbgl/layout/symbol_layout.hpp b/src/mbgl/layout/symbol_layout.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/layout/symbol_layout.hpp rename to src/mbgl/layout/symbol_layout.hpp diff --git a/mapbox-gl-native/src/mbgl/layout/symbol_projection.cpp b/src/mbgl/layout/symbol_projection.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/layout/symbol_projection.cpp rename to src/mbgl/layout/symbol_projection.cpp diff --git a/mapbox-gl-native/src/mbgl/layout/symbol_projection.hpp b/src/mbgl/layout/symbol_projection.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/layout/symbol_projection.hpp rename to src/mbgl/layout/symbol_projection.hpp diff --git a/mapbox-gl-native/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/map/map.cpp rename to src/mbgl/map/map.cpp diff --git a/mapbox-gl-native/src/mbgl/map/map_impl.cpp b/src/mbgl/map/map_impl.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/map/map_impl.cpp rename to src/mbgl/map/map_impl.cpp diff --git a/mapbox-gl-native/src/mbgl/map/map_impl.hpp b/src/mbgl/map/map_impl.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/map/map_impl.hpp rename to src/mbgl/map/map_impl.hpp diff --git a/mapbox-gl-native/src/mbgl/map/map_options.cpp b/src/mbgl/map/map_options.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/map/map_options.cpp rename to src/mbgl/map/map_options.cpp diff --git a/mapbox-gl-native/src/mbgl/map/transform.cpp b/src/mbgl/map/transform.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/map/transform.cpp rename to src/mbgl/map/transform.cpp diff --git a/mapbox-gl-native/src/mbgl/map/transform.hpp b/src/mbgl/map/transform.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/map/transform.hpp rename to src/mbgl/map/transform.hpp diff --git a/mapbox-gl-native/src/mbgl/map/transform_state.cpp b/src/mbgl/map/transform_state.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/map/transform_state.cpp rename to src/mbgl/map/transform_state.cpp diff --git a/mapbox-gl-native/src/mbgl/map/transform_state.hpp b/src/mbgl/map/transform_state.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/map/transform_state.hpp rename to src/mbgl/map/transform_state.hpp diff --git a/mapbox-gl-native/src/mbgl/map/zoom_history.hpp b/src/mbgl/map/zoom_history.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/map/zoom_history.hpp rename to src/mbgl/map/zoom_history.hpp diff --git a/mapbox-gl-native/src/mbgl/math/log2.cpp b/src/mbgl/math/log2.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/math/log2.cpp rename to src/mbgl/math/log2.cpp diff --git a/mapbox-gl-native/src/mbgl/platform/gl_functions.cpp b/src/mbgl/platform/gl_functions.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/platform/gl_functions.cpp rename to src/mbgl/platform/gl_functions.cpp diff --git a/mapbox-gl-native/src/mbgl/platform/settings.cpp b/src/mbgl/platform/settings.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/platform/settings.cpp rename to src/mbgl/platform/settings.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/attributes.hpp b/src/mbgl/programs/attributes.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/attributes.hpp rename to src/mbgl/programs/attributes.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/background_pattern_program.hpp b/src/mbgl/programs/background_pattern_program.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/background_pattern_program.hpp rename to src/mbgl/programs/background_pattern_program.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/background_program.cpp b/src/mbgl/programs/background_program.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/background_program.cpp rename to src/mbgl/programs/background_program.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/background_program.hpp b/src/mbgl/programs/background_program.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/background_program.hpp rename to src/mbgl/programs/background_program.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/circle_program.cpp b/src/mbgl/programs/circle_program.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/circle_program.cpp rename to src/mbgl/programs/circle_program.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/circle_program.hpp b/src/mbgl/programs/circle_program.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/circle_program.hpp rename to src/mbgl/programs/circle_program.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/clipping_mask_program.cpp b/src/mbgl/programs/clipping_mask_program.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/clipping_mask_program.cpp rename to src/mbgl/programs/clipping_mask_program.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/clipping_mask_program.hpp b/src/mbgl/programs/clipping_mask_program.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/clipping_mask_program.hpp rename to src/mbgl/programs/clipping_mask_program.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/collision_box_program.cpp b/src/mbgl/programs/collision_box_program.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/collision_box_program.cpp rename to src/mbgl/programs/collision_box_program.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/collision_box_program.hpp b/src/mbgl/programs/collision_box_program.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/collision_box_program.hpp rename to src/mbgl/programs/collision_box_program.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/collision_circle_program.hpp b/src/mbgl/programs/collision_circle_program.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/collision_circle_program.hpp rename to src/mbgl/programs/collision_circle_program.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/debug_program.cpp b/src/mbgl/programs/debug_program.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/debug_program.cpp rename to src/mbgl/programs/debug_program.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/debug_program.hpp b/src/mbgl/programs/debug_program.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/debug_program.hpp rename to src/mbgl/programs/debug_program.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/fill_extrusion_pattern_program.hpp b/src/mbgl/programs/fill_extrusion_pattern_program.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/fill_extrusion_pattern_program.hpp rename to src/mbgl/programs/fill_extrusion_pattern_program.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/fill_extrusion_program.cpp b/src/mbgl/programs/fill_extrusion_program.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/fill_extrusion_program.cpp rename to src/mbgl/programs/fill_extrusion_program.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/fill_extrusion_program.hpp b/src/mbgl/programs/fill_extrusion_program.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/fill_extrusion_program.hpp rename to src/mbgl/programs/fill_extrusion_program.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/fill_outline_pattern_program.hpp b/src/mbgl/programs/fill_outline_pattern_program.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/fill_outline_pattern_program.hpp rename to src/mbgl/programs/fill_outline_pattern_program.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/fill_outline_program.hpp b/src/mbgl/programs/fill_outline_program.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/fill_outline_program.hpp rename to src/mbgl/programs/fill_outline_program.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/fill_pattern_program.hpp b/src/mbgl/programs/fill_pattern_program.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/fill_pattern_program.hpp rename to src/mbgl/programs/fill_pattern_program.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/fill_program.cpp b/src/mbgl/programs/fill_program.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/fill_program.cpp rename to src/mbgl/programs/fill_program.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/fill_program.hpp b/src/mbgl/programs/fill_program.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/fill_program.hpp rename to src/mbgl/programs/fill_program.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/gl/background.cpp b/src/mbgl/programs/gl/background.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/gl/background.cpp rename to src/mbgl/programs/gl/background.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/gl/background_pattern.cpp b/src/mbgl/programs/gl/background_pattern.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/gl/background_pattern.cpp rename to src/mbgl/programs/gl/background_pattern.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/gl/circle.cpp b/src/mbgl/programs/gl/circle.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/gl/circle.cpp rename to src/mbgl/programs/gl/circle.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/gl/clipping_mask.cpp b/src/mbgl/programs/gl/clipping_mask.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/gl/clipping_mask.cpp rename to src/mbgl/programs/gl/clipping_mask.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/gl/collision_box.cpp b/src/mbgl/programs/gl/collision_box.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/gl/collision_box.cpp rename to src/mbgl/programs/gl/collision_box.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/gl/collision_circle.cpp b/src/mbgl/programs/gl/collision_circle.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/gl/collision_circle.cpp rename to src/mbgl/programs/gl/collision_circle.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/gl/debug.cpp b/src/mbgl/programs/gl/debug.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/gl/debug.cpp rename to src/mbgl/programs/gl/debug.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/gl/fill.cpp b/src/mbgl/programs/gl/fill.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/gl/fill.cpp rename to src/mbgl/programs/gl/fill.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/gl/fill_extrusion.cpp b/src/mbgl/programs/gl/fill_extrusion.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/gl/fill_extrusion.cpp rename to src/mbgl/programs/gl/fill_extrusion.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/gl/fill_extrusion_pattern.cpp b/src/mbgl/programs/gl/fill_extrusion_pattern.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/gl/fill_extrusion_pattern.cpp rename to src/mbgl/programs/gl/fill_extrusion_pattern.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/gl/fill_outline.cpp b/src/mbgl/programs/gl/fill_outline.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/gl/fill_outline.cpp rename to src/mbgl/programs/gl/fill_outline.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/gl/fill_outline_pattern.cpp b/src/mbgl/programs/gl/fill_outline_pattern.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/gl/fill_outline_pattern.cpp rename to src/mbgl/programs/gl/fill_outline_pattern.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/gl/fill_pattern.cpp b/src/mbgl/programs/gl/fill_pattern.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/gl/fill_pattern.cpp rename to src/mbgl/programs/gl/fill_pattern.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/gl/heatmap.cpp b/src/mbgl/programs/gl/heatmap.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/gl/heatmap.cpp rename to src/mbgl/programs/gl/heatmap.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/gl/heatmap_texture.cpp b/src/mbgl/programs/gl/heatmap_texture.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/gl/heatmap_texture.cpp rename to src/mbgl/programs/gl/heatmap_texture.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/gl/hillshade.cpp b/src/mbgl/programs/gl/hillshade.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/gl/hillshade.cpp rename to src/mbgl/programs/gl/hillshade.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/gl/hillshade_prepare.cpp b/src/mbgl/programs/gl/hillshade_prepare.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/gl/hillshade_prepare.cpp rename to src/mbgl/programs/gl/hillshade_prepare.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/gl/line.cpp b/src/mbgl/programs/gl/line.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/gl/line.cpp rename to src/mbgl/programs/gl/line.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/gl/line_gradient.cpp b/src/mbgl/programs/gl/line_gradient.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/gl/line_gradient.cpp rename to src/mbgl/programs/gl/line_gradient.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/gl/line_pattern.cpp b/src/mbgl/programs/gl/line_pattern.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/gl/line_pattern.cpp rename to src/mbgl/programs/gl/line_pattern.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/gl/line_sdf.cpp b/src/mbgl/programs/gl/line_sdf.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/gl/line_sdf.cpp rename to src/mbgl/programs/gl/line_sdf.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/gl/preludes.hpp b/src/mbgl/programs/gl/preludes.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/gl/preludes.hpp rename to src/mbgl/programs/gl/preludes.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/gl/raster.cpp b/src/mbgl/programs/gl/raster.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/gl/raster.cpp rename to src/mbgl/programs/gl/raster.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/gl/shader_source.cpp b/src/mbgl/programs/gl/shader_source.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/gl/shader_source.cpp rename to src/mbgl/programs/gl/shader_source.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/gl/shader_source.hpp b/src/mbgl/programs/gl/shader_source.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/gl/shader_source.hpp rename to src/mbgl/programs/gl/shader_source.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/gl/shaders.cpp b/src/mbgl/programs/gl/shaders.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/gl/shaders.cpp rename to src/mbgl/programs/gl/shaders.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/gl/shaders.hpp b/src/mbgl/programs/gl/shaders.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/gl/shaders.hpp rename to src/mbgl/programs/gl/shaders.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/gl/symbol_icon.cpp b/src/mbgl/programs/gl/symbol_icon.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/gl/symbol_icon.cpp rename to src/mbgl/programs/gl/symbol_icon.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/gl/symbol_sdf_icon.cpp b/src/mbgl/programs/gl/symbol_sdf_icon.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/gl/symbol_sdf_icon.cpp rename to src/mbgl/programs/gl/symbol_sdf_icon.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/gl/symbol_sdf_text.cpp b/src/mbgl/programs/gl/symbol_sdf_text.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/gl/symbol_sdf_text.cpp rename to src/mbgl/programs/gl/symbol_sdf_text.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/gl/symbol_text_and_icon.cpp b/src/mbgl/programs/gl/symbol_text_and_icon.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/gl/symbol_text_and_icon.cpp rename to src/mbgl/programs/gl/symbol_text_and_icon.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/heatmap_program.cpp b/src/mbgl/programs/heatmap_program.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/heatmap_program.cpp rename to src/mbgl/programs/heatmap_program.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/heatmap_program.hpp b/src/mbgl/programs/heatmap_program.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/heatmap_program.hpp rename to src/mbgl/programs/heatmap_program.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/heatmap_texture_program.cpp b/src/mbgl/programs/heatmap_texture_program.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/heatmap_texture_program.cpp rename to src/mbgl/programs/heatmap_texture_program.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/heatmap_texture_program.hpp b/src/mbgl/programs/heatmap_texture_program.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/heatmap_texture_program.hpp rename to src/mbgl/programs/heatmap_texture_program.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/hillshade_prepare_program.cpp b/src/mbgl/programs/hillshade_prepare_program.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/hillshade_prepare_program.cpp rename to src/mbgl/programs/hillshade_prepare_program.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/hillshade_prepare_program.hpp b/src/mbgl/programs/hillshade_prepare_program.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/hillshade_prepare_program.hpp rename to src/mbgl/programs/hillshade_prepare_program.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/hillshade_program.cpp b/src/mbgl/programs/hillshade_program.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/hillshade_program.cpp rename to src/mbgl/programs/hillshade_program.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/hillshade_program.hpp b/src/mbgl/programs/hillshade_program.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/hillshade_program.hpp rename to src/mbgl/programs/hillshade_program.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/line_gradient_program.hpp b/src/mbgl/programs/line_gradient_program.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/line_gradient_program.hpp rename to src/mbgl/programs/line_gradient_program.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/line_pattern_program.hpp b/src/mbgl/programs/line_pattern_program.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/line_pattern_program.hpp rename to src/mbgl/programs/line_pattern_program.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/line_program.cpp b/src/mbgl/programs/line_program.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/line_program.cpp rename to src/mbgl/programs/line_program.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/line_program.hpp b/src/mbgl/programs/line_program.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/line_program.hpp rename to src/mbgl/programs/line_program.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/line_sdf_program.hpp b/src/mbgl/programs/line_sdf_program.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/line_sdf_program.hpp rename to src/mbgl/programs/line_sdf_program.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/program.hpp b/src/mbgl/programs/program.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/program.hpp rename to src/mbgl/programs/program.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/program_parameters.cpp b/src/mbgl/programs/program_parameters.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/program_parameters.cpp rename to src/mbgl/programs/program_parameters.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/program_parameters.hpp b/src/mbgl/programs/program_parameters.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/program_parameters.hpp rename to src/mbgl/programs/program_parameters.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/programs.cpp b/src/mbgl/programs/programs.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/programs.cpp rename to src/mbgl/programs/programs.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/programs.hpp b/src/mbgl/programs/programs.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/programs.hpp rename to src/mbgl/programs/programs.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/raster_program.cpp b/src/mbgl/programs/raster_program.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/raster_program.cpp rename to src/mbgl/programs/raster_program.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/raster_program.hpp b/src/mbgl/programs/raster_program.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/raster_program.hpp rename to src/mbgl/programs/raster_program.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/segment.hpp b/src/mbgl/programs/segment.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/segment.hpp rename to src/mbgl/programs/segment.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/symbol_icon_program.hpp b/src/mbgl/programs/symbol_icon_program.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/symbol_icon_program.hpp rename to src/mbgl/programs/symbol_icon_program.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/symbol_program.cpp b/src/mbgl/programs/symbol_program.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/symbol_program.cpp rename to src/mbgl/programs/symbol_program.cpp diff --git a/mapbox-gl-native/src/mbgl/programs/symbol_program.hpp b/src/mbgl/programs/symbol_program.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/symbol_program.hpp rename to src/mbgl/programs/symbol_program.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/symbol_sdf_icon_program.hpp b/src/mbgl/programs/symbol_sdf_icon_program.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/symbol_sdf_icon_program.hpp rename to src/mbgl/programs/symbol_sdf_icon_program.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/symbol_sdf_text_program.hpp b/src/mbgl/programs/symbol_sdf_text_program.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/symbol_sdf_text_program.hpp rename to src/mbgl/programs/symbol_sdf_text_program.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/symbol_text_and_icon_program.hpp b/src/mbgl/programs/symbol_text_and_icon_program.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/symbol_text_and_icon_program.hpp rename to src/mbgl/programs/symbol_text_and_icon_program.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/textures.hpp b/src/mbgl/programs/textures.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/textures.hpp rename to src/mbgl/programs/textures.hpp diff --git a/mapbox-gl-native/src/mbgl/programs/uniforms.hpp b/src/mbgl/programs/uniforms.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/programs/uniforms.hpp rename to src/mbgl/programs/uniforms.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/backend_scope.cpp b/src/mbgl/renderer/backend_scope.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/backend_scope.cpp rename to src/mbgl/renderer/backend_scope.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/bucket.hpp b/src/mbgl/renderer/bucket.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/bucket.hpp rename to src/mbgl/renderer/bucket.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/bucket_parameters.cpp b/src/mbgl/renderer/bucket_parameters.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/bucket_parameters.cpp rename to src/mbgl/renderer/bucket_parameters.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/bucket_parameters.hpp b/src/mbgl/renderer/bucket_parameters.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/bucket_parameters.hpp rename to src/mbgl/renderer/bucket_parameters.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/buckets/circle_bucket.cpp b/src/mbgl/renderer/buckets/circle_bucket.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/buckets/circle_bucket.cpp rename to src/mbgl/renderer/buckets/circle_bucket.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/buckets/circle_bucket.hpp b/src/mbgl/renderer/buckets/circle_bucket.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/buckets/circle_bucket.hpp rename to src/mbgl/renderer/buckets/circle_bucket.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/buckets/debug_bucket.cpp b/src/mbgl/renderer/buckets/debug_bucket.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/buckets/debug_bucket.cpp rename to src/mbgl/renderer/buckets/debug_bucket.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/buckets/debug_bucket.hpp b/src/mbgl/renderer/buckets/debug_bucket.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/buckets/debug_bucket.hpp rename to src/mbgl/renderer/buckets/debug_bucket.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/buckets/fill_bucket.cpp b/src/mbgl/renderer/buckets/fill_bucket.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/buckets/fill_bucket.cpp rename to src/mbgl/renderer/buckets/fill_bucket.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/buckets/fill_bucket.hpp b/src/mbgl/renderer/buckets/fill_bucket.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/buckets/fill_bucket.hpp rename to src/mbgl/renderer/buckets/fill_bucket.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/buckets/fill_extrusion_bucket.cpp b/src/mbgl/renderer/buckets/fill_extrusion_bucket.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/buckets/fill_extrusion_bucket.cpp rename to src/mbgl/renderer/buckets/fill_extrusion_bucket.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/buckets/fill_extrusion_bucket.hpp b/src/mbgl/renderer/buckets/fill_extrusion_bucket.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/buckets/fill_extrusion_bucket.hpp rename to src/mbgl/renderer/buckets/fill_extrusion_bucket.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/buckets/heatmap_bucket.cpp b/src/mbgl/renderer/buckets/heatmap_bucket.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/buckets/heatmap_bucket.cpp rename to src/mbgl/renderer/buckets/heatmap_bucket.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/buckets/heatmap_bucket.hpp b/src/mbgl/renderer/buckets/heatmap_bucket.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/buckets/heatmap_bucket.hpp rename to src/mbgl/renderer/buckets/heatmap_bucket.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/buckets/hillshade_bucket.cpp b/src/mbgl/renderer/buckets/hillshade_bucket.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/buckets/hillshade_bucket.cpp rename to src/mbgl/renderer/buckets/hillshade_bucket.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/buckets/hillshade_bucket.hpp b/src/mbgl/renderer/buckets/hillshade_bucket.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/buckets/hillshade_bucket.hpp rename to src/mbgl/renderer/buckets/hillshade_bucket.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/buckets/line_bucket.cpp b/src/mbgl/renderer/buckets/line_bucket.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/buckets/line_bucket.cpp rename to src/mbgl/renderer/buckets/line_bucket.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/buckets/line_bucket.hpp b/src/mbgl/renderer/buckets/line_bucket.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/buckets/line_bucket.hpp rename to src/mbgl/renderer/buckets/line_bucket.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/buckets/raster_bucket.cpp b/src/mbgl/renderer/buckets/raster_bucket.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/buckets/raster_bucket.cpp rename to src/mbgl/renderer/buckets/raster_bucket.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/buckets/raster_bucket.hpp b/src/mbgl/renderer/buckets/raster_bucket.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/buckets/raster_bucket.hpp rename to src/mbgl/renderer/buckets/raster_bucket.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/buckets/symbol_bucket.cpp b/src/mbgl/renderer/buckets/symbol_bucket.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/buckets/symbol_bucket.cpp rename to src/mbgl/renderer/buckets/symbol_bucket.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/buckets/symbol_bucket.hpp b/src/mbgl/renderer/buckets/symbol_bucket.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/buckets/symbol_bucket.hpp rename to src/mbgl/renderer/buckets/symbol_bucket.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/cross_faded_property_evaluator.cpp b/src/mbgl/renderer/cross_faded_property_evaluator.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/cross_faded_property_evaluator.cpp rename to src/mbgl/renderer/cross_faded_property_evaluator.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/cross_faded_property_evaluator.hpp b/src/mbgl/renderer/cross_faded_property_evaluator.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/cross_faded_property_evaluator.hpp rename to src/mbgl/renderer/cross_faded_property_evaluator.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/data_driven_property_evaluator.hpp b/src/mbgl/renderer/data_driven_property_evaluator.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/data_driven_property_evaluator.hpp rename to src/mbgl/renderer/data_driven_property_evaluator.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/group_by_layout.cpp b/src/mbgl/renderer/group_by_layout.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/group_by_layout.cpp rename to src/mbgl/renderer/group_by_layout.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/group_by_layout.hpp b/src/mbgl/renderer/group_by_layout.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/group_by_layout.hpp rename to src/mbgl/renderer/group_by_layout.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/image_atlas.cpp b/src/mbgl/renderer/image_atlas.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/image_atlas.cpp rename to src/mbgl/renderer/image_atlas.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/image_atlas.hpp b/src/mbgl/renderer/image_atlas.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/image_atlas.hpp rename to src/mbgl/renderer/image_atlas.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/image_manager.cpp b/src/mbgl/renderer/image_manager.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/image_manager.cpp rename to src/mbgl/renderer/image_manager.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/image_manager.hpp b/src/mbgl/renderer/image_manager.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/image_manager.hpp rename to src/mbgl/renderer/image_manager.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/image_manager_observer.hpp b/src/mbgl/renderer/image_manager_observer.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/image_manager_observer.hpp rename to src/mbgl/renderer/image_manager_observer.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/layers/render_background_layer.cpp b/src/mbgl/renderer/layers/render_background_layer.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/layers/render_background_layer.cpp rename to src/mbgl/renderer/layers/render_background_layer.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/layers/render_background_layer.hpp b/src/mbgl/renderer/layers/render_background_layer.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/layers/render_background_layer.hpp rename to src/mbgl/renderer/layers/render_background_layer.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/layers/render_circle_layer.cpp b/src/mbgl/renderer/layers/render_circle_layer.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/layers/render_circle_layer.cpp rename to src/mbgl/renderer/layers/render_circle_layer.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/layers/render_circle_layer.hpp b/src/mbgl/renderer/layers/render_circle_layer.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/layers/render_circle_layer.hpp rename to src/mbgl/renderer/layers/render_circle_layer.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp b/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp rename to src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/layers/render_fill_extrusion_layer.hpp b/src/mbgl/renderer/layers/render_fill_extrusion_layer.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/layers/render_fill_extrusion_layer.hpp rename to src/mbgl/renderer/layers/render_fill_extrusion_layer.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/layers/render_fill_layer.cpp b/src/mbgl/renderer/layers/render_fill_layer.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/layers/render_fill_layer.cpp rename to src/mbgl/renderer/layers/render_fill_layer.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/layers/render_fill_layer.hpp b/src/mbgl/renderer/layers/render_fill_layer.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/layers/render_fill_layer.hpp rename to src/mbgl/renderer/layers/render_fill_layer.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/layers/render_heatmap_layer.cpp b/src/mbgl/renderer/layers/render_heatmap_layer.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/layers/render_heatmap_layer.cpp rename to src/mbgl/renderer/layers/render_heatmap_layer.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/layers/render_heatmap_layer.hpp b/src/mbgl/renderer/layers/render_heatmap_layer.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/layers/render_heatmap_layer.hpp rename to src/mbgl/renderer/layers/render_heatmap_layer.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/layers/render_hillshade_layer.cpp b/src/mbgl/renderer/layers/render_hillshade_layer.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/layers/render_hillshade_layer.cpp rename to src/mbgl/renderer/layers/render_hillshade_layer.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/layers/render_hillshade_layer.hpp b/src/mbgl/renderer/layers/render_hillshade_layer.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/layers/render_hillshade_layer.hpp rename to src/mbgl/renderer/layers/render_hillshade_layer.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/layers/render_line_layer.cpp b/src/mbgl/renderer/layers/render_line_layer.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/layers/render_line_layer.cpp rename to src/mbgl/renderer/layers/render_line_layer.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/layers/render_line_layer.hpp b/src/mbgl/renderer/layers/render_line_layer.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/layers/render_line_layer.hpp rename to src/mbgl/renderer/layers/render_line_layer.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/layers/render_location_indicator_layer.cpp b/src/mbgl/renderer/layers/render_location_indicator_layer.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/layers/render_location_indicator_layer.cpp rename to src/mbgl/renderer/layers/render_location_indicator_layer.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/layers/render_location_indicator_layer.hpp b/src/mbgl/renderer/layers/render_location_indicator_layer.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/layers/render_location_indicator_layer.hpp rename to src/mbgl/renderer/layers/render_location_indicator_layer.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/layers/render_raster_layer.cpp b/src/mbgl/renderer/layers/render_raster_layer.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/layers/render_raster_layer.cpp rename to src/mbgl/renderer/layers/render_raster_layer.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/layers/render_raster_layer.hpp b/src/mbgl/renderer/layers/render_raster_layer.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/layers/render_raster_layer.hpp rename to src/mbgl/renderer/layers/render_raster_layer.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/layers/render_symbol_layer.cpp b/src/mbgl/renderer/layers/render_symbol_layer.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/layers/render_symbol_layer.cpp rename to src/mbgl/renderer/layers/render_symbol_layer.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/layers/render_symbol_layer.hpp b/src/mbgl/renderer/layers/render_symbol_layer.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/layers/render_symbol_layer.hpp rename to src/mbgl/renderer/layers/render_symbol_layer.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/paint_parameters.cpp b/src/mbgl/renderer/paint_parameters.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/paint_parameters.cpp rename to src/mbgl/renderer/paint_parameters.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/paint_parameters.hpp b/src/mbgl/renderer/paint_parameters.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/paint_parameters.hpp rename to src/mbgl/renderer/paint_parameters.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/paint_property_binder.hpp b/src/mbgl/renderer/paint_property_binder.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/paint_property_binder.hpp rename to src/mbgl/renderer/paint_property_binder.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/paint_property_statistics.hpp b/src/mbgl/renderer/paint_property_statistics.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/paint_property_statistics.hpp rename to src/mbgl/renderer/paint_property_statistics.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/pattern_atlas.cpp b/src/mbgl/renderer/pattern_atlas.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/pattern_atlas.cpp rename to src/mbgl/renderer/pattern_atlas.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/pattern_atlas.hpp b/src/mbgl/renderer/pattern_atlas.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/pattern_atlas.hpp rename to src/mbgl/renderer/pattern_atlas.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/possibly_evaluated_property_value.hpp b/src/mbgl/renderer/possibly_evaluated_property_value.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/possibly_evaluated_property_value.hpp rename to src/mbgl/renderer/possibly_evaluated_property_value.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/property_evaluation_parameters.hpp b/src/mbgl/renderer/property_evaluation_parameters.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/property_evaluation_parameters.hpp rename to src/mbgl/renderer/property_evaluation_parameters.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/property_evaluator.hpp b/src/mbgl/renderer/property_evaluator.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/property_evaluator.hpp rename to src/mbgl/renderer/property_evaluator.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/render_layer.cpp b/src/mbgl/renderer/render_layer.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/render_layer.cpp rename to src/mbgl/renderer/render_layer.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/render_layer.hpp b/src/mbgl/renderer/render_layer.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/render_layer.hpp rename to src/mbgl/renderer/render_layer.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/render_light.cpp b/src/mbgl/renderer/render_light.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/render_light.cpp rename to src/mbgl/renderer/render_light.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/render_light.hpp b/src/mbgl/renderer/render_light.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/render_light.hpp rename to src/mbgl/renderer/render_light.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/render_orchestrator.cpp b/src/mbgl/renderer/render_orchestrator.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/render_orchestrator.cpp rename to src/mbgl/renderer/render_orchestrator.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/render_orchestrator.hpp b/src/mbgl/renderer/render_orchestrator.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/render_orchestrator.hpp rename to src/mbgl/renderer/render_orchestrator.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/render_pass.hpp b/src/mbgl/renderer/render_pass.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/render_pass.hpp rename to src/mbgl/renderer/render_pass.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/render_source.cpp b/src/mbgl/renderer/render_source.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/render_source.cpp rename to src/mbgl/renderer/render_source.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/render_source.hpp b/src/mbgl/renderer/render_source.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/render_source.hpp rename to src/mbgl/renderer/render_source.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/render_source_observer.hpp b/src/mbgl/renderer/render_source_observer.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/render_source_observer.hpp rename to src/mbgl/renderer/render_source_observer.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/render_static_data.cpp b/src/mbgl/renderer/render_static_data.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/render_static_data.cpp rename to src/mbgl/renderer/render_static_data.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/render_static_data.hpp b/src/mbgl/renderer/render_static_data.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/render_static_data.hpp rename to src/mbgl/renderer/render_static_data.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/render_tile.cpp b/src/mbgl/renderer/render_tile.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/render_tile.cpp rename to src/mbgl/renderer/render_tile.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/render_tile.hpp b/src/mbgl/renderer/render_tile.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/render_tile.hpp rename to src/mbgl/renderer/render_tile.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/render_tree.hpp b/src/mbgl/renderer/render_tree.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/render_tree.hpp rename to src/mbgl/renderer/render_tree.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/renderer.cpp b/src/mbgl/renderer/renderer.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/renderer.cpp rename to src/mbgl/renderer/renderer.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/renderer_impl.cpp b/src/mbgl/renderer/renderer_impl.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/renderer_impl.cpp rename to src/mbgl/renderer/renderer_impl.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/renderer_impl.hpp b/src/mbgl/renderer/renderer_impl.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/renderer_impl.hpp rename to src/mbgl/renderer/renderer_impl.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/renderer_state.cpp b/src/mbgl/renderer/renderer_state.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/renderer_state.cpp rename to src/mbgl/renderer/renderer_state.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/source_state.cpp b/src/mbgl/renderer/source_state.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/source_state.cpp rename to src/mbgl/renderer/source_state.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/source_state.hpp b/src/mbgl/renderer/source_state.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/source_state.hpp rename to src/mbgl/renderer/source_state.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/sources/render_custom_geometry_source.cpp b/src/mbgl/renderer/sources/render_custom_geometry_source.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/sources/render_custom_geometry_source.cpp rename to src/mbgl/renderer/sources/render_custom_geometry_source.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/sources/render_custom_geometry_source.hpp b/src/mbgl/renderer/sources/render_custom_geometry_source.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/sources/render_custom_geometry_source.hpp rename to src/mbgl/renderer/sources/render_custom_geometry_source.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/sources/render_geojson_source.cpp b/src/mbgl/renderer/sources/render_geojson_source.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/sources/render_geojson_source.cpp rename to src/mbgl/renderer/sources/render_geojson_source.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/sources/render_geojson_source.hpp b/src/mbgl/renderer/sources/render_geojson_source.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/sources/render_geojson_source.hpp rename to src/mbgl/renderer/sources/render_geojson_source.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/sources/render_image_source.cpp b/src/mbgl/renderer/sources/render_image_source.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/sources/render_image_source.cpp rename to src/mbgl/renderer/sources/render_image_source.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/sources/render_image_source.hpp b/src/mbgl/renderer/sources/render_image_source.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/sources/render_image_source.hpp rename to src/mbgl/renderer/sources/render_image_source.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/sources/render_raster_dem_source.cpp b/src/mbgl/renderer/sources/render_raster_dem_source.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/sources/render_raster_dem_source.cpp rename to src/mbgl/renderer/sources/render_raster_dem_source.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/sources/render_raster_dem_source.hpp b/src/mbgl/renderer/sources/render_raster_dem_source.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/sources/render_raster_dem_source.hpp rename to src/mbgl/renderer/sources/render_raster_dem_source.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/sources/render_raster_source.cpp b/src/mbgl/renderer/sources/render_raster_source.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/sources/render_raster_source.cpp rename to src/mbgl/renderer/sources/render_raster_source.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/sources/render_raster_source.hpp b/src/mbgl/renderer/sources/render_raster_source.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/sources/render_raster_source.hpp rename to src/mbgl/renderer/sources/render_raster_source.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/sources/render_tile_source.cpp b/src/mbgl/renderer/sources/render_tile_source.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/sources/render_tile_source.cpp rename to src/mbgl/renderer/sources/render_tile_source.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/sources/render_tile_source.hpp b/src/mbgl/renderer/sources/render_tile_source.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/sources/render_tile_source.hpp rename to src/mbgl/renderer/sources/render_tile_source.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/sources/render_vector_source.cpp b/src/mbgl/renderer/sources/render_vector_source.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/sources/render_vector_source.cpp rename to src/mbgl/renderer/sources/render_vector_source.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/sources/render_vector_source.hpp b/src/mbgl/renderer/sources/render_vector_source.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/sources/render_vector_source.hpp rename to src/mbgl/renderer/sources/render_vector_source.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/style_diff.cpp b/src/mbgl/renderer/style_diff.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/style_diff.cpp rename to src/mbgl/renderer/style_diff.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/style_diff.hpp b/src/mbgl/renderer/style_diff.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/style_diff.hpp rename to src/mbgl/renderer/style_diff.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/tile_mask.hpp b/src/mbgl/renderer/tile_mask.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/tile_mask.hpp rename to src/mbgl/renderer/tile_mask.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/tile_parameters.hpp b/src/mbgl/renderer/tile_parameters.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/tile_parameters.hpp rename to src/mbgl/renderer/tile_parameters.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/tile_pyramid.cpp b/src/mbgl/renderer/tile_pyramid.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/tile_pyramid.cpp rename to src/mbgl/renderer/tile_pyramid.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/tile_pyramid.hpp b/src/mbgl/renderer/tile_pyramid.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/tile_pyramid.hpp rename to src/mbgl/renderer/tile_pyramid.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/tile_render_data.cpp b/src/mbgl/renderer/tile_render_data.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/tile_render_data.cpp rename to src/mbgl/renderer/tile_render_data.cpp diff --git a/mapbox-gl-native/src/mbgl/renderer/tile_render_data.hpp b/src/mbgl/renderer/tile_render_data.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/tile_render_data.hpp rename to src/mbgl/renderer/tile_render_data.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/transition_parameters.hpp b/src/mbgl/renderer/transition_parameters.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/transition_parameters.hpp rename to src/mbgl/renderer/transition_parameters.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/update_parameters.hpp b/src/mbgl/renderer/update_parameters.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/update_parameters.hpp rename to src/mbgl/renderer/update_parameters.hpp diff --git a/mapbox-gl-native/src/mbgl/renderer/upload_parameters.hpp b/src/mbgl/renderer/upload_parameters.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/renderer/upload_parameters.hpp rename to src/mbgl/renderer/upload_parameters.hpp diff --git a/mapbox-gl-native/src/mbgl/sprite/sprite_loader.cpp b/src/mbgl/sprite/sprite_loader.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/sprite/sprite_loader.cpp rename to src/mbgl/sprite/sprite_loader.cpp diff --git a/mapbox-gl-native/src/mbgl/sprite/sprite_loader.hpp b/src/mbgl/sprite/sprite_loader.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/sprite/sprite_loader.hpp rename to src/mbgl/sprite/sprite_loader.hpp diff --git a/mapbox-gl-native/src/mbgl/sprite/sprite_loader_observer.hpp b/src/mbgl/sprite/sprite_loader_observer.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/sprite/sprite_loader_observer.hpp rename to src/mbgl/sprite/sprite_loader_observer.hpp diff --git a/mapbox-gl-native/src/mbgl/sprite/sprite_parser.cpp b/src/mbgl/sprite/sprite_parser.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/sprite/sprite_parser.cpp rename to src/mbgl/sprite/sprite_parser.cpp diff --git a/mapbox-gl-native/src/mbgl/sprite/sprite_parser.hpp b/src/mbgl/sprite/sprite_parser.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/sprite/sprite_parser.hpp rename to src/mbgl/sprite/sprite_parser.hpp diff --git a/mapbox-gl-native/src/mbgl/storage/asset_file_source.hpp b/src/mbgl/storage/asset_file_source.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/storage/asset_file_source.hpp rename to src/mbgl/storage/asset_file_source.hpp diff --git a/mapbox-gl-native/src/mbgl/storage/file_source_manager.cpp b/src/mbgl/storage/file_source_manager.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/storage/file_source_manager.cpp rename to src/mbgl/storage/file_source_manager.cpp diff --git a/mapbox-gl-native/src/mbgl/storage/http_file_source.hpp b/src/mbgl/storage/http_file_source.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/storage/http_file_source.hpp rename to src/mbgl/storage/http_file_source.hpp diff --git a/mapbox-gl-native/src/mbgl/storage/local_file_source.hpp b/src/mbgl/storage/local_file_source.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/storage/local_file_source.hpp rename to src/mbgl/storage/local_file_source.hpp diff --git a/mapbox-gl-native/src/mbgl/storage/main_resource_loader.hpp b/src/mbgl/storage/main_resource_loader.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/storage/main_resource_loader.hpp rename to src/mbgl/storage/main_resource_loader.hpp diff --git a/mapbox-gl-native/src/mbgl/storage/network_status.cpp b/src/mbgl/storage/network_status.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/storage/network_status.cpp rename to src/mbgl/storage/network_status.cpp diff --git a/mapbox-gl-native/src/mbgl/storage/resource.cpp b/src/mbgl/storage/resource.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/storage/resource.cpp rename to src/mbgl/storage/resource.cpp diff --git a/mapbox-gl-native/src/mbgl/storage/resource_options.cpp b/src/mbgl/storage/resource_options.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/storage/resource_options.cpp rename to src/mbgl/storage/resource_options.cpp diff --git a/mapbox-gl-native/src/mbgl/storage/resource_transform.cpp b/src/mbgl/storage/resource_transform.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/storage/resource_transform.cpp rename to src/mbgl/storage/resource_transform.cpp diff --git a/mapbox-gl-native/src/mbgl/storage/response.cpp b/src/mbgl/storage/response.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/storage/response.cpp rename to src/mbgl/storage/response.cpp diff --git a/mapbox-gl-native/src/mbgl/style/collection.hpp b/src/mbgl/style/collection.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/collection.hpp rename to src/mbgl/style/collection.hpp diff --git a/mapbox-gl-native/src/mbgl/style/conversion/color_ramp_property_value.cpp b/src/mbgl/style/conversion/color_ramp_property_value.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/conversion/color_ramp_property_value.cpp rename to src/mbgl/style/conversion/color_ramp_property_value.cpp diff --git a/mapbox-gl-native/src/mbgl/style/conversion/constant.cpp b/src/mbgl/style/conversion/constant.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/conversion/constant.cpp rename to src/mbgl/style/conversion/constant.cpp diff --git a/mapbox-gl-native/src/mbgl/style/conversion/coordinate.cpp b/src/mbgl/style/conversion/coordinate.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/conversion/coordinate.cpp rename to src/mbgl/style/conversion/coordinate.cpp diff --git a/mapbox-gl-native/src/mbgl/style/conversion/custom_geometry_source_options.cpp b/src/mbgl/style/conversion/custom_geometry_source_options.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/conversion/custom_geometry_source_options.cpp rename to src/mbgl/style/conversion/custom_geometry_source_options.cpp diff --git a/mapbox-gl-native/src/mbgl/style/conversion/filter.cpp b/src/mbgl/style/conversion/filter.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/conversion/filter.cpp rename to src/mbgl/style/conversion/filter.cpp diff --git a/mapbox-gl-native/src/mbgl/style/conversion/function.cpp b/src/mbgl/style/conversion/function.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/conversion/function.cpp rename to src/mbgl/style/conversion/function.cpp diff --git a/mapbox-gl-native/src/mbgl/style/conversion/geojson.cpp b/src/mbgl/style/conversion/geojson.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/conversion/geojson.cpp rename to src/mbgl/style/conversion/geojson.cpp diff --git a/mapbox-gl-native/src/mbgl/style/conversion/geojson_options.cpp b/src/mbgl/style/conversion/geojson_options.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/conversion/geojson_options.cpp rename to src/mbgl/style/conversion/geojson_options.cpp diff --git a/mapbox-gl-native/src/mbgl/style/conversion/get_json_type.cpp b/src/mbgl/style/conversion/get_json_type.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/conversion/get_json_type.cpp rename to src/mbgl/style/conversion/get_json_type.cpp diff --git a/mapbox-gl-native/src/mbgl/style/conversion/json.hpp b/src/mbgl/style/conversion/json.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/conversion/json.hpp rename to src/mbgl/style/conversion/json.hpp diff --git a/mapbox-gl-native/src/mbgl/style/conversion/layer.cpp b/src/mbgl/style/conversion/layer.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/conversion/layer.cpp rename to src/mbgl/style/conversion/layer.cpp diff --git a/mapbox-gl-native/src/mbgl/style/conversion/light.cpp b/src/mbgl/style/conversion/light.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/conversion/light.cpp rename to src/mbgl/style/conversion/light.cpp diff --git a/mapbox-gl-native/src/mbgl/style/conversion/position.cpp b/src/mbgl/style/conversion/position.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/conversion/position.cpp rename to src/mbgl/style/conversion/position.cpp diff --git a/mapbox-gl-native/src/mbgl/style/conversion/property_value.cpp b/src/mbgl/style/conversion/property_value.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/conversion/property_value.cpp rename to src/mbgl/style/conversion/property_value.cpp diff --git a/mapbox-gl-native/src/mbgl/style/conversion/rotation.cpp b/src/mbgl/style/conversion/rotation.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/conversion/rotation.cpp rename to src/mbgl/style/conversion/rotation.cpp diff --git a/mapbox-gl-native/src/mbgl/style/conversion/source.cpp b/src/mbgl/style/conversion/source.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/conversion/source.cpp rename to src/mbgl/style/conversion/source.cpp diff --git a/mapbox-gl-native/src/mbgl/style/conversion/stringify.hpp b/src/mbgl/style/conversion/stringify.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/conversion/stringify.hpp rename to src/mbgl/style/conversion/stringify.hpp diff --git a/mapbox-gl-native/src/mbgl/style/conversion/tileset.cpp b/src/mbgl/style/conversion/tileset.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/conversion/tileset.cpp rename to src/mbgl/style/conversion/tileset.cpp diff --git a/mapbox-gl-native/src/mbgl/style/conversion/transition_options.cpp b/src/mbgl/style/conversion/transition_options.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/conversion/transition_options.cpp rename to src/mbgl/style/conversion/transition_options.cpp diff --git a/mapbox-gl-native/src/mbgl/style/custom_tile_loader.cpp b/src/mbgl/style/custom_tile_loader.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/custom_tile_loader.cpp rename to src/mbgl/style/custom_tile_loader.cpp diff --git a/mapbox-gl-native/src/mbgl/style/custom_tile_loader.hpp b/src/mbgl/style/custom_tile_loader.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/custom_tile_loader.hpp rename to src/mbgl/style/custom_tile_loader.hpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/assertion.cpp b/src/mbgl/style/expression/assertion.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/assertion.cpp rename to src/mbgl/style/expression/assertion.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/at.cpp b/src/mbgl/style/expression/at.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/at.cpp rename to src/mbgl/style/expression/at.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/boolean_operator.cpp b/src/mbgl/style/expression/boolean_operator.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/boolean_operator.cpp rename to src/mbgl/style/expression/boolean_operator.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/case.cpp b/src/mbgl/style/expression/case.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/case.cpp rename to src/mbgl/style/expression/case.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/check_subtype.cpp b/src/mbgl/style/expression/check_subtype.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/check_subtype.cpp rename to src/mbgl/style/expression/check_subtype.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/coalesce.cpp b/src/mbgl/style/expression/coalesce.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/coalesce.cpp rename to src/mbgl/style/expression/coalesce.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/coercion.cpp b/src/mbgl/style/expression/coercion.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/coercion.cpp rename to src/mbgl/style/expression/coercion.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/collator.cpp b/src/mbgl/style/expression/collator.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/collator.cpp rename to src/mbgl/style/expression/collator.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/collator_expression.cpp b/src/mbgl/style/expression/collator_expression.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/collator_expression.cpp rename to src/mbgl/style/expression/collator_expression.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/comparison.cpp b/src/mbgl/style/expression/comparison.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/comparison.cpp rename to src/mbgl/style/expression/comparison.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/compound_expression.cpp b/src/mbgl/style/expression/compound_expression.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/compound_expression.cpp rename to src/mbgl/style/expression/compound_expression.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/distance.cpp b/src/mbgl/style/expression/distance.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/distance.cpp rename to src/mbgl/style/expression/distance.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/dsl.cpp b/src/mbgl/style/expression/dsl.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/dsl.cpp rename to src/mbgl/style/expression/dsl.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/dsl_impl.hpp b/src/mbgl/style/expression/dsl_impl.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/dsl_impl.hpp rename to src/mbgl/style/expression/dsl_impl.hpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/expression.cpp b/src/mbgl/style/expression/expression.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/expression.cpp rename to src/mbgl/style/expression/expression.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/find_zoom_curve.cpp b/src/mbgl/style/expression/find_zoom_curve.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/find_zoom_curve.cpp rename to src/mbgl/style/expression/find_zoom_curve.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/format_expression.cpp b/src/mbgl/style/expression/format_expression.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/format_expression.cpp rename to src/mbgl/style/expression/format_expression.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/formatted.cpp b/src/mbgl/style/expression/formatted.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/formatted.cpp rename to src/mbgl/style/expression/formatted.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/get_covering_stops.cpp b/src/mbgl/style/expression/get_covering_stops.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/get_covering_stops.cpp rename to src/mbgl/style/expression/get_covering_stops.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/image.cpp b/src/mbgl/style/expression/image.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/image.cpp rename to src/mbgl/style/expression/image.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/image_expression.cpp b/src/mbgl/style/expression/image_expression.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/image_expression.cpp rename to src/mbgl/style/expression/image_expression.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/in.cpp b/src/mbgl/style/expression/in.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/in.cpp rename to src/mbgl/style/expression/in.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/interpolate.cpp b/src/mbgl/style/expression/interpolate.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/interpolate.cpp rename to src/mbgl/style/expression/interpolate.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/is_constant.cpp b/src/mbgl/style/expression/is_constant.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/is_constant.cpp rename to src/mbgl/style/expression/is_constant.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/is_expression.cpp b/src/mbgl/style/expression/is_expression.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/is_expression.cpp rename to src/mbgl/style/expression/is_expression.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/length.cpp b/src/mbgl/style/expression/length.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/length.cpp rename to src/mbgl/style/expression/length.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/let.cpp b/src/mbgl/style/expression/let.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/let.cpp rename to src/mbgl/style/expression/let.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/literal.cpp b/src/mbgl/style/expression/literal.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/literal.cpp rename to src/mbgl/style/expression/literal.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/match.cpp b/src/mbgl/style/expression/match.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/match.cpp rename to src/mbgl/style/expression/match.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/number_format.cpp b/src/mbgl/style/expression/number_format.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/number_format.cpp rename to src/mbgl/style/expression/number_format.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/parsing_context.cpp b/src/mbgl/style/expression/parsing_context.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/parsing_context.cpp rename to src/mbgl/style/expression/parsing_context.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/step.cpp b/src/mbgl/style/expression/step.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/step.cpp rename to src/mbgl/style/expression/step.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/util.cpp b/src/mbgl/style/expression/util.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/util.cpp rename to src/mbgl/style/expression/util.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/util.hpp b/src/mbgl/style/expression/util.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/util.hpp rename to src/mbgl/style/expression/util.hpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/value.cpp b/src/mbgl/style/expression/value.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/value.cpp rename to src/mbgl/style/expression/value.cpp diff --git a/mapbox-gl-native/src/mbgl/style/expression/within.cpp b/src/mbgl/style/expression/within.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/expression/within.cpp rename to src/mbgl/style/expression/within.cpp diff --git a/mapbox-gl-native/src/mbgl/style/filter.cpp b/src/mbgl/style/filter.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/filter.cpp rename to src/mbgl/style/filter.cpp diff --git a/mapbox-gl-native/src/mbgl/style/image.cpp b/src/mbgl/style/image.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/image.cpp rename to src/mbgl/style/image.cpp diff --git a/mapbox-gl-native/src/mbgl/style/image_impl.cpp b/src/mbgl/style/image_impl.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/image_impl.cpp rename to src/mbgl/style/image_impl.cpp diff --git a/mapbox-gl-native/src/mbgl/style/image_impl.hpp b/src/mbgl/style/image_impl.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/image_impl.hpp rename to src/mbgl/style/image_impl.hpp diff --git a/mapbox-gl-native/src/mbgl/style/layer.cpp b/src/mbgl/style/layer.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layer.cpp rename to src/mbgl/style/layer.cpp diff --git a/mapbox-gl-native/src/mbgl/style/layer_impl.cpp b/src/mbgl/style/layer_impl.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layer_impl.cpp rename to src/mbgl/style/layer_impl.cpp diff --git a/mapbox-gl-native/src/mbgl/style/layer_impl.hpp b/src/mbgl/style/layer_impl.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layer_impl.hpp rename to src/mbgl/style/layer_impl.hpp diff --git a/mapbox-gl-native/src/mbgl/style/layer_observer.hpp b/src/mbgl/style/layer_observer.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layer_observer.hpp rename to src/mbgl/style/layer_observer.hpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/background_layer.cpp b/src/mbgl/style/layers/background_layer.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/background_layer.cpp rename to src/mbgl/style/layers/background_layer.cpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/background_layer_impl.cpp b/src/mbgl/style/layers/background_layer_impl.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/background_layer_impl.cpp rename to src/mbgl/style/layers/background_layer_impl.cpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/background_layer_impl.hpp b/src/mbgl/style/layers/background_layer_impl.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/background_layer_impl.hpp rename to src/mbgl/style/layers/background_layer_impl.hpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/background_layer_properties.cpp b/src/mbgl/style/layers/background_layer_properties.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/background_layer_properties.cpp rename to src/mbgl/style/layers/background_layer_properties.cpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/background_layer_properties.hpp b/src/mbgl/style/layers/background_layer_properties.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/background_layer_properties.hpp rename to src/mbgl/style/layers/background_layer_properties.hpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/circle_layer.cpp b/src/mbgl/style/layers/circle_layer.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/circle_layer.cpp rename to src/mbgl/style/layers/circle_layer.cpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/circle_layer_impl.cpp b/src/mbgl/style/layers/circle_layer_impl.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/circle_layer_impl.cpp rename to src/mbgl/style/layers/circle_layer_impl.cpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/circle_layer_impl.hpp b/src/mbgl/style/layers/circle_layer_impl.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/circle_layer_impl.hpp rename to src/mbgl/style/layers/circle_layer_impl.hpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/circle_layer_properties.cpp b/src/mbgl/style/layers/circle_layer_properties.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/circle_layer_properties.cpp rename to src/mbgl/style/layers/circle_layer_properties.cpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/circle_layer_properties.hpp b/src/mbgl/style/layers/circle_layer_properties.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/circle_layer_properties.hpp rename to src/mbgl/style/layers/circle_layer_properties.hpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/fill_extrusion_layer.cpp b/src/mbgl/style/layers/fill_extrusion_layer.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/fill_extrusion_layer.cpp rename to src/mbgl/style/layers/fill_extrusion_layer.cpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/fill_extrusion_layer_impl.cpp b/src/mbgl/style/layers/fill_extrusion_layer_impl.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/fill_extrusion_layer_impl.cpp rename to src/mbgl/style/layers/fill_extrusion_layer_impl.cpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/fill_extrusion_layer_impl.hpp b/src/mbgl/style/layers/fill_extrusion_layer_impl.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/fill_extrusion_layer_impl.hpp rename to src/mbgl/style/layers/fill_extrusion_layer_impl.hpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/fill_extrusion_layer_properties.cpp b/src/mbgl/style/layers/fill_extrusion_layer_properties.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/fill_extrusion_layer_properties.cpp rename to src/mbgl/style/layers/fill_extrusion_layer_properties.cpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/fill_extrusion_layer_properties.hpp b/src/mbgl/style/layers/fill_extrusion_layer_properties.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/fill_extrusion_layer_properties.hpp rename to src/mbgl/style/layers/fill_extrusion_layer_properties.hpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/fill_layer.cpp b/src/mbgl/style/layers/fill_layer.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/fill_layer.cpp rename to src/mbgl/style/layers/fill_layer.cpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/fill_layer_impl.cpp b/src/mbgl/style/layers/fill_layer_impl.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/fill_layer_impl.cpp rename to src/mbgl/style/layers/fill_layer_impl.cpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/fill_layer_impl.hpp b/src/mbgl/style/layers/fill_layer_impl.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/fill_layer_impl.hpp rename to src/mbgl/style/layers/fill_layer_impl.hpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/fill_layer_properties.cpp b/src/mbgl/style/layers/fill_layer_properties.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/fill_layer_properties.cpp rename to src/mbgl/style/layers/fill_layer_properties.cpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/fill_layer_properties.hpp b/src/mbgl/style/layers/fill_layer_properties.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/fill_layer_properties.hpp rename to src/mbgl/style/layers/fill_layer_properties.hpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/heatmap_layer.cpp b/src/mbgl/style/layers/heatmap_layer.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/heatmap_layer.cpp rename to src/mbgl/style/layers/heatmap_layer.cpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/heatmap_layer_impl.cpp b/src/mbgl/style/layers/heatmap_layer_impl.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/heatmap_layer_impl.cpp rename to src/mbgl/style/layers/heatmap_layer_impl.cpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/heatmap_layer_impl.hpp b/src/mbgl/style/layers/heatmap_layer_impl.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/heatmap_layer_impl.hpp rename to src/mbgl/style/layers/heatmap_layer_impl.hpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/heatmap_layer_properties.cpp b/src/mbgl/style/layers/heatmap_layer_properties.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/heatmap_layer_properties.cpp rename to src/mbgl/style/layers/heatmap_layer_properties.cpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/heatmap_layer_properties.hpp b/src/mbgl/style/layers/heatmap_layer_properties.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/heatmap_layer_properties.hpp rename to src/mbgl/style/layers/heatmap_layer_properties.hpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/hillshade_layer.cpp b/src/mbgl/style/layers/hillshade_layer.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/hillshade_layer.cpp rename to src/mbgl/style/layers/hillshade_layer.cpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/hillshade_layer_impl.cpp b/src/mbgl/style/layers/hillshade_layer_impl.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/hillshade_layer_impl.cpp rename to src/mbgl/style/layers/hillshade_layer_impl.cpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/hillshade_layer_impl.hpp b/src/mbgl/style/layers/hillshade_layer_impl.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/hillshade_layer_impl.hpp rename to src/mbgl/style/layers/hillshade_layer_impl.hpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/hillshade_layer_properties.cpp b/src/mbgl/style/layers/hillshade_layer_properties.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/hillshade_layer_properties.cpp rename to src/mbgl/style/layers/hillshade_layer_properties.cpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/hillshade_layer_properties.hpp b/src/mbgl/style/layers/hillshade_layer_properties.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/hillshade_layer_properties.hpp rename to src/mbgl/style/layers/hillshade_layer_properties.hpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/layer.cpp.ejs b/src/mbgl/style/layers/layer.cpp.ejs similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/layer.cpp.ejs rename to src/mbgl/style/layers/layer.cpp.ejs diff --git a/mapbox-gl-native/src/mbgl/style/layers/layer_properties.cpp.ejs b/src/mbgl/style/layers/layer_properties.cpp.ejs similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/layer_properties.cpp.ejs rename to src/mbgl/style/layers/layer_properties.cpp.ejs diff --git a/mapbox-gl-native/src/mbgl/style/layers/layer_properties.hpp.ejs b/src/mbgl/style/layers/layer_properties.hpp.ejs similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/layer_properties.hpp.ejs rename to src/mbgl/style/layers/layer_properties.hpp.ejs diff --git a/mapbox-gl-native/src/mbgl/style/layers/line_layer.cpp b/src/mbgl/style/layers/line_layer.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/line_layer.cpp rename to src/mbgl/style/layers/line_layer.cpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/line_layer_impl.cpp b/src/mbgl/style/layers/line_layer_impl.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/line_layer_impl.cpp rename to src/mbgl/style/layers/line_layer_impl.cpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/line_layer_impl.hpp b/src/mbgl/style/layers/line_layer_impl.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/line_layer_impl.hpp rename to src/mbgl/style/layers/line_layer_impl.hpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/line_layer_properties.cpp b/src/mbgl/style/layers/line_layer_properties.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/line_layer_properties.cpp rename to src/mbgl/style/layers/line_layer_properties.cpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/line_layer_properties.hpp b/src/mbgl/style/layers/line_layer_properties.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/line_layer_properties.hpp rename to src/mbgl/style/layers/line_layer_properties.hpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/location_indicator_layer.cpp b/src/mbgl/style/layers/location_indicator_layer.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/location_indicator_layer.cpp rename to src/mbgl/style/layers/location_indicator_layer.cpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/location_indicator_layer_impl.cpp b/src/mbgl/style/layers/location_indicator_layer_impl.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/location_indicator_layer_impl.cpp rename to src/mbgl/style/layers/location_indicator_layer_impl.cpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/location_indicator_layer_impl.hpp b/src/mbgl/style/layers/location_indicator_layer_impl.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/location_indicator_layer_impl.hpp rename to src/mbgl/style/layers/location_indicator_layer_impl.hpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/location_indicator_layer_properties.cpp b/src/mbgl/style/layers/location_indicator_layer_properties.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/location_indicator_layer_properties.cpp rename to src/mbgl/style/layers/location_indicator_layer_properties.cpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/location_indicator_layer_properties.hpp b/src/mbgl/style/layers/location_indicator_layer_properties.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/location_indicator_layer_properties.hpp rename to src/mbgl/style/layers/location_indicator_layer_properties.hpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/raster_layer.cpp b/src/mbgl/style/layers/raster_layer.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/raster_layer.cpp rename to src/mbgl/style/layers/raster_layer.cpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/raster_layer_impl.cpp b/src/mbgl/style/layers/raster_layer_impl.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/raster_layer_impl.cpp rename to src/mbgl/style/layers/raster_layer_impl.cpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/raster_layer_impl.hpp b/src/mbgl/style/layers/raster_layer_impl.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/raster_layer_impl.hpp rename to src/mbgl/style/layers/raster_layer_impl.hpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/raster_layer_properties.cpp b/src/mbgl/style/layers/raster_layer_properties.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/raster_layer_properties.cpp rename to src/mbgl/style/layers/raster_layer_properties.cpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/raster_layer_properties.hpp b/src/mbgl/style/layers/raster_layer_properties.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/raster_layer_properties.hpp rename to src/mbgl/style/layers/raster_layer_properties.hpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/symbol_layer.cpp b/src/mbgl/style/layers/symbol_layer.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/symbol_layer.cpp rename to src/mbgl/style/layers/symbol_layer.cpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/symbol_layer_impl.cpp b/src/mbgl/style/layers/symbol_layer_impl.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/symbol_layer_impl.cpp rename to src/mbgl/style/layers/symbol_layer_impl.cpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/symbol_layer_impl.hpp b/src/mbgl/style/layers/symbol_layer_impl.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/symbol_layer_impl.hpp rename to src/mbgl/style/layers/symbol_layer_impl.hpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/symbol_layer_properties.cpp b/src/mbgl/style/layers/symbol_layer_properties.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/symbol_layer_properties.cpp rename to src/mbgl/style/layers/symbol_layer_properties.cpp diff --git a/mapbox-gl-native/src/mbgl/style/layers/symbol_layer_properties.hpp b/src/mbgl/style/layers/symbol_layer_properties.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layers/symbol_layer_properties.hpp rename to src/mbgl/style/layers/symbol_layer_properties.hpp diff --git a/mapbox-gl-native/src/mbgl/style/layout_property.hpp b/src/mbgl/style/layout_property.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/layout_property.hpp rename to src/mbgl/style/layout_property.hpp diff --git a/mapbox-gl-native/src/mbgl/style/light.cpp b/src/mbgl/style/light.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/light.cpp rename to src/mbgl/style/light.cpp diff --git a/mapbox-gl-native/src/mbgl/style/light.cpp.ejs b/src/mbgl/style/light.cpp.ejs similarity index 100% rename from mapbox-gl-native/src/mbgl/style/light.cpp.ejs rename to src/mbgl/style/light.cpp.ejs diff --git a/mapbox-gl-native/src/mbgl/style/light_impl.cpp b/src/mbgl/style/light_impl.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/light_impl.cpp rename to src/mbgl/style/light_impl.cpp diff --git a/mapbox-gl-native/src/mbgl/style/light_impl.hpp b/src/mbgl/style/light_impl.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/light_impl.hpp rename to src/mbgl/style/light_impl.hpp diff --git a/mapbox-gl-native/src/mbgl/style/light_observer.hpp b/src/mbgl/style/light_observer.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/light_observer.hpp rename to src/mbgl/style/light_observer.hpp diff --git a/mapbox-gl-native/src/mbgl/style/observer.hpp b/src/mbgl/style/observer.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/observer.hpp rename to src/mbgl/style/observer.hpp diff --git a/mapbox-gl-native/src/mbgl/style/paint_property.hpp b/src/mbgl/style/paint_property.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/paint_property.hpp rename to src/mbgl/style/paint_property.hpp diff --git a/mapbox-gl-native/src/mbgl/style/parser.cpp b/src/mbgl/style/parser.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/parser.cpp rename to src/mbgl/style/parser.cpp diff --git a/mapbox-gl-native/src/mbgl/style/parser.hpp b/src/mbgl/style/parser.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/parser.hpp rename to src/mbgl/style/parser.hpp diff --git a/mapbox-gl-native/src/mbgl/style/properties.hpp b/src/mbgl/style/properties.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/properties.hpp rename to src/mbgl/style/properties.hpp diff --git a/mapbox-gl-native/src/mbgl/style/property_expression.cpp b/src/mbgl/style/property_expression.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/property_expression.cpp rename to src/mbgl/style/property_expression.cpp diff --git a/mapbox-gl-native/src/mbgl/style/rapidjson_conversion.hpp b/src/mbgl/style/rapidjson_conversion.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/rapidjson_conversion.hpp rename to src/mbgl/style/rapidjson_conversion.hpp diff --git a/mapbox-gl-native/src/mbgl/style/source.cpp b/src/mbgl/style/source.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/source.cpp rename to src/mbgl/style/source.cpp diff --git a/mapbox-gl-native/src/mbgl/style/source_impl.cpp b/src/mbgl/style/source_impl.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/source_impl.cpp rename to src/mbgl/style/source_impl.cpp diff --git a/mapbox-gl-native/src/mbgl/style/source_impl.hpp b/src/mbgl/style/source_impl.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/source_impl.hpp rename to src/mbgl/style/source_impl.hpp diff --git a/mapbox-gl-native/src/mbgl/style/source_observer.hpp b/src/mbgl/style/source_observer.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/source_observer.hpp rename to src/mbgl/style/source_observer.hpp diff --git a/mapbox-gl-native/src/mbgl/style/sources/custom_geometry_source.cpp b/src/mbgl/style/sources/custom_geometry_source.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/sources/custom_geometry_source.cpp rename to src/mbgl/style/sources/custom_geometry_source.cpp diff --git a/mapbox-gl-native/src/mbgl/style/sources/custom_geometry_source_impl.cpp b/src/mbgl/style/sources/custom_geometry_source_impl.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/sources/custom_geometry_source_impl.cpp rename to src/mbgl/style/sources/custom_geometry_source_impl.cpp diff --git a/mapbox-gl-native/src/mbgl/style/sources/custom_geometry_source_impl.hpp b/src/mbgl/style/sources/custom_geometry_source_impl.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/sources/custom_geometry_source_impl.hpp rename to src/mbgl/style/sources/custom_geometry_source_impl.hpp diff --git a/mapbox-gl-native/src/mbgl/style/sources/geojson_source.cpp b/src/mbgl/style/sources/geojson_source.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/sources/geojson_source.cpp rename to src/mbgl/style/sources/geojson_source.cpp diff --git a/mapbox-gl-native/src/mbgl/style/sources/geojson_source_impl.cpp b/src/mbgl/style/sources/geojson_source_impl.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/sources/geojson_source_impl.cpp rename to src/mbgl/style/sources/geojson_source_impl.cpp diff --git a/mapbox-gl-native/src/mbgl/style/sources/geojson_source_impl.hpp b/src/mbgl/style/sources/geojson_source_impl.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/sources/geojson_source_impl.hpp rename to src/mbgl/style/sources/geojson_source_impl.hpp diff --git a/mapbox-gl-native/src/mbgl/style/sources/image_source.cpp b/src/mbgl/style/sources/image_source.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/sources/image_source.cpp rename to src/mbgl/style/sources/image_source.cpp diff --git a/mapbox-gl-native/src/mbgl/style/sources/image_source_impl.cpp b/src/mbgl/style/sources/image_source_impl.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/sources/image_source_impl.cpp rename to src/mbgl/style/sources/image_source_impl.cpp diff --git a/mapbox-gl-native/src/mbgl/style/sources/image_source_impl.hpp b/src/mbgl/style/sources/image_source_impl.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/sources/image_source_impl.hpp rename to src/mbgl/style/sources/image_source_impl.hpp diff --git a/mapbox-gl-native/src/mbgl/style/sources/raster_dem_source.cpp b/src/mbgl/style/sources/raster_dem_source.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/sources/raster_dem_source.cpp rename to src/mbgl/style/sources/raster_dem_source.cpp diff --git a/mapbox-gl-native/src/mbgl/style/sources/raster_source.cpp b/src/mbgl/style/sources/raster_source.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/sources/raster_source.cpp rename to src/mbgl/style/sources/raster_source.cpp diff --git a/mapbox-gl-native/src/mbgl/style/sources/raster_source_impl.cpp b/src/mbgl/style/sources/raster_source_impl.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/sources/raster_source_impl.cpp rename to src/mbgl/style/sources/raster_source_impl.cpp diff --git a/mapbox-gl-native/src/mbgl/style/sources/raster_source_impl.hpp b/src/mbgl/style/sources/raster_source_impl.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/sources/raster_source_impl.hpp rename to src/mbgl/style/sources/raster_source_impl.hpp diff --git a/mapbox-gl-native/src/mbgl/style/sources/vector_source.cpp b/src/mbgl/style/sources/vector_source.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/sources/vector_source.cpp rename to src/mbgl/style/sources/vector_source.cpp diff --git a/mapbox-gl-native/src/mbgl/style/sources/vector_source_impl.cpp b/src/mbgl/style/sources/vector_source_impl.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/sources/vector_source_impl.cpp rename to src/mbgl/style/sources/vector_source_impl.cpp diff --git a/mapbox-gl-native/src/mbgl/style/sources/vector_source_impl.hpp b/src/mbgl/style/sources/vector_source_impl.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/sources/vector_source_impl.hpp rename to src/mbgl/style/sources/vector_source_impl.hpp diff --git a/mapbox-gl-native/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/style.cpp rename to src/mbgl/style/style.cpp diff --git a/mapbox-gl-native/src/mbgl/style/style_impl.cpp b/src/mbgl/style/style_impl.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/style_impl.cpp rename to src/mbgl/style/style_impl.cpp diff --git a/mapbox-gl-native/src/mbgl/style/style_impl.hpp b/src/mbgl/style/style_impl.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/style_impl.hpp rename to src/mbgl/style/style_impl.hpp diff --git a/mapbox-gl-native/src/mbgl/style/types.cpp b/src/mbgl/style/types.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/style/types.cpp rename to src/mbgl/style/types.cpp diff --git a/mapbox-gl-native/src/mbgl/text/bidi.hpp b/src/mbgl/text/bidi.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/text/bidi.hpp rename to src/mbgl/text/bidi.hpp diff --git a/mapbox-gl-native/src/mbgl/text/check_max_angle.cpp b/src/mbgl/text/check_max_angle.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/text/check_max_angle.cpp rename to src/mbgl/text/check_max_angle.cpp diff --git a/mapbox-gl-native/src/mbgl/text/check_max_angle.hpp b/src/mbgl/text/check_max_angle.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/text/check_max_angle.hpp rename to src/mbgl/text/check_max_angle.hpp diff --git a/mapbox-gl-native/src/mbgl/text/collision_feature.cpp b/src/mbgl/text/collision_feature.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/text/collision_feature.cpp rename to src/mbgl/text/collision_feature.cpp diff --git a/mapbox-gl-native/src/mbgl/text/collision_feature.hpp b/src/mbgl/text/collision_feature.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/text/collision_feature.hpp rename to src/mbgl/text/collision_feature.hpp diff --git a/mapbox-gl-native/src/mbgl/text/collision_index.cpp b/src/mbgl/text/collision_index.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/text/collision_index.cpp rename to src/mbgl/text/collision_index.cpp diff --git a/mapbox-gl-native/src/mbgl/text/collision_index.hpp b/src/mbgl/text/collision_index.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/text/collision_index.hpp rename to src/mbgl/text/collision_index.hpp diff --git a/mapbox-gl-native/src/mbgl/text/cross_tile_symbol_index.cpp b/src/mbgl/text/cross_tile_symbol_index.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/text/cross_tile_symbol_index.cpp rename to src/mbgl/text/cross_tile_symbol_index.cpp diff --git a/mapbox-gl-native/src/mbgl/text/cross_tile_symbol_index.hpp b/src/mbgl/text/cross_tile_symbol_index.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/text/cross_tile_symbol_index.hpp rename to src/mbgl/text/cross_tile_symbol_index.hpp diff --git a/mapbox-gl-native/src/mbgl/text/get_anchors.cpp b/src/mbgl/text/get_anchors.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/text/get_anchors.cpp rename to src/mbgl/text/get_anchors.cpp diff --git a/mapbox-gl-native/src/mbgl/text/get_anchors.hpp b/src/mbgl/text/get_anchors.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/text/get_anchors.hpp rename to src/mbgl/text/get_anchors.hpp diff --git a/mapbox-gl-native/src/mbgl/text/glyph.cpp b/src/mbgl/text/glyph.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/text/glyph.cpp rename to src/mbgl/text/glyph.cpp diff --git a/mapbox-gl-native/src/mbgl/text/glyph.hpp b/src/mbgl/text/glyph.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/text/glyph.hpp rename to src/mbgl/text/glyph.hpp diff --git a/mapbox-gl-native/src/mbgl/text/glyph_atlas.cpp b/src/mbgl/text/glyph_atlas.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/text/glyph_atlas.cpp rename to src/mbgl/text/glyph_atlas.cpp diff --git a/mapbox-gl-native/src/mbgl/text/glyph_atlas.hpp b/src/mbgl/text/glyph_atlas.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/text/glyph_atlas.hpp rename to src/mbgl/text/glyph_atlas.hpp diff --git a/mapbox-gl-native/src/mbgl/text/glyph_manager.cpp b/src/mbgl/text/glyph_manager.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/text/glyph_manager.cpp rename to src/mbgl/text/glyph_manager.cpp diff --git a/mapbox-gl-native/src/mbgl/text/glyph_manager.hpp b/src/mbgl/text/glyph_manager.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/text/glyph_manager.hpp rename to src/mbgl/text/glyph_manager.hpp diff --git a/mapbox-gl-native/src/mbgl/text/glyph_manager_observer.hpp b/src/mbgl/text/glyph_manager_observer.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/text/glyph_manager_observer.hpp rename to src/mbgl/text/glyph_manager_observer.hpp diff --git a/mapbox-gl-native/src/mbgl/text/glyph_pbf.cpp b/src/mbgl/text/glyph_pbf.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/text/glyph_pbf.cpp rename to src/mbgl/text/glyph_pbf.cpp diff --git a/mapbox-gl-native/src/mbgl/text/glyph_pbf.hpp b/src/mbgl/text/glyph_pbf.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/text/glyph_pbf.hpp rename to src/mbgl/text/glyph_pbf.hpp diff --git a/mapbox-gl-native/src/mbgl/text/glyph_range.hpp b/src/mbgl/text/glyph_range.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/text/glyph_range.hpp rename to src/mbgl/text/glyph_range.hpp diff --git a/mapbox-gl-native/src/mbgl/text/language_tag.cpp b/src/mbgl/text/language_tag.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/text/language_tag.cpp rename to src/mbgl/text/language_tag.cpp diff --git a/mapbox-gl-native/src/mbgl/text/language_tag.hpp b/src/mbgl/text/language_tag.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/text/language_tag.hpp rename to src/mbgl/text/language_tag.hpp diff --git a/mapbox-gl-native/src/mbgl/text/local_glyph_rasterizer.hpp b/src/mbgl/text/local_glyph_rasterizer.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/text/local_glyph_rasterizer.hpp rename to src/mbgl/text/local_glyph_rasterizer.hpp diff --git a/mapbox-gl-native/src/mbgl/text/placement.cpp b/src/mbgl/text/placement.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/text/placement.cpp rename to src/mbgl/text/placement.cpp diff --git a/mapbox-gl-native/src/mbgl/text/placement.hpp b/src/mbgl/text/placement.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/text/placement.hpp rename to src/mbgl/text/placement.hpp diff --git a/mapbox-gl-native/src/mbgl/text/quads.cpp b/src/mbgl/text/quads.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/text/quads.cpp rename to src/mbgl/text/quads.cpp diff --git a/mapbox-gl-native/src/mbgl/text/quads.hpp b/src/mbgl/text/quads.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/text/quads.hpp rename to src/mbgl/text/quads.hpp diff --git a/mapbox-gl-native/src/mbgl/text/shaping.cpp b/src/mbgl/text/shaping.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/text/shaping.cpp rename to src/mbgl/text/shaping.cpp diff --git a/mapbox-gl-native/src/mbgl/text/shaping.hpp b/src/mbgl/text/shaping.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/text/shaping.hpp rename to src/mbgl/text/shaping.hpp diff --git a/mapbox-gl-native/src/mbgl/text/tagged_string.cpp b/src/mbgl/text/tagged_string.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/text/tagged_string.cpp rename to src/mbgl/text/tagged_string.cpp diff --git a/mapbox-gl-native/src/mbgl/text/tagged_string.hpp b/src/mbgl/text/tagged_string.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/text/tagged_string.hpp rename to src/mbgl/text/tagged_string.hpp diff --git a/mapbox-gl-native/src/mbgl/tile/custom_geometry_tile.cpp b/src/mbgl/tile/custom_geometry_tile.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/tile/custom_geometry_tile.cpp rename to src/mbgl/tile/custom_geometry_tile.cpp diff --git a/mapbox-gl-native/src/mbgl/tile/custom_geometry_tile.hpp b/src/mbgl/tile/custom_geometry_tile.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/tile/custom_geometry_tile.hpp rename to src/mbgl/tile/custom_geometry_tile.hpp diff --git a/mapbox-gl-native/src/mbgl/tile/geojson_tile.cpp b/src/mbgl/tile/geojson_tile.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/tile/geojson_tile.cpp rename to src/mbgl/tile/geojson_tile.cpp diff --git a/mapbox-gl-native/src/mbgl/tile/geojson_tile.hpp b/src/mbgl/tile/geojson_tile.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/tile/geojson_tile.hpp rename to src/mbgl/tile/geojson_tile.hpp diff --git a/mapbox-gl-native/src/mbgl/tile/geojson_tile_data.hpp b/src/mbgl/tile/geojson_tile_data.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/tile/geojson_tile_data.hpp rename to src/mbgl/tile/geojson_tile_data.hpp diff --git a/mapbox-gl-native/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/tile/geometry_tile.cpp rename to src/mbgl/tile/geometry_tile.cpp diff --git a/mapbox-gl-native/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/tile/geometry_tile.hpp rename to src/mbgl/tile/geometry_tile.hpp diff --git a/mapbox-gl-native/src/mbgl/tile/geometry_tile_data.cpp b/src/mbgl/tile/geometry_tile_data.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/tile/geometry_tile_data.cpp rename to src/mbgl/tile/geometry_tile_data.cpp diff --git a/mapbox-gl-native/src/mbgl/tile/geometry_tile_data.hpp b/src/mbgl/tile/geometry_tile_data.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/tile/geometry_tile_data.hpp rename to src/mbgl/tile/geometry_tile_data.hpp diff --git a/mapbox-gl-native/src/mbgl/tile/geometry_tile_worker.cpp b/src/mbgl/tile/geometry_tile_worker.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/tile/geometry_tile_worker.cpp rename to src/mbgl/tile/geometry_tile_worker.cpp diff --git a/mapbox-gl-native/src/mbgl/tile/geometry_tile_worker.hpp b/src/mbgl/tile/geometry_tile_worker.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/tile/geometry_tile_worker.hpp rename to src/mbgl/tile/geometry_tile_worker.hpp diff --git a/mapbox-gl-native/src/mbgl/tile/raster_dem_tile.cpp b/src/mbgl/tile/raster_dem_tile.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/tile/raster_dem_tile.cpp rename to src/mbgl/tile/raster_dem_tile.cpp diff --git a/mapbox-gl-native/src/mbgl/tile/raster_dem_tile.hpp b/src/mbgl/tile/raster_dem_tile.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/tile/raster_dem_tile.hpp rename to src/mbgl/tile/raster_dem_tile.hpp diff --git a/mapbox-gl-native/src/mbgl/tile/raster_dem_tile_worker.cpp b/src/mbgl/tile/raster_dem_tile_worker.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/tile/raster_dem_tile_worker.cpp rename to src/mbgl/tile/raster_dem_tile_worker.cpp diff --git a/mapbox-gl-native/src/mbgl/tile/raster_dem_tile_worker.hpp b/src/mbgl/tile/raster_dem_tile_worker.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/tile/raster_dem_tile_worker.hpp rename to src/mbgl/tile/raster_dem_tile_worker.hpp diff --git a/mapbox-gl-native/src/mbgl/tile/raster_tile.cpp b/src/mbgl/tile/raster_tile.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/tile/raster_tile.cpp rename to src/mbgl/tile/raster_tile.cpp diff --git a/mapbox-gl-native/src/mbgl/tile/raster_tile.hpp b/src/mbgl/tile/raster_tile.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/tile/raster_tile.hpp rename to src/mbgl/tile/raster_tile.hpp diff --git a/mapbox-gl-native/src/mbgl/tile/raster_tile_worker.cpp b/src/mbgl/tile/raster_tile_worker.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/tile/raster_tile_worker.cpp rename to src/mbgl/tile/raster_tile_worker.cpp diff --git a/mapbox-gl-native/src/mbgl/tile/raster_tile_worker.hpp b/src/mbgl/tile/raster_tile_worker.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/tile/raster_tile_worker.hpp rename to src/mbgl/tile/raster_tile_worker.hpp diff --git a/mapbox-gl-native/src/mbgl/tile/tile.cpp b/src/mbgl/tile/tile.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/tile/tile.cpp rename to src/mbgl/tile/tile.cpp diff --git a/mapbox-gl-native/src/mbgl/tile/tile.hpp b/src/mbgl/tile/tile.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/tile/tile.hpp rename to src/mbgl/tile/tile.hpp diff --git a/mapbox-gl-native/src/mbgl/tile/tile_cache.cpp b/src/mbgl/tile/tile_cache.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/tile/tile_cache.cpp rename to src/mbgl/tile/tile_cache.cpp diff --git a/mapbox-gl-native/src/mbgl/tile/tile_cache.hpp b/src/mbgl/tile/tile_cache.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/tile/tile_cache.hpp rename to src/mbgl/tile/tile_cache.hpp diff --git a/mapbox-gl-native/src/mbgl/tile/tile_id_hash.cpp b/src/mbgl/tile/tile_id_hash.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/tile/tile_id_hash.cpp rename to src/mbgl/tile/tile_id_hash.cpp diff --git a/mapbox-gl-native/src/mbgl/tile/tile_id_io.cpp b/src/mbgl/tile/tile_id_io.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/tile/tile_id_io.cpp rename to src/mbgl/tile/tile_id_io.cpp diff --git a/mapbox-gl-native/src/mbgl/tile/tile_loader.hpp b/src/mbgl/tile/tile_loader.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/tile/tile_loader.hpp rename to src/mbgl/tile/tile_loader.hpp diff --git a/mapbox-gl-native/src/mbgl/tile/tile_loader_impl.hpp b/src/mbgl/tile/tile_loader_impl.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/tile/tile_loader_impl.hpp rename to src/mbgl/tile/tile_loader_impl.hpp diff --git a/mapbox-gl-native/src/mbgl/tile/tile_observer.hpp b/src/mbgl/tile/tile_observer.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/tile/tile_observer.hpp rename to src/mbgl/tile/tile_observer.hpp diff --git a/mapbox-gl-native/src/mbgl/tile/vector_tile.cpp b/src/mbgl/tile/vector_tile.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/tile/vector_tile.cpp rename to src/mbgl/tile/vector_tile.cpp diff --git a/mapbox-gl-native/src/mbgl/tile/vector_tile.hpp b/src/mbgl/tile/vector_tile.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/tile/vector_tile.hpp rename to src/mbgl/tile/vector_tile.hpp diff --git a/mapbox-gl-native/src/mbgl/tile/vector_tile_data.cpp b/src/mbgl/tile/vector_tile_data.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/tile/vector_tile_data.cpp rename to src/mbgl/tile/vector_tile_data.cpp diff --git a/mapbox-gl-native/src/mbgl/tile/vector_tile_data.hpp b/src/mbgl/tile/vector_tile_data.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/tile/vector_tile_data.hpp rename to src/mbgl/tile/vector_tile_data.hpp diff --git a/mapbox-gl-native/src/mbgl/util/bounding_volumes.cpp b/src/mbgl/util/bounding_volumes.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/bounding_volumes.cpp rename to src/mbgl/util/bounding_volumes.cpp diff --git a/mapbox-gl-native/src/mbgl/util/bounding_volumes.hpp b/src/mbgl/util/bounding_volumes.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/bounding_volumes.hpp rename to src/mbgl/util/bounding_volumes.hpp diff --git a/mapbox-gl-native/src/mbgl/util/camera.cpp b/src/mbgl/util/camera.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/camera.cpp rename to src/mbgl/util/camera.cpp diff --git a/mapbox-gl-native/src/mbgl/util/camera.hpp b/src/mbgl/util/camera.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/camera.hpp rename to src/mbgl/util/camera.hpp diff --git a/mapbox-gl-native/src/mbgl/util/chrono.cpp b/src/mbgl/util/chrono.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/chrono.cpp rename to src/mbgl/util/chrono.cpp diff --git a/mapbox-gl-native/src/mbgl/util/color.cpp b/src/mbgl/util/color.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/color.cpp rename to src/mbgl/util/color.cpp diff --git a/mapbox-gl-native/src/mbgl/util/constants.cpp b/src/mbgl/util/constants.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/constants.cpp rename to src/mbgl/util/constants.cpp diff --git a/mapbox-gl-native/src/mbgl/util/convert.cpp b/src/mbgl/util/convert.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/convert.cpp rename to src/mbgl/util/convert.cpp diff --git a/mapbox-gl-native/src/mbgl/util/dtoa.cpp b/src/mbgl/util/dtoa.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/dtoa.cpp rename to src/mbgl/util/dtoa.cpp diff --git a/mapbox-gl-native/src/mbgl/util/dtoa.hpp b/src/mbgl/util/dtoa.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/dtoa.hpp rename to src/mbgl/util/dtoa.hpp diff --git a/mapbox-gl-native/src/mbgl/util/event.cpp b/src/mbgl/util/event.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/event.cpp rename to src/mbgl/util/event.cpp diff --git a/mapbox-gl-native/src/mbgl/util/font_stack.cpp b/src/mbgl/util/font_stack.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/font_stack.cpp rename to src/mbgl/util/font_stack.cpp diff --git a/mapbox-gl-native/src/mbgl/util/geo.cpp b/src/mbgl/util/geo.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/geo.cpp rename to src/mbgl/util/geo.cpp diff --git a/mapbox-gl-native/src/mbgl/util/geojson_impl.cpp b/src/mbgl/util/geojson_impl.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/geojson_impl.cpp rename to src/mbgl/util/geojson_impl.cpp diff --git a/mapbox-gl-native/src/mbgl/util/geometry_util.cpp b/src/mbgl/util/geometry_util.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/geometry_util.cpp rename to src/mbgl/util/geometry_util.cpp diff --git a/mapbox-gl-native/src/mbgl/util/geometry_util.hpp b/src/mbgl/util/geometry_util.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/geometry_util.hpp rename to src/mbgl/util/geometry_util.hpp diff --git a/mapbox-gl-native/src/mbgl/util/grid_index.cpp b/src/mbgl/util/grid_index.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/grid_index.cpp rename to src/mbgl/util/grid_index.cpp diff --git a/mapbox-gl-native/src/mbgl/util/grid_index.hpp b/src/mbgl/util/grid_index.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/grid_index.hpp rename to src/mbgl/util/grid_index.hpp diff --git a/mapbox-gl-native/src/mbgl/util/hash.hpp b/src/mbgl/util/hash.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/hash.hpp rename to src/mbgl/util/hash.hpp diff --git a/mapbox-gl-native/src/mbgl/util/http_header.cpp b/src/mbgl/util/http_header.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/http_header.cpp rename to src/mbgl/util/http_header.cpp diff --git a/mapbox-gl-native/src/mbgl/util/http_header.hpp b/src/mbgl/util/http_header.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/http_header.hpp rename to src/mbgl/util/http_header.hpp diff --git a/mapbox-gl-native/src/mbgl/util/http_timeout.cpp b/src/mbgl/util/http_timeout.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/http_timeout.cpp rename to src/mbgl/util/http_timeout.cpp diff --git a/mapbox-gl-native/src/mbgl/util/http_timeout.hpp b/src/mbgl/util/http_timeout.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/http_timeout.hpp rename to src/mbgl/util/http_timeout.hpp diff --git a/mapbox-gl-native/src/mbgl/util/i18n.cpp b/src/mbgl/util/i18n.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/i18n.cpp rename to src/mbgl/util/i18n.cpp diff --git a/mapbox-gl-native/src/mbgl/util/i18n.hpp b/src/mbgl/util/i18n.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/i18n.hpp rename to src/mbgl/util/i18n.hpp diff --git a/mapbox-gl-native/src/mbgl/util/interpolate.cpp b/src/mbgl/util/interpolate.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/interpolate.cpp rename to src/mbgl/util/interpolate.cpp diff --git a/mapbox-gl-native/src/mbgl/util/intersection_tests.cpp b/src/mbgl/util/intersection_tests.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/intersection_tests.cpp rename to src/mbgl/util/intersection_tests.cpp diff --git a/mapbox-gl-native/src/mbgl/util/intersection_tests.hpp b/src/mbgl/util/intersection_tests.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/intersection_tests.hpp rename to src/mbgl/util/intersection_tests.hpp diff --git a/mapbox-gl-native/src/mbgl/util/io.cpp b/src/mbgl/util/io.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/io.cpp rename to src/mbgl/util/io.cpp diff --git a/mapbox-gl-native/src/mbgl/util/io.hpp b/src/mbgl/util/io.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/io.hpp rename to src/mbgl/util/io.hpp diff --git a/mapbox-gl-native/src/mbgl/util/literal.hpp b/src/mbgl/util/literal.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/literal.hpp rename to src/mbgl/util/literal.hpp diff --git a/mapbox-gl-native/src/mbgl/util/logging.cpp b/src/mbgl/util/logging.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/logging.cpp rename to src/mbgl/util/logging.cpp diff --git a/mapbox-gl-native/src/mbgl/util/longest_common_subsequence.hpp b/src/mbgl/util/longest_common_subsequence.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/longest_common_subsequence.hpp rename to src/mbgl/util/longest_common_subsequence.hpp diff --git a/mapbox-gl-native/src/mbgl/util/mapbox.cpp b/src/mbgl/util/mapbox.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/mapbox.cpp rename to src/mbgl/util/mapbox.cpp diff --git a/mapbox-gl-native/src/mbgl/util/mapbox.hpp b/src/mbgl/util/mapbox.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/mapbox.hpp rename to src/mbgl/util/mapbox.hpp diff --git a/mapbox-gl-native/src/mbgl/util/mat2.cpp b/src/mbgl/util/mat2.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/mat2.cpp rename to src/mbgl/util/mat2.cpp diff --git a/mapbox-gl-native/src/mbgl/util/mat2.hpp b/src/mbgl/util/mat2.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/mat2.hpp rename to src/mbgl/util/mat2.hpp diff --git a/mapbox-gl-native/src/mbgl/util/mat3.cpp b/src/mbgl/util/mat3.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/mat3.cpp rename to src/mbgl/util/mat3.cpp diff --git a/mapbox-gl-native/src/mbgl/util/mat3.hpp b/src/mbgl/util/mat3.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/mat3.hpp rename to src/mbgl/util/mat3.hpp diff --git a/mapbox-gl-native/src/mbgl/util/mat4.cpp b/src/mbgl/util/mat4.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/mat4.cpp rename to src/mbgl/util/mat4.cpp diff --git a/mapbox-gl-native/src/mbgl/util/mat4.hpp b/src/mbgl/util/mat4.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/mat4.hpp rename to src/mbgl/util/mat4.hpp diff --git a/mapbox-gl-native/src/mbgl/util/math.hpp b/src/mbgl/util/math.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/math.hpp rename to src/mbgl/util/math.hpp diff --git a/mapbox-gl-native/src/mbgl/util/premultiply.cpp b/src/mbgl/util/premultiply.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/premultiply.cpp rename to src/mbgl/util/premultiply.cpp diff --git a/mapbox-gl-native/src/mbgl/util/quaternion.cpp b/src/mbgl/util/quaternion.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/quaternion.cpp rename to src/mbgl/util/quaternion.cpp diff --git a/mapbox-gl-native/src/mbgl/util/quaternion.hpp b/src/mbgl/util/quaternion.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/quaternion.hpp rename to src/mbgl/util/quaternion.hpp diff --git a/mapbox-gl-native/src/mbgl/util/rapidjson.cpp b/src/mbgl/util/rapidjson.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/rapidjson.cpp rename to src/mbgl/util/rapidjson.cpp diff --git a/mapbox-gl-native/src/mbgl/util/rapidjson.hpp b/src/mbgl/util/rapidjson.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/rapidjson.hpp rename to src/mbgl/util/rapidjson.hpp diff --git a/mapbox-gl-native/src/mbgl/util/rect.hpp b/src/mbgl/util/rect.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/rect.hpp rename to src/mbgl/util/rect.hpp diff --git a/mapbox-gl-native/src/mbgl/util/std.hpp b/src/mbgl/util/std.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/std.hpp rename to src/mbgl/util/std.hpp diff --git a/mapbox-gl-native/src/mbgl/util/stopwatch.cpp b/src/mbgl/util/stopwatch.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/stopwatch.cpp rename to src/mbgl/util/stopwatch.cpp diff --git a/mapbox-gl-native/src/mbgl/util/stopwatch.hpp b/src/mbgl/util/stopwatch.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/stopwatch.hpp rename to src/mbgl/util/stopwatch.hpp diff --git a/mapbox-gl-native/src/mbgl/util/string.cpp b/src/mbgl/util/string.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/string.cpp rename to src/mbgl/util/string.cpp diff --git a/mapbox-gl-native/src/mbgl/util/thread.cpp b/src/mbgl/util/thread.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/thread.cpp rename to src/mbgl/util/thread.cpp diff --git a/mapbox-gl-native/src/mbgl/util/thread_local.hpp b/src/mbgl/util/thread_local.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/thread_local.hpp rename to src/mbgl/util/thread_local.hpp diff --git a/mapbox-gl-native/src/mbgl/util/thread_pool.cpp b/src/mbgl/util/thread_pool.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/thread_pool.cpp rename to src/mbgl/util/thread_pool.cpp diff --git a/mapbox-gl-native/src/mbgl/util/thread_pool.hpp b/src/mbgl/util/thread_pool.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/thread_pool.hpp rename to src/mbgl/util/thread_pool.hpp diff --git a/mapbox-gl-native/src/mbgl/util/tile_coordinate.hpp b/src/mbgl/util/tile_coordinate.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/tile_coordinate.hpp rename to src/mbgl/util/tile_coordinate.hpp diff --git a/mapbox-gl-native/src/mbgl/util/tile_cover.cpp b/src/mbgl/util/tile_cover.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/tile_cover.cpp rename to src/mbgl/util/tile_cover.cpp diff --git a/mapbox-gl-native/src/mbgl/util/tile_cover.hpp b/src/mbgl/util/tile_cover.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/tile_cover.hpp rename to src/mbgl/util/tile_cover.hpp diff --git a/mapbox-gl-native/src/mbgl/util/tile_cover_impl.cpp b/src/mbgl/util/tile_cover_impl.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/tile_cover_impl.cpp rename to src/mbgl/util/tile_cover_impl.cpp diff --git a/mapbox-gl-native/src/mbgl/util/tile_cover_impl.hpp b/src/mbgl/util/tile_cover_impl.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/tile_cover_impl.hpp rename to src/mbgl/util/tile_cover_impl.hpp diff --git a/mapbox-gl-native/src/mbgl/util/tile_range.hpp b/src/mbgl/util/tile_range.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/tile_range.hpp rename to src/mbgl/util/tile_range.hpp diff --git a/mapbox-gl-native/src/mbgl/util/tiny_sdf.cpp b/src/mbgl/util/tiny_sdf.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/tiny_sdf.cpp rename to src/mbgl/util/tiny_sdf.cpp diff --git a/mapbox-gl-native/src/mbgl/util/tiny_sdf.hpp b/src/mbgl/util/tiny_sdf.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/tiny_sdf.hpp rename to src/mbgl/util/tiny_sdf.hpp diff --git a/mapbox-gl-native/src/mbgl/util/token.hpp b/src/mbgl/util/token.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/token.hpp rename to src/mbgl/util/token.hpp diff --git a/mapbox-gl-native/src/mbgl/util/url.cpp b/src/mbgl/util/url.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/url.cpp rename to src/mbgl/util/url.cpp diff --git a/mapbox-gl-native/src/mbgl/util/url.hpp b/src/mbgl/util/url.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/url.hpp rename to src/mbgl/util/url.hpp diff --git a/mapbox-gl-native/src/mbgl/util/utf.hpp b/src/mbgl/util/utf.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/utf.hpp rename to src/mbgl/util/utf.hpp diff --git a/mapbox-gl-native/src/mbgl/util/version.cpp b/src/mbgl/util/version.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/version.cpp rename to src/mbgl/util/version.cpp diff --git a/mapbox-gl-native/src/mbgl/util/version.hpp b/src/mbgl/util/version.hpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/version.hpp rename to src/mbgl/util/version.hpp diff --git a/mapbox-gl-native/src/mbgl/util/work_request.cpp b/src/mbgl/util/work_request.cpp similarity index 100% rename from mapbox-gl-native/src/mbgl/util/work_request.cpp rename to src/mbgl/util/work_request.cpp diff --git a/mapbox-gl-native/test/.clang-tidy b/test/.clang-tidy similarity index 100% rename from mapbox-gl-native/test/.clang-tidy rename to test/.clang-tidy diff --git a/mapbox-gl-native/test/CMakeLists.txt b/test/CMakeLists.txt similarity index 100% rename from mapbox-gl-native/test/CMakeLists.txt rename to test/CMakeLists.txt diff --git a/mapbox-gl-native/test/actor/actor.test.cpp b/test/actor/actor.test.cpp similarity index 100% rename from mapbox-gl-native/test/actor/actor.test.cpp rename to test/actor/actor.test.cpp diff --git a/mapbox-gl-native/test/actor/actor_ref.test.cpp b/test/actor/actor_ref.test.cpp similarity index 100% rename from mapbox-gl-native/test/actor/actor_ref.test.cpp rename to test/actor/actor_ref.test.cpp diff --git a/mapbox-gl-native/test/algorithm/update_renderables.test.cpp b/test/algorithm/update_renderables.test.cpp similarity index 100% rename from mapbox-gl-native/test/algorithm/update_renderables.test.cpp rename to test/algorithm/update_renderables.test.cpp diff --git a/mapbox-gl-native/test/algorithm/update_tile_masks.test.cpp b/test/algorithm/update_tile_masks.test.cpp similarity index 100% rename from mapbox-gl-native/test/algorithm/update_tile_masks.test.cpp rename to test/algorithm/update_tile_masks.test.cpp diff --git a/mapbox-gl-native/test/android/README.md b/test/android/README.md similarity index 100% rename from mapbox-gl-native/test/android/README.md rename to test/android/README.md diff --git a/mapbox-gl-native/test/android/app/build.gradle b/test/android/app/build.gradle similarity index 100% rename from mapbox-gl-native/test/android/app/build.gradle rename to test/android/app/build.gradle diff --git a/mapbox-gl-native/test/android/app/src/androidTest/java/android/app/NativeActivityTest.java b/test/android/app/src/androidTest/java/android/app/NativeActivityTest.java similarity index 100% rename from mapbox-gl-native/test/android/app/src/androidTest/java/android/app/NativeActivityTest.java rename to test/android/app/src/androidTest/java/android/app/NativeActivityTest.java diff --git a/mapbox-gl-native/test/android/app/src/androidTest/java/android/app/TestState.java b/test/android/app/src/androidTest/java/android/app/TestState.java similarity index 100% rename from mapbox-gl-native/test/android/app/src/androidTest/java/android/app/TestState.java rename to test/android/app/src/androidTest/java/android/app/TestState.java diff --git a/mapbox-gl-native/test/android/app/src/main/AndroidManifest.xml b/test/android/app/src/main/AndroidManifest.xml similarity index 100% rename from mapbox-gl-native/test/android/app/src/main/AndroidManifest.xml rename to test/android/app/src/main/AndroidManifest.xml diff --git a/mapbox-gl-native/test/android/app/src/main/assets/to_zip.txt b/test/android/app/src/main/assets/to_zip.txt similarity index 100% rename from mapbox-gl-native/test/android/app/src/main/assets/to_zip.txt rename to test/android/app/src/main/assets/to_zip.txt diff --git a/mapbox-gl-native/test/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/test/android/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from mapbox-gl-native/test/android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to test/android/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/mapbox-gl-native/test/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/test/android/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from mapbox-gl-native/test/android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to test/android/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/mapbox-gl-native/test/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/test/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from mapbox-gl-native/test/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to test/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/mapbox-gl-native/test/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/test/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from mapbox-gl-native/test/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to test/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/mapbox-gl-native/test/android/app/src/main/res/values/strings.xml b/test/android/app/src/main/res/values/strings.xml similarity index 100% rename from mapbox-gl-native/test/android/app/src/main/res/values/strings.xml rename to test/android/app/src/main/res/values/strings.xml diff --git a/mapbox-gl-native/test/android/build.gradle b/test/android/build.gradle similarity index 100% rename from mapbox-gl-native/test/android/build.gradle rename to test/android/build.gradle diff --git a/mapbox-gl-native/test/android/gradle.properties b/test/android/gradle.properties similarity index 100% rename from mapbox-gl-native/test/android/gradle.properties rename to test/android/gradle.properties diff --git a/mapbox-gl-native/test/android/gradle/wrapper/gradle-wrapper.jar b/test/android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from mapbox-gl-native/test/android/gradle/wrapper/gradle-wrapper.jar rename to test/android/gradle/wrapper/gradle-wrapper.jar diff --git a/mapbox-gl-native/test/android/gradle/wrapper/gradle-wrapper.properties b/test/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from mapbox-gl-native/test/android/gradle/wrapper/gradle-wrapper.properties rename to test/android/gradle/wrapper/gradle-wrapper.properties diff --git a/mapbox-gl-native/test/android/gradlew b/test/android/gradlew similarity index 100% rename from mapbox-gl-native/test/android/gradlew rename to test/android/gradlew diff --git a/mapbox-gl-native/test/android/gradlew.bat b/test/android/gradlew.bat similarity index 100% rename from mapbox-gl-native/test/android/gradlew.bat rename to test/android/gradlew.bat diff --git a/mapbox-gl-native/test/android/settings.gradle b/test/android/settings.gradle similarity index 100% rename from mapbox-gl-native/test/android/settings.gradle rename to test/android/settings.gradle diff --git a/mapbox-gl-native/test/api/annotations.test.cpp b/test/api/annotations.test.cpp similarity index 100% rename from mapbox-gl-native/test/api/annotations.test.cpp rename to test/api/annotations.test.cpp diff --git a/mapbox-gl-native/test/api/api_misuse.test.cpp b/test/api/api_misuse.test.cpp similarity index 100% rename from mapbox-gl-native/test/api/api_misuse.test.cpp rename to test/api/api_misuse.test.cpp diff --git a/mapbox-gl-native/test/api/custom_geometry_source.test.cpp b/test/api/custom_geometry_source.test.cpp similarity index 100% rename from mapbox-gl-native/test/api/custom_geometry_source.test.cpp rename to test/api/custom_geometry_source.test.cpp diff --git a/mapbox-gl-native/test/api/custom_layer.test.cpp b/test/api/custom_layer.test.cpp similarity index 100% rename from mapbox-gl-native/test/api/custom_layer.test.cpp rename to test/api/custom_layer.test.cpp diff --git a/mapbox-gl-native/test/api/query.test.cpp b/test/api/query.test.cpp similarity index 100% rename from mapbox-gl-native/test/api/query.test.cpp rename to test/api/query.test.cpp diff --git a/mapbox-gl-native/test/api/recycle_map.cpp b/test/api/recycle_map.cpp similarity index 100% rename from mapbox-gl-native/test/api/recycle_map.cpp rename to test/api/recycle_map.cpp diff --git a/mapbox-gl-native/test/fixtures/annotations/add_multiple/expected.png b/test/fixtures/annotations/add_multiple/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/add_multiple/expected.png rename to test/fixtures/annotations/add_multiple/expected.png diff --git a/mapbox-gl-native/test/fixtures/annotations/antimeridian_annotation_large/expected.png b/test/fixtures/annotations/antimeridian_annotation_large/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/antimeridian_annotation_large/expected.png rename to test/fixtures/annotations/antimeridian_annotation_large/expected.png diff --git a/mapbox-gl-native/test/fixtures/annotations/antimeridian_annotation_small/expected.png b/test/fixtures/annotations/antimeridian_annotation_small/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/antimeridian_annotation_small/expected.png rename to test/fixtures/annotations/antimeridian_annotation_small/expected.png diff --git a/mapbox-gl-native/test/fixtures/annotations/custom_icon/expected.png b/test/fixtures/annotations/custom_icon/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/custom_icon/expected.png rename to test/fixtures/annotations/custom_icon/expected.png diff --git a/mapbox-gl-native/test/fixtures/annotations/debug_empty/expected.png b/test/fixtures/annotations/debug_empty/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/debug_empty/expected.png rename to test/fixtures/annotations/debug_empty/expected.png diff --git a/mapbox-gl-native/test/fixtures/annotations/debug_sparse/expected.png b/test/fixtures/annotations/debug_sparse/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/debug_sparse/expected.png rename to test/fixtures/annotations/debug_sparse/expected.png diff --git a/mapbox-gl-native/test/fixtures/annotations/emerald.json b/test/fixtures/annotations/emerald.json similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/emerald.json rename to test/fixtures/annotations/emerald.json diff --git a/mapbox-gl-native/test/fixtures/annotations/emerald.png b/test/fixtures/annotations/emerald.png similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/emerald.png rename to test/fixtures/annotations/emerald.png diff --git a/mapbox-gl-native/test/fixtures/annotations/emerald@2x.json b/test/fixtures/annotations/emerald@2x.json similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/emerald@2x.json rename to test/fixtures/annotations/emerald@2x.json diff --git a/mapbox-gl-native/test/fixtures/annotations/emerald@2x.png b/test/fixtures/annotations/emerald@2x.png similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/emerald@2x.png rename to test/fixtures/annotations/emerald@2x.png diff --git a/mapbox-gl-native/test/fixtures/annotations/fill_annotation/expected.png b/test/fixtures/annotations/fill_annotation/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/fill_annotation/expected.png rename to test/fixtures/annotations/fill_annotation/expected.png diff --git a/mapbox-gl-native/test/fixtures/annotations/fill_annotation_max_zoom/expected.png b/test/fixtures/annotations/fill_annotation_max_zoom/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/fill_annotation_max_zoom/expected.png rename to test/fixtures/annotations/fill_annotation_max_zoom/expected.png diff --git a/mapbox-gl-native/test/fixtures/annotations/line_annotation/expected.png b/test/fixtures/annotations/line_annotation/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/line_annotation/expected.png rename to test/fixtures/annotations/line_annotation/expected.png diff --git a/mapbox-gl-native/test/fixtures/annotations/line_annotation_max_zoom/expected.png b/test/fixtures/annotations/line_annotation_max_zoom/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/line_annotation_max_zoom/expected.png rename to test/fixtures/annotations/line_annotation_max_zoom/expected.png diff --git a/mapbox-gl-native/test/fixtures/annotations/non_immediate_add/expected.png b/test/fixtures/annotations/non_immediate_add/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/non_immediate_add/expected.png rename to test/fixtures/annotations/non_immediate_add/expected.png diff --git a/mapbox-gl-native/test/fixtures/annotations/overlapping_fill_annotation/expected.png b/test/fixtures/annotations/overlapping_fill_annotation/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/overlapping_fill_annotation/expected.png rename to test/fixtures/annotations/overlapping_fill_annotation/expected.png diff --git a/mapbox-gl-native/test/fixtures/annotations/point_annotation/expected.png b/test/fixtures/annotations/point_annotation/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/point_annotation/expected.png rename to test/fixtures/annotations/point_annotation/expected.png diff --git a/mapbox-gl-native/test/fixtures/annotations/readd_image/expected.png b/test/fixtures/annotations/readd_image/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/readd_image/expected.png rename to test/fixtures/annotations/readd_image/expected.png diff --git a/mapbox-gl-native/test/fixtures/annotations/remove_point/expected.png b/test/fixtures/annotations/remove_point/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/remove_point/expected.png rename to test/fixtures/annotations/remove_point/expected.png diff --git a/mapbox-gl-native/test/fixtures/annotations/remove_shape/expected.png b/test/fixtures/annotations/remove_shape/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/remove_shape/expected.png rename to test/fixtures/annotations/remove_shape/expected.png diff --git a/mapbox-gl-native/test/fixtures/annotations/result-spriteimagecreation1_5x-hospital.png b/test/fixtures/annotations/result-spriteimagecreation1_5x-hospital.png similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/result-spriteimagecreation1_5x-hospital.png rename to test/fixtures/annotations/result-spriteimagecreation1_5x-hospital.png diff --git a/mapbox-gl-native/test/fixtures/annotations/result-spriteimagecreation1_5x-museum.png b/test/fixtures/annotations/result-spriteimagecreation1_5x-museum.png similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/result-spriteimagecreation1_5x-museum.png rename to test/fixtures/annotations/result-spriteimagecreation1_5x-museum.png diff --git a/mapbox-gl-native/test/fixtures/annotations/result-spriteimagecreation1x-blank.png b/test/fixtures/annotations/result-spriteimagecreation1x-blank.png similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/result-spriteimagecreation1x-blank.png rename to test/fixtures/annotations/result-spriteimagecreation1x-blank.png diff --git a/mapbox-gl-native/test/fixtures/annotations/result-spriteimagecreation1x-museum.png b/test/fixtures/annotations/result-spriteimagecreation1x-museum.png similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/result-spriteimagecreation1x-museum.png rename to test/fixtures/annotations/result-spriteimagecreation1x-museum.png diff --git a/mapbox-gl-native/test/fixtures/annotations/result-spriteimagecreation2x.png b/test/fixtures/annotations/result-spriteimagecreation2x.png similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/result-spriteimagecreation2x.png rename to test/fixtures/annotations/result-spriteimagecreation2x.png diff --git a/mapbox-gl-native/test/fixtures/annotations/result-spriteparsing.png b/test/fixtures/annotations/result-spriteparsing.png similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/result-spriteparsing.png rename to test/fixtures/annotations/result-spriteparsing.png diff --git a/mapbox-gl-native/test/fixtures/annotations/style_sourced_shape_annotation/expected.png b/test/fixtures/annotations/style_sourced_shape_annotation/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/style_sourced_shape_annotation/expected.png rename to test/fixtures/annotations/style_sourced_shape_annotation/expected.png diff --git a/mapbox-gl-native/test/fixtures/annotations/switch_style/expected.png b/test/fixtures/annotations/switch_style/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/switch_style/expected.png rename to test/fixtures/annotations/switch_style/expected.png diff --git a/mapbox-gl-native/test/fixtures/annotations/update_fill_geometry/expected.png b/test/fixtures/annotations/update_fill_geometry/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/update_fill_geometry/expected.png rename to test/fixtures/annotations/update_fill_geometry/expected.png diff --git a/mapbox-gl-native/test/fixtures/annotations/update_fill_style/expected.png b/test/fixtures/annotations/update_fill_style/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/update_fill_style/expected.png rename to test/fixtures/annotations/update_fill_style/expected.png diff --git a/mapbox-gl-native/test/fixtures/annotations/update_icon/expected.png b/test/fixtures/annotations/update_icon/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/update_icon/expected.png rename to test/fixtures/annotations/update_icon/expected.png diff --git a/mapbox-gl-native/test/fixtures/annotations/update_line_geometry/expected.png b/test/fixtures/annotations/update_line_geometry/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/update_line_geometry/expected.png rename to test/fixtures/annotations/update_line_geometry/expected.png diff --git a/mapbox-gl-native/test/fixtures/annotations/update_line_style/expected.png b/test/fixtures/annotations/update_line_style/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/update_line_style/expected.png rename to test/fixtures/annotations/update_line_style/expected.png diff --git a/mapbox-gl-native/test/fixtures/annotations/update_point/expected.png b/test/fixtures/annotations/update_point/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/annotations/update_point/expected.png rename to test/fixtures/annotations/update_point/expected.png diff --git a/mapbox-gl-native/test/fixtures/api/annotation.json b/test/fixtures/api/annotation.json similarity index 100% rename from mapbox-gl-native/test/fixtures/api/annotation.json rename to test/fixtures/api/annotation.json diff --git a/mapbox-gl-native/test/fixtures/api/assets/streets.json b/test/fixtures/api/assets/streets.json similarity index 100% rename from mapbox-gl-native/test/fixtures/api/assets/streets.json rename to test/fixtures/api/assets/streets.json diff --git a/mapbox-gl-native/test/fixtures/api/assets/streets/0-0-0.vector.pbf b/test/fixtures/api/assets/streets/0-0-0.vector.pbf similarity index 100% rename from mapbox-gl-native/test/fixtures/api/assets/streets/0-0-0.vector.pbf rename to test/fixtures/api/assets/streets/0-0-0.vector.pbf diff --git a/mapbox-gl-native/test/fixtures/api/assets/streets/10-163-395.vector.pbf b/test/fixtures/api/assets/streets/10-163-395.vector.pbf similarity index 100% rename from mapbox-gl-native/test/fixtures/api/assets/streets/10-163-395.vector.pbf rename to test/fixtures/api/assets/streets/10-163-395.vector.pbf diff --git a/mapbox-gl-native/test/fixtures/api/assets/streets_missing_tiles.json b/test/fixtures/api/assets/streets_missing_tiles.json similarity index 100% rename from mapbox-gl-native/test/fixtures/api/assets/streets_missing_tiles.json rename to test/fixtures/api/assets/streets_missing_tiles.json diff --git a/mapbox-gl-native/test/fixtures/api/empty-zoomed.json b/test/fixtures/api/empty-zoomed.json similarity index 100% rename from mapbox-gl-native/test/fixtures/api/empty-zoomed.json rename to test/fixtures/api/empty-zoomed.json diff --git a/mapbox-gl-native/test/fixtures/api/empty.json b/test/fixtures/api/empty.json similarity index 100% rename from mapbox-gl-native/test/fixtures/api/empty.json rename to test/fixtures/api/empty.json diff --git a/mapbox-gl-native/test/fixtures/api/icon_style.json b/test/fixtures/api/icon_style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/api/icon_style.json rename to test/fixtures/api/icon_style.json diff --git a/mapbox-gl-native/test/fixtures/api/query_style.json b/test/fixtures/api/query_style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/api/query_style.json rename to test/fixtures/api/query_style.json diff --git a/mapbox-gl-native/test/fixtures/api/water.json b/test/fixtures/api/water.json similarity index 100% rename from mapbox-gl-native/test/fixtures/api/water.json rename to test/fixtures/api/water.json diff --git a/mapbox-gl-native/test/fixtures/api/water_missing_tiles.json b/test/fixtures/api/water_missing_tiles.json similarity index 100% rename from mapbox-gl-native/test/fixtures/api/water_missing_tiles.json rename to test/fixtures/api/water_missing_tiles.json diff --git a/mapbox-gl-native/test/fixtures/custom_geometry_source/grid/expected.png b/test/fixtures/custom_geometry_source/grid/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/custom_geometry_source/grid/expected.png rename to test/fixtures/custom_geometry_source/grid/expected.png diff --git a/mapbox-gl-native/test/fixtures/custom_layer/basic/expected.png b/test/fixtures/custom_layer/basic/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/custom_layer/basic/expected.png rename to test/fixtures/custom_layer/basic/expected.png diff --git a/mapbox-gl-native/test/fixtures/expression_equality/acos.a.json b/test/fixtures/expression_equality/acos.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/acos.a.json rename to test/fixtures/expression_equality/acos.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/acos.b.json b/test/fixtures/expression_equality/acos.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/acos.b.json rename to test/fixtures/expression_equality/acos.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/all.a.json b/test/fixtures/expression_equality/all.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/all.a.json rename to test/fixtures/expression_equality/all.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/all.b.json b/test/fixtures/expression_equality/all.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/all.b.json rename to test/fixtures/expression_equality/all.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/any.a.json b/test/fixtures/expression_equality/any.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/any.a.json rename to test/fixtures/expression_equality/any.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/any.b.json b/test/fixtures/expression_equality/any.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/any.b.json rename to test/fixtures/expression_equality/any.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/array.a.json b/test/fixtures/expression_equality/array.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/array.a.json rename to test/fixtures/expression_equality/array.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/array.b.json b/test/fixtures/expression_equality/array.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/array.b.json rename to test/fixtures/expression_equality/array.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/asin.a.json b/test/fixtures/expression_equality/asin.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/asin.a.json rename to test/fixtures/expression_equality/asin.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/asin.b.json b/test/fixtures/expression_equality/asin.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/asin.b.json rename to test/fixtures/expression_equality/asin.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/at.a.json b/test/fixtures/expression_equality/at.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/at.a.json rename to test/fixtures/expression_equality/at.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/at.b.json b/test/fixtures/expression_equality/at.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/at.b.json rename to test/fixtures/expression_equality/at.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/atan.a.json b/test/fixtures/expression_equality/atan.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/atan.a.json rename to test/fixtures/expression_equality/atan.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/atan.b.json b/test/fixtures/expression_equality/atan.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/atan.b.json rename to test/fixtures/expression_equality/atan.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/boolean.a.json b/test/fixtures/expression_equality/boolean.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/boolean.a.json rename to test/fixtures/expression_equality/boolean.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/boolean.b.json b/test/fixtures/expression_equality/boolean.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/boolean.b.json rename to test/fixtures/expression_equality/boolean.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/case.a.json b/test/fixtures/expression_equality/case.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/case.a.json rename to test/fixtures/expression_equality/case.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/case.b.json b/test/fixtures/expression_equality/case.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/case.b.json rename to test/fixtures/expression_equality/case.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/coalesce.a.json b/test/fixtures/expression_equality/coalesce.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/coalesce.a.json rename to test/fixtures/expression_equality/coalesce.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/coalesce.b.json b/test/fixtures/expression_equality/coalesce.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/coalesce.b.json rename to test/fixtures/expression_equality/coalesce.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/concat.a.json b/test/fixtures/expression_equality/concat.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/concat.a.json rename to test/fixtures/expression_equality/concat.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/concat.b.json b/test/fixtures/expression_equality/concat.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/concat.b.json rename to test/fixtures/expression_equality/concat.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/cos.a.json b/test/fixtures/expression_equality/cos.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/cos.a.json rename to test/fixtures/expression_equality/cos.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/cos.b.json b/test/fixtures/expression_equality/cos.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/cos.b.json rename to test/fixtures/expression_equality/cos.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/distance.a.json b/test/fixtures/expression_equality/distance.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/distance.a.json rename to test/fixtures/expression_equality/distance.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/distance.b.json b/test/fixtures/expression_equality/distance.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/distance.b.json rename to test/fixtures/expression_equality/distance.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/divide.a.json b/test/fixtures/expression_equality/divide.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/divide.a.json rename to test/fixtures/expression_equality/divide.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/divide.b.json b/test/fixtures/expression_equality/divide.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/divide.b.json rename to test/fixtures/expression_equality/divide.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/downcase.a.json b/test/fixtures/expression_equality/downcase.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/downcase.a.json rename to test/fixtures/expression_equality/downcase.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/downcase.b.json b/test/fixtures/expression_equality/downcase.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/downcase.b.json rename to test/fixtures/expression_equality/downcase.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/get.a.json b/test/fixtures/expression_equality/get.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/get.a.json rename to test/fixtures/expression_equality/get.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/get.b.json b/test/fixtures/expression_equality/get.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/get.b.json rename to test/fixtures/expression_equality/get.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/has.a.json b/test/fixtures/expression_equality/has.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/has.a.json rename to test/fixtures/expression_equality/has.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/has.b.json b/test/fixtures/expression_equality/has.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/has.b.json rename to test/fixtures/expression_equality/has.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/heatmap-density.a.json b/test/fixtures/expression_equality/heatmap-density.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/heatmap-density.a.json rename to test/fixtures/expression_equality/heatmap-density.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/heatmap-density.b.json b/test/fixtures/expression_equality/heatmap-density.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/heatmap-density.b.json rename to test/fixtures/expression_equality/heatmap-density.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/image.a.json b/test/fixtures/expression_equality/image.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/image.a.json rename to test/fixtures/expression_equality/image.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/image.b.json b/test/fixtures/expression_equality/image.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/image.b.json rename to test/fixtures/expression_equality/image.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/in.a.json b/test/fixtures/expression_equality/in.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/in.a.json rename to test/fixtures/expression_equality/in.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/in.b.json b/test/fixtures/expression_equality/in.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/in.b.json rename to test/fixtures/expression_equality/in.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/let.a.json b/test/fixtures/expression_equality/let.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/let.a.json rename to test/fixtures/expression_equality/let.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/let.b.json b/test/fixtures/expression_equality/let.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/let.b.json rename to test/fixtures/expression_equality/let.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/ln.a.json b/test/fixtures/expression_equality/ln.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/ln.a.json rename to test/fixtures/expression_equality/ln.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/ln.b.json b/test/fixtures/expression_equality/ln.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/ln.b.json rename to test/fixtures/expression_equality/ln.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/log10.a.json b/test/fixtures/expression_equality/log10.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/log10.a.json rename to test/fixtures/expression_equality/log10.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/log10.b.json b/test/fixtures/expression_equality/log10.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/log10.b.json rename to test/fixtures/expression_equality/log10.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/log2.a.json b/test/fixtures/expression_equality/log2.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/log2.a.json rename to test/fixtures/expression_equality/log2.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/log2.b.json b/test/fixtures/expression_equality/log2.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/log2.b.json rename to test/fixtures/expression_equality/log2.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/match.a.json b/test/fixtures/expression_equality/match.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/match.a.json rename to test/fixtures/expression_equality/match.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/match.b.json b/test/fixtures/expression_equality/match.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/match.b.json rename to test/fixtures/expression_equality/match.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/max.a.json b/test/fixtures/expression_equality/max.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/max.a.json rename to test/fixtures/expression_equality/max.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/max.b.json b/test/fixtures/expression_equality/max.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/max.b.json rename to test/fixtures/expression_equality/max.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/min.a.json b/test/fixtures/expression_equality/min.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/min.a.json rename to test/fixtures/expression_equality/min.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/min.b.json b/test/fixtures/expression_equality/min.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/min.b.json rename to test/fixtures/expression_equality/min.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/minus.a.json b/test/fixtures/expression_equality/minus.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/minus.a.json rename to test/fixtures/expression_equality/minus.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/minus.b.json b/test/fixtures/expression_equality/minus.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/minus.b.json rename to test/fixtures/expression_equality/minus.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/mod.a.json b/test/fixtures/expression_equality/mod.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/mod.a.json rename to test/fixtures/expression_equality/mod.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/mod.b.json b/test/fixtures/expression_equality/mod.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/mod.b.json rename to test/fixtures/expression_equality/mod.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/not.a.json b/test/fixtures/expression_equality/not.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/not.a.json rename to test/fixtures/expression_equality/not.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/not.b.json b/test/fixtures/expression_equality/not.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/not.b.json rename to test/fixtures/expression_equality/not.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/number-format-currency.a.json b/test/fixtures/expression_equality/number-format-currency.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/number-format-currency.a.json rename to test/fixtures/expression_equality/number-format-currency.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/number-format-currency.b.json b/test/fixtures/expression_equality/number-format-currency.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/number-format-currency.b.json rename to test/fixtures/expression_equality/number-format-currency.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/number-format-default.a.json b/test/fixtures/expression_equality/number-format-default.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/number-format-default.a.json rename to test/fixtures/expression_equality/number-format-default.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/number-format-default.b.json b/test/fixtures/expression_equality/number-format-default.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/number-format-default.b.json rename to test/fixtures/expression_equality/number-format-default.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/number-format-precision.a.json b/test/fixtures/expression_equality/number-format-precision.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/number-format-precision.a.json rename to test/fixtures/expression_equality/number-format-precision.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/number-format-precision.b.json b/test/fixtures/expression_equality/number-format-precision.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/number-format-precision.b.json rename to test/fixtures/expression_equality/number-format-precision.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/number.a.json b/test/fixtures/expression_equality/number.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/number.a.json rename to test/fixtures/expression_equality/number.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/number.b.json b/test/fixtures/expression_equality/number.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/number.b.json rename to test/fixtures/expression_equality/number.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/object.a.json b/test/fixtures/expression_equality/object.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/object.a.json rename to test/fixtures/expression_equality/object.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/object.b.json b/test/fixtures/expression_equality/object.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/object.b.json rename to test/fixtures/expression_equality/object.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/plus.a.json b/test/fixtures/expression_equality/plus.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/plus.a.json rename to test/fixtures/expression_equality/plus.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/plus.b.json b/test/fixtures/expression_equality/plus.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/plus.b.json rename to test/fixtures/expression_equality/plus.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/pow.a.json b/test/fixtures/expression_equality/pow.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/pow.a.json rename to test/fixtures/expression_equality/pow.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/pow.b.json b/test/fixtures/expression_equality/pow.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/pow.b.json rename to test/fixtures/expression_equality/pow.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/rgb.a.json b/test/fixtures/expression_equality/rgb.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/rgb.a.json rename to test/fixtures/expression_equality/rgb.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/rgb.b.json b/test/fixtures/expression_equality/rgb.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/rgb.b.json rename to test/fixtures/expression_equality/rgb.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/rgba.a.json b/test/fixtures/expression_equality/rgba.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/rgba.a.json rename to test/fixtures/expression_equality/rgba.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/rgba.b.json b/test/fixtures/expression_equality/rgba.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/rgba.b.json rename to test/fixtures/expression_equality/rgba.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/sin.a.json b/test/fixtures/expression_equality/sin.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/sin.a.json rename to test/fixtures/expression_equality/sin.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/sin.b.json b/test/fixtures/expression_equality/sin.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/sin.b.json rename to test/fixtures/expression_equality/sin.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/sqrt.a.json b/test/fixtures/expression_equality/sqrt.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/sqrt.a.json rename to test/fixtures/expression_equality/sqrt.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/sqrt.b.json b/test/fixtures/expression_equality/sqrt.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/sqrt.b.json rename to test/fixtures/expression_equality/sqrt.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/step.a.json b/test/fixtures/expression_equality/step.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/step.a.json rename to test/fixtures/expression_equality/step.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/step.b.json b/test/fixtures/expression_equality/step.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/step.b.json rename to test/fixtures/expression_equality/step.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/string.a.json b/test/fixtures/expression_equality/string.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/string.a.json rename to test/fixtures/expression_equality/string.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/string.b.json b/test/fixtures/expression_equality/string.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/string.b.json rename to test/fixtures/expression_equality/string.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/tan.a.json b/test/fixtures/expression_equality/tan.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/tan.a.json rename to test/fixtures/expression_equality/tan.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/tan.b.json b/test/fixtures/expression_equality/tan.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/tan.b.json rename to test/fixtures/expression_equality/tan.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/times.a.json b/test/fixtures/expression_equality/times.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/times.a.json rename to test/fixtures/expression_equality/times.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/times.b.json b/test/fixtures/expression_equality/times.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/times.b.json rename to test/fixtures/expression_equality/times.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/to-boolean.a.json b/test/fixtures/expression_equality/to-boolean.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/to-boolean.a.json rename to test/fixtures/expression_equality/to-boolean.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/to-boolean.b.json b/test/fixtures/expression_equality/to-boolean.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/to-boolean.b.json rename to test/fixtures/expression_equality/to-boolean.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/to-color.a.json b/test/fixtures/expression_equality/to-color.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/to-color.a.json rename to test/fixtures/expression_equality/to-color.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/to-color.b.json b/test/fixtures/expression_equality/to-color.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/to-color.b.json rename to test/fixtures/expression_equality/to-color.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/to-number.a.json b/test/fixtures/expression_equality/to-number.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/to-number.a.json rename to test/fixtures/expression_equality/to-number.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/to-number.b.json b/test/fixtures/expression_equality/to-number.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/to-number.b.json rename to test/fixtures/expression_equality/to-number.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/to-string.a.json b/test/fixtures/expression_equality/to-string.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/to-string.a.json rename to test/fixtures/expression_equality/to-string.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/to-string.b.json b/test/fixtures/expression_equality/to-string.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/to-string.b.json rename to test/fixtures/expression_equality/to-string.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/typeof.a.json b/test/fixtures/expression_equality/typeof.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/typeof.a.json rename to test/fixtures/expression_equality/typeof.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/typeof.b.json b/test/fixtures/expression_equality/typeof.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/typeof.b.json rename to test/fixtures/expression_equality/typeof.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/upcase.a.json b/test/fixtures/expression_equality/upcase.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/upcase.a.json rename to test/fixtures/expression_equality/upcase.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/upcase.b.json b/test/fixtures/expression_equality/upcase.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/upcase.b.json rename to test/fixtures/expression_equality/upcase.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/within.a.json b/test/fixtures/expression_equality/within.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/within.a.json rename to test/fixtures/expression_equality/within.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/within.b.json b/test/fixtures/expression_equality/within.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/within.b.json rename to test/fixtures/expression_equality/within.b.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/zoom.a.json b/test/fixtures/expression_equality/zoom.a.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/zoom.a.json rename to test/fixtures/expression_equality/zoom.a.json diff --git a/mapbox-gl-native/test/fixtures/expression_equality/zoom.b.json b/test/fixtures/expression_equality/zoom.b.json similarity index 100% rename from mapbox-gl-native/test/fixtures/expression_equality/zoom.b.json rename to test/fixtures/expression_equality/zoom.b.json diff --git a/mapbox-gl-native/test/fixtures/geometry_data/line_string_1.geojson b/test/fixtures/geometry_data/line_string_1.geojson similarity index 100% rename from mapbox-gl-native/test/fixtures/geometry_data/line_string_1.geojson rename to test/fixtures/geometry_data/line_string_1.geojson diff --git a/mapbox-gl-native/test/fixtures/geometry_data/line_string_2.geojson b/test/fixtures/geometry_data/line_string_2.geojson similarity index 100% rename from mapbox-gl-native/test/fixtures/geometry_data/line_string_2.geojson rename to test/fixtures/geometry_data/line_string_2.geojson diff --git a/mapbox-gl-native/test/fixtures/geometry_data/multi_line_string_1.geojson b/test/fixtures/geometry_data/multi_line_string_1.geojson similarity index 100% rename from mapbox-gl-native/test/fixtures/geometry_data/multi_line_string_1.geojson rename to test/fixtures/geometry_data/multi_line_string_1.geojson diff --git a/mapbox-gl-native/test/fixtures/geometry_data/multi_line_string_2.geojson b/test/fixtures/geometry_data/multi_line_string_2.geojson similarity index 100% rename from mapbox-gl-native/test/fixtures/geometry_data/multi_line_string_2.geojson rename to test/fixtures/geometry_data/multi_line_string_2.geojson diff --git a/mapbox-gl-native/test/fixtures/geometry_data/multi_point_1.geojson b/test/fixtures/geometry_data/multi_point_1.geojson similarity index 100% rename from mapbox-gl-native/test/fixtures/geometry_data/multi_point_1.geojson rename to test/fixtures/geometry_data/multi_point_1.geojson diff --git a/mapbox-gl-native/test/fixtures/geometry_data/multi_point_2.geojson b/test/fixtures/geometry_data/multi_point_2.geojson similarity index 100% rename from mapbox-gl-native/test/fixtures/geometry_data/multi_point_2.geojson rename to test/fixtures/geometry_data/multi_point_2.geojson diff --git a/mapbox-gl-native/test/fixtures/geometry_data/multi_point_3.geojson b/test/fixtures/geometry_data/multi_point_3.geojson similarity index 100% rename from mapbox-gl-native/test/fixtures/geometry_data/multi_point_3.geojson rename to test/fixtures/geometry_data/multi_point_3.geojson diff --git a/mapbox-gl-native/test/fixtures/geometry_data/multi_polygon_1.geojson b/test/fixtures/geometry_data/multi_polygon_1.geojson similarity index 100% rename from mapbox-gl-native/test/fixtures/geometry_data/multi_polygon_1.geojson rename to test/fixtures/geometry_data/multi_polygon_1.geojson diff --git a/mapbox-gl-native/test/fixtures/geometry_data/multi_polygon_2.geojson b/test/fixtures/geometry_data/multi_polygon_2.geojson similarity index 100% rename from mapbox-gl-native/test/fixtures/geometry_data/multi_polygon_2.geojson rename to test/fixtures/geometry_data/multi_polygon_2.geojson diff --git a/mapbox-gl-native/test/fixtures/image/no_profile.png b/test/fixtures/image/no_profile.png similarity index 100% rename from mapbox-gl-native/test/fixtures/image/no_profile.png rename to test/fixtures/image/no_profile.png diff --git a/mapbox-gl-native/test/fixtures/image/no_profile_alpha.png b/test/fixtures/image/no_profile_alpha.png similarity index 100% rename from mapbox-gl-native/test/fixtures/image/no_profile_alpha.png rename to test/fixtures/image/no_profile_alpha.png diff --git a/mapbox-gl-native/test/fixtures/image/profile.png b/test/fixtures/image/profile.png similarity index 100% rename from mapbox-gl-native/test/fixtures/image/profile.png rename to test/fixtures/image/profile.png diff --git a/mapbox-gl-native/test/fixtures/image/profile_alpha.png b/test/fixtures/image/profile_alpha.png similarity index 100% rename from mapbox-gl-native/test/fixtures/image/profile_alpha.png rename to test/fixtures/image/profile_alpha.png diff --git a/mapbox-gl-native/test/fixtures/image/tile.jpeg b/test/fixtures/image/tile.jpeg similarity index 100% rename from mapbox-gl-native/test/fixtures/image/tile.jpeg rename to test/fixtures/image/tile.jpeg diff --git a/mapbox-gl-native/test/fixtures/image/tile.png b/test/fixtures/image/tile.png similarity index 100% rename from mapbox-gl-native/test/fixtures/image/tile.png rename to test/fixtures/image/tile.png diff --git a/mapbox-gl-native/test/fixtures/image_manager/basic/expected.png b/test/fixtures/image_manager/basic/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/image_manager/basic/expected.png rename to test/fixtures/image_manager/basic/expected.png diff --git a/mapbox-gl-native/test/fixtures/image_manager/updates_after/expected.png b/test/fixtures/image_manager/updates_after/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/image_manager/updates_after/expected.png rename to test/fixtures/image_manager/updates_after/expected.png diff --git a/mapbox-gl-native/test/fixtures/image_manager/updates_before/expected.png b/test/fixtures/image_manager/updates_before/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/image_manager/updates_before/expected.png rename to test/fixtures/image_manager/updates_before/expected.png diff --git a/mapbox-gl-native/test/fixtures/local_glyphs/droid/expected.png b/test/fixtures/local_glyphs/droid/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/local_glyphs/droid/expected.png rename to test/fixtures/local_glyphs/droid/expected.png diff --git a/mapbox-gl-native/test/fixtures/local_glyphs/mixed.json b/test/fixtures/local_glyphs/mixed.json similarity index 100% rename from mapbox-gl-native/test/fixtures/local_glyphs/mixed.json rename to test/fixtures/local_glyphs/mixed.json diff --git a/mapbox-gl-native/test/fixtures/local_glyphs/no_local/expected.png b/test/fixtures/local_glyphs/no_local/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/local_glyphs/no_local/expected.png rename to test/fixtures/local_glyphs/no_local/expected.png diff --git a/mapbox-gl-native/test/fixtures/local_glyphs/no_local_with_content_insets/expected.png b/test/fixtures/local_glyphs/no_local_with_content_insets/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/local_glyphs/no_local_with_content_insets/expected.png rename to test/fixtures/local_glyphs/no_local_with_content_insets/expected.png diff --git a/mapbox-gl-native/test/fixtures/local_glyphs/no_local_with_content_insets_and_pitch/expected.png b/test/fixtures/local_glyphs/no_local_with_content_insets_and_pitch/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/local_glyphs/no_local_with_content_insets_and_pitch/expected.png rename to test/fixtures/local_glyphs/no_local_with_content_insets_and_pitch/expected.png diff --git a/mapbox-gl-native/test/fixtures/local_glyphs/noto_sans_cjk_kr_regular_qt/expected.png b/test/fixtures/local_glyphs/noto_sans_cjk_kr_regular_qt/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/local_glyphs/noto_sans_cjk_kr_regular_qt/expected.png rename to test/fixtures/local_glyphs/noto_sans_cjk_kr_regular_qt/expected.png diff --git a/mapbox-gl-native/test/fixtures/local_glyphs/ping_fang/expected.png b/test/fixtures/local_glyphs/ping_fang/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/local_glyphs/ping_fang/expected.png rename to test/fixtures/local_glyphs/ping_fang/expected.png diff --git a/mapbox-gl-native/test/fixtures/local_glyphs/ping_fang_qt/expected.png b/test/fixtures/local_glyphs/ping_fang_qt/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/local_glyphs/ping_fang_qt/expected.png rename to test/fixtures/local_glyphs/ping_fang_qt/expected.png diff --git a/mapbox-gl-native/test/fixtures/local_glyphs/ping_fang_semibold/expected.png b/test/fixtures/local_glyphs/ping_fang_semibold/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/local_glyphs/ping_fang_semibold/expected.png rename to test/fixtures/local_glyphs/ping_fang_semibold/expected.png diff --git a/mapbox-gl-native/test/fixtures/map/add_icon/expected.png b/test/fixtures/map/add_icon/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/map/add_icon/expected.png rename to test/fixtures/map/add_icon/expected.png diff --git a/mapbox-gl-native/test/fixtures/map/add_layer/expected.png b/test/fixtures/map/add_layer/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/map/add_layer/expected.png rename to test/fixtures/map/add_layer/expected.png diff --git a/mapbox-gl-native/test/fixtures/map/disabled_layers/first/expected.png b/test/fixtures/map/disabled_layers/first/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/map/disabled_layers/first/expected.png rename to test/fixtures/map/disabled_layers/first/expected.png diff --git a/mapbox-gl-native/test/fixtures/map/disabled_layers/second/expected.png b/test/fixtures/map/disabled_layers/second/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/map/disabled_layers/second/expected.png rename to test/fixtures/map/disabled_layers/second/expected.png diff --git a/mapbox-gl-native/test/fixtures/map/disabled_layers/tile.png b/test/fixtures/map/disabled_layers/tile.png similarity index 100% rename from mapbox-gl-native/test/fixtures/map/disabled_layers/tile.png rename to test/fixtures/map/disabled_layers/tile.png diff --git a/mapbox-gl-native/test/fixtures/map/get_icon/expected.png b/test/fixtures/map/get_icon/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/map/get_icon/expected.png rename to test/fixtures/map/get_icon/expected.png diff --git a/mapbox-gl-native/test/fixtures/map/issue12432/0-0-0.mvt b/test/fixtures/map/issue12432/0-0-0.mvt similarity index 100% rename from mapbox-gl-native/test/fixtures/map/issue12432/0-0-0.mvt rename to test/fixtures/map/issue12432/0-0-0.mvt diff --git a/mapbox-gl-native/test/fixtures/map/map_snapshotter_overlay/expected.png b/test/fixtures/map/map_snapshotter_overlay/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/map/map_snapshotter_overlay/expected.png rename to test/fixtures/map/map_snapshotter_overlay/expected.png diff --git a/mapbox-gl-native/test/fixtures/map/no_vao/expected.png b/test/fixtures/map/no_vao/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/map/no_vao/expected.png rename to test/fixtures/map/no_vao/expected.png diff --git a/mapbox-gl-native/test/fixtures/map/nocontent/expected.png b/test/fixtures/map/nocontent/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/map/nocontent/expected.png rename to test/fixtures/map/nocontent/expected.png diff --git a/mapbox-gl-native/test/fixtures/map/offline/0-0-0.vector.pbf b/test/fixtures/map/offline/0-0-0.vector.pbf similarity index 100% rename from mapbox-gl-native/test/fixtures/map/offline/0-0-0.vector.pbf rename to test/fixtures/map/offline/0-0-0.vector.pbf diff --git a/mapbox-gl-native/test/fixtures/map/offline/expected.png b/test/fixtures/map/offline/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/map/offline/expected.png rename to test/fixtures/map/offline/expected.png diff --git a/mapbox-gl-native/test/fixtures/map/offline/glyph.pbf b/test/fixtures/map/offline/glyph.pbf similarity index 100% rename from mapbox-gl-native/test/fixtures/map/offline/glyph.pbf rename to test/fixtures/map/offline/glyph.pbf diff --git a/mapbox-gl-native/test/fixtures/map/offline/sprite.json b/test/fixtures/map/offline/sprite.json similarity index 100% rename from mapbox-gl-native/test/fixtures/map/offline/sprite.json rename to test/fixtures/map/offline/sprite.json diff --git a/mapbox-gl-native/test/fixtures/map/offline/sprite.png b/test/fixtures/map/offline/sprite.png similarity index 100% rename from mapbox-gl-native/test/fixtures/map/offline/sprite.png rename to test/fixtures/map/offline/sprite.png diff --git a/mapbox-gl-native/test/fixtures/map/offline/streets.json b/test/fixtures/map/offline/streets.json similarity index 100% rename from mapbox-gl-native/test/fixtures/map/offline/streets.json rename to test/fixtures/map/offline/streets.json diff --git a/mapbox-gl-native/test/fixtures/map/offline/style.json b/test/fixtures/map/offline/style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/map/offline/style.json rename to test/fixtures/map/offline/style.json diff --git a/mapbox-gl-native/test/fixtures/map/online/0-0-0.vector.pbf b/test/fixtures/map/online/0-0-0.vector.pbf similarity index 100% rename from mapbox-gl-native/test/fixtures/map/online/0-0-0.vector.pbf rename to test/fixtures/map/online/0-0-0.vector.pbf diff --git a/mapbox-gl-native/test/fixtures/map/online/sprite.json b/test/fixtures/map/online/sprite.json similarity index 100% rename from mapbox-gl-native/test/fixtures/map/online/sprite.json rename to test/fixtures/map/online/sprite.json diff --git a/mapbox-gl-native/test/fixtures/map/online/sprite.png b/test/fixtures/map/online/sprite.png similarity index 100% rename from mapbox-gl-native/test/fixtures/map/online/sprite.png rename to test/fixtures/map/online/sprite.png diff --git a/mapbox-gl-native/test/fixtures/map/online/streets.json b/test/fixtures/map/online/streets.json similarity index 100% rename from mapbox-gl-native/test/fixtures/map/online/streets.json rename to test/fixtures/map/online/streets.json diff --git a/mapbox-gl-native/test/fixtures/map/online/style.json b/test/fixtures/map/online/style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/map/online/style.json rename to test/fixtures/map/online/style.json diff --git a/mapbox-gl-native/test/fixtures/map/prefetch/empty.json b/test/fixtures/map/prefetch/empty.json similarity index 100% rename from mapbox-gl-native/test/fixtures/map/prefetch/empty.json rename to test/fixtures/map/prefetch/empty.json diff --git a/mapbox-gl-native/test/fixtures/map/prefetch/style.json b/test/fixtures/map/prefetch/style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/map/prefetch/style.json rename to test/fixtures/map/prefetch/style.json diff --git a/mapbox-gl-native/test/fixtures/map/prefetch/tile.png b/test/fixtures/map/prefetch/tile.png similarity index 100% rename from mapbox-gl-native/test/fixtures/map/prefetch/tile.png rename to test/fixtures/map/prefetch/tile.png diff --git a/mapbox-gl-native/test/fixtures/map/remove_icon/expected.png b/test/fixtures/map/remove_icon/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/map/remove_icon/expected.png rename to test/fixtures/map/remove_icon/expected.png diff --git a/mapbox-gl-native/test/fixtures/map/remove_layer/expected.png b/test/fixtures/map/remove_layer/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/map/remove_layer/expected.png rename to test/fixtures/map/remove_layer/expected.png diff --git a/mapbox-gl-native/test/fixtures/offline_database/corrupt-delayed.db b/test/fixtures/offline_database/corrupt-delayed.db similarity index 100% rename from mapbox-gl-native/test/fixtures/offline_database/corrupt-delayed.db rename to test/fixtures/offline_database/corrupt-delayed.db diff --git a/mapbox-gl-native/test/fixtures/offline_database/corrupt-immediate.db b/test/fixtures/offline_database/corrupt-immediate.db similarity index 100% rename from mapbox-gl-native/test/fixtures/offline_database/corrupt-immediate.db rename to test/fixtures/offline_database/corrupt-immediate.db diff --git a/mapbox-gl-native/test/fixtures/offline_database/no_auto_vacuum.db b/test/fixtures/offline_database/no_auto_vacuum.db similarity index 100% rename from mapbox-gl-native/test/fixtures/offline_database/no_auto_vacuum.db rename to test/fixtures/offline_database/no_auto_vacuum.db diff --git a/mapbox-gl-native/test/fixtures/offline_database/offline_sideload.db b/test/fixtures/offline_database/offline_sideload.db similarity index 100% rename from mapbox-gl-native/test/fixtures/offline_database/offline_sideload.db rename to test/fixtures/offline_database/offline_sideload.db diff --git a/mapbox-gl-native/test/fixtures/offline_database/satellite_test.db b/test/fixtures/offline_database/satellite_test.db similarity index 100% rename from mapbox-gl-native/test/fixtures/offline_database/satellite_test.db rename to test/fixtures/offline_database/satellite_test.db diff --git a/mapbox-gl-native/test/fixtures/offline_database/sideload_ambient.db b/test/fixtures/offline_database/sideload_ambient.db similarity index 100% rename from mapbox-gl-native/test/fixtures/offline_database/sideload_ambient.db rename to test/fixtures/offline_database/sideload_ambient.db diff --git a/mapbox-gl-native/test/fixtures/offline_database/sideload_sat.db b/test/fixtures/offline_database/sideload_sat.db similarity index 100% rename from mapbox-gl-native/test/fixtures/offline_database/sideload_sat.db rename to test/fixtures/offline_database/sideload_sat.db diff --git a/mapbox-gl-native/test/fixtures/offline_database/sideload_sat_multiple.db b/test/fixtures/offline_database/sideload_sat_multiple.db similarity index 100% rename from mapbox-gl-native/test/fixtures/offline_database/sideload_sat_multiple.db rename to test/fixtures/offline_database/sideload_sat_multiple.db diff --git a/mapbox-gl-native/test/fixtures/offline_database/v2.db b/test/fixtures/offline_database/v2.db similarity index 100% rename from mapbox-gl-native/test/fixtures/offline_database/v2.db rename to test/fixtures/offline_database/v2.db diff --git a/mapbox-gl-native/test/fixtures/offline_database/v3.db b/test/fixtures/offline_database/v3.db similarity index 100% rename from mapbox-gl-native/test/fixtures/offline_database/v3.db rename to test/fixtures/offline_database/v3.db diff --git a/mapbox-gl-native/test/fixtures/offline_database/v4.db b/test/fixtures/offline_database/v4.db similarity index 100% rename from mapbox-gl-native/test/fixtures/offline_database/v4.db rename to test/fixtures/offline_database/v4.db diff --git a/mapbox-gl-native/test/fixtures/offline_database/v4.db-shm b/test/fixtures/offline_database/v4.db-shm similarity index 100% rename from mapbox-gl-native/test/fixtures/offline_database/v4.db-shm rename to test/fixtures/offline_database/v4.db-shm diff --git a/mapbox-gl-native/test/fixtures/offline_database/v4.db-wal b/test/fixtures/offline_database/v4.db-wal similarity index 100% rename from mapbox-gl-native/test/fixtures/offline_database/v4.db-wal rename to test/fixtures/offline_database/v4.db-wal diff --git a/mapbox-gl-native/test/fixtures/offline_database/v5.db b/test/fixtures/offline_database/v5.db similarity index 100% rename from mapbox-gl-native/test/fixtures/offline_database/v5.db rename to test/fixtures/offline_database/v5.db diff --git a/mapbox-gl-native/test/fixtures/offline_database/v999.db b/test/fixtures/offline_database/v999.db similarity index 100% rename from mapbox-gl-native/test/fixtures/offline_database/v999.db rename to test/fixtures/offline_database/v999.db diff --git a/mapbox-gl-native/test/fixtures/offline_download/0-0-0.vector.pbf b/test/fixtures/offline_download/0-0-0.vector.pbf similarity index 100% rename from mapbox-gl-native/test/fixtures/offline_download/0-0-0.vector.pbf rename to test/fixtures/offline_download/0-0-0.vector.pbf diff --git a/mapbox-gl-native/test/fixtures/offline_download/empty.style.json b/test/fixtures/offline_download/empty.style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/offline_download/empty.style.json rename to test/fixtures/offline_download/empty.style.json diff --git a/mapbox-gl-native/test/fixtures/offline_download/geojson.json b/test/fixtures/offline_download/geojson.json similarity index 100% rename from mapbox-gl-native/test/fixtures/offline_download/geojson.json rename to test/fixtures/offline_download/geojson.json diff --git a/mapbox-gl-native/test/fixtures/offline_download/geojson_source.style.json b/test/fixtures/offline_download/geojson_source.style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/offline_download/geojson_source.style.json rename to test/fixtures/offline_download/geojson_source.style.json diff --git a/mapbox-gl-native/test/fixtures/offline_download/glyph.pbf b/test/fixtures/offline_download/glyph.pbf similarity index 100% rename from mapbox-gl-native/test/fixtures/offline_download/glyph.pbf rename to test/fixtures/offline_download/glyph.pbf diff --git a/mapbox-gl-native/test/fixtures/offline_download/inline_source.style.json b/test/fixtures/offline_download/inline_source.style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/offline_download/inline_source.style.json rename to test/fixtures/offline_download/inline_source.style.json diff --git a/mapbox-gl-native/test/fixtures/offline_download/mapbox_source.style.json b/test/fixtures/offline_download/mapbox_source.style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/offline_download/mapbox_source.style.json rename to test/fixtures/offline_download/mapbox_source.style.json diff --git a/mapbox-gl-native/test/fixtures/offline_download/radar.gif b/test/fixtures/offline_download/radar.gif similarity index 100% rename from mapbox-gl-native/test/fixtures/offline_download/radar.gif rename to test/fixtures/offline_download/radar.gif diff --git a/mapbox-gl-native/test/fixtures/offline_download/sprite.json b/test/fixtures/offline_download/sprite.json similarity index 100% rename from mapbox-gl-native/test/fixtures/offline_download/sprite.json rename to test/fixtures/offline_download/sprite.json diff --git a/mapbox-gl-native/test/fixtures/offline_download/sprite.png b/test/fixtures/offline_download/sprite.png similarity index 100% rename from mapbox-gl-native/test/fixtures/offline_download/sprite.png rename to test/fixtures/offline_download/sprite.png diff --git a/mapbox-gl-native/test/fixtures/offline_download/streets.json b/test/fixtures/offline_download/streets.json similarity index 100% rename from mapbox-gl-native/test/fixtures/offline_download/streets.json rename to test/fixtures/offline_download/streets.json diff --git a/mapbox-gl-native/test/fixtures/offline_download/style.json b/test/fixtures/offline_download/style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/offline_download/style.json rename to test/fixtures/offline_download/style.json diff --git a/mapbox-gl-native/test/fixtures/offscreen_texture/clear-render-pass-color/expected.png b/test/fixtures/offscreen_texture/clear-render-pass-color/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/offscreen_texture/clear-render-pass-color/expected.png rename to test/fixtures/offscreen_texture/clear-render-pass-color/expected.png diff --git a/mapbox-gl-native/test/fixtures/offscreen_texture/empty-red/expected.png b/test/fixtures/offscreen_texture/empty-red/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/offscreen_texture/empty-red/expected.png rename to test/fixtures/offscreen_texture/empty-red/expected.png diff --git a/mapbox-gl-native/test/fixtures/offscreen_texture/render-to-fbo-composited/expected.png b/test/fixtures/offscreen_texture/render-to-fbo-composited/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/offscreen_texture/render-to-fbo-composited/expected.png rename to test/fixtures/offscreen_texture/render-to-fbo-composited/expected.png diff --git a/mapbox-gl-native/test/fixtures/offscreen_texture/render-to-fbo/expected.png b/test/fixtures/offscreen_texture/render-to-fbo/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/offscreen_texture/render-to-fbo/expected.png rename to test/fixtures/offscreen_texture/render-to-fbo/expected.png diff --git a/mapbox-gl-native/test/fixtures/offscreen_texture/render-to-texture/expected.png b/test/fixtures/offscreen_texture/render-to-texture/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/offscreen_texture/render-to-texture/expected.png rename to test/fixtures/offscreen_texture/render-to-texture/expected.png diff --git a/mapbox-gl-native/test/fixtures/recycle_map/default_marker/expected.png b/test/fixtures/recycle_map/default_marker/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/recycle_map/default_marker/expected.png rename to test/fixtures/recycle_map/default_marker/expected.png diff --git a/mapbox-gl-native/test/fixtures/recycle_map/flipped_marker/expected.png b/test/fixtures/recycle_map/flipped_marker/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/recycle_map/flipped_marker/expected.png rename to test/fixtures/recycle_map/flipped_marker/expected.png diff --git a/mapbox-gl-native/test/fixtures/resources/fake_glyphs-0-255.pbf b/test/fixtures/resources/fake_glyphs-0-255.pbf similarity index 100% rename from mapbox-gl-native/test/fixtures/resources/fake_glyphs-0-255.pbf rename to test/fixtures/resources/fake_glyphs-0-255.pbf diff --git a/mapbox-gl-native/test/fixtures/resources/fake_glyphs-0-255.pbf.txt b/test/fixtures/resources/fake_glyphs-0-255.pbf.txt similarity index 100% rename from mapbox-gl-native/test/fixtures/resources/fake_glyphs-0-255.pbf.txt rename to test/fixtures/resources/fake_glyphs-0-255.pbf.txt diff --git a/mapbox-gl-native/test/fixtures/resources/fake_glyphs.proto b/test/fixtures/resources/fake_glyphs.proto similarity index 100% rename from mapbox-gl-native/test/fixtures/resources/fake_glyphs.proto rename to test/fixtures/resources/fake_glyphs.proto diff --git a/mapbox-gl-native/test/fixtures/resources/glyphs-12244-12543.pbf b/test/fixtures/resources/glyphs-12244-12543.pbf similarity index 100% rename from mapbox-gl-native/test/fixtures/resources/glyphs-12244-12543.pbf rename to test/fixtures/resources/glyphs-12244-12543.pbf diff --git a/mapbox-gl-native/test/fixtures/resources/glyphs.pbf b/test/fixtures/resources/glyphs.pbf similarity index 100% rename from mapbox-gl-native/test/fixtures/resources/glyphs.pbf rename to test/fixtures/resources/glyphs.pbf diff --git a/mapbox-gl-native/test/fixtures/resources/raster.tile b/test/fixtures/resources/raster.tile similarity index 100% rename from mapbox-gl-native/test/fixtures/resources/raster.tile rename to test/fixtures/resources/raster.tile diff --git a/mapbox-gl-native/test/fixtures/resources/source_raster.json b/test/fixtures/resources/source_raster.json similarity index 100% rename from mapbox-gl-native/test/fixtures/resources/source_raster.json rename to test/fixtures/resources/source_raster.json diff --git a/mapbox-gl-native/test/fixtures/resources/source_vector.json b/test/fixtures/resources/source_vector.json similarity index 100% rename from mapbox-gl-native/test/fixtures/resources/source_vector.json rename to test/fixtures/resources/source_vector.json diff --git a/mapbox-gl-native/test/fixtures/resources/sprite.json b/test/fixtures/resources/sprite.json similarity index 100% rename from mapbox-gl-native/test/fixtures/resources/sprite.json rename to test/fixtures/resources/sprite.json diff --git a/mapbox-gl-native/test/fixtures/resources/sprite.png b/test/fixtures/resources/sprite.png similarity index 100% rename from mapbox-gl-native/test/fixtures/resources/sprite.png rename to test/fixtures/resources/sprite.png diff --git a/mapbox-gl-native/test/fixtures/resources/style-unused-sources.json b/test/fixtures/resources/style-unused-sources.json similarity index 100% rename from mapbox-gl-native/test/fixtures/resources/style-unused-sources.json rename to test/fixtures/resources/style-unused-sources.json diff --git a/mapbox-gl-native/test/fixtures/resources/style_raster.json b/test/fixtures/resources/style_raster.json similarity index 100% rename from mapbox-gl-native/test/fixtures/resources/style_raster.json rename to test/fixtures/resources/style_raster.json diff --git a/mapbox-gl-native/test/fixtures/resources/style_vector.json b/test/fixtures/resources/style_vector.json similarity index 100% rename from mapbox-gl-native/test/fixtures/resources/style_vector.json rename to test/fixtures/resources/style_vector.json diff --git a/mapbox-gl-native/test/fixtures/resources/vector.tile b/test/fixtures/resources/vector.tile similarity index 100% rename from mapbox-gl-native/test/fixtures/resources/vector.tile rename to test/fixtures/resources/vector.tile diff --git a/mapbox-gl-native/test/fixtures/shared_context/expected.png b/test/fixtures/shared_context/expected.png similarity index 100% rename from mapbox-gl-native/test/fixtures/shared_context/expected.png rename to test/fixtures/shared_context/expected.png diff --git a/mapbox-gl-native/test/fixtures/sprites/atlas_reference.bin b/test/fixtures/sprites/atlas_reference.bin similarity index 100% rename from mapbox-gl-native/test/fixtures/sprites/atlas_reference.bin rename to test/fixtures/sprites/atlas_reference.bin diff --git a/mapbox-gl-native/test/fixtures/sprites/atlas_reference.png b/test/fixtures/sprites/atlas_reference.png similarity index 100% rename from mapbox-gl-native/test/fixtures/sprites/atlas_reference.png rename to test/fixtures/sprites/atlas_reference.png diff --git a/mapbox-gl-native/test/fixtures/sprites/bright.bin b/test/fixtures/sprites/bright.bin similarity index 100% rename from mapbox-gl-native/test/fixtures/sprites/bright.bin rename to test/fixtures/sprites/bright.bin diff --git a/mapbox-gl-native/test/fixtures/sprites/convert_sprite.js b/test/fixtures/sprites/convert_sprite.js similarity index 100% rename from mapbox-gl-native/test/fixtures/sprites/convert_sprite.js rename to test/fixtures/sprites/convert_sprite.js diff --git a/mapbox-gl-native/test/fixtures/sprites/default_marker.png b/test/fixtures/sprites/default_marker.png similarity index 100% rename from mapbox-gl-native/test/fixtures/sprites/default_marker.png rename to test/fixtures/sprites/default_marker.png diff --git a/mapbox-gl-native/test/fixtures/sprites/flipped_marker.png b/test/fixtures/sprites/flipped_marker.png similarity index 100% rename from mapbox-gl-native/test/fixtures/sprites/flipped_marker.png rename to test/fixtures/sprites/flipped_marker.png diff --git a/mapbox-gl-native/test/fixtures/storage/assets/directory/file b/test/fixtures/storage/assets/directory/file similarity index 100% rename from mapbox-gl-native/test/fixtures/storage/assets/directory/file rename to test/fixtures/storage/assets/directory/file diff --git a/mapbox-gl-native/test/fixtures/storage/assets/empty b/test/fixtures/storage/assets/empty similarity index 100% rename from mapbox-gl-native/test/fixtures/storage/assets/empty rename to test/fixtures/storage/assets/empty diff --git a/mapbox-gl-native/test/fixtures/storage/assets/nonempty b/test/fixtures/storage/assets/nonempty similarity index 100% rename from mapbox-gl-native/test/fixtures/storage/assets/nonempty rename to test/fixtures/storage/assets/nonempty diff --git a/mapbox-gl-native/test/fixtures/style_parser/center-not-latlong.info.json b/test/fixtures/style_parser/center-not-latlong.info.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/center-not-latlong.info.json rename to test/fixtures/style_parser/center-not-latlong.info.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/center-not-latlong.style.json b/test/fixtures/style_parser/center-not-latlong.style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/center-not-latlong.style.json rename to test/fixtures/style_parser/center-not-latlong.style.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/circle-blur.info.json b/test/fixtures/style_parser/circle-blur.info.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/circle-blur.info.json rename to test/fixtures/style_parser/circle-blur.info.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/circle-blur.style.json b/test/fixtures/style_parser/circle-blur.style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/circle-blur.style.json rename to test/fixtures/style_parser/circle-blur.style.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/circle-color.info.json b/test/fixtures/style_parser/circle-color.info.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/circle-color.info.json rename to test/fixtures/style_parser/circle-color.info.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/circle-color.style.json b/test/fixtures/style_parser/circle-color.style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/circle-color.style.json rename to test/fixtures/style_parser/circle-color.style.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/circle-opacity.info.json b/test/fixtures/style_parser/circle-opacity.info.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/circle-opacity.info.json rename to test/fixtures/style_parser/circle-opacity.info.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/circle-opacity.style.json b/test/fixtures/style_parser/circle-opacity.style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/circle-opacity.style.json rename to test/fixtures/style_parser/circle-opacity.style.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/circle-radius.info.json b/test/fixtures/style_parser/circle-radius.info.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/circle-radius.info.json rename to test/fixtures/style_parser/circle-radius.info.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/circle-radius.style.json b/test/fixtures/style_parser/circle-radius.style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/circle-radius.style.json rename to test/fixtures/style_parser/circle-radius.style.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/colors.info.json b/test/fixtures/style_parser/colors.info.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/colors.info.json rename to test/fixtures/style_parser/colors.info.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/colors.style.json b/test/fixtures/style_parser/colors.style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/colors.style.json rename to test/fixtures/style_parser/colors.style.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/expressions.info.json b/test/fixtures/style_parser/expressions.info.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/expressions.info.json rename to test/fixtures/style_parser/expressions.info.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/expressions.style.json b/test/fixtures/style_parser/expressions.style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/expressions.style.json rename to test/fixtures/style_parser/expressions.style.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/font_stacks.json b/test/fixtures/style_parser/font_stacks.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/font_stacks.json rename to test/fixtures/style_parser/font_stacks.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/function-numeric.info.json b/test/fixtures/style_parser/function-numeric.info.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/function-numeric.info.json rename to test/fixtures/style_parser/function-numeric.info.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/function-numeric.style.json b/test/fixtures/style_parser/function-numeric.style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/function-numeric.style.json rename to test/fixtures/style_parser/function-numeric.style.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/function-string-bool-enum.info.json b/test/fixtures/style_parser/function-string-bool-enum.info.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/function-string-bool-enum.info.json rename to test/fixtures/style_parser/function-string-bool-enum.info.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/function-string-bool-enum.style.json b/test/fixtures/style_parser/function-string-bool-enum.style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/function-string-bool-enum.style.json rename to test/fixtures/style_parser/function-string-bool-enum.style.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/function-type.info.json b/test/fixtures/style_parser/function-type.info.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/function-type.info.json rename to test/fixtures/style_parser/function-type.info.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/function-type.style.json b/test/fixtures/style_parser/function-type.style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/function-type.style.json rename to test/fixtures/style_parser/function-type.style.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/geojson-data-inline.info.json b/test/fixtures/style_parser/geojson-data-inline.info.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/geojson-data-inline.info.json rename to test/fixtures/style_parser/geojson-data-inline.info.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/geojson-data-inline.style.json b/test/fixtures/style_parser/geojson-data-inline.style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/geojson-data-inline.style.json rename to test/fixtures/style_parser/geojson-data-inline.style.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/geojson-data-url.info.json b/test/fixtures/style_parser/geojson-data-url.info.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/geojson-data-url.info.json rename to test/fixtures/style_parser/geojson-data-url.info.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/geojson-data-url.style.json b/test/fixtures/style_parser/geojson-data-url.style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/geojson-data-url.style.json rename to test/fixtures/style_parser/geojson-data-url.style.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/geojson-invalid-data.info.json b/test/fixtures/style_parser/geojson-invalid-data.info.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/geojson-invalid-data.info.json rename to test/fixtures/style_parser/geojson-invalid-data.info.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/geojson-invalid-data.style.json b/test/fixtures/style_parser/geojson-invalid-data.style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/geojson-invalid-data.style.json rename to test/fixtures/style_parser/geojson-invalid-data.style.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/geojson-missing-data.info.json b/test/fixtures/style_parser/geojson-missing-data.info.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/geojson-missing-data.info.json rename to test/fixtures/style_parser/geojson-missing-data.info.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/geojson-missing-data.style.json b/test/fixtures/style_parser/geojson-missing-data.style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/geojson-missing-data.style.json rename to test/fixtures/style_parser/geojson-missing-data.style.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/geojson-missing-properties.info.json b/test/fixtures/style_parser/geojson-missing-properties.info.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/geojson-missing-properties.info.json rename to test/fixtures/style_parser/geojson-missing-properties.info.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/geojson-missing-properties.style.json b/test/fixtures/style_parser/geojson-missing-properties.style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/geojson-missing-properties.style.json rename to test/fixtures/style_parser/geojson-missing-properties.style.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/image-coordinates.info.json b/test/fixtures/style_parser/image-coordinates.info.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/image-coordinates.info.json rename to test/fixtures/style_parser/image-coordinates.info.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/image-coordinates.style.json b/test/fixtures/style_parser/image-coordinates.style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/image-coordinates.style.json rename to test/fixtures/style_parser/image-coordinates.style.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/image-url.info.json b/test/fixtures/style_parser/image-url.info.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/image-url.info.json rename to test/fixtures/style_parser/image-url.info.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/image-url.style.json b/test/fixtures/style_parser/image-url.style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/image-url.style.json rename to test/fixtures/style_parser/image-url.style.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/line-opacity.info.json b/test/fixtures/style_parser/line-opacity.info.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/line-opacity.info.json rename to test/fixtures/style_parser/line-opacity.info.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/line-opacity.style.json b/test/fixtures/style_parser/line-opacity.style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/line-opacity.style.json rename to test/fixtures/style_parser/line-opacity.style.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/line-translate.info.json b/test/fixtures/style_parser/line-translate.info.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/line-translate.info.json rename to test/fixtures/style_parser/line-translate.info.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/line-translate.style.json b/test/fixtures/style_parser/line-translate.style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/line-translate.style.json rename to test/fixtures/style_parser/line-translate.style.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/line-width.info.json b/test/fixtures/style_parser/line-width.info.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/line-width.info.json rename to test/fixtures/style_parser/line-width.info.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/line-width.style.json b/test/fixtures/style_parser/line-width.style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/line-width.style.json rename to test/fixtures/style_parser/line-width.style.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/non-object.info.json b/test/fixtures/style_parser/non-object.info.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/non-object.info.json rename to test/fixtures/style_parser/non-object.info.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/non-object.style.json b/test/fixtures/style_parser/non-object.style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/non-object.style.json rename to test/fixtures/style_parser/non-object.style.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/paint-nonobject.info.json b/test/fixtures/style_parser/paint-nonobject.info.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/paint-nonobject.info.json rename to test/fixtures/style_parser/paint-nonobject.info.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/paint-nonobject.style.json b/test/fixtures/style_parser/paint-nonobject.style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/paint-nonobject.style.json rename to test/fixtures/style_parser/paint-nonobject.style.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/stop-zoom-value.info.json b/test/fixtures/style_parser/stop-zoom-value.info.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/stop-zoom-value.info.json rename to test/fixtures/style_parser/stop-zoom-value.info.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/stop-zoom-value.style.json b/test/fixtures/style_parser/stop-zoom-value.style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/stop-zoom-value.style.json rename to test/fixtures/style_parser/stop-zoom-value.style.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/stops-array.info.json b/test/fixtures/style_parser/stops-array.info.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/stops-array.info.json rename to test/fixtures/style_parser/stops-array.info.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/stops-array.style.json b/test/fixtures/style_parser/stops-array.style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/stops-array.style.json rename to test/fixtures/style_parser/stops-array.style.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/text-font.info.json b/test/fixtures/style_parser/text-font.info.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/text-font.info.json rename to test/fixtures/style_parser/text-font.info.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/text-font.style.json b/test/fixtures/style_parser/text-font.style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/text-font.style.json rename to test/fixtures/style_parser/text-font.style.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/text-size.info.json b/test/fixtures/style_parser/text-size.info.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/text-size.info.json rename to test/fixtures/style_parser/text-size.info.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/text-size.style.json b/test/fixtures/style_parser/text-size.style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/text-size.style.json rename to test/fixtures/style_parser/text-size.style.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/version-not-number.info.json b/test/fixtures/style_parser/version-not-number.info.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/version-not-number.info.json rename to test/fixtures/style_parser/version-not-number.info.json diff --git a/mapbox-gl-native/test/fixtures/style_parser/version-not-number.style.json b/test/fixtures/style_parser/version-not-number.style.json similarity index 100% rename from mapbox-gl-native/test/fixtures/style_parser/version-not-number.style.json rename to test/fixtures/style_parser/version-not-number.style.json diff --git a/mapbox-gl-native/test/fixtures/supercluster/places.json b/test/fixtures/supercluster/places.json similarity index 100% rename from mapbox-gl-native/test/fixtures/supercluster/places.json rename to test/fixtures/supercluster/places.json diff --git a/mapbox-gl-native/test/geometry/dem_data.test.cpp b/test/geometry/dem_data.test.cpp similarity index 100% rename from mapbox-gl-native/test/geometry/dem_data.test.cpp rename to test/geometry/dem_data.test.cpp diff --git a/mapbox-gl-native/test/geometry/line_atlas.test.cpp b/test/geometry/line_atlas.test.cpp similarity index 100% rename from mapbox-gl-native/test/geometry/line_atlas.test.cpp rename to test/geometry/line_atlas.test.cpp diff --git a/mapbox-gl-native/test/gl/bucket.test.cpp b/test/gl/bucket.test.cpp similarity index 100% rename from mapbox-gl-native/test/gl/bucket.test.cpp rename to test/gl/bucket.test.cpp diff --git a/mapbox-gl-native/test/gl/context.test.cpp b/test/gl/context.test.cpp similarity index 100% rename from mapbox-gl-native/test/gl/context.test.cpp rename to test/gl/context.test.cpp diff --git a/mapbox-gl-native/test/gl/gl_functions.test.cpp b/test/gl/gl_functions.test.cpp similarity index 100% rename from mapbox-gl-native/test/gl/gl_functions.test.cpp rename to test/gl/gl_functions.test.cpp diff --git a/mapbox-gl-native/test/gl/object.test.cpp b/test/gl/object.test.cpp similarity index 100% rename from mapbox-gl-native/test/gl/object.test.cpp rename to test/gl/object.test.cpp diff --git a/mapbox-gl-native/test/include/mbgl/test.hpp b/test/include/mbgl/test.hpp similarity index 100% rename from mapbox-gl-native/test/include/mbgl/test.hpp rename to test/include/mbgl/test.hpp diff --git a/mapbox-gl-native/test/include/mbgl/test/util.hpp b/test/include/mbgl/test/util.hpp similarity index 100% rename from mapbox-gl-native/test/include/mbgl/test/util.hpp rename to test/include/mbgl/test/util.hpp diff --git a/mapbox-gl-native/test/ios/Info.plist b/test/ios/Info.plist similarity index 100% rename from mapbox-gl-native/test/ios/Info.plist rename to test/ios/Info.plist diff --git a/mapbox-gl-native/test/ios/README.md b/test/ios/README.md similarity index 100% rename from mapbox-gl-native/test/ios/README.md rename to test/ios/README.md diff --git a/mapbox-gl-native/test/ios/UnitTestsApp_iphoneos13.2-arm64e-debug.xctestrun b/test/ios/UnitTestsApp_iphoneos13.2-arm64e-debug.xctestrun similarity index 100% rename from mapbox-gl-native/test/ios/UnitTestsApp_iphoneos13.2-arm64e-debug.xctestrun rename to test/ios/UnitTestsApp_iphoneos13.2-arm64e-debug.xctestrun diff --git a/mapbox-gl-native/test/ios/UnitTestsApp_iphoneos13.2-arm64e-release.xctestrun b/test/ios/UnitTestsApp_iphoneos13.2-arm64e-release.xctestrun similarity index 100% rename from mapbox-gl-native/test/ios/UnitTestsApp_iphoneos13.2-arm64e-release.xctestrun rename to test/ios/UnitTestsApp_iphoneos13.2-arm64e-release.xctestrun diff --git a/mapbox-gl-native/test/ios/codesigning/UnitTestsApp.app.xcent.template b/test/ios/codesigning/UnitTestsApp.app.xcent.template similarity index 100% rename from mapbox-gl-native/test/ios/codesigning/UnitTestsApp.app.xcent.template rename to test/ios/codesigning/UnitTestsApp.app.xcent.template diff --git a/mapbox-gl-native/test/ios/codesigning/UnitTestsAppTests.xctest.xcent.template b/test/ios/codesigning/UnitTestsAppTests.xctest.xcent.template similarity index 100% rename from mapbox-gl-native/test/ios/codesigning/UnitTestsAppTests.xctest.xcent.template rename to test/ios/codesigning/UnitTestsAppTests.xctest.xcent.template diff --git a/mapbox-gl-native/test/ios/codesigning/XCTAutomationSupport.framework.xcent.template b/test/ios/codesigning/XCTAutomationSupport.framework.xcent.template similarity index 100% rename from mapbox-gl-native/test/ios/codesigning/XCTAutomationSupport.framework.xcent.template rename to test/ios/codesigning/XCTAutomationSupport.framework.xcent.template diff --git a/mapbox-gl-native/test/ios/codesigning/XCTest.framework.xcent.template b/test/ios/codesigning/XCTest.framework.xcent.template similarity index 100% rename from mapbox-gl-native/test/ios/codesigning/XCTest.framework.xcent.template rename to test/ios/codesigning/XCTest.framework.xcent.template diff --git a/mapbox-gl-native/test/ios/codesigning/codesign_all.sh b/test/ios/codesigning/codesign_all.sh similarity index 100% rename from mapbox-gl-native/test/ios/codesigning/codesign_all.sh rename to test/ios/codesigning/codesign_all.sh diff --git a/mapbox-gl-native/test/ios/codesigning/generate-entitlements.swift b/test/ios/codesigning/generate-entitlements.swift similarity index 100% rename from mapbox-gl-native/test/ios/codesigning/generate-entitlements.swift rename to test/ios/codesigning/generate-entitlements.swift diff --git a/mapbox-gl-native/test/ios/codesigning/libXCTestSwiftSupport.dylib.xcent.template b/test/ios/codesigning/libXCTestSwiftSupport.dylib.xcent.template similarity index 100% rename from mapbox-gl-native/test/ios/codesigning/libXCTestSwiftSupport.dylib.xcent.template rename to test/ios/codesigning/libXCTestSwiftSupport.dylib.xcent.template diff --git a/mapbox-gl-native/test/ios/fastlane/Appfile b/test/ios/fastlane/Appfile similarity index 100% rename from mapbox-gl-native/test/ios/fastlane/Appfile rename to test/ios/fastlane/Appfile diff --git a/mapbox-gl-native/test/ios/fastlane/Matchfile b/test/ios/fastlane/Matchfile similarity index 100% rename from mapbox-gl-native/test/ios/fastlane/Matchfile rename to test/ios/fastlane/Matchfile diff --git a/mapbox-gl-native/test/ios/iosTestRunner.h b/test/ios/iosTestRunner.h similarity index 100% rename from mapbox-gl-native/test/ios/iosTestRunner.h rename to test/ios/iosTestRunner.h diff --git a/mapbox-gl-native/test/ios/ios_test_runner.cpp b/test/ios/ios_test_runner.cpp similarity index 100% rename from mapbox-gl-native/test/ios/ios_test_runner.cpp rename to test/ios/ios_test_runner.cpp diff --git a/mapbox-gl-native/test/ios/tests/Info.plist b/test/ios/tests/Info.plist similarity index 100% rename from mapbox-gl-native/test/ios/tests/Info.plist rename to test/ios/tests/Info.plist diff --git a/mapbox-gl-native/test/map/map.test.cpp b/test/map/map.test.cpp similarity index 100% rename from mapbox-gl-native/test/map/map.test.cpp rename to test/map/map.test.cpp diff --git a/mapbox-gl-native/test/map/map_snapshotter.test.cpp b/test/map/map_snapshotter.test.cpp similarity index 100% rename from mapbox-gl-native/test/map/map_snapshotter.test.cpp rename to test/map/map_snapshotter.test.cpp diff --git a/mapbox-gl-native/test/map/prefetch.test.cpp b/test/map/prefetch.test.cpp similarity index 100% rename from mapbox-gl-native/test/map/prefetch.test.cpp rename to test/map/prefetch.test.cpp diff --git a/mapbox-gl-native/test/map/transform.test.cpp b/test/map/transform.test.cpp similarity index 100% rename from mapbox-gl-native/test/map/transform.test.cpp rename to test/map/transform.test.cpp diff --git a/mapbox-gl-native/test/math/clamp.test.cpp b/test/math/clamp.test.cpp similarity index 100% rename from mapbox-gl-native/test/math/clamp.test.cpp rename to test/math/clamp.test.cpp diff --git a/mapbox-gl-native/test/math/minmax.test.cpp b/test/math/minmax.test.cpp similarity index 100% rename from mapbox-gl-native/test/math/minmax.test.cpp rename to test/math/minmax.test.cpp diff --git a/mapbox-gl-native/test/math/wrap.test.cpp b/test/math/wrap.test.cpp similarity index 100% rename from mapbox-gl-native/test/math/wrap.test.cpp rename to test/math/wrap.test.cpp diff --git a/mapbox-gl-native/test/platform/settings.test.cpp b/test/platform/settings.test.cpp similarity index 100% rename from mapbox-gl-native/test/platform/settings.test.cpp rename to test/platform/settings.test.cpp diff --git a/mapbox-gl-native/test/programs/symbol_program.test.cpp b/test/programs/symbol_program.test.cpp similarity index 100% rename from mapbox-gl-native/test/programs/symbol_program.test.cpp rename to test/programs/symbol_program.test.cpp diff --git a/mapbox-gl-native/test/renderer/backend_scope.test.cpp b/test/renderer/backend_scope.test.cpp similarity index 100% rename from mapbox-gl-native/test/renderer/backend_scope.test.cpp rename to test/renderer/backend_scope.test.cpp diff --git a/mapbox-gl-native/test/renderer/image_manager.test.cpp b/test/renderer/image_manager.test.cpp similarity index 100% rename from mapbox-gl-native/test/renderer/image_manager.test.cpp rename to test/renderer/image_manager.test.cpp diff --git a/mapbox-gl-native/test/renderer/pattern_atlas.test.cpp b/test/renderer/pattern_atlas.test.cpp similarity index 100% rename from mapbox-gl-native/test/renderer/pattern_atlas.test.cpp rename to test/renderer/pattern_atlas.test.cpp diff --git a/mapbox-gl-native/test/sprite/sprite_loader.test.cpp b/test/sprite/sprite_loader.test.cpp similarity index 100% rename from mapbox-gl-native/test/sprite/sprite_loader.test.cpp rename to test/sprite/sprite_loader.test.cpp diff --git a/mapbox-gl-native/test/sprite/sprite_parser.test.cpp b/test/sprite/sprite_parser.test.cpp similarity index 100% rename from mapbox-gl-native/test/sprite/sprite_parser.test.cpp rename to test/sprite/sprite_parser.test.cpp diff --git a/mapbox-gl-native/test/src/app-info.plist b/test/src/app-info.plist similarity index 100% rename from mapbox-gl-native/test/src/app-info.plist rename to test/src/app-info.plist diff --git a/mapbox-gl-native/test/src/main.mm b/test/src/main.mm similarity index 100% rename from mapbox-gl-native/test/src/main.mm rename to test/src/main.mm diff --git a/mapbox-gl-native/test/src/mbgl/test/fake_file_source.hpp b/test/src/mbgl/test/fake_file_source.hpp similarity index 100% rename from mapbox-gl-native/test/src/mbgl/test/fake_file_source.hpp rename to test/src/mbgl/test/fake_file_source.hpp diff --git a/mapbox-gl-native/test/src/mbgl/test/fixture_log_observer.cpp b/test/src/mbgl/test/fixture_log_observer.cpp similarity index 100% rename from mapbox-gl-native/test/src/mbgl/test/fixture_log_observer.cpp rename to test/src/mbgl/test/fixture_log_observer.cpp diff --git a/mapbox-gl-native/test/src/mbgl/test/fixture_log_observer.hpp b/test/src/mbgl/test/fixture_log_observer.hpp similarity index 100% rename from mapbox-gl-native/test/src/mbgl/test/fixture_log_observer.hpp rename to test/src/mbgl/test/fixture_log_observer.hpp diff --git a/mapbox-gl-native/test/src/mbgl/test/getrss.cpp b/test/src/mbgl/test/getrss.cpp similarity index 100% rename from mapbox-gl-native/test/src/mbgl/test/getrss.cpp rename to test/src/mbgl/test/getrss.cpp diff --git a/mapbox-gl-native/test/src/mbgl/test/getrss.hpp b/test/src/mbgl/test/getrss.hpp similarity index 100% rename from mapbox-gl-native/test/src/mbgl/test/getrss.hpp rename to test/src/mbgl/test/getrss.hpp diff --git a/mapbox-gl-native/test/src/mbgl/test/http_server.cpp b/test/src/mbgl/test/http_server.cpp similarity index 100% rename from mapbox-gl-native/test/src/mbgl/test/http_server.cpp rename to test/src/mbgl/test/http_server.cpp diff --git a/mapbox-gl-native/test/src/mbgl/test/map_adapter.hpp b/test/src/mbgl/test/map_adapter.hpp similarity index 100% rename from mapbox-gl-native/test/src/mbgl/test/map_adapter.hpp rename to test/src/mbgl/test/map_adapter.hpp diff --git a/mapbox-gl-native/test/src/mbgl/test/mock.hpp b/test/src/mbgl/test/mock.hpp similarity index 100% rename from mapbox-gl-native/test/src/mbgl/test/mock.hpp rename to test/src/mbgl/test/mock.hpp diff --git a/mapbox-gl-native/test/src/mbgl/test/sqlite3_test_fs.cpp b/test/src/mbgl/test/sqlite3_test_fs.cpp similarity index 100% rename from mapbox-gl-native/test/src/mbgl/test/sqlite3_test_fs.cpp rename to test/src/mbgl/test/sqlite3_test_fs.cpp diff --git a/mapbox-gl-native/test/src/mbgl/test/sqlite3_test_fs.hpp b/test/src/mbgl/test/sqlite3_test_fs.hpp similarity index 100% rename from mapbox-gl-native/test/src/mbgl/test/sqlite3_test_fs.hpp rename to test/src/mbgl/test/sqlite3_test_fs.hpp diff --git a/mapbox-gl-native/test/src/mbgl/test/stub_file_source.cpp b/test/src/mbgl/test/stub_file_source.cpp similarity index 100% rename from mapbox-gl-native/test/src/mbgl/test/stub_file_source.cpp rename to test/src/mbgl/test/stub_file_source.cpp diff --git a/mapbox-gl-native/test/src/mbgl/test/stub_file_source.hpp b/test/src/mbgl/test/stub_file_source.hpp similarity index 100% rename from mapbox-gl-native/test/src/mbgl/test/stub_file_source.hpp rename to test/src/mbgl/test/stub_file_source.hpp diff --git a/mapbox-gl-native/test/src/mbgl/test/stub_geometry_tile_feature.hpp b/test/src/mbgl/test/stub_geometry_tile_feature.hpp similarity index 100% rename from mapbox-gl-native/test/src/mbgl/test/stub_geometry_tile_feature.hpp rename to test/src/mbgl/test/stub_geometry_tile_feature.hpp diff --git a/mapbox-gl-native/test/src/mbgl/test/stub_layer_observer.hpp b/test/src/mbgl/test/stub_layer_observer.hpp similarity index 100% rename from mapbox-gl-native/test/src/mbgl/test/stub_layer_observer.hpp rename to test/src/mbgl/test/stub_layer_observer.hpp diff --git a/mapbox-gl-native/test/src/mbgl/test/stub_map_observer.hpp b/test/src/mbgl/test/stub_map_observer.hpp similarity index 100% rename from mapbox-gl-native/test/src/mbgl/test/stub_map_observer.hpp rename to test/src/mbgl/test/stub_map_observer.hpp diff --git a/mapbox-gl-native/test/src/mbgl/test/stub_render_source_observer.hpp b/test/src/mbgl/test/stub_render_source_observer.hpp similarity index 100% rename from mapbox-gl-native/test/src/mbgl/test/stub_render_source_observer.hpp rename to test/src/mbgl/test/stub_render_source_observer.hpp diff --git a/mapbox-gl-native/test/src/mbgl/test/stub_style_observer.hpp b/test/src/mbgl/test/stub_style_observer.hpp similarity index 100% rename from mapbox-gl-native/test/src/mbgl/test/stub_style_observer.hpp rename to test/src/mbgl/test/stub_style_observer.hpp diff --git a/mapbox-gl-native/test/src/mbgl/test/stub_tile_observer.hpp b/test/src/mbgl/test/stub_tile_observer.hpp similarity index 100% rename from mapbox-gl-native/test/src/mbgl/test/stub_tile_observer.hpp rename to test/src/mbgl/test/stub_tile_observer.hpp diff --git a/mapbox-gl-native/test/src/mbgl/test/test.cpp b/test/src/mbgl/test/test.cpp similarity index 100% rename from mapbox-gl-native/test/src/mbgl/test/test.cpp rename to test/src/mbgl/test/test.cpp diff --git a/mapbox-gl-native/test/src/mbgl/test/util.cpp b/test/src/mbgl/test/util.cpp similarity index 100% rename from mapbox-gl-native/test/src/mbgl/test/util.cpp rename to test/src/mbgl/test/util.cpp diff --git a/mapbox-gl-native/test/storage/asset_file_source.test.cpp b/test/storage/asset_file_source.test.cpp similarity index 100% rename from mapbox-gl-native/test/storage/asset_file_source.test.cpp rename to test/storage/asset_file_source.test.cpp diff --git a/mapbox-gl-native/test/storage/database_file_source.test.cpp b/test/storage/database_file_source.test.cpp similarity index 100% rename from mapbox-gl-native/test/storage/database_file_source.test.cpp rename to test/storage/database_file_source.test.cpp diff --git a/mapbox-gl-native/test/storage/headers.test.cpp b/test/storage/headers.test.cpp similarity index 100% rename from mapbox-gl-native/test/storage/headers.test.cpp rename to test/storage/headers.test.cpp diff --git a/mapbox-gl-native/test/storage/http_file_source.test.cpp b/test/storage/http_file_source.test.cpp similarity index 100% rename from mapbox-gl-native/test/storage/http_file_source.test.cpp rename to test/storage/http_file_source.test.cpp diff --git a/mapbox-gl-native/test/storage/local_file_source.test.cpp b/test/storage/local_file_source.test.cpp similarity index 100% rename from mapbox-gl-native/test/storage/local_file_source.test.cpp rename to test/storage/local_file_source.test.cpp diff --git a/mapbox-gl-native/test/storage/main_resource_loader.test.cpp b/test/storage/main_resource_loader.test.cpp similarity index 100% rename from mapbox-gl-native/test/storage/main_resource_loader.test.cpp rename to test/storage/main_resource_loader.test.cpp diff --git a/mapbox-gl-native/test/storage/offline.test.cpp b/test/storage/offline.test.cpp similarity index 100% rename from mapbox-gl-native/test/storage/offline.test.cpp rename to test/storage/offline.test.cpp diff --git a/mapbox-gl-native/test/storage/offline_database.test.cpp b/test/storage/offline_database.test.cpp similarity index 100% rename from mapbox-gl-native/test/storage/offline_database.test.cpp rename to test/storage/offline_database.test.cpp diff --git a/mapbox-gl-native/test/storage/offline_download.test.cpp b/test/storage/offline_download.test.cpp similarity index 100% rename from mapbox-gl-native/test/storage/offline_download.test.cpp rename to test/storage/offline_download.test.cpp diff --git a/mapbox-gl-native/test/storage/online_file_source.test.cpp b/test/storage/online_file_source.test.cpp similarity index 100% rename from mapbox-gl-native/test/storage/online_file_source.test.cpp rename to test/storage/online_file_source.test.cpp diff --git a/mapbox-gl-native/test/storage/resource.test.cpp b/test/storage/resource.test.cpp similarity index 100% rename from mapbox-gl-native/test/storage/resource.test.cpp rename to test/storage/resource.test.cpp diff --git a/mapbox-gl-native/test/storage/sqlite.test.cpp b/test/storage/sqlite.test.cpp similarity index 100% rename from mapbox-gl-native/test/storage/sqlite.test.cpp rename to test/storage/sqlite.test.cpp diff --git a/mapbox-gl-native/test/storage/sync_file_source.test.cpp b/test/storage/sync_file_source.test.cpp similarity index 100% rename from mapbox-gl-native/test/storage/sync_file_source.test.cpp rename to test/storage/sync_file_source.test.cpp diff --git a/mapbox-gl-native/test/style/conversion/conversion_impl.test.cpp b/test/style/conversion/conversion_impl.test.cpp similarity index 100% rename from mapbox-gl-native/test/style/conversion/conversion_impl.test.cpp rename to test/style/conversion/conversion_impl.test.cpp diff --git a/mapbox-gl-native/test/style/conversion/function.test.cpp b/test/style/conversion/function.test.cpp similarity index 100% rename from mapbox-gl-native/test/style/conversion/function.test.cpp rename to test/style/conversion/function.test.cpp diff --git a/mapbox-gl-native/test/style/conversion/geojson_options.test.cpp b/test/style/conversion/geojson_options.test.cpp similarity index 100% rename from mapbox-gl-native/test/style/conversion/geojson_options.test.cpp rename to test/style/conversion/geojson_options.test.cpp diff --git a/mapbox-gl-native/test/style/conversion/layer.test.cpp b/test/style/conversion/layer.test.cpp similarity index 100% rename from mapbox-gl-native/test/style/conversion/layer.test.cpp rename to test/style/conversion/layer.test.cpp diff --git a/mapbox-gl-native/test/style/conversion/light.test.cpp b/test/style/conversion/light.test.cpp similarity index 100% rename from mapbox-gl-native/test/style/conversion/light.test.cpp rename to test/style/conversion/light.test.cpp diff --git a/mapbox-gl-native/test/style/conversion/property_value.test.cpp b/test/style/conversion/property_value.test.cpp similarity index 100% rename from mapbox-gl-native/test/style/conversion/property_value.test.cpp rename to test/style/conversion/property_value.test.cpp diff --git a/mapbox-gl-native/test/style/conversion/stringify.test.cpp b/test/style/conversion/stringify.test.cpp similarity index 100% rename from mapbox-gl-native/test/style/conversion/stringify.test.cpp rename to test/style/conversion/stringify.test.cpp diff --git a/mapbox-gl-native/test/style/conversion/tileset.test.cpp b/test/style/conversion/tileset.test.cpp similarity index 100% rename from mapbox-gl-native/test/style/conversion/tileset.test.cpp rename to test/style/conversion/tileset.test.cpp diff --git a/mapbox-gl-native/test/style/expression/expression.test.cpp b/test/style/expression/expression.test.cpp similarity index 100% rename from mapbox-gl-native/test/style/expression/expression.test.cpp rename to test/style/expression/expression.test.cpp diff --git a/mapbox-gl-native/test/style/expression/util.test.cpp b/test/style/expression/util.test.cpp similarity index 100% rename from mapbox-gl-native/test/style/expression/util.test.cpp rename to test/style/expression/util.test.cpp diff --git a/mapbox-gl-native/test/style/filter.test.cpp b/test/style/filter.test.cpp similarity index 100% rename from mapbox-gl-native/test/style/filter.test.cpp rename to test/style/filter.test.cpp diff --git a/mapbox-gl-native/test/style/properties.test.cpp b/test/style/properties.test.cpp similarity index 100% rename from mapbox-gl-native/test/style/properties.test.cpp rename to test/style/properties.test.cpp diff --git a/mapbox-gl-native/test/style/property_expression.test.cpp b/test/style/property_expression.test.cpp similarity index 100% rename from mapbox-gl-native/test/style/property_expression.test.cpp rename to test/style/property_expression.test.cpp diff --git a/mapbox-gl-native/test/style/source.test.cpp b/test/style/source.test.cpp similarity index 100% rename from mapbox-gl-native/test/style/source.test.cpp rename to test/style/source.test.cpp diff --git a/mapbox-gl-native/test/style/style.test.cpp b/test/style/style.test.cpp similarity index 100% rename from mapbox-gl-native/test/style/style.test.cpp rename to test/style/style.test.cpp diff --git a/mapbox-gl-native/test/style/style_image.test.cpp b/test/style/style_image.test.cpp similarity index 100% rename from mapbox-gl-native/test/style/style_image.test.cpp rename to test/style/style_image.test.cpp diff --git a/mapbox-gl-native/test/style/style_layer.test.cpp b/test/style/style_layer.test.cpp similarity index 100% rename from mapbox-gl-native/test/style/style_layer.test.cpp rename to test/style/style_layer.test.cpp diff --git a/mapbox-gl-native/test/style/style_parser.test.cpp b/test/style/style_parser.test.cpp similarity index 100% rename from mapbox-gl-native/test/style/style_parser.test.cpp rename to test/style/style_parser.test.cpp diff --git a/mapbox-gl-native/test/text/bidi.test.cpp b/test/text/bidi.test.cpp similarity index 100% rename from mapbox-gl-native/test/text/bidi.test.cpp rename to test/text/bidi.test.cpp diff --git a/mapbox-gl-native/test/text/calculate_tile_distances.test.cpp b/test/text/calculate_tile_distances.test.cpp similarity index 100% rename from mapbox-gl-native/test/text/calculate_tile_distances.test.cpp rename to test/text/calculate_tile_distances.test.cpp diff --git a/mapbox-gl-native/test/text/cross_tile_symbol_index.test.cpp b/test/text/cross_tile_symbol_index.test.cpp similarity index 100% rename from mapbox-gl-native/test/text/cross_tile_symbol_index.test.cpp rename to test/text/cross_tile_symbol_index.test.cpp diff --git a/mapbox-gl-native/test/text/formatted.test.cpp b/test/text/formatted.test.cpp similarity index 100% rename from mapbox-gl-native/test/text/formatted.test.cpp rename to test/text/formatted.test.cpp diff --git a/mapbox-gl-native/test/text/get_anchors.test.cpp b/test/text/get_anchors.test.cpp similarity index 100% rename from mapbox-gl-native/test/text/get_anchors.test.cpp rename to test/text/get_anchors.test.cpp diff --git a/mapbox-gl-native/test/text/glyph_manager.test.cpp b/test/text/glyph_manager.test.cpp similarity index 100% rename from mapbox-gl-native/test/text/glyph_manager.test.cpp rename to test/text/glyph_manager.test.cpp diff --git a/mapbox-gl-native/test/text/glyph_pbf.test.cpp b/test/text/glyph_pbf.test.cpp similarity index 100% rename from mapbox-gl-native/test/text/glyph_pbf.test.cpp rename to test/text/glyph_pbf.test.cpp diff --git a/mapbox-gl-native/test/text/language_tag.test.cpp b/test/text/language_tag.test.cpp similarity index 100% rename from mapbox-gl-native/test/text/language_tag.test.cpp rename to test/text/language_tag.test.cpp diff --git a/mapbox-gl-native/test/text/local_glyph_rasterizer.test.cpp b/test/text/local_glyph_rasterizer.test.cpp similarity index 100% rename from mapbox-gl-native/test/text/local_glyph_rasterizer.test.cpp rename to test/text/local_glyph_rasterizer.test.cpp diff --git a/mapbox-gl-native/test/text/quads.test.cpp b/test/text/quads.test.cpp similarity index 100% rename from mapbox-gl-native/test/text/quads.test.cpp rename to test/text/quads.test.cpp diff --git a/mapbox-gl-native/test/text/shaping.test.cpp b/test/text/shaping.test.cpp similarity index 100% rename from mapbox-gl-native/test/text/shaping.test.cpp rename to test/text/shaping.test.cpp diff --git a/mapbox-gl-native/test/text/tagged_string.test.cpp b/test/text/tagged_string.test.cpp similarity index 100% rename from mapbox-gl-native/test/text/tagged_string.test.cpp rename to test/text/tagged_string.test.cpp diff --git a/mapbox-gl-native/test/tile/custom_geometry_tile.test.cpp b/test/tile/custom_geometry_tile.test.cpp similarity index 100% rename from mapbox-gl-native/test/tile/custom_geometry_tile.test.cpp rename to test/tile/custom_geometry_tile.test.cpp diff --git a/mapbox-gl-native/test/tile/geojson_tile.test.cpp b/test/tile/geojson_tile.test.cpp similarity index 100% rename from mapbox-gl-native/test/tile/geojson_tile.test.cpp rename to test/tile/geojson_tile.test.cpp diff --git a/mapbox-gl-native/test/tile/geometry_tile_data.test.cpp b/test/tile/geometry_tile_data.test.cpp similarity index 100% rename from mapbox-gl-native/test/tile/geometry_tile_data.test.cpp rename to test/tile/geometry_tile_data.test.cpp diff --git a/mapbox-gl-native/test/tile/raster_dem_tile.test.cpp b/test/tile/raster_dem_tile.test.cpp similarity index 100% rename from mapbox-gl-native/test/tile/raster_dem_tile.test.cpp rename to test/tile/raster_dem_tile.test.cpp diff --git a/mapbox-gl-native/test/tile/raster_tile.test.cpp b/test/tile/raster_tile.test.cpp similarity index 100% rename from mapbox-gl-native/test/tile/raster_tile.test.cpp rename to test/tile/raster_tile.test.cpp diff --git a/mapbox-gl-native/test/tile/tile_cache.test.cpp b/test/tile/tile_cache.test.cpp similarity index 100% rename from mapbox-gl-native/test/tile/tile_cache.test.cpp rename to test/tile/tile_cache.test.cpp diff --git a/mapbox-gl-native/test/tile/tile_coordinate.test.cpp b/test/tile/tile_coordinate.test.cpp similarity index 100% rename from mapbox-gl-native/test/tile/tile_coordinate.test.cpp rename to test/tile/tile_coordinate.test.cpp diff --git a/mapbox-gl-native/test/tile/tile_id.test.cpp b/test/tile/tile_id.test.cpp similarity index 100% rename from mapbox-gl-native/test/tile/tile_id.test.cpp rename to test/tile/tile_id.test.cpp diff --git a/mapbox-gl-native/test/tile/vector_tile.test.cpp b/test/tile/vector_tile.test.cpp similarity index 100% rename from mapbox-gl-native/test/tile/vector_tile.test.cpp rename to test/tile/vector_tile.test.cpp diff --git a/mapbox-gl-native/test/util/async_task.test.cpp b/test/util/async_task.test.cpp similarity index 100% rename from mapbox-gl-native/test/util/async_task.test.cpp rename to test/util/async_task.test.cpp diff --git a/mapbox-gl-native/test/util/bounding_volumes.test.cpp b/test/util/bounding_volumes.test.cpp similarity index 100% rename from mapbox-gl-native/test/util/bounding_volumes.test.cpp rename to test/util/bounding_volumes.test.cpp diff --git a/mapbox-gl-native/test/util/camera.test.cpp b/test/util/camera.test.cpp similarity index 100% rename from mapbox-gl-native/test/util/camera.test.cpp rename to test/util/camera.test.cpp diff --git a/mapbox-gl-native/test/util/dtoa.test.cpp b/test/util/dtoa.test.cpp similarity index 100% rename from mapbox-gl-native/test/util/dtoa.test.cpp rename to test/util/dtoa.test.cpp diff --git a/mapbox-gl-native/test/util/geo.test.cpp b/test/util/geo.test.cpp similarity index 100% rename from mapbox-gl-native/test/util/geo.test.cpp rename to test/util/geo.test.cpp diff --git a/mapbox-gl-native/test/util/grid_index.test.cpp b/test/util/grid_index.test.cpp similarity index 100% rename from mapbox-gl-native/test/util/grid_index.test.cpp rename to test/util/grid_index.test.cpp diff --git a/mapbox-gl-native/test/util/http_timeout.test.cpp b/test/util/http_timeout.test.cpp similarity index 100% rename from mapbox-gl-native/test/util/http_timeout.test.cpp rename to test/util/http_timeout.test.cpp diff --git a/mapbox-gl-native/test/util/image.test.cpp b/test/util/image.test.cpp similarity index 100% rename from mapbox-gl-native/test/util/image.test.cpp rename to test/util/image.test.cpp diff --git a/mapbox-gl-native/test/util/mapbox.test.cpp b/test/util/mapbox.test.cpp similarity index 100% rename from mapbox-gl-native/test/util/mapbox.test.cpp rename to test/util/mapbox.test.cpp diff --git a/mapbox-gl-native/test/util/memory.test.cpp b/test/util/memory.test.cpp similarity index 100% rename from mapbox-gl-native/test/util/memory.test.cpp rename to test/util/memory.test.cpp diff --git a/mapbox-gl-native/test/util/merge_lines.test.cpp b/test/util/merge_lines.test.cpp similarity index 100% rename from mapbox-gl-native/test/util/merge_lines.test.cpp rename to test/util/merge_lines.test.cpp diff --git a/mapbox-gl-native/test/util/number_conversions.test.cpp b/test/util/number_conversions.test.cpp similarity index 100% rename from mapbox-gl-native/test/util/number_conversions.test.cpp rename to test/util/number_conversions.test.cpp diff --git a/mapbox-gl-native/test/util/offscreen_texture.test.cpp b/test/util/offscreen_texture.test.cpp similarity index 100% rename from mapbox-gl-native/test/util/offscreen_texture.test.cpp rename to test/util/offscreen_texture.test.cpp diff --git a/mapbox-gl-native/test/util/pass.test.cpp b/test/util/pass.test.cpp similarity index 100% rename from mapbox-gl-native/test/util/pass.test.cpp rename to test/util/pass.test.cpp diff --git a/mapbox-gl-native/test/util/position.test.cpp b/test/util/position.test.cpp similarity index 100% rename from mapbox-gl-native/test/util/position.test.cpp rename to test/util/position.test.cpp diff --git a/mapbox-gl-native/test/util/projection.test.cpp b/test/util/projection.test.cpp similarity index 100% rename from mapbox-gl-native/test/util/projection.test.cpp rename to test/util/projection.test.cpp diff --git a/mapbox-gl-native/test/util/rotation.test.cpp b/test/util/rotation.test.cpp similarity index 100% rename from mapbox-gl-native/test/util/rotation.test.cpp rename to test/util/rotation.test.cpp diff --git a/mapbox-gl-native/test/util/run_loop.test.cpp b/test/util/run_loop.test.cpp similarity index 100% rename from mapbox-gl-native/test/util/run_loop.test.cpp rename to test/util/run_loop.test.cpp diff --git a/mapbox-gl-native/test/util/string.test.cpp b/test/util/string.test.cpp similarity index 100% rename from mapbox-gl-native/test/util/string.test.cpp rename to test/util/string.test.cpp diff --git a/mapbox-gl-native/test/util/text_conversions.test.cpp b/test/util/text_conversions.test.cpp similarity index 100% rename from mapbox-gl-native/test/util/text_conversions.test.cpp rename to test/util/text_conversions.test.cpp diff --git a/mapbox-gl-native/test/util/thread.test.cpp b/test/util/thread.test.cpp similarity index 100% rename from mapbox-gl-native/test/util/thread.test.cpp rename to test/util/thread.test.cpp diff --git a/mapbox-gl-native/test/util/thread_local.test.cpp b/test/util/thread_local.test.cpp similarity index 100% rename from mapbox-gl-native/test/util/thread_local.test.cpp rename to test/util/thread_local.test.cpp diff --git a/mapbox-gl-native/test/util/tile_cover.test.cpp b/test/util/tile_cover.test.cpp similarity index 100% rename from mapbox-gl-native/test/util/tile_cover.test.cpp rename to test/util/tile_cover.test.cpp diff --git a/mapbox-gl-native/test/util/tile_range.test.cpp b/test/util/tile_range.test.cpp similarity index 100% rename from mapbox-gl-native/test/util/tile_range.test.cpp rename to test/util/tile_range.test.cpp diff --git a/mapbox-gl-native/test/util/timer.test.cpp b/test/util/timer.test.cpp similarity index 100% rename from mapbox-gl-native/test/util/timer.test.cpp rename to test/util/timer.test.cpp diff --git a/mapbox-gl-native/test/util/token.test.cpp b/test/util/token.test.cpp similarity index 100% rename from mapbox-gl-native/test/util/token.test.cpp rename to test/util/token.test.cpp diff --git a/mapbox-gl-native/test/util/url.test.cpp b/test/util/url.test.cpp similarity index 100% rename from mapbox-gl-native/test/util/url.test.cpp rename to test/util/url.test.cpp diff --git a/vendor/benchmark b/vendor/benchmark index bf585a278..090faecb4 160000 --- a/vendor/benchmark +++ b/vendor/benchmark @@ -1 +1 @@ -Subproject commit bf585a2789e30585b4e3ce6baf11ef2750b54677 +Subproject commit 090faecb454fbd6e6e17a75ef8146acb037118d4 diff --git a/mapbox-gl-native/vendor/benchmark.cmake b/vendor/benchmark.cmake similarity index 100% rename from mapbox-gl-native/vendor/benchmark.cmake rename to vendor/benchmark.cmake diff --git a/mapbox-gl-native/vendor/boost.cmake b/vendor/boost.cmake similarity index 100% rename from mapbox-gl-native/vendor/boost.cmake rename to vendor/boost.cmake diff --git a/vendor/cpp-httplib b/vendor/cpp-httplib index 40db42108..b557ac932 160000 --- a/vendor/cpp-httplib +++ b/vendor/cpp-httplib @@ -1 +1 @@ -Subproject commit 40db42108f4303057a0494710ab06c796bb60448 +Subproject commit b557ac9328f3571edbb8efa25905b950f6654e9d diff --git a/mapbox-gl-native/vendor/cpp-httplib.cmake b/vendor/cpp-httplib.cmake similarity index 100% rename from mapbox-gl-native/vendor/cpp-httplib.cmake rename to vendor/cpp-httplib.cmake diff --git a/mapbox-gl-native/vendor/csscolorparser.cmake b/vendor/csscolorparser.cmake similarity index 100% rename from mapbox-gl-native/vendor/csscolorparser.cmake rename to vendor/csscolorparser.cmake diff --git a/mapbox-gl-native/vendor/csscolorparser/LICENSE b/vendor/csscolorparser/LICENSE similarity index 100% rename from mapbox-gl-native/vendor/csscolorparser/LICENSE rename to vendor/csscolorparser/LICENSE diff --git a/mapbox-gl-native/vendor/csscolorparser/csscolorparser.cpp b/vendor/csscolorparser/csscolorparser.cpp similarity index 100% rename from mapbox-gl-native/vendor/csscolorparser/csscolorparser.cpp rename to vendor/csscolorparser/csscolorparser.cpp diff --git a/mapbox-gl-native/vendor/csscolorparser/csscolorparser/csscolorparser.hpp b/vendor/csscolorparser/csscolorparser/csscolorparser.hpp similarity index 100% rename from mapbox-gl-native/vendor/csscolorparser/csscolorparser/csscolorparser.hpp rename to vendor/csscolorparser/csscolorparser/csscolorparser.hpp diff --git a/mapbox-gl-native/vendor/curl.cmake b/vendor/curl.cmake similarity index 100% rename from mapbox-gl-native/vendor/curl.cmake rename to vendor/curl.cmake diff --git a/vendor/earcut.hpp b/vendor/earcut.hpp index 6d18edf0c..0d0897a9d 160000 --- a/vendor/earcut.hpp +++ b/vendor/earcut.hpp @@ -1 +1 @@ -Subproject commit 6d18edf0ce046023a7cb55e69c4cd9ba90e2c716 +Subproject commit 0d0897a9dc462edf6396aedb335ddeb4aa302b78 diff --git a/mapbox-gl-native/vendor/earcut.hpp.cmake b/vendor/earcut.hpp.cmake similarity index 100% rename from mapbox-gl-native/vendor/earcut.hpp.cmake rename to vendor/earcut.hpp.cmake diff --git a/vendor/eternal b/vendor/eternal index dd2f5b9ff..8eee34761 160000 --- a/vendor/eternal +++ b/vendor/eternal @@ -1 +1 @@ -Subproject commit dd2f5b9ff38fcd36b59efd9d289127fa73efc6cb +Subproject commit 8eee3476198f99c2e2621b36f764a5a30bd71ab7 diff --git a/mapbox-gl-native/vendor/eternal.cmake b/vendor/eternal.cmake similarity index 100% rename from mapbox-gl-native/vendor/eternal.cmake rename to vendor/eternal.cmake diff --git a/vendor/googletest b/vendor/googletest index 18f8200e3..703bd9caa 160000 --- a/vendor/googletest +++ b/vendor/googletest @@ -1 +1 @@ -Subproject commit 18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6 +Subproject commit 703bd9caab50b139428cea1aaff9974ebee5742e diff --git a/mapbox-gl-native/vendor/googletest.cmake b/vendor/googletest.cmake similarity index 100% rename from mapbox-gl-native/vendor/googletest.cmake rename to vendor/googletest.cmake diff --git a/mapbox-gl-native/vendor/icu.cmake b/vendor/icu.cmake similarity index 100% rename from mapbox-gl-native/vendor/icu.cmake rename to vendor/icu.cmake diff --git a/mapbox-gl-native/vendor/icu/LICENSE b/vendor/icu/LICENSE similarity index 100% rename from mapbox-gl-native/vendor/icu/LICENSE rename to vendor/icu/LICENSE diff --git a/mapbox-gl-native/vendor/icu/files.txt b/vendor/icu/files.txt similarity index 100% rename from mapbox-gl-native/vendor/icu/files.txt rename to vendor/icu/files.txt diff --git a/mapbox-gl-native/vendor/icu/include/unicode/bytestream.h b/vendor/icu/include/unicode/bytestream.h similarity index 100% rename from mapbox-gl-native/vendor/icu/include/unicode/bytestream.h rename to vendor/icu/include/unicode/bytestream.h diff --git a/mapbox-gl-native/vendor/icu/include/unicode/char16ptr.h b/vendor/icu/include/unicode/char16ptr.h similarity index 100% rename from mapbox-gl-native/vendor/icu/include/unicode/char16ptr.h rename to vendor/icu/include/unicode/char16ptr.h diff --git a/mapbox-gl-native/vendor/icu/include/unicode/localpointer.h b/vendor/icu/include/unicode/localpointer.h similarity index 100% rename from mapbox-gl-native/vendor/icu/include/unicode/localpointer.h rename to vendor/icu/include/unicode/localpointer.h diff --git a/mapbox-gl-native/vendor/icu/include/unicode/platform.h b/vendor/icu/include/unicode/platform.h similarity index 100% rename from mapbox-gl-native/vendor/icu/include/unicode/platform.h rename to vendor/icu/include/unicode/platform.h diff --git a/mapbox-gl-native/vendor/icu/include/unicode/ptypes.h b/vendor/icu/include/unicode/ptypes.h similarity index 100% rename from mapbox-gl-native/vendor/icu/include/unicode/ptypes.h rename to vendor/icu/include/unicode/ptypes.h diff --git a/mapbox-gl-native/vendor/icu/include/unicode/putil.h b/vendor/icu/include/unicode/putil.h similarity index 100% rename from mapbox-gl-native/vendor/icu/include/unicode/putil.h rename to vendor/icu/include/unicode/putil.h diff --git a/mapbox-gl-native/vendor/icu/include/unicode/rep.h b/vendor/icu/include/unicode/rep.h similarity index 100% rename from mapbox-gl-native/vendor/icu/include/unicode/rep.h rename to vendor/icu/include/unicode/rep.h diff --git a/mapbox-gl-native/vendor/icu/include/unicode/std_string.h b/vendor/icu/include/unicode/std_string.h similarity index 100% rename from mapbox-gl-native/vendor/icu/include/unicode/std_string.h rename to vendor/icu/include/unicode/std_string.h diff --git a/mapbox-gl-native/vendor/icu/include/unicode/stringoptions.h b/vendor/icu/include/unicode/stringoptions.h similarity index 100% rename from mapbox-gl-native/vendor/icu/include/unicode/stringoptions.h rename to vendor/icu/include/unicode/stringoptions.h diff --git a/mapbox-gl-native/vendor/icu/include/unicode/stringpiece.h b/vendor/icu/include/unicode/stringpiece.h similarity index 100% rename from mapbox-gl-native/vendor/icu/include/unicode/stringpiece.h rename to vendor/icu/include/unicode/stringpiece.h diff --git a/mapbox-gl-native/vendor/icu/include/unicode/ubidi.h b/vendor/icu/include/unicode/ubidi.h similarity index 100% rename from mapbox-gl-native/vendor/icu/include/unicode/ubidi.h rename to vendor/icu/include/unicode/ubidi.h diff --git a/mapbox-gl-native/vendor/icu/include/unicode/uchar.h b/vendor/icu/include/unicode/uchar.h similarity index 100% rename from mapbox-gl-native/vendor/icu/include/unicode/uchar.h rename to vendor/icu/include/unicode/uchar.h diff --git a/mapbox-gl-native/vendor/icu/include/unicode/uclean.h b/vendor/icu/include/unicode/uclean.h similarity index 100% rename from mapbox-gl-native/vendor/icu/include/unicode/uclean.h rename to vendor/icu/include/unicode/uclean.h diff --git a/mapbox-gl-native/vendor/icu/include/unicode/uconfig.h b/vendor/icu/include/unicode/uconfig.h similarity index 100% rename from mapbox-gl-native/vendor/icu/include/unicode/uconfig.h rename to vendor/icu/include/unicode/uconfig.h diff --git a/mapbox-gl-native/vendor/icu/include/unicode/udata.h b/vendor/icu/include/unicode/udata.h similarity index 100% rename from mapbox-gl-native/vendor/icu/include/unicode/udata.h rename to vendor/icu/include/unicode/udata.h diff --git a/mapbox-gl-native/vendor/icu/include/unicode/uiter.h b/vendor/icu/include/unicode/uiter.h similarity index 100% rename from mapbox-gl-native/vendor/icu/include/unicode/uiter.h rename to vendor/icu/include/unicode/uiter.h diff --git a/mapbox-gl-native/vendor/icu/include/unicode/umachine.h b/vendor/icu/include/unicode/umachine.h similarity index 100% rename from mapbox-gl-native/vendor/icu/include/unicode/umachine.h rename to vendor/icu/include/unicode/umachine.h diff --git a/mapbox-gl-native/vendor/icu/include/unicode/unistr.h b/vendor/icu/include/unicode/unistr.h similarity index 100% rename from mapbox-gl-native/vendor/icu/include/unicode/unistr.h rename to vendor/icu/include/unicode/unistr.h diff --git a/mapbox-gl-native/vendor/icu/include/unicode/uobject.h b/vendor/icu/include/unicode/uobject.h similarity index 100% rename from mapbox-gl-native/vendor/icu/include/unicode/uobject.h rename to vendor/icu/include/unicode/uobject.h diff --git a/mapbox-gl-native/vendor/icu/include/unicode/urename.h b/vendor/icu/include/unicode/urename.h similarity index 100% rename from mapbox-gl-native/vendor/icu/include/unicode/urename.h rename to vendor/icu/include/unicode/urename.h diff --git a/mapbox-gl-native/vendor/icu/include/unicode/uscript.h b/vendor/icu/include/unicode/uscript.h similarity index 100% rename from mapbox-gl-native/vendor/icu/include/unicode/uscript.h rename to vendor/icu/include/unicode/uscript.h diff --git a/mapbox-gl-native/vendor/icu/include/unicode/uset.h b/vendor/icu/include/unicode/uset.h similarity index 100% rename from mapbox-gl-native/vendor/icu/include/unicode/uset.h rename to vendor/icu/include/unicode/uset.h diff --git a/mapbox-gl-native/vendor/icu/include/unicode/ushape.h b/vendor/icu/include/unicode/ushape.h similarity index 100% rename from mapbox-gl-native/vendor/icu/include/unicode/ushape.h rename to vendor/icu/include/unicode/ushape.h diff --git a/mapbox-gl-native/vendor/icu/include/unicode/ustring.h b/vendor/icu/include/unicode/ustring.h similarity index 100% rename from mapbox-gl-native/vendor/icu/include/unicode/ustring.h rename to vendor/icu/include/unicode/ustring.h diff --git a/mapbox-gl-native/vendor/icu/include/unicode/utf.h b/vendor/icu/include/unicode/utf.h similarity index 100% rename from mapbox-gl-native/vendor/icu/include/unicode/utf.h rename to vendor/icu/include/unicode/utf.h diff --git a/mapbox-gl-native/vendor/icu/include/unicode/utf16.h b/vendor/icu/include/unicode/utf16.h similarity index 100% rename from mapbox-gl-native/vendor/icu/include/unicode/utf16.h rename to vendor/icu/include/unicode/utf16.h diff --git a/mapbox-gl-native/vendor/icu/include/unicode/utf8.h b/vendor/icu/include/unicode/utf8.h similarity index 100% rename from mapbox-gl-native/vendor/icu/include/unicode/utf8.h rename to vendor/icu/include/unicode/utf8.h diff --git a/mapbox-gl-native/vendor/icu/include/unicode/utf_old.h b/vendor/icu/include/unicode/utf_old.h similarity index 100% rename from mapbox-gl-native/vendor/icu/include/unicode/utf_old.h rename to vendor/icu/include/unicode/utf_old.h diff --git a/mapbox-gl-native/vendor/icu/include/unicode/utypes.h b/vendor/icu/include/unicode/utypes.h similarity index 100% rename from mapbox-gl-native/vendor/icu/include/unicode/utypes.h rename to vendor/icu/include/unicode/utypes.h diff --git a/mapbox-gl-native/vendor/icu/include/unicode/uvernum.h b/vendor/icu/include/unicode/uvernum.h similarity index 100% rename from mapbox-gl-native/vendor/icu/include/unicode/uvernum.h rename to vendor/icu/include/unicode/uvernum.h diff --git a/mapbox-gl-native/vendor/icu/include/unicode/uversion.h b/vendor/icu/include/unicode/uversion.h similarity index 100% rename from mapbox-gl-native/vendor/icu/include/unicode/uversion.h rename to vendor/icu/include/unicode/uversion.h diff --git a/mapbox-gl-native/vendor/icu/src/cmemory.cpp b/vendor/icu/src/cmemory.cpp similarity index 100% rename from mapbox-gl-native/vendor/icu/src/cmemory.cpp rename to vendor/icu/src/cmemory.cpp diff --git a/mapbox-gl-native/vendor/icu/src/cmemory.h b/vendor/icu/src/cmemory.h similarity index 100% rename from mapbox-gl-native/vendor/icu/src/cmemory.h rename to vendor/icu/src/cmemory.h diff --git a/mapbox-gl-native/vendor/icu/src/cstring.cpp b/vendor/icu/src/cstring.cpp similarity index 100% rename from mapbox-gl-native/vendor/icu/src/cstring.cpp rename to vendor/icu/src/cstring.cpp diff --git a/mapbox-gl-native/vendor/icu/src/cstring.h b/vendor/icu/src/cstring.h similarity index 100% rename from mapbox-gl-native/vendor/icu/src/cstring.h rename to vendor/icu/src/cstring.h diff --git a/mapbox-gl-native/vendor/icu/src/cwchar.h b/vendor/icu/src/cwchar.h similarity index 100% rename from mapbox-gl-native/vendor/icu/src/cwchar.h rename to vendor/icu/src/cwchar.h diff --git a/mapbox-gl-native/vendor/icu/src/mutex.h b/vendor/icu/src/mutex.h similarity index 100% rename from mapbox-gl-native/vendor/icu/src/mutex.h rename to vendor/icu/src/mutex.h diff --git a/mapbox-gl-native/vendor/icu/src/putilimp.h b/vendor/icu/src/putilimp.h similarity index 100% rename from mapbox-gl-native/vendor/icu/src/putilimp.h rename to vendor/icu/src/putilimp.h diff --git a/mapbox-gl-native/vendor/icu/src/uassert.h b/vendor/icu/src/uassert.h similarity index 100% rename from mapbox-gl-native/vendor/icu/src/uassert.h rename to vendor/icu/src/uassert.h diff --git a/mapbox-gl-native/vendor/icu/src/ubidi.cpp b/vendor/icu/src/ubidi.cpp similarity index 100% rename from mapbox-gl-native/vendor/icu/src/ubidi.cpp rename to vendor/icu/src/ubidi.cpp diff --git a/mapbox-gl-native/vendor/icu/src/ubidi_props.cpp b/vendor/icu/src/ubidi_props.cpp similarity index 100% rename from mapbox-gl-native/vendor/icu/src/ubidi_props.cpp rename to vendor/icu/src/ubidi_props.cpp diff --git a/mapbox-gl-native/vendor/icu/src/ubidi_props.h b/vendor/icu/src/ubidi_props.h similarity index 100% rename from mapbox-gl-native/vendor/icu/src/ubidi_props.h rename to vendor/icu/src/ubidi_props.h diff --git a/mapbox-gl-native/vendor/icu/src/ubidi_props_data.h b/vendor/icu/src/ubidi_props_data.h similarity index 100% rename from mapbox-gl-native/vendor/icu/src/ubidi_props_data.h rename to vendor/icu/src/ubidi_props_data.h diff --git a/mapbox-gl-native/vendor/icu/src/ubidiimp.h b/vendor/icu/src/ubidiimp.h similarity index 100% rename from mapbox-gl-native/vendor/icu/src/ubidiimp.h rename to vendor/icu/src/ubidiimp.h diff --git a/mapbox-gl-native/vendor/icu/src/ubidiln.cpp b/vendor/icu/src/ubidiln.cpp similarity index 100% rename from mapbox-gl-native/vendor/icu/src/ubidiln.cpp rename to vendor/icu/src/ubidiln.cpp diff --git a/mapbox-gl-native/vendor/icu/src/ubidiwrt.cpp b/vendor/icu/src/ubidiwrt.cpp similarity index 100% rename from mapbox-gl-native/vendor/icu/src/ubidiwrt.cpp rename to vendor/icu/src/ubidiwrt.cpp diff --git a/mapbox-gl-native/vendor/icu/src/uchar.cpp b/vendor/icu/src/uchar.cpp similarity index 100% rename from mapbox-gl-native/vendor/icu/src/uchar.cpp rename to vendor/icu/src/uchar.cpp diff --git a/mapbox-gl-native/vendor/icu/src/uchar_props_data.h b/vendor/icu/src/uchar_props_data.h similarity index 100% rename from mapbox-gl-native/vendor/icu/src/uchar_props_data.h rename to vendor/icu/src/uchar_props_data.h diff --git a/mapbox-gl-native/vendor/icu/src/ucln.h b/vendor/icu/src/ucln.h similarity index 100% rename from mapbox-gl-native/vendor/icu/src/ucln.h rename to vendor/icu/src/ucln.h diff --git a/mapbox-gl-native/vendor/icu/src/ucln_cmn.h b/vendor/icu/src/ucln_cmn.h similarity index 100% rename from mapbox-gl-native/vendor/icu/src/ucln_cmn.h rename to vendor/icu/src/ucln_cmn.h diff --git a/mapbox-gl-native/vendor/icu/src/ucmndata.h b/vendor/icu/src/ucmndata.h similarity index 100% rename from mapbox-gl-native/vendor/icu/src/ucmndata.h rename to vendor/icu/src/ucmndata.h diff --git a/mapbox-gl-native/vendor/icu/src/udatamem.h b/vendor/icu/src/udatamem.h similarity index 100% rename from mapbox-gl-native/vendor/icu/src/udatamem.h rename to vendor/icu/src/udatamem.h diff --git a/mapbox-gl-native/vendor/icu/src/udataswp.cpp b/vendor/icu/src/udataswp.cpp similarity index 100% rename from mapbox-gl-native/vendor/icu/src/udataswp.cpp rename to vendor/icu/src/udataswp.cpp diff --git a/mapbox-gl-native/vendor/icu/src/udataswp.h b/vendor/icu/src/udataswp.h similarity index 100% rename from mapbox-gl-native/vendor/icu/src/udataswp.h rename to vendor/icu/src/udataswp.h diff --git a/mapbox-gl-native/vendor/icu/src/uinvchar.cpp b/vendor/icu/src/uinvchar.cpp similarity index 100% rename from mapbox-gl-native/vendor/icu/src/uinvchar.cpp rename to vendor/icu/src/uinvchar.cpp diff --git a/mapbox-gl-native/vendor/icu/src/uinvchar.h b/vendor/icu/src/uinvchar.h similarity index 100% rename from mapbox-gl-native/vendor/icu/src/uinvchar.h rename to vendor/icu/src/uinvchar.h diff --git a/mapbox-gl-native/vendor/icu/src/umapfile.h b/vendor/icu/src/umapfile.h similarity index 100% rename from mapbox-gl-native/vendor/icu/src/umapfile.h rename to vendor/icu/src/umapfile.h diff --git a/mapbox-gl-native/vendor/icu/src/umath.cpp b/vendor/icu/src/umath.cpp similarity index 100% rename from mapbox-gl-native/vendor/icu/src/umath.cpp rename to vendor/icu/src/umath.cpp diff --git a/mapbox-gl-native/vendor/icu/src/umutex.h b/vendor/icu/src/umutex.h similarity index 100% rename from mapbox-gl-native/vendor/icu/src/umutex.h rename to vendor/icu/src/umutex.h diff --git a/mapbox-gl-native/vendor/icu/src/uprops.h b/vendor/icu/src/uprops.h similarity index 100% rename from mapbox-gl-native/vendor/icu/src/uprops.h rename to vendor/icu/src/uprops.h diff --git a/mapbox-gl-native/vendor/icu/src/uset_imp.h b/vendor/icu/src/uset_imp.h similarity index 100% rename from mapbox-gl-native/vendor/icu/src/uset_imp.h rename to vendor/icu/src/uset_imp.h diff --git a/mapbox-gl-native/vendor/icu/src/ushape.cpp b/vendor/icu/src/ushape.cpp similarity index 100% rename from mapbox-gl-native/vendor/icu/src/ushape.cpp rename to vendor/icu/src/ushape.cpp diff --git a/mapbox-gl-native/vendor/icu/src/ustr_imp.h b/vendor/icu/src/ustr_imp.h similarity index 100% rename from mapbox-gl-native/vendor/icu/src/ustr_imp.h rename to vendor/icu/src/ustr_imp.h diff --git a/mapbox-gl-native/vendor/icu/src/ustring.cpp b/vendor/icu/src/ustring.cpp similarity index 100% rename from mapbox-gl-native/vendor/icu/src/ustring.cpp rename to vendor/icu/src/ustring.cpp diff --git a/mapbox-gl-native/vendor/icu/src/utf_impl.cpp b/vendor/icu/src/utf_impl.cpp similarity index 100% rename from mapbox-gl-native/vendor/icu/src/utf_impl.cpp rename to vendor/icu/src/utf_impl.cpp diff --git a/mapbox-gl-native/vendor/icu/src/utrie2.cpp b/vendor/icu/src/utrie2.cpp similarity index 100% rename from mapbox-gl-native/vendor/icu/src/utrie2.cpp rename to vendor/icu/src/utrie2.cpp diff --git a/mapbox-gl-native/vendor/icu/src/utrie2.h b/vendor/icu/src/utrie2.h similarity index 100% rename from mapbox-gl-native/vendor/icu/src/utrie2.h rename to vendor/icu/src/utrie2.h diff --git a/mapbox-gl-native/vendor/icu/src/utrie2_impl.h b/vendor/icu/src/utrie2_impl.h similarity index 100% rename from mapbox-gl-native/vendor/icu/src/utrie2_impl.h rename to vendor/icu/src/utrie2_impl.h diff --git a/mapbox-gl-native/vendor/icu/src/utypes.cpp b/vendor/icu/src/utypes.cpp similarity index 100% rename from mapbox-gl-native/vendor/icu/src/utypes.cpp rename to vendor/icu/src/utypes.cpp diff --git a/mapbox-gl-native/vendor/icu/version.txt b/vendor/icu/version.txt similarity index 100% rename from mapbox-gl-native/vendor/icu/version.txt rename to vendor/icu/version.txt diff --git a/vendor/mapbox-base b/vendor/mapbox-base index 1102de277..3dbd294c0 160000 --- a/vendor/mapbox-base +++ b/vendor/mapbox-base @@ -1 +1 @@ -Subproject commit 1102de27775a42d23abb53832eb0e06e36bd4cac +Subproject commit 3dbd294c036d51d65b3bb12c628c6867d8b7b072 diff --git a/mapbox-gl-native/vendor/mapbox-base.cmake b/vendor/mapbox-base.cmake similarity index 100% rename from mapbox-gl-native/vendor/mapbox-base.cmake rename to vendor/mapbox-base.cmake diff --git a/mapbox-gl-native/vendor/nunicode.cmake b/vendor/nunicode.cmake similarity index 100% rename from mapbox-gl-native/vendor/nunicode.cmake rename to vendor/nunicode.cmake diff --git a/mapbox-gl-native/vendor/nunicode/LICENSE b/vendor/nunicode/LICENSE similarity index 100% rename from mapbox-gl-native/vendor/nunicode/LICENSE rename to vendor/nunicode/LICENSE diff --git a/mapbox-gl-native/vendor/nunicode/files.txt b/vendor/nunicode/files.txt similarity index 100% rename from mapbox-gl-native/vendor/nunicode/files.txt rename to vendor/nunicode/files.txt diff --git a/mapbox-gl-native/vendor/nunicode/include/libnu/casemap.h b/vendor/nunicode/include/libnu/casemap.h similarity index 100% rename from mapbox-gl-native/vendor/nunicode/include/libnu/casemap.h rename to vendor/nunicode/include/libnu/casemap.h diff --git a/mapbox-gl-native/vendor/nunicode/include/libnu/casemap_internal.h b/vendor/nunicode/include/libnu/casemap_internal.h similarity index 100% rename from mapbox-gl-native/vendor/nunicode/include/libnu/casemap_internal.h rename to vendor/nunicode/include/libnu/casemap_internal.h diff --git a/mapbox-gl-native/vendor/nunicode/include/libnu/config.h b/vendor/nunicode/include/libnu/config.h similarity index 100% rename from mapbox-gl-native/vendor/nunicode/include/libnu/config.h rename to vendor/nunicode/include/libnu/config.h diff --git a/mapbox-gl-native/vendor/nunicode/include/libnu/defines.h b/vendor/nunicode/include/libnu/defines.h similarity index 100% rename from mapbox-gl-native/vendor/nunicode/include/libnu/defines.h rename to vendor/nunicode/include/libnu/defines.h diff --git a/mapbox-gl-native/vendor/nunicode/include/libnu/ducet.h b/vendor/nunicode/include/libnu/ducet.h similarity index 100% rename from mapbox-gl-native/vendor/nunicode/include/libnu/ducet.h rename to vendor/nunicode/include/libnu/ducet.h diff --git a/mapbox-gl-native/vendor/nunicode/include/libnu/mph.h b/vendor/nunicode/include/libnu/mph.h similarity index 100% rename from mapbox-gl-native/vendor/nunicode/include/libnu/mph.h rename to vendor/nunicode/include/libnu/mph.h diff --git a/mapbox-gl-native/vendor/nunicode/include/libnu/strcoll.h b/vendor/nunicode/include/libnu/strcoll.h similarity index 100% rename from mapbox-gl-native/vendor/nunicode/include/libnu/strcoll.h rename to vendor/nunicode/include/libnu/strcoll.h diff --git a/mapbox-gl-native/vendor/nunicode/include/libnu/strcoll_internal.h b/vendor/nunicode/include/libnu/strcoll_internal.h similarity index 100% rename from mapbox-gl-native/vendor/nunicode/include/libnu/strcoll_internal.h rename to vendor/nunicode/include/libnu/strcoll_internal.h diff --git a/mapbox-gl-native/vendor/nunicode/include/libnu/strings.h b/vendor/nunicode/include/libnu/strings.h similarity index 100% rename from mapbox-gl-native/vendor/nunicode/include/libnu/strings.h rename to vendor/nunicode/include/libnu/strings.h diff --git a/mapbox-gl-native/vendor/nunicode/include/libnu/udb.h b/vendor/nunicode/include/libnu/udb.h similarity index 100% rename from mapbox-gl-native/vendor/nunicode/include/libnu/udb.h rename to vendor/nunicode/include/libnu/udb.h diff --git a/mapbox-gl-native/vendor/nunicode/include/libnu/unaccent.h b/vendor/nunicode/include/libnu/unaccent.h similarity index 100% rename from mapbox-gl-native/vendor/nunicode/include/libnu/unaccent.h rename to vendor/nunicode/include/libnu/unaccent.h diff --git a/mapbox-gl-native/vendor/nunicode/include/libnu/utf8.h b/vendor/nunicode/include/libnu/utf8.h similarity index 100% rename from mapbox-gl-native/vendor/nunicode/include/libnu/utf8.h rename to vendor/nunicode/include/libnu/utf8.h diff --git a/mapbox-gl-native/vendor/nunicode/include/libnu/utf8_internal.h b/vendor/nunicode/include/libnu/utf8_internal.h similarity index 100% rename from mapbox-gl-native/vendor/nunicode/include/libnu/utf8_internal.h rename to vendor/nunicode/include/libnu/utf8_internal.h diff --git a/mapbox-gl-native/vendor/nunicode/src/libnu/ducet.c b/vendor/nunicode/src/libnu/ducet.c similarity index 100% rename from mapbox-gl-native/vendor/nunicode/src/libnu/ducet.c rename to vendor/nunicode/src/libnu/ducet.c diff --git a/mapbox-gl-native/vendor/nunicode/src/libnu/gen/_ducet.c b/vendor/nunicode/src/libnu/gen/_ducet.c similarity index 100% rename from mapbox-gl-native/vendor/nunicode/src/libnu/gen/_ducet.c rename to vendor/nunicode/src/libnu/gen/_ducet.c diff --git a/mapbox-gl-native/vendor/nunicode/src/libnu/gen/_ducet_switch.c b/vendor/nunicode/src/libnu/gen/_ducet_switch.c similarity index 100% rename from mapbox-gl-native/vendor/nunicode/src/libnu/gen/_ducet_switch.c rename to vendor/nunicode/src/libnu/gen/_ducet_switch.c diff --git a/mapbox-gl-native/vendor/nunicode/src/libnu/gen/_tolower.c b/vendor/nunicode/src/libnu/gen/_tolower.c similarity index 100% rename from mapbox-gl-native/vendor/nunicode/src/libnu/gen/_tolower.c rename to vendor/nunicode/src/libnu/gen/_tolower.c diff --git a/mapbox-gl-native/vendor/nunicode/src/libnu/gen/_tounaccent.c b/vendor/nunicode/src/libnu/gen/_tounaccent.c similarity index 100% rename from mapbox-gl-native/vendor/nunicode/src/libnu/gen/_tounaccent.c rename to vendor/nunicode/src/libnu/gen/_tounaccent.c diff --git a/mapbox-gl-native/vendor/nunicode/src/libnu/gen/_toupper.c b/vendor/nunicode/src/libnu/gen/_toupper.c similarity index 100% rename from mapbox-gl-native/vendor/nunicode/src/libnu/gen/_toupper.c rename to vendor/nunicode/src/libnu/gen/_toupper.c diff --git a/mapbox-gl-native/vendor/nunicode/src/libnu/strcoll.c b/vendor/nunicode/src/libnu/strcoll.c similarity index 100% rename from mapbox-gl-native/vendor/nunicode/src/libnu/strcoll.c rename to vendor/nunicode/src/libnu/strcoll.c diff --git a/mapbox-gl-native/vendor/nunicode/src/libnu/strings.c b/vendor/nunicode/src/libnu/strings.c similarity index 100% rename from mapbox-gl-native/vendor/nunicode/src/libnu/strings.c rename to vendor/nunicode/src/libnu/strings.c diff --git a/mapbox-gl-native/vendor/nunicode/src/libnu/tolower.c b/vendor/nunicode/src/libnu/tolower.c similarity index 100% rename from mapbox-gl-native/vendor/nunicode/src/libnu/tolower.c rename to vendor/nunicode/src/libnu/tolower.c diff --git a/mapbox-gl-native/vendor/nunicode/src/libnu/tounaccent.c b/vendor/nunicode/src/libnu/tounaccent.c similarity index 100% rename from mapbox-gl-native/vendor/nunicode/src/libnu/tounaccent.c rename to vendor/nunicode/src/libnu/tounaccent.c diff --git a/mapbox-gl-native/vendor/nunicode/src/libnu/toupper.c b/vendor/nunicode/src/libnu/toupper.c similarity index 100% rename from mapbox-gl-native/vendor/nunicode/src/libnu/toupper.c rename to vendor/nunicode/src/libnu/toupper.c diff --git a/mapbox-gl-native/vendor/nunicode/src/libnu/utf8.c b/vendor/nunicode/src/libnu/utf8.c similarity index 100% rename from mapbox-gl-native/vendor/nunicode/src/libnu/utf8.c rename to vendor/nunicode/src/libnu/utf8.c diff --git a/mapbox-gl-native/vendor/nunicode/version.txt b/vendor/nunicode/version.txt similarity index 100% rename from mapbox-gl-native/vendor/nunicode/version.txt rename to vendor/nunicode/version.txt diff --git a/mapbox-gl-native/vendor/parsedate.cmake b/vendor/parsedate.cmake similarity index 100% rename from mapbox-gl-native/vendor/parsedate.cmake rename to vendor/parsedate.cmake diff --git a/mapbox-gl-native/vendor/parsedate/COPYING b/vendor/parsedate/COPYING similarity index 100% rename from mapbox-gl-native/vendor/parsedate/COPYING rename to vendor/parsedate/COPYING diff --git a/mapbox-gl-native/vendor/parsedate/parsedate.cpp b/vendor/parsedate/parsedate.cpp similarity index 100% rename from mapbox-gl-native/vendor/parsedate/parsedate.cpp rename to vendor/parsedate/parsedate.cpp diff --git a/mapbox-gl-native/vendor/parsedate/parsedate/parsedate.hpp b/vendor/parsedate/parsedate/parsedate.hpp similarity index 100% rename from mapbox-gl-native/vendor/parsedate/parsedate/parsedate.hpp rename to vendor/parsedate/parsedate/parsedate.hpp diff --git a/vendor/polylabel b/vendor/polylabel index c7a7839e9..51f09d04c 160000 --- a/vendor/polylabel +++ b/vendor/polylabel @@ -1 +1 @@ -Subproject commit c7a7839e9fec68c22088debcfc88e93816c47b3f +Subproject commit 51f09d04c21e7b7faf94e2300ca1fe6e1f12fa7f diff --git a/mapbox-gl-native/vendor/polylabel.cmake b/vendor/polylabel.cmake similarity index 100% rename from mapbox-gl-native/vendor/polylabel.cmake rename to vendor/polylabel.cmake diff --git a/vendor/protozero b/vendor/protozero index 9f85f3a5e..951a8d0e0 160000 --- a/vendor/protozero +++ b/vendor/protozero @@ -1 +1 @@ -Subproject commit 9f85f3a5e64c63b0a731ceab2c399506982de549 +Subproject commit 951a8d0e03ea07ccc4064692434ef15ff2b973f9 diff --git a/mapbox-gl-native/vendor/protozero.cmake b/vendor/protozero.cmake similarity index 100% rename from mapbox-gl-native/vendor/protozero.cmake rename to vendor/protozero.cmake diff --git a/mapbox-gl-native/vendor/sqlite.cmake b/vendor/sqlite.cmake similarity index 100% rename from mapbox-gl-native/vendor/sqlite.cmake rename to vendor/sqlite.cmake diff --git a/mapbox-gl-native/vendor/sqlite/files.txt b/vendor/sqlite/files.txt similarity index 100% rename from mapbox-gl-native/vendor/sqlite/files.txt rename to vendor/sqlite/files.txt diff --git a/mapbox-gl-native/vendor/sqlite/include/sqlite3.h b/vendor/sqlite/include/sqlite3.h similarity index 100% rename from mapbox-gl-native/vendor/sqlite/include/sqlite3.h rename to vendor/sqlite/include/sqlite3.h diff --git a/mapbox-gl-native/vendor/sqlite/src/sqlite3.c b/vendor/sqlite/src/sqlite3.c similarity index 100% rename from mapbox-gl-native/vendor/sqlite/src/sqlite3.c rename to vendor/sqlite/src/sqlite3.c diff --git a/mapbox-gl-native/vendor/sqlite/version.txt b/vendor/sqlite/version.txt similarity index 100% rename from mapbox-gl-native/vendor/sqlite/version.txt rename to vendor/sqlite/version.txt diff --git a/mapbox-gl-native/vendor/unique_resource.cmake b/vendor/unique_resource.cmake similarity index 100% rename from mapbox-gl-native/vendor/unique_resource.cmake rename to vendor/unique_resource.cmake diff --git a/vendor/vector-tile b/vendor/vector-tile index 711f1dcdb..5084dba54 160000 --- a/vendor/vector-tile +++ b/vendor/vector-tile @@ -1 +1 @@ -Subproject commit 711f1dcdb67643290b38d7e5b32e722523810673 +Subproject commit 5084dba54d2245980ffeac27ecbe47d2dd73a9d3 diff --git a/mapbox-gl-native/vendor/vector-tile.cmake b/vendor/vector-tile.cmake similarity index 100% rename from mapbox-gl-native/vendor/vector-tile.cmake rename to vendor/vector-tile.cmake diff --git a/vendor/wagyu b/vendor/wagyu index b00a2067b..0ff3b5f82 160000 --- a/vendor/wagyu +++ b/vendor/wagyu @@ -1 +1 @@ -Subproject commit b00a2067b6337fb9b69a126d7cd8c35a67905a0f +Subproject commit 0ff3b5f82908af45f32266b8cb5f107c86147d87 diff --git a/mapbox-gl-native/vendor/wagyu.cmake b/vendor/wagyu.cmake similarity index 100% rename from mapbox-gl-native/vendor/wagyu.cmake rename to vendor/wagyu.cmake diff --git a/vendor/zip-archive b/vendor/zip-archive index 81d8deeaf..44970effa 160000 --- a/vendor/zip-archive +++ b/vendor/zip-archive @@ -1 +1 @@ -Subproject commit 81d8deeaf0d19f6e3ac40f55e5f9f3cdf1b433a3 +Subproject commit 44970effad727e97a28a0b21e1f5a298949cb29a diff --git a/mapbox-gl-native/vendor/zip-archive.cmake b/vendor/zip-archive.cmake similarity index 100% rename from mapbox-gl-native/vendor/zip-archive.cmake rename to vendor/zip-archive.cmake