diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 863c7f66f..000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "vendor/mbgl"]
-	path = vendor/mbgl
-	url = https://github.com/mapbox/mapbox-gl-native.git
diff --git a/.clang-format b/platform/node/.clang-format
similarity index 100%
rename from .clang-format
rename to platform/node/.clang-format
diff --git a/.gitignore b/platform/node/.gitignore
similarity index 100%
rename from .gitignore
rename to platform/node/.gitignore
diff --git a/.travis.yml b/platform/node/.travis.yml
similarity index 100%
rename from .travis.yml
rename to platform/node/.travis.yml
diff --git a/CHANGELOG.md b/platform/node/CHANGELOG.md
similarity index 100%
rename from CHANGELOG.md
rename to platform/node/CHANGELOG.md
diff --git a/CONTRIBUTING.md b/platform/node/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to platform/node/CONTRIBUTING.md
diff --git a/LICENSE.txt b/platform/node/LICENSE.txt
similarity index 100%
rename from LICENSE.txt
rename to platform/node/LICENSE.txt
diff --git a/Makefile b/platform/node/Makefile
similarity index 100%
rename from Makefile
rename to platform/node/Makefile
diff --git a/README.md b/platform/node/README.md
similarity index 100%
rename from README.md
rename to platform/node/README.md
diff --git a/binding.gyp b/platform/node/binding.gyp
similarity index 100%
rename from binding.gyp
rename to platform/node/binding.gyp
diff --git a/cloudformation/travis.template b/platform/node/cloudformation/travis.template
similarity index 100%
rename from cloudformation/travis.template
rename to platform/node/cloudformation/travis.template
diff --git a/examples/load-from-fs.js b/platform/node/examples/load-from-fs.js
similarity index 100%
rename from examples/load-from-fs.js
rename to platform/node/examples/load-from-fs.js
diff --git a/package.json b/platform/node/package.json
similarity index 100%
rename from package.json
rename to platform/node/package.json
diff --git a/scripts/deploy_results.sh b/platform/node/scripts/deploy_results.sh
similarity index 100%
rename from scripts/deploy_results.sh
rename to platform/node/scripts/deploy_results.sh
diff --git a/scripts/install_node.sh b/platform/node/scripts/install_node.sh
similarity index 100%
rename from scripts/install_node.sh
rename to platform/node/scripts/install_node.sh
diff --git a/scripts/travis_publish.sh b/platform/node/scripts/travis_publish.sh
similarity index 100%
rename from scripts/travis_publish.sh
rename to platform/node/scripts/travis_publish.sh
diff --git a/scripts/travis_test.sh b/platform/node/scripts/travis_test.sh
similarity index 100%
rename from scripts/travis_test.sh
rename to platform/node/scripts/travis_test.sh
diff --git a/src/node_file_source.cpp b/platform/node/src/node_file_source.cpp
similarity index 100%
rename from src/node_file_source.cpp
rename to platform/node/src/node_file_source.cpp
diff --git a/src/node_file_source.hpp b/platform/node/src/node_file_source.hpp
similarity index 100%
rename from src/node_file_source.hpp
rename to platform/node/src/node_file_source.hpp
diff --git a/src/node_log.cpp b/platform/node/src/node_log.cpp
similarity index 100%
rename from src/node_log.cpp
rename to platform/node/src/node_log.cpp
diff --git a/src/node_log.hpp b/platform/node/src/node_log.hpp
similarity index 100%
rename from src/node_log.hpp
rename to platform/node/src/node_log.hpp
diff --git a/src/node_map.cpp b/platform/node/src/node_map.cpp
similarity index 100%
rename from src/node_map.cpp
rename to platform/node/src/node_map.cpp
diff --git a/src/node_map.hpp b/platform/node/src/node_map.hpp
similarity index 100%
rename from src/node_map.hpp
rename to platform/node/src/node_map.hpp
diff --git a/src/node_mapbox_gl_native.cpp b/platform/node/src/node_mapbox_gl_native.cpp
similarity index 100%
rename from src/node_mapbox_gl_native.cpp
rename to platform/node/src/node_mapbox_gl_native.cpp
diff --git a/src/node_request.cpp b/platform/node/src/node_request.cpp
similarity index 100%
rename from src/node_request.cpp
rename to platform/node/src/node_request.cpp
diff --git a/src/node_request.hpp b/platform/node/src/node_request.hpp
similarity index 100%
rename from src/node_request.hpp
rename to platform/node/src/node_request.hpp
diff --git a/src/util/async_queue.hpp b/platform/node/src/util/async_queue.hpp
similarity index 100%
rename from src/util/async_queue.hpp
rename to platform/node/src/util/async_queue.hpp
diff --git a/test/compare.js b/platform/node/test/compare.js
similarity index 100%
rename from test/compare.js
rename to platform/node/test/compare.js
diff --git a/test/expected/gzip/success.png b/platform/node/test/expected/gzip/success.png
similarity index 100%
rename from test/expected/gzip/success.png
rename to platform/node/test/expected/gzip/success.png
diff --git a/test/expected/gzip/unhandled.png b/platform/node/test/expected/gzip/unhandled.png
similarity index 100%
rename from test/expected/gzip/unhandled.png
rename to platform/node/test/expected/gzip/unhandled.png
diff --git a/test/expected/map/image.png b/platform/node/test/expected/map/image.png
similarity index 100%
rename from test/expected/map/image.png
rename to platform/node/test/expected/map/image.png
diff --git a/test/fixtures/style.json b/platform/node/test/fixtures/style.json
similarity index 100%
rename from test/fixtures/style.json
rename to platform/node/test/fixtures/style.json
diff --git a/test/fixtures/tiles.tilejson b/platform/node/test/fixtures/tiles.tilejson
similarity index 100%
rename from test/fixtures/tiles.tilejson
rename to platform/node/test/fixtures/tiles.tilejson
diff --git a/test/fixtures/tiles/0-0-0.vector.pbf b/platform/node/test/fixtures/tiles/0-0-0.vector.pbf
similarity index 100%
rename from test/fixtures/tiles/0-0-0.vector.pbf
rename to platform/node/test/fixtures/tiles/0-0-0.vector.pbf
diff --git a/test/js/consecutive.test.js b/platform/node/test/js/consecutive.test.js
similarity index 100%
rename from test/js/consecutive.test.js
rename to platform/node/test/js/consecutive.test.js
diff --git a/test/js/gzip.test.js b/platform/node/test/js/gzip.test.js
similarity index 100%
rename from test/js/gzip.test.js
rename to platform/node/test/js/gzip.test.js
diff --git a/test/js/map.test.js b/platform/node/test/js/map.test.js
similarity index 100%
rename from test/js/map.test.js
rename to platform/node/test/js/map.test.js
diff --git a/test/render.test.js b/platform/node/test/render.test.js
similarity index 100%
rename from test/render.test.js
rename to platform/node/test/render.test.js
diff --git a/vendor/mbgl b/vendor/mbgl
deleted file mode 160000
index 5d038fbd8..000000000
--- a/vendor/mbgl
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5d038fbd840717b606a15b825015958228d42450