diff --git a/.gitignore b/.gitignore
index d5fb118e90a..e68138b4996 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,8 +13,6 @@
 /config/*.gypi
 /build
 /lib
-/macosx/build
-/linux/build
 /ios/build
 /ios/app/build
 /test/build
diff --git a/gyp/linux.gyp b/gyp/linux.gyp
index 6cc168ba8de..51d304bc650 100644
--- a/gyp/linux.gyp
+++ b/gyp/linux.gyp
@@ -1,6 +1,6 @@
 {
   'includes': [
-    '../linux/mapboxgl-app.gypi',
+    '../platform/linux/mapboxgl-app.gypi',
   ],
 
   'conditions': [
diff --git a/gyp/osx.gyp b/gyp/osx.gyp
index 64663540b2d..8810144a805 100644
--- a/gyp/osx.gyp
+++ b/gyp/osx.gyp
@@ -1,7 +1,7 @@
 {
   'includes': [
-    '../macosx/mapboxgl-app.gypi',
-    '../linux/mapboxgl-app.gypi',
+    '../platform/osx/mapboxgl-app.gypi',
+    '../platform/linux/mapboxgl-app.gypi',
     '../test/test.gypi',
     '../bin/render.gypi',
   ],
diff --git a/linux/main.cpp b/platform/linux/main.cpp
similarity index 100%
rename from linux/main.cpp
rename to platform/linux/main.cpp
diff --git a/linux/mapboxgl-app.gypi b/platform/linux/mapboxgl-app.gypi
similarity index 86%
rename from linux/mapboxgl-app.gypi
rename to platform/linux/mapboxgl-app.gypi
index 0c9e03ce38e..c3e66101a9a 100644
--- a/linux/mapboxgl-app.gypi
+++ b/platform/linux/mapboxgl-app.gypi
@@ -1,6 +1,6 @@
 {
   'includes': [
-    '../gyp/common.gypi',
+    '../../gyp/common.gypi',
   ],
   'targets': [
     { 'target_name': 'linuxapp',
@@ -18,10 +18,10 @@
 
       'sources': [
         'main.cpp',
-        '../platform/default/settings_json.cpp',
-        '../platform/default/glfw_view.hpp',
-        '../platform/default/glfw_view.cpp',
-        '../platform/default/log_stderr.cpp',
+        '../default/settings_json.cpp',
+        '../default/glfw_view.hpp',
+        '../default/glfw_view.cpp',
+        '../default/log_stderr.cpp',
       ],
 
       'variables' : {
diff --git a/macosx/Icon.icns b/platform/osx/Icon.icns
similarity index 100%
rename from macosx/Icon.icns
rename to platform/osx/Icon.icns
diff --git a/macosx/Info.plist b/platform/osx/Info.plist
similarity index 100%
rename from macosx/Info.plist
rename to platform/osx/Info.plist
diff --git a/macosx/main.mm b/platform/osx/main.mm
similarity index 100%
rename from macosx/main.mm
rename to platform/osx/main.mm
diff --git a/macosx/mapboxgl-app.gypi b/platform/osx/mapboxgl-app.gypi
similarity index 79%
rename from macosx/mapboxgl-app.gypi
rename to platform/osx/mapboxgl-app.gypi
index 67e5e211ed2..2bb893af307 100644
--- a/macosx/mapboxgl-app.gypi
+++ b/platform/osx/mapboxgl-app.gypi
@@ -1,6 +1,6 @@
 {
   'includes': [
-    '../gyp/common.gypi',
+    '../../gyp/common.gypi',
   ],
   'targets': [
     { 'target_name': 'osxapp',
@@ -22,11 +22,11 @@
 
       'sources': [
         './main.mm',
-        '../platform/darwin/settings_nsuserdefaults.hpp',
-        '../platform/darwin/settings_nsuserdefaults.mm',
-        '../platform/darwin/reachability.m',
-        '../platform/default/glfw_view.hpp',
-        '../platform/default/glfw_view.cpp',
+        '../darwin/settings_nsuserdefaults.hpp',
+        '../darwin/settings_nsuserdefaults.mm',
+        '../darwin/reachability.m',
+        '../default/glfw_view.hpp',
+        '../default/glfw_view.cpp',
       ],
 
       'variables' : {
@@ -55,7 +55,7 @@
         'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ],
         'OTHER_LDFLAGS': [ '<@(ldflags)' ],
         'SDKROOT': 'macosx',
-        'INFOPLIST_FILE': '../macosx/Info.plist',
+        'INFOPLIST_FILE': '../platform/osx/Info.plist',
         'CLANG_ENABLE_OBJC_ARC': 'YES'
       },
     }