46 files changed, 40 insertions, 40 deletions
diff --git a/.travis.yml b/.travis.yml
index da5bae89b1..95ff5d0897 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -117,20 +117,20 @@ before_install:
 - source ./scripts/travis_helper.sh
 
 install:
-- ./scripts/${FLAVOR}/install.sh
+- ./platform/${FLAVOR}/scripts/install.sh
 
 before_script:
 - if command -v ccache >/dev/null 2>&1; then ccache --zero-stats ; fi
 
 script:
-- ./scripts/${FLAVOR}/${ACTION:-run}.sh
+- ./platform/${FLAVOR}/scripts/${ACTION:-run}.sh
 
 after_failure:
-- "[ -f ./scripts/${FLAVOR}/after_failure.sh ] && ./scripts/${FLAVOR}/after_failure.sh"
+- "[ -f ./platform/${FLAVOR}/scripts/after_failure.sh ] && ./platform/${FLAVOR}/scripts/after_failure.sh"
 
 after_script:
 - if command -v ccache >/dev/null 2>&1; then ccache --show-stats ; fi
-- "[ -f ./scripts/${FLAVOR}/after_script.sh ] && ./scripts/${FLAVOR}/after_script.sh"
+- "[ -f ./platform/${FLAVOR}/scripts/after_script.sh ] && ./platform/${FLAVOR}/scripts/after_script.sh"
 
 notifications:
   slack:
diff --git a/Makefile b/Makefile
index 364aaad939..b917e9e81f 100644
--- a/Makefile
+++ b/Makefile
@@ -50,16 +50,16 @@ ibench: export XCODEBUILD_ARGS += -sdk iphoneos ARCHS="arm64"
 ibench: ; $(RUN) HOST=ios Xcode/ios-bench
 
 .PHONY: ipackage ipackage-strip ipackage-sim ipackage-no-bitcode itest
-ipackage: Xcode/ios ; @JOBS=$(JOBS) ./scripts/ios/package.sh
-ipackage-strip: Xcode/ios ; @JOBS=$(JOBS) ./scripts/ios/package.sh strip
-ipackage-sim: Xcode/ios ; @JOBS=$(JOBS) ./scripts/ios/package.sh sim
-ipackage-no-bitcode: Xcode/ios ; @JOBS=$(JOBS) ./scripts/ios/package.sh no-bitcode
-iframework: ipackage-strip ; ./scripts/ios/framework.sh
-itest: ipackage-sim ; ./scripts/ios/test.sh
+ipackage: Xcode/ios ; @JOBS=$(JOBS) ./platform/ios/scripts/package.sh
+ipackage-strip: Xcode/ios ; @JOBS=$(JOBS) ./platform/ios/scripts/package.sh strip
+ipackage-sim: Xcode/ios ; @JOBS=$(JOBS) ./platform/ios/scripts/package.sh sim
+ipackage-no-bitcode: Xcode/ios ; @JOBS=$(JOBS) ./platform/ios/scripts/package.sh no-bitcode
+iframework: ipackage-strip ; ./platform/ios/scripts/framework.sh
+itest: ipackage-sim ; ./platform/ios/scripts/test.sh
 
 .PHONY: xpackage xpackage-strip
-xpackage: Xcode/osx ; @JOBS=$(JOBS) ./scripts/osx/package.sh
-xpackage-strip: Xcode/osx ; @JOBS=$(JOBS) ./scripts/osx/package.sh strip
+xpackage: Xcode/osx ; @JOBS=$(JOBS) ./platform/osx/scripts/package.sh
+xpackage-strip: Xcode/osx ; @JOBS=$(JOBS) ./platform/osx/scripts/package.sh strip
 endif
 
 #### All platforms targets #####################################################
diff --git a/configure b/configure
index 8c74b1db8e..d8ccc0b19e 100755
--- a/configure
+++ b/configure
@@ -54,9 +54,9 @@ function print_opengl_flags {
 }
 
 # Load dependencies
-source scripts/${MASON_PLATFORM}/configure.sh
-if [ -e scripts/${MASON_PLATFORM}/${MASON_PLATFORM_VERSION}/configure.sh ]; then
-    source scripts/${MASON_PLATFORM}/${MASON_PLATFORM_VERSION}/configure.sh
+source platform/${MASON_PLATFORM}/scripts/configure.sh
+if [ -e platform/${MASON_PLATFORM}/scripts/${MASON_PLATFORM_VERSION}/configure.sh ]; then
+    source platform/${MASON_PLATFORM}/scripts/${MASON_PLATFORM_VERSION}/configure.sh
 fi
 
 PYTHON=`which python || abort 'Cannot find python'`
diff --git a/docker/clang-tidy/tidy.sh b/docker/clang-tidy/tidy.sh
index 9c939d219b..222bd263f8 100755
--- a/docker/clang-tidy/tidy.sh
+++ b/docker/clang-tidy/tidy.sh
@@ -13,7 +13,7 @@ cd build
 source ./scripts/travis_helper.sh
 
 # install
-./scripts/${FLAVOR}/install.sh
+./platform/${FLAVOR}/scripts/install.sh
 
 export CLANG_TIDY=clang-tidy-3.8
 make tidy
diff --git a/docker/linux/test.sh b/docker/linux/test.sh
index 63057d9422..f9d0b5daec 100755
--- a/docker/linux/test.sh
+++ b/docker/linux/test.sh
@@ -20,7 +20,7 @@ cd build
 source ./scripts/travis_helper.sh
 
 # install
-./scripts/${FLAVOR}/install.sh
+./platform/${FLAVOR}/scripts/install.sh
 
 # script
-./scripts/${FLAVOR}/run.sh
+./platform/${FLAVOR}/scripts/run.sh
diff --git a/scripts/android/configure.sh b/platform/android/scripts/configure.sh
index 2e3e7b9d7c..2e3e7b9d7c 100644
--- a/scripts/android/configure.sh
+++ b/platform/android/scripts/configure.sh
diff --git a/scripts/android/defaults.mk b/platform/android/scripts/defaults.mk
index 29f047c887..d5e87c6796 100644
--- a/scripts/android/defaults.mk
+++ b/platform/android/scripts/defaults.mk
@@ -8,4 +8,4 @@ GYP_FLAVOR_SUFFIX=-android
 
 HOST_VERSION ?= arm-v7
 
-ENV = $(shell MASON_ANDROID_ABI=$(HOST_VERSION) ./scripts/android/toolchain.sh)
+ENV = $(shell MASON_ANDROID_ABI=$(HOST_VERSION) ./platform/android/scripts/toolchain.sh)
diff --git a/scripts/android/install.sh b/platform/android/scripts/install.sh
index fe2b816064..e99c3dc75e 100755
--- a/scripts/android/install.sh
+++ b/platform/android/scripts/install.sh
@@ -10,4 +10,4 @@ export MASON_PLATFORM=android
 export MASON_ANDROID_ABI=${ANDROID_ABI}
 
 mapbox_time "android_toolchain" \
-./scripts/android/toolchain.sh
+./platform/android/scripts/toolchain.sh
diff --git a/scripts/android/run.sh b/platform/android/scripts/run.sh
index 9e87298fe9..9e87298fe9 100755
--- a/scripts/android/run.sh
+++ b/platform/android/scripts/run.sh
diff --git a/scripts/android/toolchain.sh b/platform/android/scripts/toolchain.sh
index 67cd0aa476..67cd0aa476 100755
--- a/scripts/android/toolchain.sh
+++ b/platform/android/scripts/toolchain.sh
diff --git a/scripts/ios/add-key.sh b/platform/ios/scripts/add-key.sh
index fe963d38eb..37a989025e 100755
--- a/scripts/ios/add-key.sh
+++ b/platform/ios/scripts/add-key.sh
@@ -16,10 +16,10 @@ security unlock-keychain -p travis ios-build.keychain
 security set-keychain-settings -t 3600 -l ~/Library/Keychains/ios-build.keychain
 
 # Add certificates to keychain and allow codesign to access them
-security import ./scripts/ios/apple.crt    -k ~/Library/Keychains/ios-build.keychain -T /usr/bin/codesign
-security import ./scripts/ios/ios-dist.cer -k ~/Library/Keychains/ios-build.keychain -T /usr/bin/codesign
-security import ./scripts/ios/ios-dist.p12 -k ~/Library/Keychains/ios-build.keychain -P $IOS_KEY_PASSWORD -T /usr/bin/codesign
+security import ./platform/ios/scripts/apple.crt    -k ~/Library/Keychains/ios-build.keychain -T /usr/bin/codesign
+security import ./platform/ios/scripts/ios-dist.cer -k ~/Library/Keychains/ios-build.keychain -T /usr/bin/codesign
+security import ./platform/ios/scripts/ios-dist.p12 -k ~/Library/Keychains/ios-build.keychain -P $IOS_KEY_PASSWORD -T /usr/bin/codesign
 
 # Put the provisioning profile in place
 mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
-cp "./scripts/ios/$IOS_PROFILE_NAME.mobileprovision" ~/Library/MobileDevice/Provisioning\ Profiles/
+cp "./platform/ios/scripts/$IOS_PROFILE_NAME.mobileprovision" ~/Library/MobileDevice/Provisioning\ Profiles/
diff --git a/scripts/ios/after_failure.sh b/platform/ios/scripts/after_failure.sh
index 88a6427f75..88a6427f75 100755
--- a/scripts/ios/after_failure.sh
+++ b/platform/ios/scripts/after_failure.sh
diff --git a/scripts/ios/apple.crt b/platform/ios/scripts/apple.crt
index 0de099b869..0de099b869 100644
--- a/scripts/ios/apple.crt
+++ b/platform/ios/scripts/apple.crt
diff --git a/scripts/ios/benchmark.sh b/platform/ios/scripts/benchmark.sh
index 1c342e6533..1c342e6533 100755
--- a/scripts/ios/benchmark.sh
+++ b/platform/ios/scripts/benchmark.sh
diff --git a/scripts/ios/configure.sh b/platform/ios/scripts/configure.sh
index ee6d60de2f..ee6d60de2f 100644
--- a/scripts/ios/configure.sh
+++ b/platform/ios/scripts/configure.sh
diff --git a/scripts/ios/defaults.mk b/platform/ios/scripts/defaults.mk
index fafc332133..fafc332133 100644
--- a/scripts/ios/defaults.mk
+++ b/platform/ios/scripts/defaults.mk
diff --git a/scripts/ios/framework.sh b/platform/ios/scripts/framework.sh
index e2842a4707..e2842a4707 100755
--- a/scripts/ios/framework.sh
+++ b/platform/ios/scripts/framework.sh
diff --git a/scripts/ios/install.sh b/platform/ios/scripts/install.sh
index b002aeeca8..b002aeeca8 100755
--- a/scripts/ios/install.sh
+++ b/platform/ios/scripts/install.sh
diff --git a/scripts/ios/ios-dist.cer.enc b/platform/ios/scripts/ios-dist.cer.enc
index dfdd0ca997..dfdd0ca997 100644
--- a/scripts/ios/ios-dist.cer.enc
+++ b/platform/ios/scripts/ios-dist.cer.enc
diff --git a/scripts/ios/ios-dist.p12.enc b/platform/ios/scripts/ios-dist.p12.enc
index ad6507ef9f..ad6507ef9f 100644
--- a/scripts/ios/ios-dist.p12.enc
+++ b/platform/ios/scripts/ios-dist.p12.enc
diff --git a/scripts/ios/ios-in-house.mobileprovision.enc b/platform/ios/scripts/ios-in-house.mobileprovision.enc
index 51036a7415..51036a7415 100644
--- a/scripts/ios/ios-in-house.mobileprovision.enc
+++ b/platform/ios/scripts/ios-in-house.mobileprovision.enc
diff --git a/scripts/ios/package.sh b/platform/ios/scripts/package.sh
index d067e67eab..d067e67eab 100755
--- a/scripts/ios/package.sh
+++ b/platform/ios/scripts/package.sh
diff --git a/scripts/ios/publish.sh b/platform/ios/scripts/publish.sh
index c914fcaccd..c914fcaccd 100755
--- a/scripts/ios/publish.sh
+++ b/platform/ios/scripts/publish.sh
diff --git a/scripts/ios/remove-key.sh b/platform/ios/scripts/remove-key.sh
index 56b769ac21..56b769ac21 100755
--- a/scripts/ios/remove-key.sh
+++ b/platform/ios/scripts/remove-key.sh
diff --git a/scripts/ios/run.sh b/platform/ios/scripts/run.sh
index d74daec699..bfca74d318 100755
--- a/scripts/ios/run.sh
+++ b/platform/ios/scripts/run.sh
@@ -4,7 +4,7 @@ set -e
 set -o pipefail
 set -u
 
-source ./scripts/ios/setup.sh
+source ./platform/ios/scripts/setup.sh
 
 BUILDTYPE=${BUILDTYPE:-Release}
 
@@ -23,21 +23,21 @@ if [[ ${PUBLISH_PLATFORM} = 'ios' ]]; then
     make ipackage
 
     mapbox_time "deploy_ios_symbols"
-    ./scripts/ios/publish.sh "${PUBLISH_VERSION}" symbols
+    ./platform/ios/scripts/publish.sh "${PUBLISH_VERSION}" symbols
 
     # no debug symbols, for smaller distribution
     mapbox_time "package_ios_stripped" \
     make ipackage-strip
 
     mapbox_time "deploy_ios_stripped"
-    ./scripts/ios/publish.sh "${PUBLISH_VERSION}"
+    ./platform/ios/scripts/publish.sh "${PUBLISH_VERSION}"
 
     # debug symbols but no Bitcode
     mapbox_time "package_ios_no_bitcode" \
     make ipackage-no-bitcode
 
     mapbox_time "deploy_ios_no_bitcode"
-    ./scripts/ios/publish.sh "${PUBLISH_VERSION}" no-bitcode
+    ./platform/ios/scripts/publish.sh "${PUBLISH_VERSION}" no-bitcode
 else
     # build & test iOS
     mapbox_time "run_ios_tests" \
diff --git a/scripts/ios/setup.sh b/platform/ios/scripts/setup.sh
index d115cf9020..d115cf9020 100644
--- a/scripts/ios/setup.sh
+++ b/platform/ios/scripts/setup.sh
diff --git a/scripts/ios/test.sh b/platform/ios/scripts/test.sh
index 60ccc76a9e..60ccc76a9e 100755
--- a/scripts/ios/test.sh
+++ b/platform/ios/scripts/test.sh
diff --git a/scripts/linux/after_script.sh b/platform/linux/scripts/after_script.sh
index f8e4bc3486..f8e4bc3486 100755
--- a/scripts/linux/after_script.sh
+++ b/platform/linux/scripts/after_script.sh
diff --git a/scripts/linux/configure.sh b/platform/linux/scripts/configure.sh
index 1c2dff9d27..1c2dff9d27 100644
--- a/scripts/linux/configure.sh
+++ b/platform/linux/scripts/configure.sh
diff --git a/scripts/linux/defaults.mk b/platform/linux/scripts/defaults.mk
index 126c8f99a4..126c8f99a4 100644
--- a/scripts/linux/defaults.mk
+++ b/platform/linux/scripts/defaults.mk
diff --git a/scripts/linux/install.sh b/platform/linux/scripts/install.sh
index a254d312ec..a254d312ec 100755
--- a/scripts/linux/install.sh
+++ b/platform/linux/scripts/install.sh
diff --git a/scripts/linux/run.sh b/platform/linux/scripts/run.sh
index 142cbcb680..3e40881ec6 100755
--- a/scripts/linux/run.sh
+++ b/platform/linux/scripts/run.sh
@@ -3,7 +3,7 @@
 set -e
 set -o pipefail
 
-source ./scripts/linux/setup.sh
+source ./platform/linux/scripts/setup.sh
 
 BUILDTYPE=${BUILDTYPE:-Release}
 
diff --git a/scripts/linux/setup.sh b/platform/linux/scripts/setup.sh
index af0eafb5cf..af0eafb5cf 100755
--- a/scripts/linux/setup.sh
+++ b/platform/linux/scripts/setup.sh
diff --git a/scripts/linux/tidy.sh b/platform/linux/scripts/tidy.sh
index 424c82c3cd..424c82c3cd 100755
--- a/scripts/linux/tidy.sh
+++ b/platform/linux/scripts/tidy.sh
diff --git a/scripts/node/after_script.sh b/platform/node/scripts/after_script.sh
index 6ab07fe03d..af2cd78dd6 100755
--- a/scripts/node/after_script.sh
+++ b/platform/node/scripts/after_script.sh
@@ -28,7 +28,7 @@ if [[ ${TRAVIS_TAG} == node-v${PACKAGE_JSON_VERSION} ]] || test "${COMMIT_MESSAG
     ./node_modules/.bin/node-pre-gyp publish info
 
     if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
-        source ./scripts/${TRAVIS_OS_NAME}/setup.sh
+        source ./platform/linux/scripts/setup.sh
 
         rm -rf build
         rm -rf lib
diff --git a/scripts/node/create_node_scheme.sh b/platform/node/scripts/create_node_scheme.sh
index c0907f5d20..5b97918aea 100755
--- a/scripts/node/create_node_scheme.sh
+++ b/platform/node/scripts/create_node_scheme.sh
@@ -5,4 +5,4 @@ CMD=$@
 DIR="build/binding.xcodeproj/xcshareddata/xcschemes"
 mkdir -p "${DIR}"
 
-sed "s#{{NODE_PATH}}#$(dirname `which node`)#;s#{{BLUEPRINT_IDENTIFIER}}#$(hexdump -n 12 -v -e '/1 "%02X"' /dev/urandom)#;s#{{WORKING_DIRECTORY}}#$(pwd)#;s#{{NODE_ARGUMENT}}#${CMD}#" scripts/node/node.xcscheme > "${DIR}/${NAME}.xcscheme"
+sed "s#{{NODE_PATH}}#$(dirname `which node`)#;s#{{BLUEPRINT_IDENTIFIER}}#$(hexdump -n 12 -v -e '/1 "%02X"' /dev/urandom)#;s#{{WORKING_DIRECTORY}}#$(pwd)#;s#{{NODE_ARGUMENT}}#${CMD}#" platform/node/scripts/node.xcscheme > "${DIR}/${NAME}.xcscheme"
diff --git a/scripts/node/install.sh b/platform/node/scripts/install.sh
index 1edc2c91d9..1edc2c91d9 100755
--- a/scripts/node/install.sh
+++ b/platform/node/scripts/install.sh
diff --git a/scripts/node/node.xcscheme b/platform/node/scripts/node.xcscheme
index 52a89fb81f..52a89fb81f 100644
--- a/scripts/node/node.xcscheme
+++ b/platform/node/scripts/node.xcscheme
diff --git a/scripts/node/run.sh b/platform/node/scripts/run.sh
index 983916c90c..07395d6a69 100755
--- a/scripts/node/run.sh
+++ b/platform/node/scripts/run.sh
@@ -3,7 +3,7 @@
 set -e
 set -o pipefail
 
-source ./scripts/${TRAVIS_OS_NAME}/setup.sh
+source ./platform/${TRAVIS_OS_NAME}/scripts/setup.sh
 
 BUILDTYPE=${BUILDTYPE:-Release}
 
diff --git a/scripts/osx/configure.sh b/platform/osx/scripts/configure.sh
index 138738bb44..138738bb44 100644
--- a/scripts/osx/configure.sh
+++ b/platform/osx/scripts/configure.sh
diff --git a/scripts/osx/defaults.mk b/platform/osx/scripts/defaults.mk
index f148f66d8a..f148f66d8a 100644
--- a/scripts/osx/defaults.mk
+++ b/platform/osx/scripts/defaults.mk
diff --git a/scripts/osx/install.sh b/platform/osx/scripts/install.sh
index d6d9c065cf..d6d9c065cf 100755
--- a/scripts/osx/install.sh
+++ b/platform/osx/scripts/install.sh
diff --git a/scripts/osx/package.sh b/platform/osx/scripts/package.sh
index f39d730674..f39d730674 100755
--- a/scripts/osx/package.sh
+++ b/platform/osx/scripts/package.sh
diff --git a/scripts/osx/run.sh b/platform/osx/scripts/run.sh
index 28c1adba1b..dcb83e2902 100755
--- a/scripts/osx/run.sh
+++ b/platform/osx/scripts/run.sh
@@ -3,7 +3,7 @@
 set -e
 set -o pipefail
 
-source ./scripts/osx/setup.sh
+source ./platform/osx/scripts/setup.sh
 
 BUILDTYPE=${BUILDTYPE:-Release}
 
diff --git a/scripts/osx/setup.sh b/platform/osx/scripts/setup.sh
index 502d61d44d..502d61d44d 100755
--- a/scripts/osx/setup.sh
+++ b/platform/osx/scripts/setup.sh
diff --git a/scripts/main.mk b/scripts/main.mk
index d2cf13b524..afbb34f56a 100644
--- a/scripts/main.mk
+++ b/scripts/main.mk
@@ -6,7 +6,7 @@ endif
 export HOST ?= $(BUILD)
 
 # Defines host defaults
-include scripts/$(HOST)/defaults.mk
+include platform/$(HOST)/scripts/defaults.mk
 
 export HOST_VERSION ?= $(BUILD_VERSION)
 
@@ -16,14 +16,14 @@ export HOST_VERSION ?= $(BUILD_VERSION)
 export MASON_PLATFORM=$(HOST)
 export MASON_PLATFORM_VERSION=$(HOST_VERSION)
 
-ifneq (,$(wildcard scripts/$(HOST)/$(HOST_VERSION)/configure.sh))
+ifneq (,$(wildcard platform/$(HOST)/scripts/$(HOST_VERSION)/configure.sh))
 	CONFIGURE_FILES += scripts/$(HOST)/$(HOST_VERSION)/configure.sh
 endif
 
 export HOST_SLUG = $(HOST)-$(HOST_VERSION)
-CONFIGURE_FILES = scripts/$(HOST)/configure.sh
-ifneq (,$(wildcard scripts/$(HOST)/$(HOST_VERSION)/configure.sh))
-	CONFIGURE_FILES += scripts/$(HOST)/$(HOST_VERSION)/configure.sh
+CONFIGURE_FILES = platform/$(HOST)/scripts/configure.sh
+ifneq (,$(wildcard platform/$(HOST)/scripts/$(HOST_VERSION)/configure.sh))
+	CONFIGURE_FILES += platform/$(HOST)/scripts/$(HOST_VERSION)/configure.sh
 endif
 
 ifneq (,$(findstring clang,$(CXX)))
@@ -112,8 +112,8 @@ node/configure:
 node/xproj: Xcode/__project__ node/configure
 	$(QUIET)$(ENV) $(NODE_PRE_GYP) configure --clang -- \
 	$(GYP_FLAGS) -f xcode -Dlibuv_cflags= -Dlibuv_ldflags= -Dlibuv_static_libs=
-	$(QUIET)$(ENV) ./scripts/node/create_node_scheme.sh "node test" "`npm bin tape`/tape platform/node/test/js/**/*.test.js"
-	$(QUIET)$(ENV) ./scripts/node/create_node_scheme.sh "npm run test-suite" "platform/node/test/render.test.js"
+	$(QUIET)$(ENV) ./platform/node/scripts/create_node_scheme.sh "node test" "`npm bin tape`/tape platform/node/test/js/**/*.test.js"
+	$(QUIET)$(ENV) ./platform/node/scripts/create_node_scheme.sh "npm run test-suite" "platform/node/test/render.test.js"
 
 Makefile/node: Makefile/__project__ node/configure
 	@printf "$(TEXT_BOLD)$(COLOR_GREEN)* Building target node...$(FORMAT_END)\n"