diff --git a/sky/shell/BUILD.gn b/sky/shell/BUILD.gn
index 3360fa5788fdbbf58f8ddf474ac50e090d61de41..0c3086791fed69d01f4b915b2a2dd8cf3a31cfe5 100644
--- a/sky/shell/BUILD.gn
+++ b/sky/shell/BUILD.gn
@@ -85,27 +85,27 @@ if (is_android) {
 
   generate_jni("jni_headers") {
     sources = [
-      "android/org/domokit/sky/shell/PlatformServiceProvider.java",
-      "android/org/domokit/sky/shell/PlatformViewAndroid.java",
-      "android/org/domokit/sky/shell/SkyMain.java",
-      "android/org/domokit/sky/shell/TracingController.java",
-      "android/org/domokit/sky/shell/UpdateService.java",
+      "platform/android/org/domokit/sky/shell/PlatformServiceProvider.java",
+      "platform/android/org/domokit/sky/shell/PlatformViewAndroid.java",
+      "platform/android/org/domokit/sky/shell/SkyMain.java",
+      "platform/android/org/domokit/sky/shell/TracingController.java",
+      "platform/android/org/domokit/sky/shell/UpdateService.java",
     ]
     jni_package = "sky/shell"
   }
 
   shared_library("sky_shell") {
     sources = [
-      "android/library_loader.cc",
-      "android/platform_service_provider_android.cc",
-      "android/platform_service_provider_android.h",
-      "android/platform_view_android.cc",
-      "android/platform_view_android.h",
-      "android/sky_main.cc",
-      "android/sky_main.h",
-      "android/tracing_controller.cc",
-      "android/tracing_controller.h",
-      "android/update_service_android.cc",
+      "platform/android/library_loader.cc",
+      "platform/android/platform_service_provider_android.cc",
+      "platform/android/platform_service_provider_android.h",
+      "platform/android/platform_view_android.cc",
+      "platform/android/platform_view_android.h",
+      "platform/android/sky_main.cc",
+      "platform/android/sky_main.h",
+      "platform/android/tracing_controller.cc",
+      "platform/android/tracing_controller.h",
+      "platform/android/update_service_android.cc",
     ]
 
     deps = common_deps + [
@@ -121,17 +121,17 @@ if (is_android) {
 
   android_library("java") {
     java_files = [
-      "android/org/domokit/sky/shell/PlatformServiceProvider.java",
-      "android/org/domokit/sky/shell/PlatformViewAndroid.java",
-      "android/org/domokit/sky/shell/ResourceCleaner.java",
-      "android/org/domokit/sky/shell/ResourceExtractor.java",
-      "android/org/domokit/sky/shell/ServiceFactory.java",
-      "android/org/domokit/sky/shell/ServiceRegistry.java",
-      "android/org/domokit/sky/shell/SkyActivity.java",
-      "android/org/domokit/sky/shell/SkyApplication.java",
-      "android/org/domokit/sky/shell/SkyMain.java",
-      "android/org/domokit/sky/shell/TracingController.java",
-      "android/org/domokit/sky/shell/UpdateService.java",
+      "platform/android/org/domokit/sky/shell/PlatformServiceProvider.java",
+      "platform/android/org/domokit/sky/shell/PlatformViewAndroid.java",
+      "platform/android/org/domokit/sky/shell/ResourceCleaner.java",
+      "platform/android/org/domokit/sky/shell/ResourceExtractor.java",
+      "platform/android/org/domokit/sky/shell/ServiceFactory.java",
+      "platform/android/org/domokit/sky/shell/ServiceRegistry.java",
+      "platform/android/org/domokit/sky/shell/SkyActivity.java",
+      "platform/android/org/domokit/sky/shell/SkyApplication.java",
+      "platform/android/org/domokit/sky/shell/SkyMain.java",
+      "platform/android/org/domokit/sky/shell/TracingController.java",
+      "platform/android/org/domokit/sky/shell/UpdateService.java",
     ]
 
     deps = [
@@ -173,7 +173,7 @@ if (is_android) {
 
   android_apk("shell") {
     apk_name = "SkyShell"
-    android_manifest = "android/AndroidManifest.xml"
+    android_manifest = "platform/android/AndroidManifest.xml"
 
     native_libs = [ "libsky_shell.so" ]
     asset_location = "$root_build_dir/sky_shell/assets"
@@ -195,22 +195,22 @@ if (is_android) {
 
   source_set("ios_scaffolding") {
     sources = [
-      "ios/main_ios.mm",
-      "ios/sky_app_delegate.h",
-      "ios/sky_app_delegate.mm",
-      "ios/sky_surface.h",
-      "ios/sky_surface.mm",
-      "ios/sky_view_controller.h",
-      "ios/sky_view_controller.mm",
+      "platform/ios/main_ios.mm",
+      "platform/ios/sky_app_delegate.h",
+      "platform/ios/sky_app_delegate.mm",
+      "platform/ios/sky_surface.h",
+      "platform/ios/sky_surface.mm",
+      "platform/ios/sky_view_controller.h",
+      "platform/ios/sky_view_controller.mm",
     ]
 
     set_sources_assignment_filter([])
     sources += [
-      "mac/platform_mac.h",
-      "mac/platform_mac.mm",
-      "mac/platform_service_provider_mac.cc",
-      "mac/platform_view_mac.h",
-      "mac/platform_view_mac.mm",
+      "platform/mac/platform_mac.h",
+      "platform/mac/platform_mac.mm",
+      "platform/mac/platform_service_provider_mac.cc",
+      "platform/mac/platform_view_mac.h",
+      "platform/mac/platform_view_mac.mm",
     ]
     set_sources_assignment_filter(sources_assignment_filter)
 
@@ -231,9 +231,9 @@ if (is_android) {
     output_name = "sky_shell"
 
     sources = [
-      "linux/main_linux.cc",
-      "linux/platform_service_provider_linux.cc",
-      "linux/platform_view_linux.cc",
+      "platform/linux/main_linux.cc",
+      "platform/linux/platform_service_provider_linux.cc",
+      "platform/linux/platform_view_linux.cc",
     ] + testing_sources
 
     deps = common_deps + [
@@ -246,18 +246,18 @@ if (is_android) {
 
   source_set("mac_scaffolding") {
     sources = [
-      "mac/main_mac.mm",
-      "mac/platform_mac.h",
-      "mac/platform_mac.mm",
-      "mac/platform_service_provider_mac.cc",
-      "mac/platform_view_mac.h",
-      "mac/platform_view_mac.mm",
-      "mac/sky_app_delegate.h",
-      "mac/sky_app_delegate.m",
-      "mac/sky_application.h",
-      "mac/sky_application.mm",
-      "mac/sky_window.h",
-      "mac/sky_window.mm",
+      "platform/mac/main_mac.mm",
+      "platform/mac/platform_mac.h",
+      "platform/mac/platform_mac.mm",
+      "platform/mac/platform_service_provider_mac.cc",
+      "platform/mac/platform_view_mac.h",
+      "platform/mac/platform_view_mac.mm",
+      "platform/mac/sky_app_delegate.h",
+      "platform/mac/sky_app_delegate.m",
+      "platform/mac/sky_application.h",
+      "platform/mac/sky_application.mm",
+      "platform/mac/sky_window.h",
+      "platform/mac/sky_window.mm",
     ] + testing_sources
 
     deps = common_deps + [
@@ -269,14 +269,14 @@ if (is_android) {
 
   mac_app("shell") {
     app_name = "SkyShell"
-    info_plist = "mac/Info.plist"
+    info_plist = "platform/mac/Info.plist"
 
-    xibs = [ "mac/sky_mac.xib" ]
+    xibs = [ "platform/mac/sky_mac.xib" ]
 
     resource_copy_mac("sky_resources") {
       resources = [
         "//third_party/icu/android/icudtl.dat",
-        "ios/LaunchScreen.storyboardc"
+        "platform/ios/LaunchScreen.storyboardc"
       ]
       bundle_directory = "."
     }
diff --git a/sky/shell/android/AndroidManifest.xml b/sky/shell/platform/android/AndroidManifest.xml
similarity index 100%
rename from sky/shell/android/AndroidManifest.xml
rename to sky/shell/platform/android/AndroidManifest.xml
diff --git a/sky/shell/android/library_loader.cc b/sky/shell/platform/android/library_loader.cc
similarity index 85%
rename from sky/shell/android/library_loader.cc
rename to sky/shell/platform/android/library_loader.cc
index 35e16052498bc906fd6f29df534fd1047846471e..9063e083db11a7e88751686cb1f2e3682a471f98 100644
--- a/sky/shell/android/library_loader.cc
+++ b/sky/shell/platform/android/library_loader.cc
@@ -11,11 +11,11 @@
 #include "base/logging.h"
 #include "mojo/android/system/base_run_loop.h"
 #include "mojo/android/system/core_impl.h"
-#include "sky/shell/android/platform_service_provider_android.h"
-#include "sky/shell/android/platform_view_android.h"
-#include "sky/shell/android/sky_main.h"
-#include "sky/shell/android/tracing_controller.h"
-#include "sky/shell/android/update_service_android.h"
+#include "sky/shell/platform/android/platform_service_provider_android.h"
+#include "sky/shell/platform/android/platform_view_android.h"
+#include "sky/shell/platform/android/sky_main.h"
+#include "sky/shell/platform/android/tracing_controller.h"
+#include "sky/shell/platform/android/update_service_android.h"
 
 namespace {
 
diff --git a/sky/shell/android/org/domokit/sky/shell/PlatformServiceProvider.java b/sky/shell/platform/android/org/domokit/sky/shell/PlatformServiceProvider.java
similarity index 100%
rename from sky/shell/android/org/domokit/sky/shell/PlatformServiceProvider.java
rename to sky/shell/platform/android/org/domokit/sky/shell/PlatformServiceProvider.java
diff --git a/sky/shell/android/org/domokit/sky/shell/PlatformViewAndroid.java b/sky/shell/platform/android/org/domokit/sky/shell/PlatformViewAndroid.java
similarity index 100%
rename from sky/shell/android/org/domokit/sky/shell/PlatformViewAndroid.java
rename to sky/shell/platform/android/org/domokit/sky/shell/PlatformViewAndroid.java
diff --git a/sky/shell/android/org/domokit/sky/shell/ResourceCleaner.java b/sky/shell/platform/android/org/domokit/sky/shell/ResourceCleaner.java
similarity index 100%
rename from sky/shell/android/org/domokit/sky/shell/ResourceCleaner.java
rename to sky/shell/platform/android/org/domokit/sky/shell/ResourceCleaner.java
diff --git a/sky/shell/android/org/domokit/sky/shell/ResourceExtractor.java b/sky/shell/platform/android/org/domokit/sky/shell/ResourceExtractor.java
similarity index 100%
rename from sky/shell/android/org/domokit/sky/shell/ResourceExtractor.java
rename to sky/shell/platform/android/org/domokit/sky/shell/ResourceExtractor.java
diff --git a/sky/shell/android/org/domokit/sky/shell/ServiceFactory.java b/sky/shell/platform/android/org/domokit/sky/shell/ServiceFactory.java
similarity index 100%
rename from sky/shell/android/org/domokit/sky/shell/ServiceFactory.java
rename to sky/shell/platform/android/org/domokit/sky/shell/ServiceFactory.java
diff --git a/sky/shell/android/org/domokit/sky/shell/ServiceRegistry.java b/sky/shell/platform/android/org/domokit/sky/shell/ServiceRegistry.java
similarity index 100%
rename from sky/shell/android/org/domokit/sky/shell/ServiceRegistry.java
rename to sky/shell/platform/android/org/domokit/sky/shell/ServiceRegistry.java
diff --git a/sky/shell/android/org/domokit/sky/shell/SkyActivity.java b/sky/shell/platform/android/org/domokit/sky/shell/SkyActivity.java
similarity index 100%
rename from sky/shell/android/org/domokit/sky/shell/SkyActivity.java
rename to sky/shell/platform/android/org/domokit/sky/shell/SkyActivity.java
diff --git a/sky/shell/android/org/domokit/sky/shell/SkyApplication.java b/sky/shell/platform/android/org/domokit/sky/shell/SkyApplication.java
similarity index 100%
rename from sky/shell/android/org/domokit/sky/shell/SkyApplication.java
rename to sky/shell/platform/android/org/domokit/sky/shell/SkyApplication.java
diff --git a/sky/shell/android/org/domokit/sky/shell/SkyMain.java b/sky/shell/platform/android/org/domokit/sky/shell/SkyMain.java
similarity index 100%
rename from sky/shell/android/org/domokit/sky/shell/SkyMain.java
rename to sky/shell/platform/android/org/domokit/sky/shell/SkyMain.java
diff --git a/sky/shell/android/org/domokit/sky/shell/TracingController.java b/sky/shell/platform/android/org/domokit/sky/shell/TracingController.java
similarity index 100%
rename from sky/shell/android/org/domokit/sky/shell/TracingController.java
rename to sky/shell/platform/android/org/domokit/sky/shell/TracingController.java
diff --git a/sky/shell/android/org/domokit/sky/shell/UpdateService.java b/sky/shell/platform/android/org/domokit/sky/shell/UpdateService.java
similarity index 100%
rename from sky/shell/android/org/domokit/sky/shell/UpdateService.java
rename to sky/shell/platform/android/org/domokit/sky/shell/UpdateService.java
diff --git a/sky/shell/android/platform_service_provider_android.cc b/sky/shell/platform/android/platform_service_provider_android.cc
similarity index 94%
rename from sky/shell/android/platform_service_provider_android.cc
rename to sky/shell/platform/android/platform_service_provider_android.cc
index 5cae2e0d914d9fe96290f2dc5d66bea971d4cb45..c71b6ea771936d8cb3041d56efce32385b12189b 100644
--- a/sky/shell/android/platform_service_provider_android.cc
+++ b/sky/shell/platform/android/platform_service_provider_android.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sky/shell/android/platform_service_provider_android.h"
+#include "sky/shell/platform/android/platform_service_provider_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/bind.h"
diff --git a/sky/shell/android/platform_service_provider_android.h b/sky/shell/platform/android/platform_service_provider_android.h
similarity index 100%
rename from sky/shell/android/platform_service_provider_android.h
rename to sky/shell/platform/android/platform_service_provider_android.h
diff --git a/sky/shell/android/platform_view_android.cc b/sky/shell/platform/android/platform_view_android.cc
similarity index 97%
rename from sky/shell/android/platform_view_android.cc
rename to sky/shell/platform/android/platform_view_android.cc
index af9e38c0569ae2428e600d0e9582babddb4f1869..a0ae895c60f94d5c0e2805761b45ebdb9499d7d9 100644
--- a/sky/shell/android/platform_view_android.cc
+++ b/sky/shell/platform/android/platform_view_android.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sky/shell/android/platform_view_android.h"
+#include "sky/shell/platform/android/platform_view_android.h"
 
 #include <android/input.h>
 #include <android/native_window_jni.h>
diff --git a/sky/shell/android/platform_view_android.h b/sky/shell/platform/android/platform_view_android.h
similarity index 100%
rename from sky/shell/android/platform_view_android.h
rename to sky/shell/platform/android/platform_view_android.h
diff --git a/sky/shell/android/sky_main.cc b/sky/shell/platform/android/sky_main.cc
similarity index 98%
rename from sky/shell/android/sky_main.cc
rename to sky/shell/platform/android/sky_main.cc
index 5f986c2c9171d1555873f0eb93dd0511840fbc88..a6da01c0fe5cb64436d34f6c95a0afc51e232b2b 100644
--- a/sky/shell/android/sky_main.cc
+++ b/sky/shell/platform/android/sky_main.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sky/shell/android/sky_main.h"
+#include "sky/shell/platform/android/sky_main.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
diff --git a/sky/shell/android/sky_main.h b/sky/shell/platform/android/sky_main.h
similarity index 100%
rename from sky/shell/android/sky_main.h
rename to sky/shell/platform/android/sky_main.h
diff --git a/sky/shell/android/tracing_controller.cc b/sky/shell/platform/android/tracing_controller.cc
similarity index 93%
rename from sky/shell/android/tracing_controller.cc
rename to sky/shell/platform/android/tracing_controller.cc
index 44cd4147b90fc6d4b359261f55c22ba71397eb90..f5c25a08f7c2e97438c7c4056f155093e5018204 100644
--- a/sky/shell/android/tracing_controller.cc
+++ b/sky/shell/platform/android/tracing_controller.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sky/shell/android/tracing_controller.h"
+#include "sky/shell/platform/android/tracing_controller.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
diff --git a/sky/shell/android/tracing_controller.h b/sky/shell/platform/android/tracing_controller.h
similarity index 100%
rename from sky/shell/android/tracing_controller.h
rename to sky/shell/platform/android/tracing_controller.h
diff --git a/sky/shell/android/update_service_android.cc b/sky/shell/platform/android/update_service_android.cc
similarity index 96%
rename from sky/shell/android/update_service_android.cc
rename to sky/shell/platform/android/update_service_android.cc
index 9b601dd552eebc199470f34af0f99cebe1411137..c87e080ff01537fa4699775dfe65cbd890c00e9e 100644
--- a/sky/shell/android/update_service_android.cc
+++ b/sky/shell/platform/android/update_service_android.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sky/shell/android/update_service_android.h"
+#include "sky/shell/platform/android/update_service_android.h"
 
 #include "base/logging.h"
 #include "base/task_runner_util.h"
diff --git a/sky/shell/android/update_service_android.h b/sky/shell/platform/android/update_service_android.h
similarity index 100%
rename from sky/shell/android/update_service_android.h
rename to sky/shell/platform/android/update_service_android.h
diff --git a/sky/shell/ios/.gitignore b/sky/shell/platform/ios/.gitignore
similarity index 100%
rename from sky/shell/ios/.gitignore
rename to sky/shell/platform/ios/.gitignore
diff --git a/sky/shell/ios/Entitlements.xcent b/sky/shell/platform/ios/Entitlements.xcent
similarity index 100%
rename from sky/shell/ios/Entitlements.xcent
rename to sky/shell/platform/ios/Entitlements.xcent
diff --git a/sky/shell/ios/Info.plist b/sky/shell/platform/ios/Info.plist
similarity index 100%
rename from sky/shell/ios/Info.plist
rename to sky/shell/platform/ios/Info.plist
diff --git a/sky/shell/ios/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib b/sky/shell/platform/ios/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib
similarity index 100%
rename from sky/shell/ios/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib
rename to sky/shell/platform/ios/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib
diff --git a/sky/shell/ios/LaunchScreen.storyboardc/Info.plist b/sky/shell/platform/ios/LaunchScreen.storyboardc/Info.plist
similarity index 100%
rename from sky/shell/ios/LaunchScreen.storyboardc/Info.plist
rename to sky/shell/platform/ios/LaunchScreen.storyboardc/Info.plist
diff --git a/sky/shell/ios/LaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib b/sky/shell/platform/ios/LaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib
similarity index 100%
rename from sky/shell/ios/LaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib
rename to sky/shell/platform/ios/LaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib
diff --git a/sky/shell/ios/main_ios.mm b/sky/shell/platform/ios/main_ios.mm
similarity index 87%
rename from sky/shell/ios/main_ios.mm
rename to sky/shell/platform/ios/main_ios.mm
index 524b89f5b9a26e6f6beca8401e20d766dab5970e..58a57f5e929c11eed374d317c2f3a6ef249a5f09 100644
--- a/sky/shell/ios/main_ios.mm
+++ b/sky/shell/platform/ios/main_ios.mm
@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 #import <UIKit/UIKit.h>
-#import "sky/shell/ios/sky_app_delegate.h"
+#import "sky/shell/platform/ios/sky_app_delegate.h"
 
-#include "sky/shell/mac/platform_mac.h"
+#include "sky/shell/platform/mac/platform_mac.h"
 
 extern "C" {
 // TODO(csg): HACK! boringssl accesses this on Android using a weak symbol
diff --git a/sky/shell/ios/sky_app_delegate.h b/sky/shell/platform/ios/sky_app_delegate.h
similarity index 100%
rename from sky/shell/ios/sky_app_delegate.h
rename to sky/shell/platform/ios/sky_app_delegate.h
diff --git a/sky/shell/ios/sky_app_delegate.mm b/sky/shell/platform/ios/sky_app_delegate.mm
similarity index 100%
rename from sky/shell/ios/sky_app_delegate.mm
rename to sky/shell/platform/ios/sky_app_delegate.mm
diff --git a/sky/shell/ios/sky_surface.h b/sky/shell/platform/ios/sky_surface.h
similarity index 100%
rename from sky/shell/ios/sky_surface.h
rename to sky/shell/platform/ios/sky_surface.h
diff --git a/sky/shell/ios/sky_surface.mm b/sky/shell/platform/ios/sky_surface.mm
similarity index 99%
rename from sky/shell/ios/sky_surface.mm
rename to sky/shell/platform/ios/sky_surface.mm
index a29339aff799f04c456ed2e977db95cbe4a27c5d..654cb3353dd8640cc613d2340fde186b383d46ef 100644
--- a/sky/shell/ios/sky_surface.mm
+++ b/sky/shell/platform/ios/sky_surface.mm
@@ -12,7 +12,7 @@
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "sky/services/engine/input_event.mojom.h"
 #include "sky/services/pointer/pointer.mojom.h"
-#include "sky/shell/mac/platform_view_mac.h"
+#include "sky/shell/platform/mac/platform_view_mac.h"
 #include "sky/shell/shell_view.h"
 #include "sky/shell/shell.h"
 #include "sky/shell/ui_delegate.h"
diff --git a/sky/shell/ios/sky_view_controller.h b/sky/shell/platform/ios/sky_view_controller.h
similarity index 100%
rename from sky/shell/ios/sky_view_controller.h
rename to sky/shell/platform/ios/sky_view_controller.h
diff --git a/sky/shell/ios/sky_view_controller.mm b/sky/shell/platform/ios/sky_view_controller.mm
similarity index 100%
rename from sky/shell/ios/sky_view_controller.mm
rename to sky/shell/platform/ios/sky_view_controller.mm
diff --git a/sky/shell/linux/main_linux.cc b/sky/shell/platform/linux/main_linux.cc
similarity index 100%
rename from sky/shell/linux/main_linux.cc
rename to sky/shell/platform/linux/main_linux.cc
diff --git a/sky/shell/linux/platform_service_provider_linux.cc b/sky/shell/platform/linux/platform_service_provider_linux.cc
similarity index 100%
rename from sky/shell/linux/platform_service_provider_linux.cc
rename to sky/shell/platform/linux/platform_service_provider_linux.cc
diff --git a/sky/shell/linux/platform_view_linux.cc b/sky/shell/platform/linux/platform_view_linux.cc
similarity index 100%
rename from sky/shell/linux/platform_view_linux.cc
rename to sky/shell/platform/linux/platform_view_linux.cc
diff --git a/sky/shell/mac/.gitignore b/sky/shell/platform/mac/.gitignore
similarity index 100%
rename from sky/shell/mac/.gitignore
rename to sky/shell/platform/mac/.gitignore
diff --git a/sky/shell/mac/Info.plist b/sky/shell/platform/mac/Info.plist
similarity index 100%
rename from sky/shell/mac/Info.plist
rename to sky/shell/platform/mac/Info.plist
diff --git a/sky/shell/mac/main_mac.mm b/sky/shell/platform/mac/main_mac.mm
similarity index 93%
rename from sky/shell/mac/main_mac.mm
rename to sky/shell/platform/mac/main_mac.mm
index 02814b954666b311ca284cf20b7a8dd637eaeff8..523f0af5d65aa7ec4ba592958eef4967d2d1b301 100644
--- a/sky/shell/mac/main_mac.mm
+++ b/sky/shell/platform/mac/main_mac.mm
@@ -7,8 +7,8 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
-#include "sky/shell/mac/platform_mac.h"
-#include "sky/shell/mac/sky_application.h"
+#include "sky/shell/platform/mac/platform_mac.h"
+#include "sky/shell/platform/mac/sky_application.h"
 #include "sky/shell/switches.h"
 #include "sky/shell/testing/testing.h"
 
diff --git a/sky/shell/mac/platform_mac.h b/sky/shell/platform/mac/platform_mac.h
similarity index 100%
rename from sky/shell/mac/platform_mac.h
rename to sky/shell/platform/mac/platform_mac.h
diff --git a/sky/shell/mac/platform_mac.mm b/sky/shell/platform/mac/platform_mac.mm
similarity index 97%
rename from sky/shell/mac/platform_mac.mm
rename to sky/shell/platform/mac/platform_mac.mm
index 27f50774c3aece0d59458872e2eb7d6c2dffddef..2440fdd6d12d4fc780d55d7342df6d3acb049940 100644
--- a/sky/shell/mac/platform_mac.mm
+++ b/sky/shell/platform/mac/platform_mac.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sky/shell/mac/platform_mac.h"
+#include "sky/shell/platform/mac/platform_mac.h"
 
 #include <asl.h>
 #include "base/at_exit.h"
diff --git a/sky/shell/mac/platform_service_provider_mac.cc b/sky/shell/platform/mac/platform_service_provider_mac.cc
similarity index 100%
rename from sky/shell/mac/platform_service_provider_mac.cc
rename to sky/shell/platform/mac/platform_service_provider_mac.cc
diff --git a/sky/shell/mac/platform_view_mac.h b/sky/shell/platform/mac/platform_view_mac.h
similarity index 100%
rename from sky/shell/mac/platform_view_mac.h
rename to sky/shell/platform/mac/platform_view_mac.h
diff --git a/sky/shell/mac/platform_view_mac.mm b/sky/shell/platform/mac/platform_view_mac.mm
similarity index 92%
rename from sky/shell/mac/platform_view_mac.mm
rename to sky/shell/platform/mac/platform_view_mac.mm
index f4bc15b1d19ef376f4f1aba330ac77a4f26f292f..3308a4c5223621e4b7e06b566c4c33a7f3e24e90 100644
--- a/sky/shell/mac/platform_view_mac.mm
+++ b/sky/shell/platform/mac/platform_view_mac.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sky/shell/mac/platform_view_mac.h"
+#include "sky/shell/platform/mac/platform_view_mac.h"
 
 namespace sky {
 namespace shell {
diff --git a/sky/shell/mac/sky_app_delegate.h b/sky/shell/platform/mac/sky_app_delegate.h
similarity index 100%
rename from sky/shell/mac/sky_app_delegate.h
rename to sky/shell/platform/mac/sky_app_delegate.h
diff --git a/sky/shell/mac/sky_app_delegate.m b/sky/shell/platform/mac/sky_app_delegate.m
similarity index 100%
rename from sky/shell/mac/sky_app_delegate.m
rename to sky/shell/platform/mac/sky_app_delegate.m
diff --git a/sky/shell/mac/sky_application.h b/sky/shell/platform/mac/sky_application.h
similarity index 100%
rename from sky/shell/mac/sky_application.h
rename to sky/shell/platform/mac/sky_application.h
diff --git a/sky/shell/mac/sky_application.mm b/sky/shell/platform/mac/sky_application.mm
similarity index 95%
rename from sky/shell/mac/sky_application.mm
rename to sky/shell/platform/mac/sky_application.mm
index 51a04c3061ea73c681c397e784faa4f4836148f5..71d5919dcd31fad14b0326810ce5dd7c27a97980 100644
--- a/sky/shell/mac/sky_application.mm
+++ b/sky/shell/platform/mac/sky_application.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sky/shell/mac/sky_application.h"
+#include "sky/shell/platform/mac/sky_application.h"
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
diff --git a/sky/shell/mac/sky_mac.xib b/sky/shell/platform/mac/sky_mac.xib
similarity index 100%
rename from sky/shell/mac/sky_mac.xib
rename to sky/shell/platform/mac/sky_mac.xib
diff --git a/sky/shell/mac/sky_window.h b/sky/shell/platform/mac/sky_window.h
similarity index 100%
rename from sky/shell/mac/sky_window.h
rename to sky/shell/platform/mac/sky_window.h
diff --git a/sky/shell/mac/sky_window.mm b/sky/shell/platform/mac/sky_window.mm
similarity index 99%
rename from sky/shell/mac/sky_window.mm
rename to sky/shell/platform/mac/sky_window.mm
index 49bd510ee9f3ea2ce833ac657f03fa1502b7cd61..2ccc9f31e61ab85f3cb1f91527d899bda0c27e8b 100644
--- a/sky/shell/mac/sky_window.mm
+++ b/sky/shell/platform/mac/sky_window.mm
@@ -8,7 +8,7 @@
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "sky/services/engine/input_event.mojom.h"
 #include "sky/services/pointer/pointer.mojom.h"
-#include "sky/shell/mac/platform_view_mac.h"
+#include "sky/shell/platform/mac/platform_view_mac.h"
 #include "sky/shell/shell_view.h"
 #include "sky/shell/shell.h"
 #include "sky/shell/switches.h"