Move mojo/application/public -> mojo/shell/public

TBR=sky@chromium.org http://crbug.com/575308 Review URL: https://codereview.chromium.org/1565343003 Cr-Commit-Position: refs/heads/master@{#368776}
author: ben <ben@chromium.org> 2016-01-11 18:44:08 -0800
committer: Commit bot <commit-bot@chromium.org> 2016-01-12 02:44:59 +0000
commit: 273c1e30241a8a5509ad9b307380ed8600ba82d8 (patch)
tree: 25da3f1a02f1f9d5f129ba8d794d20b51355a07b
parent: 9c1122c7163411be938195ba546460ba54d33b00 (diff)
download: chromium_src-273c1e30241a8a5509ad9b307380ed8600ba82d8.zip
chromium_src-273c1e30241a8a5509ad9b307380ed8600ba82d8.tar.gz
chromium_src-273c1e30241a8a5509ad9b307380ed8600ba82d8.tar.bz2
379 files changed, 768 insertions, 768 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 205e74c..741ae41 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -175,8 +175,8 @@ group("both_gn_and_gyp") {
       "//media/cast:cast_unittests",
       "//media/midi:midi_unittests",
       "//mojo",
-      "//mojo/application/public/cpp",
       "//mojo/common:mojo_common_unittests",
+      "//mojo/shell/public/cpp",
       "//net:net_perftests",
 
       # TODO(use-new-edk):
@@ -505,7 +505,7 @@ group("both_gn_and_gyp") {
       # TODO(GYP): Remove this when the gles2 tests work
       "//gpu/command_buffer/client:gles2_implementation_no_check",
       "//gpu/khronos_glcts_support:khronos_glcts_test",  # TODO(GYP) crbug.com/471903 to make this complete.
-      "//mojo/application/public/cpp",
+      "//mojo/shell/public/cpp",
       "//testing/gmock:gmock_main",
 
       # TODO(use-new-edk):
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index da52cb6..1f0e03b 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -359,11 +359,11 @@ source_set("browser") {
       "//device/usb",
       "//media",
       "//media/midi",
-      "//mojo/application/public/cpp",
       "//mojo/common",
       "//mojo/environment:chromium",
       "//mojo/public/cpp/bindings",
       "//mojo/public/js",
+      "//mojo/shell/public/cpp",
       "//net:extras",
       "//net:net_with_v8",
       "//storage/browser",
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
index 775d53e..ad690f8 100644
--- a/chrome/browser/DEPS
+++ b/chrome/browser/DEPS
@@ -153,7 +153,7 @@ include_rules = [
   "+media/audio", # For media audio hang monitor.
   "+media/base",  # For media switches
   "+media/midi",  # For midi switches
-  "+mojo/application/public/cpp",
+  "+mojo/shell/public/cpp",
   "+mojo/converters",
   "+mojo/runner/child",
   "+policy",  # For generated headers and source
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 34b0a73..f1e30b2 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -152,7 +152,7 @@
 #include "content/public/common/web_preferences.h"
 #include "device/devices_app/usb/public/interfaces/device_manager.mojom.h"
 #include "gin/v8_initializer.h"
-#include "mojo/application/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
 #include "net/base/mime_util.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_options.h"
diff --git a/chrome/browser/ui/views/frame/browser_frame_mus.cc b/chrome/browser/ui/views/frame/browser_frame_mus.cc
index ca2264b..b3ff9f6 100644
--- a/chrome/browser/ui/views/frame/browser_frame_mus.cc
+++ b/chrome/browser/ui/views/frame/browser_frame_mus.cc
@@ -10,7 +10,7 @@
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/interfaces/window_tree.mojom.h"
-#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 #include "ui/views/mus/window_manager_connection.h"
 #include "ui/views/mus/window_manager_frame_values.h"
 
diff --git a/components/bitmap_uploader/BUILD.gn b/components/bitmap_uploader/BUILD.gn
index c9d2862..3aade97 100644
--- a/components/bitmap_uploader/BUILD.gn
+++ b/components/bitmap_uploader/BUILD.gn
@@ -18,10 +18,10 @@ component("bitmap_uploader") {
     "//components/mus/public/cpp",
     "//components/mus/public/interfaces",
     "//gpu",
-    "//mojo/application/public/cpp",
-    "//mojo/application/public/interfaces",
     "//mojo/converters/surfaces",
     "//mojo/public/c/gles2",
     "//mojo/public/c/system:for_component",
+    "//mojo/shell/public/cpp",
+    "//mojo/shell/public/interfaces",
   ]
 }
diff --git a/components/bitmap_uploader/DEPS b/components/bitmap_uploader/DEPS
index 8a0ec23..d24de36 100644
--- a/components/bitmap_uploader/DEPS
+++ b/components/bitmap_uploader/DEPS
@@ -1,7 +1,7 @@
 include_rules = [
   "+components/mus/public",
   "+gpu/GLES2",
-  "+mojo/application/public",
+  "+mojo/shell/public",
   "+mojo/common",
   "+mojo/converters/geometry",
   "+mojo/converters/surfaces",
diff --git a/components/bitmap_uploader/bitmap_uploader.cc b/components/bitmap_uploader/bitmap_uploader.cc
index baa5103..aed09e2b 100644
--- a/components/bitmap_uploader/bitmap_uploader.cc
+++ b/components/bitmap_uploader/bitmap_uploader.cc
@@ -11,14 +11,14 @@
 #include "base/callback.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_surface.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/connect.h"
-#include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_utils.h"
 #include "mojo/public/c/gles2/gles2.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/connect.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 
 namespace bitmap_uploader {
 namespace {
diff --git a/components/clipboard/BUILD.gn b/components/clipboard/BUILD.gn
index a15617b..f720ea8 100644
--- a/components/clipboard/BUILD.gn
+++ b/components/clipboard/BUILD.gn
@@ -15,10 +15,10 @@ source_set("lib") {
   deps = [
     "//base",
     "//components/clipboard/public/interfaces",
-    "//mojo/application/public/cpp",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/bindings:callback",
     "//mojo/services/tracing/public/cpp",
+    "//mojo/shell/public/cpp",
   ]
 }
 
@@ -30,8 +30,8 @@ mojo_native_application("clipboard") {
   deps = [
     ":lib",
     "//base",
-    "//mojo/application/public/cpp",
     "//mojo/public/cpp/bindings:callback",
+    "//mojo/shell/public/cpp",
   ]
 }
 
@@ -47,9 +47,9 @@ mojo_native_application("apptests") {
   deps = [
     "//base",
     "//components/clipboard/public/interfaces",
-    "//mojo/application/public/cpp",
-    "//mojo/application/public/cpp:test_support",
     "//mojo/common",
+    "//mojo/shell/public/cpp",
+    "//mojo/shell/public/cpp:test_support",
   ]
 
   data_deps = [
diff --git a/components/clipboard/DEPS b/components/clipboard/DEPS
index df5394e..78718eb 100644
--- a/components/clipboard/DEPS
+++ b/components/clipboard/DEPS
@@ -1,5 +1,5 @@
 include_rules = [
-  "+mojo/application",
+  "+mojo/shell",
   "+mojo/common",
   "+mojo/public",
   "+mojo/services/tracing/public/cpp",
diff --git a/components/clipboard/clipboard_application_delegate.cc b/components/clipboard/clipboard_application_delegate.cc
index b259855..a182377 100644
--- a/components/clipboard/clipboard_application_delegate.cc
+++ b/components/clipboard/clipboard_application_delegate.cc
@@ -7,7 +7,7 @@
 #include <utility>
 
 #include "components/clipboard/clipboard_standalone_impl.h"
-#include "mojo/application/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_connection.h"
 
 namespace clipboard {
 
diff --git a/components/clipboard/clipboard_application_delegate.h b/components/clipboard/clipboard_application_delegate.h
index d54bd3b..f3f6c29 100644
--- a/components/clipboard/clipboard_application_delegate.h
+++ b/components/clipboard/clipboard_application_delegate.h
@@ -7,9 +7,9 @@
 
 #include "base/macros.h"
 #include "components/clipboard/public/interfaces/clipboard.mojom.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 
 namespace mojo {
 class ApplicationConnection;
diff --git a/components/clipboard/clipboard_apptest.cc b/components/clipboard/clipboard_apptest.cc
index 814dd38..92808c0 100644
--- a/components/clipboard/clipboard_apptest.cc
+++ b/components/clipboard/clipboard_apptest.cc
@@ -9,9 +9,9 @@
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "components/clipboard/public/interfaces/clipboard.mojom.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_test_base.h"
 #include "mojo/common/common_type_converters.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
 
 using mojo::Array;
 using mojo::Clipboard;
diff --git a/components/clipboard/main.cc b/components/clipboard/main.cc
index ceafe5c..4e2a55f 100644
--- a/components/clipboard/main.cc
+++ b/components/clipboard/main.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "components/clipboard/clipboard_application_delegate.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(new clipboard::ClipboardApplicationDelegate);
diff --git a/components/devtools_service/BUILD.gn b/components/devtools_service/BUILD.gn
index 9c78abb..1c524fb 100644
--- a/components/devtools_service/BUILD.gn
+++ b/components/devtools_service/BUILD.gn
@@ -21,13 +21,13 @@ source_set("lib") {
   deps = [
     "//base",
     "//components/devtools_service/public/interfaces",
-    "//mojo/application/public/cpp",
     "//mojo/common",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/bindings:callback",
     "//mojo/public/cpp/system",
     "//mojo/services/network/public/cpp",
     "//mojo/services/network/public/interfaces",
+    "//mojo/shell/public/cpp",
     "//url",
   ]
 }
@@ -41,6 +41,6 @@ mojo_native_application("devtools_service") {
 
   deps = [
     ":lib",
-    "//mojo/application/public/cpp",
+    "//mojo/shell/public/cpp",
   ]
 }
diff --git a/components/devtools_service/DEPS b/components/devtools_service/DEPS
index 0ccf7fc..d5bdd60 100644
--- a/components/devtools_service/DEPS
+++ b/components/devtools_service/DEPS
@@ -1,5 +1,5 @@
 include_rules = [
-  "+mojo/application",
+  "+mojo/shell",
   "+mojo/common",
   "+mojo/public",
   "+mojo/services/network/public",
diff --git a/components/devtools_service/devtools_http_server.cc b/components/devtools_service/devtools_http_server.cc
index 28dff65..3ab27d9 100644
--- a/components/devtools_service/devtools_http_server.cc
+++ b/components/devtools_service/devtools_http_server.cc
@@ -19,13 +19,13 @@
 #include "components/devtools_service/devtools_agent_host.h"
 #include "components/devtools_service/devtools_registry_impl.h"
 #include "components/devtools_service/devtools_service.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/public/cpp/system/data_pipe.h"
 #include "mojo/services/network/public/cpp/web_socket_read_queue.h"
 #include "mojo/services/network/public/cpp/web_socket_write_queue.h"
 #include "mojo/services/network/public/interfaces/net_address.mojom.h"
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
 #include "mojo/services/network/public/interfaces/web_socket.mojom.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 namespace devtools_service {
 
diff --git a/components/devtools_service/devtools_service.cc b/components/devtools_service/devtools_service.cc
index f2b47046..291fca3 100644
--- a/components/devtools_service/devtools_service.cc
+++ b/components/devtools_service/devtools_service.cc
@@ -8,7 +8,7 @@
 
 #include "base/logging.h"
 #include "components/devtools_service/devtools_http_server.h"
-#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 namespace devtools_service {
 
diff --git a/components/devtools_service/devtools_service_delegate.cc b/components/devtools_service/devtools_service_delegate.cc
index c59e970a..5ba6adf 100644
--- a/components/devtools_service/devtools_service_delegate.cc
+++ b/components/devtools_service/devtools_service_delegate.cc
@@ -9,9 +9,9 @@
 #include "base/logging.h"
 #include "components/devtools_service/devtools_registry_impl.h"
 #include "components/devtools_service/devtools_service.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/common/url_type_converters.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 #include "url/gurl.h"
 
 namespace devtools_service {
diff --git a/components/devtools_service/devtools_service_delegate.h b/components/devtools_service/devtools_service_delegate.h
index 93dc993..966e90f2 100644
--- a/components/devtools_service/devtools_service_delegate.h
+++ b/components/devtools_service/devtools_service_delegate.h
@@ -8,8 +8,8 @@
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/devtools_service/public/interfaces/devtools_service.mojom.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/interface_factory.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 
 namespace devtools_service {
 
diff --git a/components/devtools_service/main.cc b/components/devtools_service/main.cc
index b8f99f8..169ba7b 100644
--- a/components/devtools_service/main.cc
+++ b/components/devtools_service/main.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "components/devtools_service/devtools_service_delegate.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(new devtools_service::DevToolsServiceDelegate);
diff --git a/components/filesystem/BUILD.gn b/components/filesystem/BUILD.gn
index 178633b..299ac10 100644
--- a/components/filesystem/BUILD.gn
+++ b/components/filesystem/BUILD.gn
@@ -21,11 +21,11 @@ source_set("lib") {
   deps = [
     "//base",
     "//components/filesystem/public/interfaces",
-    "//mojo/application/public/cpp",
     "//mojo/common",
     "//mojo/common:common_base",
     "//mojo/platform_handle",
     "//mojo/services/tracing/public/cpp",
+    "//mojo/shell/public/cpp",
     "//url",
   ]
 }
@@ -38,12 +38,12 @@ mojo_native_application("filesystem") {
   deps = [
     ":lib",
     "//base",
-    "//mojo/application/public/cpp",
     "//mojo/common",
     "//mojo/environment:chromium",
     "//mojo/platform_handle:for_shared_library",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",
+    "//mojo/shell/public/cpp",
   ]
 }
 
@@ -62,9 +62,9 @@ mojo_native_application("apptests") {
   deps = [
     "//base",
     "//components/filesystem/public/interfaces",
-    "//mojo/application/public/cpp:test_support",
     "//mojo/platform_handle:for_shared_library",
     "//mojo/public/cpp/bindings",
+    "//mojo/shell/public/cpp:test_support",
   ]
 
   data_deps = [
diff --git a/components/filesystem/DEPS b/components/filesystem/DEPS
index 1d92bb6..ba5ed50 100644
--- a/components/filesystem/DEPS
+++ b/components/filesystem/DEPS
@@ -1,5 +1,5 @@
 include_rules = [
-  "+mojo/application",
+  "+mojo/shell",
   "+mojo/platform_handle",
   "+mojo/public",
   "+mojo/services/tracing/public/cpp",
diff --git a/components/filesystem/file_system_app.cc b/components/filesystem/file_system_app.cc
index 65401fe..81bc02a 100644
--- a/components/filesystem/file_system_app.cc
+++ b/components/filesystem/file_system_app.cc
@@ -8,8 +8,8 @@
 
 #include "base/bind.h"
 #include "base/logging.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 namespace filesystem {
 
diff --git a/components/filesystem/file_system_app.h b/components/filesystem/file_system_app.h
index b997bb5..75ce463 100644
--- a/components/filesystem/file_system_app.h
+++ b/components/filesystem/file_system_app.h
@@ -9,9 +9,9 @@
 #include "components/filesystem/directory_impl.h"
 #include "components/filesystem/file_system_impl.h"
 #include "components/filesystem/public/interfaces/file_system.mojom.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 
 namespace mojo {
 class ApplicationImpl;
diff --git a/components/filesystem/file_system_impl.cc b/components/filesystem/file_system_impl.cc
index 6ccf5cb..9049776 100644
--- a/components/filesystem/file_system_impl.cc
+++ b/components/filesystem/file_system_impl.cc
@@ -17,7 +17,7 @@
 #include "build/build_config.h"
 #include "components/filesystem/directory_impl.h"
 #include "components/filesystem/file_system_app.h"
-#include "mojo/application/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_connection.h"
 #include "url/gurl.h"
 
 #if defined(OS_WIN)
diff --git a/components/filesystem/files_test_base.cc b/components/filesystem/files_test_base.cc
index 28e36fa..d57acf2 100644
--- a/components/filesystem/files_test_base.cc
+++ b/components/filesystem/files_test_base.cc
@@ -8,7 +8,7 @@
 
 #include "components/filesystem/public/interfaces/directory.mojom.h"
 #include "components/filesystem/public/interfaces/types.mojom.h"
-#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 #include "mojo/util/capture_util.h"
 
 namespace filesystem {
diff --git a/components/filesystem/files_test_base.h b/components/filesystem/files_test_base.h
index 43ffccf..0449949 100644
--- a/components/filesystem/files_test_base.h
+++ b/components/filesystem/files_test_base.h
@@ -7,8 +7,8 @@
 
 #include "base/macros.h"
 #include "components/filesystem/public/interfaces/file_system.mojom.h"
-#include "mojo/application/public/cpp/application_test_base.h"
 #include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
 
 namespace filesystem {
 
diff --git a/components/filesystem/main.cc b/components/filesystem/main.cc
index 6e25653..b84980e 100644
--- a/components/filesystem/main.cc
+++ b/components/filesystem/main.cc
@@ -4,8 +4,8 @@
 
 #include "base/macros.h"
 #include "components/filesystem/file_system_app.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunner runner(new filesystem::FileSystemApp());
diff --git a/components/font_service/BUILD.gn b/components/font_service/BUILD.gn
index 49f9390..eb48d92 100644
--- a/components/font_service/BUILD.gn
+++ b/components/font_service/BUILD.gn
@@ -13,11 +13,11 @@ source_set("lib") {
   deps = [
     "//base",
     "//components/font_service/public/interfaces",
-    "//mojo/application/public/cpp",
     "//mojo/common:common_base",
     "//mojo/platform_handle",
     "//mojo/public/cpp/bindings",
     "//mojo/services/tracing/public/cpp",
+    "//mojo/shell/public/cpp",
   ]
 
   public_deps = [
@@ -33,9 +33,9 @@ mojo_native_application("font_service") {
   deps = [
     ":lib",
     "//base",
-    "//mojo/application/public/cpp",
     "//mojo/common",
     "//mojo/common:common_base",
     "//mojo/public/cpp/bindings:callback",
+    "//mojo/shell/public/cpp",
   ]
 }
diff --git a/components/font_service/DEPS b/components/font_service/DEPS
index bce6c1c..cad5e7f 100644
--- a/components/font_service/DEPS
+++ b/components/font_service/DEPS
@@ -1,5 +1,5 @@
 include_rules = [
-  "+mojo/application",
+  "+mojo/shell",
   "+mojo/common",
   "+mojo/message_pump",
   "+mojo/platform_handle",
diff --git a/components/font_service/font_service_app.cc b/components/font_service/font_service_app.cc
index 275db7f..21c688f 100644
--- a/components/font_service/font_service_app.cc
+++ b/components/font_service/font_service_app.cc
@@ -8,8 +8,8 @@
 
 #include "base/files/file.h"
 #include "base/files/file_path.h"
-#include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/platform_handle/platform_handle_functions.h"
+#include "mojo/shell/public/cpp/application_connection.h"
 
 static_assert(static_cast<uint32_t>(SkTypeface::kNormal) ==
                   static_cast<uint32_t>(font_service::TYPEFACE_STYLE_NORMAL),
diff --git a/components/font_service/font_service_app.h b/components/font_service/font_service_app.h
index 079e84a..990f294 100644
--- a/components/font_service/font_service_app.h
+++ b/components/font_service/font_service_app.h
@@ -9,10 +9,10 @@
 
 #include "base/macros.h"
 #include "components/font_service/public/interfaces/font_service.mojom.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 #include "skia/ext/skia_utils_base.h"
 
 namespace font_service {
diff --git a/components/font_service/main.cc b/components/font_service/main.cc
index 983c07d..23393f6 100644
--- a/components/font_service/main.cc
+++ b/components/font_service/main.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "components/font_service/font_service_app.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(new font_service::FontServiceApp);
diff --git a/components/font_service/public/cpp/BUILD.gn b/components/font_service/public/cpp/BUILD.gn
index 0047d49..8816dab 100644
--- a/components/font_service/public/cpp/BUILD.gn
+++ b/components/font_service/public/cpp/BUILD.gn
@@ -15,13 +15,13 @@ source_set("cpp") {
   deps = [
     "../interfaces",
     "//base",
-    "//mojo/application/public/cpp",
-    "//mojo/application/public/interfaces",
     "//mojo/common",
     "//mojo/message_pump",
     "//mojo/platform_handle",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",
+    "//mojo/shell/public/cpp",
+    "//mojo/shell/public/interfaces",
     "//skia",
   ]
 }
diff --git a/components/font_service/public/cpp/font_loader.cc b/components/font_service/public/cpp/font_loader.cc
index 2b21232..e426bbb 100644
--- a/components/font_service/public/cpp/font_loader.cc
+++ b/components/font_service/public/cpp/font_loader.cc
@@ -9,9 +9,9 @@
 #include "base/bind.h"
 #include "base/trace_event/trace_event.h"
 #include "components/font_service/public/cpp/font_service_thread.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/connect.h"
-#include "mojo/application/public/interfaces/shell.mojom.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/connect.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 
 namespace font_service {
 namespace {
diff --git a/components/html_viewer/BUILD.gn b/components/html_viewer/BUILD.gn
index e4c270f..a6cff06 100644
--- a/components/html_viewer/BUILD.gn
+++ b/components/html_viewer/BUILD.gn
@@ -171,8 +171,6 @@ source_set("lib") {
     "//media:shared_memory_support",
     "//media/blink",
     "//media/mojo",
-    "//mojo/application/public/cpp",
-    "//mojo/application/public/interfaces",
     "//mojo/common",
     "//mojo/converters/blink",
     "//mojo/converters/surfaces",
@@ -187,6 +185,8 @@ source_set("lib") {
     "//mojo/services/network/public/interfaces",
     "//mojo/services/tracing/public/cpp",
     "//mojo/services/tracing/public/interfaces",
+    "//mojo/shell/public/cpp",
+    "//mojo/shell/public/interfaces",
     "//net",
     "//skia",
     "//third_party/WebKit/public:image_resources",
@@ -238,7 +238,7 @@ mojo_native_application("html_viewer") {
     ":lib",
     ":pak",
     "//base",
-    "//mojo/application/public/cpp:sources",
+    "//mojo/shell/public/cpp:sources",
   ]
   resources = [ "$root_out_dir/html_viewer.pak" ]
 
@@ -270,8 +270,8 @@ mojo_native_application("layout_test_html_viewer") {
     "//cc",
     "//components/test_runner",
     "//components/web_view/test_runner/public/interfaces",
-    "//mojo/application/public/cpp:sources",
     "//mojo/public/c/system:for_shared_library",
+    "//mojo/shell/public/cpp:sources",
     "//third_party/WebKit/public:blink",
     "//third_party/WebKit/public:test_support",
     "//ui/base",
@@ -352,11 +352,11 @@ mojo_native_application("apptests") {
     "//components/web_view:lib",
     "//components/web_view:test_support",
     "//components/web_view/public/interfaces",
-    "//mojo/application/public/cpp:sources",
-    "//mojo/application/public/cpp:test_support",
     "//mojo/converters/network",
     "//mojo/public/c/system:for_shared_library",
     "//mojo/services/accessibility/public/interfaces",
+    "//mojo/shell/public/cpp:sources",
+    "//mojo/shell/public/cpp:test_support",
     "//net:test_support",
     "//testing/gtest",
   ]
diff --git a/components/html_viewer/DEPS b/components/html_viewer/DEPS
index 6b44e1f..43b66df 100644
--- a/components/html_viewer/DEPS
+++ b/components/html_viewer/DEPS
@@ -21,7 +21,7 @@ include_rules = [
   "+gpu/command_buffer/common/gles2_cmd_utils.h",
   "+mandoline/services",
   "+media",
-  "+mojo/application",
+  "+mojo/shell",
   "+mojo/cc",
   "+mojo/common",
   "+mojo/converters/blink",
diff --git a/components/html_viewer/ax_provider_apptest.cc b/components/html_viewer/ax_provider_apptest.cc
index a8cd4e2..44ce4d6 100644
--- a/components/html_viewer/ax_provider_apptest.cc
+++ b/components/html_viewer/ax_provider_apptest.cc
@@ -17,10 +17,10 @@
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/web_view/public/interfaces/frame.mojom.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_test_base.h"
 #include "mojo/converters/network/network_type_converters.h"
 #include "mojo/services/accessibility/public/interfaces/accessibility.mojom.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/components/html_viewer/blink_platform_impl.cc b/components/html_viewer/blink_platform_impl.cc
index d8d7812..5127bbe 100644
--- a/components/html_viewer/blink_platform_impl.cc
+++ b/components/html_viewer/blink_platform_impl.cc
@@ -27,9 +27,9 @@
 #include "components/scheduler/child/webthread_impl_for_worker_scheduler.h"
 #include "components/scheduler/renderer/renderer_scheduler.h"
 #include "components/scheduler/renderer/webthread_impl_for_renderer_scheduler.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/connect.h"
 #include "mojo/common/user_agent.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/connect.h"
 #include "net/base/data_url.h"
 #include "net/base/ip_address_number.h"
 #include "net/base/net_errors.h"
diff --git a/components/html_viewer/content_handler_impl.h b/components/html_viewer/content_handler_impl.h
index 50a48d7..7aa8996 100644
--- a/components/html_viewer/content_handler_impl.h
+++ b/components/html_viewer/content_handler_impl.h
@@ -6,9 +6,9 @@
 #define COMPONENTS_HTML_VIEWER_CONTENT_HANDLER_IMPL_H_
 
 #include "base/macros.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/interfaces/content_handler.mojom.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/interfaces/content_handler.mojom.h"
 
 namespace html_viewer {
 
diff --git a/components/html_viewer/global_state.cc b/components/html_viewer/global_state.cc
index 5b4999e..5410fa6 100644
--- a/components/html_viewer/global_state.cc
+++ b/components/html_viewer/global_state.cc
@@ -19,9 +19,9 @@
 #include "components/html_viewer/media_factory.h"
 #include "components/scheduler/renderer/renderer_scheduler.h"
 #include "gin/v8_initializer.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/logging/init_logging.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/components/html_viewer/html_document.cc b/components/html_viewer/html_document.cc
index 3da8c5d..ac2cb21 100644
--- a/components/html_viewer/html_document.cc
+++ b/components/html_viewer/html_document.cc
@@ -25,11 +25,11 @@
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/mus/ws/ids.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/connect.h"
-#include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/public/cpp/system/data_pipe.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/connect.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "ui/gfx/geometry/dip_util.h"
 #include "ui/gfx/geometry/size.h"
diff --git a/components/html_viewer/html_document.h b/components/html_viewer/html_document.h
index 8b7aee2..2eb5d6e 100644
--- a/components/html_viewer/html_document.h
+++ b/components/html_viewer/html_document.h
@@ -17,11 +17,11 @@
 #include "components/html_viewer/public/interfaces/test_html_viewer.mojom.h"
 #include "components/mus/public/cpp/window_tree_delegate.h"
 #include "components/web_view/public/interfaces/frame.mojom.h"
-#include "mojo/application/public/cpp/app_lifetime_helper.h"
-#include "mojo/application/public/cpp/interface_factory.h"
-#include "mojo/application/public/cpp/service_provider_impl.h"
-#include "mojo/application/public/interfaces/application.mojom.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
+#include "mojo/shell/public/cpp/app_lifetime_helper.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
+#include "mojo/shell/public/cpp/service_provider_impl.h"
+#include "mojo/shell/public/interfaces/application.mojom.h"
 
 namespace base {
 class SingleThreadTaskRunner;
diff --git a/components/html_viewer/html_document_application_delegate.cc b/components/html_viewer/html_document_application_delegate.cc
index 79c2834..028ea24 100644
--- a/components/html_viewer/html_document_application_delegate.cc
+++ b/components/html_viewer/html_document_application_delegate.cc
@@ -10,9 +10,9 @@
 #include "base/macros.h"
 #include "components/html_viewer/global_state.h"
 #include "components/html_viewer/html_document.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/connect.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/connect.h"
 
 namespace html_viewer {
 
diff --git a/components/html_viewer/html_document_application_delegate.h b/components/html_viewer/html_document_application_delegate.h
index 6a1676e..a2264cb 100644
--- a/components/html_viewer/html_document_application_delegate.h
+++ b/components/html_viewer/html_document_application_delegate.h
@@ -11,10 +11,10 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "components/html_viewer/html_factory.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 namespace html_viewer {
 
diff --git a/components/html_viewer/html_frame.cc b/components/html_viewer/html_frame.cc
index 3365852..22f3ca9 100644
--- a/components/html_viewer/html_frame.cc
+++ b/components/html_viewer/html_frame.cc
@@ -39,12 +39,12 @@
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/mus/ws/ids.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/connect.h"
-#include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/converters/blink/blink_input_events_type_converters.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/connect.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "third_party/WebKit/public/platform/Platform.h"
 #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h"
 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
diff --git a/components/html_viewer/html_frame_apptest.cc b/components/html_viewer/html_frame_apptest.cc
index f887ef3..1b1829b 100644
--- a/components/html_viewer/html_frame_apptest.cc
+++ b/components/html_viewer/html_frame_apptest.cc
@@ -27,8 +27,8 @@
 #include "components/web_view/frame_tree.h"
 #include "components/web_view/public/interfaces/frame.mojom.h"
 #include "components/web_view/test_frame_tree_delegate.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/services/accessibility/public/interfaces/accessibility.mojom.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 
 using mus::mojom::WindowTreeClientPtr;
diff --git a/components/html_viewer/html_viewer.cc b/components/html_viewer/html_viewer.cc
index 8d541d5..a8616ba 100644
--- a/components/html_viewer/html_viewer.cc
+++ b/components/html_viewer/html_viewer.cc
@@ -8,7 +8,7 @@
 
 #include "components/html_viewer/content_handler_impl.h"
 #include "components/html_viewer/global_state.h"
-#include "mojo/application/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_connection.h"
 
 namespace html_viewer {
 
diff --git a/components/html_viewer/html_viewer.h b/components/html_viewer/html_viewer.h
index ba8af6a..59563ea 100644
--- a/components/html_viewer/html_viewer.h
+++ b/components/html_viewer/html_viewer.h
@@ -7,9 +7,9 @@
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/interface_factory_impl.h"
-#include "mojo/application/public/interfaces/content_handler.mojom.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/interface_factory_impl.h"
+#include "mojo/shell/public/interfaces/content_handler.mojom.h"
 
 namespace html_viewer {
 
diff --git a/components/html_viewer/html_viewer_main.cc b/components/html_viewer/html_viewer_main.cc
index c256530..cb03407 100644
--- a/components/html_viewer/html_viewer_main.cc
+++ b/components/html_viewer/html_viewer_main.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "components/html_viewer/html_viewer.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(new html_viewer::HTMLViewer);
diff --git a/components/html_viewer/html_widget.cc b/components/html_viewer/html_widget.cc
index 21ac280..0ffd991 100644
--- a/components/html_viewer/html_widget.cc
+++ b/components/html_viewer/html_widget.cc
@@ -15,8 +15,8 @@
 #include "components/html_viewer/web_layer_tree_view_impl.h"
 #include "components/html_viewer/web_storage_namespace_impl.h"
 #include "components/mus/public/cpp/window.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 #include "third_party/WebKit/public/web/WebFrameWidget.h"
 #include "third_party/WebKit/public/web/WebSettings.h"
 #include "third_party/WebKit/public/web/WebView.h"
diff --git a/components/html_viewer/layout_test_html_viewer_main.cc b/components/html_viewer/layout_test_html_viewer_main.cc
index 08186ce..2a56ac9 100644
--- a/components/html_viewer/layout_test_html_viewer_main.cc
+++ b/components/html_viewer/layout_test_html_viewer_main.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "components/html_viewer/layout_test_html_viewer.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(new html_viewer::LayoutTestHTMLViewer);
diff --git a/components/html_viewer/media_factory.cc b/components/html_viewer/media_factory.cc
index 613ac61..dda9427 100644
--- a/components/html_viewer/media_factory.cc
+++ b/components/html_viewer/media_factory.cc
@@ -29,8 +29,8 @@
 #include "media/mojo/services/mojo_renderer_factory.h"
 #include "media/renderers/default_renderer_factory.h"
 #include "media/renderers/gpu_video_accelerator_factories.h"
-#include "mojo/application/public/cpp/connect.h"
-#include "mojo/application/public/interfaces/shell.mojom.h"
+#include "mojo/shell/public/cpp/connect.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "v8/include/v8.h"
diff --git a/components/html_viewer/media_factory.h b/components/html_viewer/media_factory.h
index 031e4c9..dc486f4 100644
--- a/components/html_viewer/media_factory.h
+++ b/components/html_viewer/media_factory.h
@@ -15,7 +15,7 @@
 #include "media/base/audio_hardware_config.h"
 #include "media/blink/url_index.h"
 #include "media/mojo/interfaces/service_factory.mojom.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
 
 namespace base {
 class SingleThreadTaskRunner;
diff --git a/components/html_viewer/stats_collection_controller.cc b/components/html_viewer/stats_collection_controller.cc
index 9205027..a234459 100644
--- a/components/html_viewer/stats_collection_controller.cc
+++ b/components/html_viewer/stats_collection_controller.cc
@@ -14,8 +14,8 @@
 #include "components/startup_metric_utils/browser/startup_metric_utils.h"
 #include "gin/handle.h"
 #include "gin/object_template_builder.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/services/tracing/public/cpp/switches.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 
diff --git a/components/html_viewer/web_graphics_context_3d_command_buffer_impl.cc b/components/html_viewer/web_graphics_context_3d_command_buffer_impl.cc
index c4f7a6b..f927610 100644
--- a/components/html_viewer/web_graphics_context_3d_command_buffer_impl.cc
+++ b/components/html_viewer/web_graphics_context_3d_command_buffer_impl.cc
@@ -11,11 +11,11 @@
 #include "components/mus/public/cpp/context_provider.h"
 #include "components/mus/public/interfaces/gpu.mojom.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/gles2/gles2_context.h"
 #include "mojo/gpu/mojo_gles2_impl_autogen.h"
 #include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/system/message_pipe.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 namespace html_viewer {
 
diff --git a/components/mus/BUILD.gn b/components/mus/BUILD.gn
index 2c96d08..24106872 100644
--- a/components/mus/BUILD.gn
+++ b/components/mus/BUILD.gn
@@ -19,10 +19,10 @@ if (is_android) {
     deps = [
       ":lib",
       "public/interfaces",
-      "//mojo/application/public/cpp:sources",
       "//mojo/public/cpp/bindings",
       "//mojo/services/tracing/public/interfaces",
       "//mojo/shell",
+      "//mojo/shell/public/cpp:sources",
     ]
   }
 } else {
@@ -33,7 +33,7 @@ if (is_android) {
 
     deps = [
       ":lib",
-      "//mojo/application/public/cpp:sources",
+      "//mojo/shell/public/cpp:sources",
     ]
 
     if (is_win) {
@@ -75,9 +75,9 @@ source_set("lib") {
     "//components/mus/public/interfaces",
     "//components/mus/surfaces",
     "//components/mus/ws:lib",
-    "//mojo/application/public/cpp",
     "//mojo/common:common_base",
     "//mojo/services/tracing/public/cpp",
+    "//mojo/shell/public/cpp",
     "//ui/events",
     "//ui/gl:gl",
     "//ui/platform_window:platform_impls",
diff --git a/components/mus/DEPS b/components/mus/DEPS
index 33261cd..13a109e 100644
--- a/components/mus/DEPS
+++ b/components/mus/DEPS
@@ -1,7 +1,7 @@
 include_rules = [
   "+cc",
   "+components/gpu",
-  "+mojo/application",
+  "+mojo/shell",
   "+mojo/common",
   "+mojo/converters",
   "+mojo/public",
diff --git a/components/mus/android_loader.cc b/components/mus/android_loader.cc
index a7e9b72..e910225 100644
--- a/components/mus/android_loader.cc
+++ b/components/mus/android_loader.cc
@@ -5,7 +5,7 @@
 #include "components/mus/android_loader.h"
 
 #include "components/mus/mus_app.h"
-#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 namespace mus {
 
diff --git a/components/mus/main.cc b/components/mus/main.cc
index 4a0edb9..3dea969 100644
--- a/components/mus/main.cc
+++ b/components/mus/main.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "components/mus/mus_app.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(new mus::MandolineUIServicesApp);
diff --git a/components/mus/mus_app.cc b/components/mus/mus_app.cc
index c51fe59..7454fab 100644
--- a/components/mus/mus_app.cc
+++ b/components/mus/mus_app.cc
@@ -15,11 +15,11 @@
 #include "components/mus/ws/window_tree_host_connection.h"
 #include "components/mus/ws/window_tree_host_impl.h"
 #include "components/mus/ws/window_tree_impl.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 #include "ui/events/event_switches.h"
 #include "ui/events/platform/platform_event_source.h"
 #include "ui/gl/gl_surface.h"
diff --git a/components/mus/mus_app.h b/components/mus/mus_app.h
index 058d418..d318b569 100644
--- a/components/mus/mus_app.h
+++ b/components/mus/mus_app.h
@@ -16,11 +16,11 @@
 #include "components/mus/public/interfaces/window_tree.mojom.h"
 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
 #include "components/mus/ws/connection_manager_delegate.h"
-#include "mojo/application/public/cpp/app_lifetime_helper.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
+#include "mojo/shell/public/cpp/app_lifetime_helper.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 
 namespace mojo {
 class ApplicationImpl;
diff --git a/components/mus/public/cpp/BUILD.gn b/components/mus/public/cpp/BUILD.gn
index 59ca9be..2a5931d 100644
--- a/components/mus/public/cpp/BUILD.gn
+++ b/components/mus/public/cpp/BUILD.gn
@@ -50,8 +50,6 @@ source_set("cpp") {
     "//cc/surfaces",
     "//cc/surfaces:surface_id",
     "//components/mus/common",
-    "//mojo/application/public/cpp",
-    "//mojo/application/public/interfaces",
     "//mojo/converters/geometry",
     "//mojo/converters/surfaces",
     "//mojo/gles2:headers",
@@ -59,6 +57,8 @@ source_set("cpp") {
     "//mojo/public/cpp/bindings:bindings",
     "//mojo/public/cpp/environment",
     "//mojo/public/cpp/system",
+    "//mojo/shell/public/cpp",
+    "//mojo/shell/public/interfaces",
     "//ui/gfx/geometry",
     "//ui/mojo/geometry:interfaces",
   ]
diff --git a/components/mus/public/cpp/lib/window.cc b/components/mus/public/cpp/lib/window.cc
index 46291b0..aae1e20 100644
--- a/components/mus/public/cpp/lib/window.cc
+++ b/components/mus/public/cpp/lib/window.cc
@@ -18,7 +18,7 @@
 #include "components/mus/public/cpp/window_observer.h"
 #include "components/mus/public/cpp/window_surface.h"
 #include "components/mus/public/cpp/window_tracker.h"
-#include "mojo/application/public/cpp/service_provider_impl.h"
+#include "mojo/shell/public/cpp/service_provider_impl.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 
diff --git a/components/mus/public/cpp/lib/window_tree_client_impl.cc b/components/mus/public/cpp/lib/window_tree_client_impl.cc
index 0e46a96..f243d63 100644
--- a/components/mus/public/cpp/lib/window_tree_client_impl.cc
+++ b/components/mus/public/cpp/lib/window_tree_client_impl.cc
@@ -17,11 +17,11 @@
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/mus/public/cpp/window_tree_connection_observer.h"
 #include "components/mus/public/cpp/window_tree_delegate.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/connect.h"
-#include "mojo/application/public/cpp/service_provider_impl.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/connect.h"
+#include "mojo/shell/public/cpp/service_provider_impl.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/size.h"
 
diff --git a/components/mus/public/cpp/lib/window_tree_host_factory.cc b/components/mus/public/cpp/lib/window_tree_host_factory.cc
index 98c111b..2e1c0de 100644
--- a/components/mus/public/cpp/lib/window_tree_host_factory.cc
+++ b/components/mus/public/cpp/lib/window_tree_host_factory.cc
@@ -6,7 +6,7 @@
 
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/mus/public/cpp/window_tree_delegate.h"
-#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 namespace mus {
 
diff --git a/components/mus/public/cpp/tests/BUILD.gn b/components/mus/public/cpp/tests/BUILD.gn
index 13bccc5..f7c2b25 100644
--- a/components/mus/public/cpp/tests/BUILD.gn
+++ b/components/mus/public/cpp/tests/BUILD.gn
@@ -28,8 +28,8 @@ source_set("test_support") {
     "//base",
     "//base/test:test_config",
     "//components/mus/public/cpp",
-    "//mojo/application/public/cpp:sources",
-    "//mojo/application/public/cpp:test_support",
+    "//mojo/shell/public/cpp:sources",
+    "//mojo/shell/public/cpp:test_support",
     "//testing/gtest",
   ]
 }
@@ -51,13 +51,13 @@ test("mojo_view_manager_lib_unittests") {
     "//base/test:test_support",
     "//components/mus/common",
     "//components/mus/public/cpp",
-    "//mojo/application/public/cpp",
     "//mojo/common:common_base",
     "//mojo/converters/geometry",
     "//mojo/converters/input_events",
     "//mojo/gles2",
     "//mojo/platform_handle:platform_handle_impl",
     "//mojo/public/cpp/system",
+    "//mojo/shell/public/cpp",
     "//testing/gtest",
     "//third_party/mojo/src/mojo/edk/system",
     "//ui/events",
diff --git a/components/mus/public/cpp/tests/window_server_test_base.cc b/components/mus/public/cpp/tests/window_server_test_base.cc
index 2022faa..9686c49 100644
--- a/components/mus/public/cpp/tests/window_server_test_base.cc
+++ b/components/mus/public/cpp/tests/window_server_test_base.cc
@@ -11,7 +11,7 @@
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/mus/public/cpp/window_tree_host_factory.h"
-#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 namespace mus {
 namespace {
diff --git a/components/mus/public/cpp/tests/window_server_test_base.h b/components/mus/public/cpp/tests/window_server_test_base.h
index dd3e897..1414ed5 100644
--- a/components/mus/public/cpp/tests/window_server_test_base.h
+++ b/components/mus/public/cpp/tests/window_server_test_base.h
@@ -10,9 +10,9 @@
 #include "components/mus/public/cpp/window_tree_delegate.h"
 #include "components/mus/public/interfaces/window_tree.mojom.h"
 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_test_base.h"
-#include "mojo/application/public/cpp/interface_factory.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 
 namespace mus {
 
diff --git a/components/mus/public/cpp/window.h b/components/mus/public/cpp/window.h
index ef042d2..21661c2 100644
--- a/components/mus/public/cpp/window.h
+++ b/components/mus/public/cpp/window.h
@@ -15,9 +15,9 @@
 #include "components/mus/public/interfaces/mus_constants.mojom.h"
 #include "components/mus/public/interfaces/surface_id.mojom.h"
 #include "components/mus/public/interfaces/window_tree.mojom.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/cpp/system/macros.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rect.h"
 
diff --git a/components/mus/public/cpp/window_tree_delegate.h b/components/mus/public/cpp/window_tree_delegate.h
index d75af40..dd9bb37 100644
--- a/components/mus/public/cpp/window_tree_delegate.h
+++ b/components/mus/public/cpp/window_tree_delegate.h
@@ -8,8 +8,8 @@
 #include <string>
 
 #include "components/mus/public/interfaces/window_tree.mojom.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
 
 namespace mus {
 
diff --git a/components/mus/surfaces/BUILD.gn b/components/mus/surfaces/BUILD.gn
index 8f12ed5..893a00c 100644
--- a/components/mus/surfaces/BUILD.gn
+++ b/components/mus/surfaces/BUILD.gn
@@ -28,10 +28,10 @@ source_set("surfaces") {
     "//gpu/command_buffer/client:gles2_cmd_helper",
     "//gpu/command_buffer/client:gles2_implementation",
     "//gpu/command_buffer/client:gles2_interface",
-    "//mojo/application/public/cpp",
     "//mojo/converters/geometry",
     "//mojo/converters/surfaces",
     "//mojo/services/tracing/public/cpp",
+    "//mojo/shell/public/cpp",
     "//ui/gfx",
     "//ui/gl",
     "//ui/mojo/geometry:interfaces",
diff --git a/components/mus/surfaces/DEPS b/components/mus/surfaces/DEPS
index 7c6b8d2..98322b9 100644
--- a/components/mus/surfaces/DEPS
+++ b/components/mus/surfaces/DEPS
@@ -2,7 +2,7 @@ include_rules = [
   "+cc",
   "+components/gpu",
   "+gpu",
-  "+mojo/application",
+  "+mojo/shell",
   "+mojo/common",
   "+mojo/converters",
   "+mojo/public",
diff --git a/components/mus/ws/BUILD.gn b/components/mus/ws/BUILD.gn
index 9312a0c..29b317d 100644
--- a/components/mus/ws/BUILD.gn
+++ b/components/mus/ws/BUILD.gn
@@ -69,7 +69,6 @@ source_set("lib") {
     "//components/mus/gles2",
     "//components/mus/public/interfaces",
     "//components/mus/surfaces",
-    "//mojo/application/public/cpp",
     "//mojo/common:common_base",
     "//mojo/converters/geometry",
     "//mojo/converters/ime",
@@ -77,6 +76,7 @@ source_set("lib") {
     "//mojo/converters/surfaces",
     "//mojo/public/cpp/bindings:callback",
     "//mojo/services/tracing/public/cpp",
+    "//mojo/shell/public/cpp",
     "//ui/base",
     "//ui/events",
     "//ui/events/platform",
@@ -145,7 +145,6 @@ test("window_manager_unittests") {
     "//components/mus/public/cpp",
     "//components/mus/public/interfaces",
     "//components/mus/surfaces",
-    "//mojo/application/public/interfaces",
     "//mojo/converters/geometry",
     "//mojo/converters/input_events",
     "//mojo/converters/transform",
@@ -153,6 +152,7 @@ test("window_manager_unittests") {
     "//mojo/gles2",
     "//mojo/platform_handle",
     "//mojo/public/cpp/bindings:bindings",
+    "//mojo/shell/public/interfaces",
     "//testing/gtest",
     "//third_party/mojo/src/mojo/edk/test:run_all_unittests",
     "//ui/events",
@@ -184,9 +184,9 @@ mojo_native_application("apptests") {
     "//components/mus/public/cpp",
     "//components/mus/public/cpp/tests:test_support",
     "//components/mus/public/interfaces",
-    "//mojo/application/public/cpp:sources",
-    "//mojo/application/public/cpp:test_support",
     "//mojo/converters/geometry",
+    "//mojo/shell/public/cpp:sources",
+    "//mojo/shell/public/cpp:test_support",
     "//ui/gfx:test_support",
     "//ui/gfx/geometry",
     "//ui/mojo/geometry:interfaces",
diff --git a/components/mus/ws/connection_manager.cc b/components/mus/ws/connection_manager.cc
index b520f04..fd7e782 100644
--- a/components/mus/ws/connection_manager.cc
+++ b/components/mus/ws/connection_manager.cc
@@ -13,10 +13,10 @@
 #include "components/mus/ws/window_coordinate_conversions.h"
 #include "components/mus/ws/window_tree_host_connection.h"
 #include "components/mus/ws/window_tree_impl.h"
-#include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
+#include "mojo/shell/public/cpp/application_connection.h"
 #include "ui/gfx/geometry/size_conversions.h"
 
 namespace mus {
diff --git a/components/mus/ws/display_manager.cc b/components/mus/ws/display_manager.cc
index 1815dd5..e38e1d4 100644
--- a/components/mus/ws/display_manager.cc
+++ b/components/mus/ws/display_manager.cc
@@ -21,14 +21,14 @@
 #include "components/mus/ws/server_window_surface.h"
 #include "components/mus/ws/server_window_surface_manager.h"
 #include "components/mus/ws/window_coordinate_conversions.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
 #include "mojo/converters/input_events/mojo_extended_key_event_data.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_utils.h"
 #include "mojo/converters/transform/transform_type_converters.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 #include "third_party/skia/include/core/SkXfermode.h"
 #include "ui/base/cursor/cursor_loader.h"
 #include "ui/events/event.h"
diff --git a/components/mus/ws/window_manager_client_apptest.cc b/components/mus/ws/window_manager_client_apptest.cc
index 2e65f71..abf575f 100644
--- a/components/mus/ws/window_manager_client_apptest.cc
+++ b/components/mus/ws/window_manager_client_apptest.cc
@@ -15,10 +15,10 @@
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/mus/public/cpp/window_tree_connection_observer.h"
 #include "components/mus/public/cpp/window_tree_delegate.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_test_base.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/mojo/geometry/geometry_util.h"
 
diff --git a/components/mus/ws/window_tree_apptest.cc b/components/mus/ws/window_tree_apptest.cc
index f5ab086..58dc59b 100644
--- a/components/mus/ws/window_tree_apptest.cc
+++ b/components/mus/ws/window_tree_apptest.cc
@@ -14,10 +14,10 @@
 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
 #include "components/mus/ws/ids.h"
 #include "components/mus/ws/test_change_tracker.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_test_base.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
 
 using mojo::ApplicationConnection;
 using mojo::ApplicationDelegate;
diff --git a/components/mus/ws/window_tree_unittest.cc b/components/mus/ws/window_tree_unittest.cc
index 9325f26..713ad18 100644
--- a/components/mus/ws/window_tree_unittest.cc
+++ b/components/mus/ws/window_tree_unittest.cc
@@ -25,9 +25,9 @@
 #include "components/mus/ws/test_change_tracker.h"
 #include "components/mus/ws/window_tree_host_connection.h"
 #include "components/mus/ws/window_tree_impl.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
diff --git a/components/pdf_viewer/BUILD.gn b/components/pdf_viewer/BUILD.gn
index d91db36..56f0649 100644
--- a/components/pdf_viewer/BUILD.gn
+++ b/components/pdf_viewer/BUILD.gn
@@ -19,8 +19,6 @@ mojo_native_application("pdf_viewer") {
     "//components/mus/public/interfaces",
     "//components/web_view/public/interfaces",
     "//gpu",
-    "//mojo/application/public/cpp",
-    "//mojo/application/public/interfaces",
     "//mojo/common",
     "//mojo/common:common_base",
     "//mojo/converters/input_events",
@@ -31,6 +29,8 @@ mojo_native_application("pdf_viewer") {
     "//mojo/services/network/public/interfaces",
     "//mojo/services/tracing/public/cpp",
     "//mojo/services/tracing/public/interfaces",
+    "//mojo/shell/public/cpp",
+    "//mojo/shell/public/interfaces",
     "//third_party/pdfium",
     "//ui/gfx/geometry",
     "//ui/mojo/geometry:interfaces",
diff --git a/components/pdf_viewer/DEPS b/components/pdf_viewer/DEPS
index b625831..4501636 100644
--- a/components/pdf_viewer/DEPS
+++ b/components/pdf_viewer/DEPS
@@ -4,7 +4,7 @@ include_rules = [
   "+components/mus/public",
   "+components/web_view/public",
   "+gpu/GLES2",
-  "+mojo/application/public",
+  "+mojo/shell/public",
   "+mojo/common",
   "+mojo/converters/geometry",
   "+mojo/converters/surfaces",
diff --git a/components/pdf_viewer/pdf_viewer.cc b/components/pdf_viewer/pdf_viewer.cc
index 38eef0b..5897ecc 100644
--- a/components/pdf_viewer/pdf_viewer.cc
+++ b/components/pdf_viewer/pdf_viewer.cc
@@ -22,19 +22,19 @@
 #include "components/mus/public/interfaces/input_events.mojom.h"
 #include "components/mus/public/interfaces/input_key_codes.mojom.h"
 #include "components/web_view/public/interfaces/frame.mojom.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_runner.h"
-#include "mojo/application/public/cpp/connect.h"
-#include "mojo/application/public/cpp/interface_factory_impl.h"
-#include "mojo/application/public/cpp/service_provider_impl.h"
-#include "mojo/application/public/interfaces/content_handler.mojom.h"
-#include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/common/data_pipe_utils.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_runner.h"
+#include "mojo/shell/public/cpp/connect.h"
+#include "mojo/shell/public/cpp/interface_factory_impl.h"
+#include "mojo/shell/public/cpp/service_provider_impl.h"
+#include "mojo/shell/public/interfaces/content_handler.mojom.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "third_party/pdfium/public/fpdf_ext.h"
 #include "third_party/pdfium/public/fpdfview.h"
 #include "ui/gfx/geometry/rect.h"
diff --git a/components/resource_provider/BUILD.gn b/components/resource_provider/BUILD.gn
index 51d3b5a..97d1ee4 100644
--- a/components/resource_provider/BUILD.gn
+++ b/components/resource_provider/BUILD.gn
@@ -17,7 +17,7 @@ if (is_android) {
     deps = [
       ":java_library",
       ":resource_provider_lib",
-      "//mojo/application/public/cpp",
+      "//mojo/shell/public/cpp",
     ]
   }
 
@@ -33,10 +33,10 @@ if (is_android) {
       "//base",
       "//build/config/sanitizers:deps",
       "//components/resource_provider/public/interfaces",
-      "//mojo/application/public/cpp",
       "//mojo/environment:chromium",
       "//mojo/platform_handle:for_shared_library",
       "//mojo/public/c/system:for_shared_library",
+      "//mojo/shell/public/cpp",
       "//url",
     ]
   }
@@ -73,8 +73,8 @@ if (is_android) {
       ":lib",
       "//base",
       "//components/resource_provider/public/interfaces",
-      "//mojo/application/public/cpp",
       "//mojo/environment:chromium",
+      "//mojo/shell/public/cpp",
       "//url",
     ]
   }
@@ -93,10 +93,10 @@ source_set("lib") {
   deps = [
     "//base",
     "//components/resource_provider/public/interfaces",
-    "//mojo/application/public/cpp",
     "//mojo/common:common_base",
     "//mojo/platform_handle",
     "//mojo/services/tracing/public/cpp",
+    "//mojo/shell/public/cpp",
     "//url",
   ]
 }
@@ -137,8 +137,8 @@ mojo_native_application("apptests") {
     "//base/test:test_config",
     "//components/resource_provider/public/cpp",
     "//components/resource_provider/public/interfaces",
-    "//mojo/application/public/cpp:test_support",
     "//mojo/common",
+    "//mojo/shell/public/cpp:test_support",
   ]
 
   data_deps = [
diff --git a/components/resource_provider/DEPS b/components/resource_provider/DEPS
index 5780d73..bae258a 100644
--- a/components/resource_provider/DEPS
+++ b/components/resource_provider/DEPS
@@ -1,5 +1,5 @@
 include_rules = [
-  "+mojo/application",
+  "+mojo/shell",
   "+mojo/common",
   "+mojo/converters",
   "+mojo/platform_handle",
diff --git a/components/resource_provider/main.cc b/components/resource_provider/main.cc
index 60b78c1..92b4c99 100644
--- a/components/resource_provider/main.cc
+++ b/components/resource_provider/main.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "components/resource_provider/resource_provider_app.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(
diff --git a/components/resource_provider/public/cpp/BUILD.gn b/components/resource_provider/public/cpp/BUILD.gn
index 0842a71..3ac9ffb 100644
--- a/components/resource_provider/public/cpp/BUILD.gn
+++ b/components/resource_provider/public/cpp/BUILD.gn
@@ -11,11 +11,11 @@ source_set("cpp") {
   deps = [
     "../interfaces",
     "//base",
-    "//mojo/application/public/cpp",
-    "//mojo/application/public/interfaces",
     "//mojo/common",
     "//mojo/platform_handle",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",
+    "//mojo/shell/public/cpp",
+    "//mojo/shell/public/interfaces",
   ]
 }
diff --git a/components/resource_provider/public/cpp/resource_loader.cc b/components/resource_provider/public/cpp/resource_loader.cc
index 47f7db1..21ce94d 100644
--- a/components/resource_provider/public/cpp/resource_loader.cc
+++ b/components/resource_provider/public/cpp/resource_loader.cc
@@ -9,12 +9,12 @@
 
 #include "base/bind.h"
 #include "base/files/file.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/connect.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
-#include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/platform_handle/platform_handle_functions.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/connect.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 
 namespace resource_provider {
 namespace {
diff --git a/components/resource_provider/public/interfaces/BUILD.gn b/components/resource_provider/public/interfaces/BUILD.gn
index d7abe36..9a70453 100644
--- a/components/resource_provider/public/interfaces/BUILD.gn
+++ b/components/resource_provider/public/interfaces/BUILD.gn
@@ -10,6 +10,6 @@ mojom("interfaces") {
   ]
 
   deps = [
-    "//mojo/application/public/interfaces",
+    "//mojo/shell/public/interfaces",
   ]
 }
diff --git a/components/resource_provider/resource_provider_app.cc b/components/resource_provider/resource_provider_app.cc
index 56506e1..29cc400 100644
--- a/components/resource_provider/resource_provider_app.cc
+++ b/components/resource_provider/resource_provider_app.cc
@@ -8,7 +8,7 @@
 
 #include "components/resource_provider/file_utils.h"
 #include "components/resource_provider/resource_provider_impl.h"
-#include "mojo/application/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_connection.h"
 #include "url/gurl.h"
 
 namespace resource_provider {
diff --git a/components/resource_provider/resource_provider_app.h b/components/resource_provider/resource_provider_app.h
index 6bd9f9f..deeb218 100644
--- a/components/resource_provider/resource_provider_app.h
+++ b/components/resource_provider/resource_provider_app.h
@@ -9,11 +9,11 @@
 
 #include "base/macros.h"
 #include "components/resource_provider/public/interfaces/resource_provider.mojom.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 
 namespace mojo {
 class ApplicationImpl;
diff --git a/components/resource_provider/resource_provider_apptest.cc b/components/resource_provider/resource_provider_apptest.cc
index 8e7c4d8..86b7577 100644
--- a/components/resource_provider/resource_provider_apptest.cc
+++ b/components/resource_provider/resource_provider_apptest.cc
@@ -11,14 +11,14 @@
 #include "base/run_loop.h"
 #include "components/resource_provider/public/cpp/resource_loader.h"
 #include "components/resource_provider/public/interfaces/resource_provider.mojom.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_test_base.h"
-#include "mojo/application/public/cpp/service_provider_impl.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/platform_handle/platform_handle_functions.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/cpp/system/macros.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
+#include "mojo/shell/public/cpp/service_provider_impl.h"
 
 namespace resource_provider {
 namespace {
diff --git a/components/web_view/BUILD.gn b/components/web_view/BUILD.gn
index b228220..8d3a87c 100644
--- a/components/web_view/BUILD.gn
+++ b/components/web_view/BUILD.gn
@@ -59,8 +59,6 @@ source_set("lib") {
     "//components/mus/public/interfaces",
     "//components/resource_provider/public/interfaces",
     "//components/web_view/test_runner/public/interfaces",
-    "//mojo/application/public/cpp:sources",
-    "//mojo/application/public/interfaces",
     "//mojo/common:common_base",
     "//mojo/common:url_type_converters",
     "//mojo/converters/geometry",
@@ -68,6 +66,8 @@ source_set("lib") {
     "//mojo/services/network/public/interfaces",
     "//mojo/services/tracing/public/cpp",
     "//mojo/services/tracing/public/interfaces",
+    "//mojo/shell/public/cpp:sources",
+    "//mojo/shell/public/interfaces",
     "//url",
   ]
 
@@ -87,7 +87,7 @@ mojo_native_application("web_view") {
 
   deps = [
     ":lib",
-    "//mojo/application/public/cpp",
+    "//mojo/shell/public/cpp",
   ]
 }
 
@@ -124,8 +124,8 @@ mojo_native_application("apptests") {
     "//components/mus/public/interfaces",
     "//components/web_view/public/cpp",
     "//components/web_view/public/interfaces",
-    "//mojo/application/public/cpp:sources",
-    "//mojo/application/public/cpp:test_support",
+    "//mojo/shell/public/cpp:sources",
+    "//mojo/shell/public/cpp:test_support",
     "//mojo/util:filename_util",
     "//ui/mojo/geometry:interfaces",
     "//ui/mojo/geometry:util",
diff --git a/components/web_view/DEPS b/components/web_view/DEPS
index 7d07d3d..f9241ae 100644
--- a/components/web_view/DEPS
+++ b/components/web_view/DEPS
@@ -6,7 +6,7 @@ include_rules = [
   "+components/mus/common",
   "+components/mus/public",
   "+components/resource_provider/public/interfaces",
-  "+mojo/application/public",
+  "+mojo/shell/public",
   "+mojo/common",
   "+mojo/converters/geometry",
   "+mojo/public",
diff --git a/components/web_view/frame.cc b/components/web_view/frame.cc
index aa957ba..877a53f 100644
--- a/components/web_view/frame.cc
+++ b/components/web_view/frame.cc
@@ -19,8 +19,8 @@
 #include "components/web_view/frame_tree_delegate.h"
 #include "components/web_view/frame_user_data.h"
 #include "components/web_view/frame_utils.h"
-#include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/common/url_type_converters.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "url/gurl.h"
 
 using mus::Window;
diff --git a/components/web_view/frame_apptest.cc b/components/web_view/frame_apptest.cc
index ce9f9cd..4ff7dc0 100644
--- a/components/web_view/frame_apptest.cc
+++ b/components/web_view/frame_apptest.cc
@@ -26,11 +26,11 @@
 #include "components/web_view/frame_tree_delegate.h"
 #include "components/web_view/frame_user_data.h"
 #include "components/web_view/test_frame_tree_delegate.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_test_base.h"
-#include "mojo/application/public/cpp/service_provider_impl.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
+#include "mojo/shell/public/cpp/service_provider_impl.h"
 
 using mus::Window;
 using mus::WindowTreeConnection;
diff --git a/components/web_view/frame_connection.cc b/components/web_view/frame_connection.cc
index b7f2fd5..a29b0501 100644
--- a/components/web_view/frame_connection.cc
+++ b/components/web_view/frame_connection.cc
@@ -16,13 +16,13 @@
 #include "components/web_view/frame_tree.h"
 #include "components/web_view/frame_utils.h"
 #include "components/web_view/test_runner/public/interfaces/layout_test_runner.mojom.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/services/network/public/interfaces/cookie_store.mojom.h"
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
 #include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h"
 #include "mojo/services/network/public/interfaces/web_socket_factory.mojom.h"
 #include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 #if defined(OS_LINUX) && !defined(OS_ANDROID)
 #include "components/font_service/public/interfaces/font_service.mojom.h"
diff --git a/components/web_view/frame_devtools_agent.cc b/components/web_view/frame_devtools_agent.cc
index cf4cd25..f2667b1 100644
--- a/components/web_view/frame_devtools_agent.cc
+++ b/components/web_view/frame_devtools_agent.cc
@@ -15,8 +15,8 @@
 #include "base/macros.h"
 #include "base/values.h"
 #include "components/web_view/frame_devtools_agent_delegate.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 #include "url/gurl.h"
 
 namespace web_view {
diff --git a/components/web_view/frame_utils.cc b/components/web_view/frame_utils.cc
index 27fb218..b95e4f9 100644
--- a/components/web_view/frame_utils.cc
+++ b/components/web_view/frame_utils.cc
@@ -6,7 +6,7 @@
 
 #include "base/command_line.h"
 #include "components/web_view/web_view_switches.h"
-#include "mojo/application/public/interfaces/shell.mojom.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 
 namespace web_view {
 namespace {
diff --git a/components/web_view/main.cc b/components/web_view/main.cc
index 6323f9b..aa66dc3 100644
--- a/components/web_view/main.cc
+++ b/components/web_view/main.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "components/web_view/web_view_application_delegate.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(new web_view::WebViewApplicationDelegate);
diff --git a/components/web_view/public/cpp/BUILD.gn b/components/web_view/public/cpp/BUILD.gn
index 789939a..81e6f12 100644
--- a/components/web_view/public/cpp/BUILD.gn
+++ b/components/web_view/public/cpp/BUILD.gn
@@ -12,9 +12,9 @@ source_set("cpp") {
     "//base",
     "//components/mus/public/cpp",
     "//components/web_view/public/interfaces",
-    "//mojo/application/public/cpp",
     "//mojo/converters/geometry",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",
+    "//mojo/shell/public/cpp",
   ]
 }
diff --git a/components/web_view/public/cpp/web_view.cc b/components/web_view/public/cpp/web_view.cc
index 1d966b3..7f66c69 100644
--- a/components/web_view/public/cpp/web_view.cc
+++ b/components/web_view/public/cpp/web_view.cc
@@ -9,7 +9,7 @@
 
 #include "base/bind.h"
 #include "components/mus/public/cpp/window.h"
-#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 namespace web_view {
 namespace {
diff --git a/components/web_view/test_runner/BUILD.gn b/components/web_view/test_runner/BUILD.gn
index 4a528cb..9f8a4b9 100644
--- a/components/web_view/test_runner/BUILD.gn
+++ b/components/web_view/test_runner/BUILD.gn
@@ -58,9 +58,9 @@ mojo_native_application("web_view_test_runner") {
     "//components/web_view/public/cpp",
     "//components/web_view/public/interfaces",
     "//components/web_view/test_runner/public/interfaces",
-    "//mojo/application/public/cpp",
     "//mojo/common",
     "//mojo/converters/geometry",
+    "//mojo/shell/public/cpp",
     "//ui/gfx/geometry",
     "//url",
   ]
diff --git a/components/web_view/test_runner/DEPS b/components/web_view/test_runner/DEPS
index 0792749..eb21a94 100644
--- a/components/web_view/test_runner/DEPS
+++ b/components/web_view/test_runner/DEPS
@@ -3,7 +3,7 @@ include_rules = [
   "+components/mus/public",
   "+components/test_runner",
   "+components/web_view/public",
-  "+mojo/application/public",
+  "+mojo/shell/public",
   "+mojo/public",
   "+mojo/runner",
   "+ui/gfx",
diff --git a/components/web_view/test_runner/test_runner_application_delegate.cc b/components/web_view/test_runner/test_runner_application_delegate.cc
index b0cf38d..af583a4 100644
--- a/components/web_view/test_runner/test_runner_application_delegate.cc
+++ b/components/web_view/test_runner/test_runner_application_delegate.cc
@@ -22,10 +22,10 @@
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/mus/public/cpp/window_tree_host_factory.h"
 #include "components/test_runner/blink_test_platform_support.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "url/gurl.h"
diff --git a/components/web_view/test_runner/test_runner_application_delegate.h b/components/web_view/test_runner/test_runner_application_delegate.h
index 49a0ee1..a475ac7 100644
--- a/components/web_view/test_runner/test_runner_application_delegate.h
+++ b/components/web_view/test_runner/test_runner_application_delegate.h
@@ -16,9 +16,9 @@
 #include "components/web_view/public/cpp/web_view.h"
 #include "components/web_view/public/interfaces/web_view.mojom.h"
 #include "components/web_view/test_runner/public/interfaces/layout_test_runner.mojom.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/common/weak_binding_set.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 
 class GURL;
 
diff --git a/components/web_view/test_runner/test_runner_main.cc b/components/web_view/test_runner/test_runner_main.cc
index 8925ace..b157c38 100644
--- a/components/web_view/test_runner/test_runner_main.cc
+++ b/components/web_view/test_runner/test_runner_main.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "components/web_view/test_runner/test_runner_application_delegate.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(new web_view::TestRunnerApplicationDelegate);
diff --git a/components/web_view/web_view_application_delegate.cc b/components/web_view/web_view_application_delegate.cc
index d66b775..c6de155 100644
--- a/components/web_view/web_view_application_delegate.cc
+++ b/components/web_view/web_view_application_delegate.cc
@@ -7,7 +7,7 @@
 #include <utility>
 
 #include "components/web_view/web_view_impl.h"
-#include "mojo/application/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_connection.h"
 
 namespace web_view {
 
diff --git a/components/web_view/web_view_application_delegate.h b/components/web_view/web_view_application_delegate.h
index a5482ba..b06463a 100644
--- a/components/web_view/web_view_application_delegate.h
+++ b/components/web_view/web_view_application_delegate.h
@@ -7,10 +7,10 @@
 
 #include "base/macros.h"
 #include "components/web_view/public/interfaces/web_view.mojom.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 
 namespace web_view {
 
diff --git a/components/web_view/web_view_impl.cc b/components/web_view/web_view_impl.cc
index 43f0111..6d140cb 100644
--- a/components/web_view/web_view_impl.cc
+++ b/components/web_view/web_view_impl.cc
@@ -21,8 +21,8 @@
 #include "components/web_view/navigation_entry.h"
 #include "components/web_view/pending_web_view_load.h"
 #include "components/web_view/url_request_cloneable.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 #include "url/gurl.h"
 
 namespace web_view {
diff --git a/content/app/BUILD.gn b/content/app/BUILD.gn
index 923e608..6abee23 100644
--- a/content/app/BUILD.gn
+++ b/content/app/BUILD.gn
@@ -64,7 +64,7 @@ if (is_ios) {
   ]
 } else {
   content_app_deps += [
-    "//mojo/application/public/interfaces",
+    "//mojo/shell/public/interfaces",
     "//mojo/environment:chromium",
     "//third_party/mojo/src/mojo/edk/system",
   ]
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 8222e0a..cc4419c 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -38,12 +38,12 @@ source_set("browser") {
     "//device/battery",
     "//device/vibration",
     "//google_apis",
-    "//mojo/application/public/cpp:cpp_for_chromium",
-    "//mojo/application/public/interfaces",
     "//mojo/common",
     "//mojo/public/cpp/bindings",
     "//mojo/shell",
     "//mojo/shell/package_manager",
+    "//mojo/shell/public/cpp:cpp_for_chromium",
+    "//mojo/shell/public/interfaces",
     "//net",
     "//net:extras",
     "//skia",
@@ -127,11 +127,11 @@ source_set("browser") {
       "//content/public/common:mojo_bindings",
       "//device/bluetooth",
       "//gin",
-      "//mojo/application/public/interfaces",
       "//mojo/common:url_type_converters",
       "//mojo/converters/geometry",
       "//mojo/public/cpp/bindings",
       "//mojo/public/js",
+      "//mojo/shell/public/interfaces",
       "//skia/public",
       "//storage/browser",
       "//storage/common",
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 732f0e2..6255f4a 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -177,8 +177,8 @@
 #if defined(MOJO_SHELL_CLIENT)
 #include "components/mus/public/interfaces/window_manager.mojom.h"
 #include "content/common/mojo/mojo_shell_connection_impl.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/converters/network/network_type_converters.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
 #include "ui/views/mus/window_manager_connection.h"
 #endif
diff --git a/content/browser/frame_host/frame_mojo_shell.h b/content/browser/frame_host/frame_mojo_shell.h
index d2cc6bb..08a60e9 100644
--- a/content/browser/frame_host/frame_mojo_shell.h
+++ b/content/browser/frame_host/frame_mojo_shell.h
@@ -7,9 +7,9 @@
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 
 namespace content {
 
diff --git a/content/browser/mojo/mojo_app_connection_impl.h b/content/browser/mojo/mojo_app_connection_impl.h
index 6fc4ea3..3cdfc59 100644
--- a/content/browser/mojo/mojo_app_connection_impl.h
+++ b/content/browser/mojo/mojo_app_connection_impl.h
@@ -7,7 +7,7 @@
 
 #include "base/macros.h"
 #include "content/public/browser/mojo_app_connection.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
 
 class GURL;
 
diff --git a/content/browser/mojo/mojo_shell_client_host.cc b/content/browser/mojo/mojo_shell_client_host.cc
index b11b636..e9b6896 100644
--- a/content/browser/mojo/mojo_shell_client_host.cc
+++ b/content/browser/mojo/mojo_shell_client_host.cc
@@ -17,9 +17,9 @@
 #include "content/public/browser/render_process_host_observer.h"
 #include "content/public/common/mojo_shell_connection.h"
 #include "ipc/ipc_sender.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/interfaces/application_manager.mojom.h"
 #include "mojo/converters/network/network_type_converters.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/interfaces/application_manager.mojom.h"
 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
 #include "third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h"
 #include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h"
diff --git a/content/browser/mojo/mojo_shell_client_host.h b/content/browser/mojo/mojo_shell_client_host.h
index 8566af1..5624643 100644
--- a/content/browser/mojo/mojo_shell_client_host.h
+++ b/content/browser/mojo/mojo_shell_client_host.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/process/process_handle.h"
-#include "mojo/application/public/interfaces/shell.mojom.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h"
 
 namespace content {
diff --git a/content/browser/mojo/mojo_shell_context.cc b/content/browser/mojo/mojo_shell_context.cc
index 6cdaeb0..199744d 100644
--- a/content/browser/mojo/mojo_shell_context.cc
+++ b/content/browser/mojo/mojo_shell_context.cc
@@ -20,7 +20,6 @@
 #include "content/public/browser/utility_process_host_client.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/service_registry.h"
-#include "mojo/application/public/cpp/application_delegate.h"
 #include "mojo/common/url_type_converters.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/string.h"
@@ -28,6 +27,7 @@
 #include "mojo/shell/connect_to_application_params.h"
 #include "mojo/shell/identity.h"
 #include "mojo/shell/package_manager/package_manager_impl.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
 #include "mojo/shell/static_application_loader.h"
 
 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) || \
diff --git a/content/browser/mojo/mojo_shell_context.h b/content/browser/mojo/mojo_shell_context.h
index b838781..e45ab88 100644
--- a/content/browser/mojo/mojo_shell_context.h
+++ b/content/browser/mojo/mojo_shell_context.h
@@ -13,8 +13,8 @@
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/common/content_export.h"
-#include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/shell/application_manager.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 
 class GURL;
 
diff --git a/content/browser/renderer_host/render_widget_host_view_mus.cc b/content/browser/renderer_host/render_widget_host_view_mus.cc
index 26a0022..3cfdacf 100644
--- a/content/browser/renderer_host/render_widget_host_view_mus.cc
+++ b/content/browser/renderer_host/render_widget_host_view_mus.cc
@@ -14,7 +14,7 @@
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/common/render_widget_window_tree_client_factory.mojom.h"
 #include "content/public/common/mojo_shell_connection.h"
-#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn
index 5a70f60..86e154d 100644
--- a/content/child/BUILD.gn
+++ b/content/child/BUILD.gn
@@ -31,10 +31,10 @@ source_set("child") {
     "//components/tracing:startup_tracing",
     "//components/webcrypto",
     "//content/common:mojo_bindings",
-    "//mojo/application/public/interfaces",
     "//mojo/common",
     "//mojo/environment:chromium",
     "//mojo/message_pump",
+    "//mojo/shell/public/interfaces",
     "//net",
     "//skia",
     "//third_party/icu",
diff --git a/content/child/DEPS b/content/child/DEPS
index 524e4d0f..14bada5 100644
--- a/content/child/DEPS
+++ b/content/child/DEPS
@@ -10,7 +10,7 @@ include_rules = [
   "+content/app/strings/grit",  # For generated headers
   "+content/public/child",
   "+media/base",
-  "+mojo/application",
+  "+mojo/shell",
   "+mojo/shell",
   "+v8/include/v8.h"
 ]
diff --git a/content/child/process_control_impl.h b/content/child/process_control_impl.h
index f3756ac..6d85c50 100644
--- a/content/child/process_control_impl.h
+++ b/content/child/process_control_impl.h
@@ -9,8 +9,8 @@
 
 #include "base/macros.h"
 #include "content/common/process_control.mojom.h"
-#include "mojo/application/public/interfaces/application.mojom.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
+#include "mojo/shell/public/interfaces/application.mojom.h"
 
 class GURL;
 
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index 5fb4e35..d2ef67d 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -160,9 +160,9 @@ source_set("common") {
     "//components/tracing:startup_tracing",
     "//gpu/command_buffer/client:gles2_interface",
     "//gpu/command_buffer/common:gles2_utils",
-    "//mojo/application/public/cpp",
     "//mojo/converters/network",
     "//mojo/runner/child:lib",
+    "//mojo/shell/public/cpp",
     "//net",
     "//skia",
     "//third_party/icu",
@@ -199,9 +199,9 @@ source_set("common") {
       "//media",
       "//media:shared_memory_support",
       "//media/midi",
-      "//mojo/application/public/interfaces",
       "//mojo/common:common_base",
       "//mojo/environment:chromium",
+      "//mojo/shell/public/interfaces",
       "//sandbox",
       "//storage/common",
       "//third_party/WebKit/public:blink",
@@ -548,7 +548,7 @@ mojom("mojo_bindings") {
   deps = [
     "//components/mus/public/interfaces",
     "//content/public/common:mojo_bindings",
-    "//mojo/application/public/interfaces",
+    "//mojo/shell/public/interfaces",
     "//skia/public/interfaces",
     "//ui/mojo/geometry:interfaces",
   ]
diff --git a/content/common/application_setup.mojom b/content/common/application_setup.mojom
index 1005663..df45c5a 100644
--- a/content/common/application_setup.mojom
+++ b/content/common/application_setup.mojom
@@ -4,7 +4,7 @@
 
 module content;
 
-import "mojo/application/public/interfaces/service_provider.mojom";
+import "mojo/shell/public/interfaces/service_provider.mojom";
 
 interface ApplicationSetup {
   ExchangeServiceProviders(mojo.ServiceProvider& services,
diff --git a/content/common/mojo/DEPS b/content/common/mojo/DEPS
index a8c7fc4..c70d064 100644
--- a/content/common/mojo/DEPS
+++ b/content/common/mojo/DEPS
@@ -1,6 +1,6 @@
 include_rules = [
-  "+mojo/application/public/cpp",
-  "+mojo/application/public/interfaces",
+  "+mojo/shell/public/cpp",
+  "+mojo/shell/public/interfaces",
   "+mojo/converters/network",
   "+mojo/runner/child",
 ]
diff --git a/content/common/mojo/mojo_shell_connection_impl.cc b/content/common/mojo/mojo_shell_connection_impl.cc
index 0c6a3df..34bf88a 100644
--- a/content/common/mojo/mojo_shell_connection_impl.cc
+++ b/content/common/mojo/mojo_shell_connection_impl.cc
@@ -10,10 +10,10 @@
 #include "base/lazy_instance.h"
 #include "base/stl_util.h"
 #include "base/threading/thread_local.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/converters/network/network_type_converters.h"
 #include "mojo/runner/child/runner_connection.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 namespace content {
 namespace {
diff --git a/content/common/mojo/mojo_shell_connection_impl.h b/content/common/mojo/mojo_shell_connection_impl.h
index 872ee2b..3f7ecfa 100644
--- a/content/common/mojo/mojo_shell_connection_impl.h
+++ b/content/common/mojo/mojo_shell_connection_impl.h
@@ -10,8 +10,8 @@
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/common/mojo_shell_connection.h"
-#include "mojo/application/public/cpp/application_delegate.h"
 #include "mojo/public/cpp/system/message_pipe.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
 
 namespace mojo {
 namespace runner {
diff --git a/content/common/mojo/service_registry_impl.h b/content/common/mojo/service_registry_impl.h
index 80f4ef0..5e4fd73 100644
--- a/content/common/mojo/service_registry_impl.h
+++ b/content/common/mojo/service_registry_impl.h
@@ -14,9 +14,9 @@
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "content/public/common/service_registry.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/system/core.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
 
 namespace content {
 
diff --git a/content/common/process_control.mojom b/content/common/process_control.mojom
index 4b3237a..efd0adc 100644
--- a/content/common/process_control.mojom
+++ b/content/common/process_control.mojom
@@ -4,7 +4,7 @@
 
 module content;
 
-import "mojo/application/public/interfaces/application.mojom";
+import "mojo/shell/public/interfaces/application.mojom";
 
 interface ProcessControl {
   LoadApplication(string url, mojo.Application& request) => (bool success);
diff --git a/content/common/render_frame_setup.mojom b/content/common/render_frame_setup.mojom
index b32f953..abe4f65 100644
--- a/content/common/render_frame_setup.mojom
+++ b/content/common/render_frame_setup.mojom
@@ -4,7 +4,7 @@
 
 module content;
 
-import "mojo/application/public/interfaces/service_provider.mojom";
+import "mojo/shell/public/interfaces/service_provider.mojom";
 
 interface RenderFrameSetup {
   ExchangeServiceProviders(int32 frame_routing_id,
diff --git a/content/common/service_worker/embedded_worker_setup.mojom b/content/common/service_worker/embedded_worker_setup.mojom
index a4bede7..4a74854 100644
--- a/content/common/service_worker/embedded_worker_setup.mojom
+++ b/content/common/service_worker/embedded_worker_setup.mojom
@@ -4,7 +4,7 @@
 
 module content;
 
-import "mojo/application/public/interfaces/service_provider.mojom";
+import "mojo/shell/public/interfaces/service_provider.mojom";
 
 interface EmbeddedWorkerSetup {
   ExchangeServiceProviders(int32 thread_id,
diff --git a/content/gpu/BUILD.gn b/content/gpu/BUILD.gn
index 33a3675..91600f1 100644
--- a/content/gpu/BUILD.gn
+++ b/content/gpu/BUILD.gn
@@ -44,7 +44,7 @@ source_set("gpu_sources") {
     "//base",
     "//content:export",
     "//content/public/child:child_sources",
-    "//mojo/application/public/interfaces",
+    "//mojo/shell/public/interfaces",
     "//skia",
     "//ui/gl",
   ]
diff --git a/content/plugin/BUILD.gn b/content/plugin/BUILD.gn
index ed12ee6..6e87a12 100644
--- a/content/plugin/BUILD.gn
+++ b/content/plugin/BUILD.gn
@@ -33,7 +33,7 @@ if (enable_plugins && !is_linux) {
     deps = [
       "//content:export",
       "//content/public/common:common_sources",
-      "//mojo/application/public/interfaces",
+      "//mojo/shell/public/interfaces",
       "//skia",
       "//third_party/WebKit/public:blink",
       "//third_party/npapi",
diff --git a/content/ppapi_plugin/BUILD.gn b/content/ppapi_plugin/BUILD.gn
index f5fc125..e127a3d 100644
--- a/content/ppapi_plugin/BUILD.gn
+++ b/content/ppapi_plugin/BUILD.gn
@@ -39,7 +39,7 @@ source_set("ppapi_plugin_sources") {
     "//content:export",
     "//content/public/child:child_sources",
     "//content/public/common:common_sources",
-    "//mojo/application/public/interfaces",
+    "//mojo/shell/public/interfaces",
     "//ppapi/proxy:ipc",
     "//skia",
     "//third_party/WebKit/public:blink",
diff --git a/content/public/test/DEPS b/content/public/test/DEPS
index 88c3916..8d005cf 100644
--- a/content/public/test/DEPS
+++ b/content/public/test/DEPS
@@ -1,7 +1,7 @@
 include_rules = [
   "-content",
   "+content/public",
-  "+mojo/application",
+  "+mojo/shell",
   "+v8/include/v8.h",
 ]
 
diff --git a/content/public/test/test_mojo_app.cc b/content/public/test/test_mojo_app.cc
index aac7665..488f8c1 100644
--- a/content/public/test/test_mojo_app.cc
+++ b/content/public/test/test_mojo_app.cc
@@ -7,8 +7,8 @@
 #include <utility>
 
 #include "base/logging.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 namespace content {
 
diff --git a/content/public/test/test_mojo_app.h b/content/public/test/test_mojo_app.h
index c37d529..760645b 100644
--- a/content/public/test/test_mojo_app.h
+++ b/content/public/test/test_mojo_app.h
@@ -7,9 +7,9 @@
 
 #include "base/macros.h"
 #include "content/public/test/test_mojo_service.mojom.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 #include "url/gurl.h"
 
 namespace content {
diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
index c3234b0..f480c13 100644
--- a/content/renderer/BUILD.gn
+++ b/content/renderer/BUILD.gn
@@ -57,13 +57,13 @@ source_set("renderer") {
     "//media",
     "//media/blink",
     "//media/midi",
-    "//mojo/application/public/cpp",
-    "//mojo/application/public/interfaces",
     "//mojo/common:url_type_converters",
     "//mojo/converters/geometry",
     "//mojo/environment:chromium",
     "//mojo/public/cpp/bindings",
     "//mojo/public/js",
+    "//mojo/shell/public/cpp",
+    "//mojo/shell/public/interfaces",
     "//net",
     "//skia",
     "//skia/public",
diff --git a/content/renderer/mus/render_widget_mus_connection.cc b/content/renderer/mus/render_widget_mus_connection.cc
index 9a68449..d34fad9 100644
--- a/content/renderer/mus/render_widget_mus_connection.cc
+++ b/content/renderer/mus/render_widget_mus_connection.cc
@@ -18,9 +18,9 @@
 #include "content/renderer/mus/compositor_mus_connection.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view_impl.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_utils.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 namespace content {
 
diff --git a/content/renderer/mus/render_widget_window_tree_client_factory.cc b/content/renderer/mus/render_widget_window_tree_client_factory.cc
index 4bc5805..1451490 100644
--- a/content/renderer/mus/render_widget_window_tree_client_factory.cc
+++ b/content/renderer/mus/render_widget_window_tree_client_factory.cc
@@ -12,9 +12,9 @@
 #include "content/common/render_widget_window_tree_client_factory.mojom.h"
 #include "content/public/common/mojo_shell_connection.h"
 #include "content/renderer/mus/render_widget_mus_connection.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/common/weak_binding_set.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 #include "url/gurl.h"
 
 namespace content {
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 03908b3..88306cc 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -214,9 +214,9 @@
 
 #if defined(ENABLE_MOJO_MEDIA)
 #include "media/mojo/services/mojo_cdm_factory.h"  // nogncheck
-#include "mojo/application/public/cpp/connect.h"
-#include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
+#include "mojo/shell/public/cpp/connect.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 #endif
 
 #if defined(ENABLE_MOJO_MEDIA) && !defined(OS_ANDROID)
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index a6154c2..72fd2a7 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -34,8 +34,8 @@
 #include "ipc/ipc_platform_file.h"
 #include "media/blink/webmediaplayer_delegate.h"
 #include "media/blink/webmediaplayer_params.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
-#include "mojo/application/public/interfaces/shell.mojom.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "third_party/WebKit/public/platform/WebFocusType.h"
 #include "third_party/WebKit/public/platform/modules/app_banner/WebAppBannerClient.h"
 #include "third_party/WebKit/public/web/WebAXObject.h"
diff --git a/content/renderer/service_worker/service_worker_context_client.h b/content/renderer/service_worker/service_worker_context_client.h
index f2b9928..6356e37 100644
--- a/content/renderer/service_worker/service_worker_context_client.h
+++ b/content/renderer/service_worker/service_worker_context_client.h
@@ -22,7 +22,7 @@
 #include "content/common/service_worker/service_worker_types.h"
 #include "content/public/common/service_worker_event_status.mojom.h"
 #include "ipc/ipc_listener.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
 #include "third_party/WebKit/public/platform/WebGeofencingEventType.h"
 #include "third_party/WebKit/public/platform/WebMessagePortChannel.h"
 #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerError.h"
diff --git a/content/renderer/usb/web_usb_device_impl.cc b/content/renderer/usb/web_usb_device_impl.cc
index ab812fd..d1db890 100644
--- a/content/renderer/usb/web_usb_device_impl.cc
+++ b/content/renderer/usb/web_usb_device_impl.cc
@@ -12,8 +12,8 @@
 #include "content/child/scoped_web_callbacks.h"
 #include "content/renderer/usb/type_converters.h"
 #include "device/devices_app/public/cpp/constants.h"
-#include "mojo/application/public/cpp/connect.h"
-#include "mojo/application/public/interfaces/shell.mojom.h"
+#include "mojo/shell/public/cpp/connect.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/public/platform/modules/webusb/WebUSBDeviceInfo.h"
 #include "third_party/WebKit/public/platform/modules/webusb/WebUSBTransferInfo.h"
diff --git a/content/renderer/usb/web_usb_device_impl.h b/content/renderer/usb/web_usb_device_impl.h
index 4e49ae9..dd2e9a2 100644
--- a/content/renderer/usb/web_usb_device_impl.h
+++ b/content/renderer/usb/web_usb_device_impl.h
@@ -13,7 +13,7 @@
 #include "base/memory/weak_ptr.h"
 #include "device/devices_app/usb/public/interfaces/device.mojom.h"
 #include "device/devices_app/usb/public/interfaces/device_manager.mojom.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
 #include "third_party/WebKit/public/platform/modules/webusb/WebUSBDevice.h"
 #include "third_party/WebKit/public/platform/modules/webusb/WebUSBDeviceInfo.h"
 #include "third_party/WebKit/public/platform/modules/webusb/WebUSBError.h"
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index c9d3a05..641c4c1 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -99,8 +99,8 @@ source_set("test_support") {
       "//ipc:test_support",
       "//ipc/mojo",
       "//media",
-      "//mojo/application/public/cpp:cpp_for_chromium",
       "//mojo/environment:chromium",
+      "//mojo/shell/public/cpp:cpp_for_chromium",
       "//storage/browser",
       "//storage/common",
       "//third_party/mojo/src/mojo/edk/test:test_support",
@@ -388,10 +388,10 @@ test("content_browsertests") {
     "//media:test_support",
     "//media/audio:test_support",
     "//media/base:test_support",
-    "//mojo/application/public/cpp:cpp_for_chromium",
     "//mojo/environment:chromium",
     "//mojo/public/cpp/bindings",
     "//mojo/public/js",
+    "//mojo/shell/public/cpp:cpp_for_chromium",
     "//mojo/test:test_support",
     "//net:test_support",
     "//testing/gmock",
diff --git a/content/test/data/web_ui_mojo_shell_test.js b/content/test/data/web_ui_mojo_shell_test.js
index 15c2a8f..b0ba4d0 100644
--- a/content/test/data/web_ui_mojo_shell_test.js
+++ b/content/test/data/web_ui_mojo_shell_test.js
@@ -11,13 +11,13 @@ var TEST_APP_URL = 'system:content_mojo_test';
 
 
 define('main', [
-  'mojo/application/public/interfaces/shell.mojom',
   'mojo/public/js/core',
   'mojo/public/js/router',
   'mojo/services/network/public/interfaces/url_loader.mojom',
+  'mojo/shell/public/interfaces/shell.mojom',
   'content/public/renderer/service_provider',
   'content/public/test/test_mojo_service.mojom',
-], function(shellMojom, core, router, urlMojom, serviceRegistry, testMojom) {
+], function (core, router, urlMojom, shellMojom, serviceRegistry, testMojom) {
 
   var connectToService = function(serviceProvider, iface) {
     var pipe = core.createMessagePipe();
diff --git a/content/utility/BUILD.gn b/content/utility/BUILD.gn
index 65012ac..8bb058a 100644
--- a/content/utility/BUILD.gn
+++ b/content/utility/BUILD.gn
@@ -22,11 +22,11 @@ source_set("utility") {
     "//content/public/common:common_sources",
     "//content/public/common:mojo_bindings",
     "//courgette:courgette_lib",
-    "//mojo/application/public/cpp:cpp_for_chromium",
-    "//mojo/application/public/interfaces",
     "//mojo/common",
     "//mojo/public/cpp/bindings",
     "//mojo/shell",
+    "//mojo/shell/public/cpp:cpp_for_chromium",
+    "//mojo/shell/public/interfaces",
     "//third_party/WebKit/public:blink_headers",
     "//url",
   ]
diff --git a/content/utility/DEPS b/content/utility/DEPS
index b714ae1..482337a 100644
--- a/content/utility/DEPS
+++ b/content/utility/DEPS
@@ -3,7 +3,7 @@ include_rules = [
   "+content/child",
   "+content/public/utility",
   "+media/mojo/services",
-  "+mojo/application",
+  "+mojo/shell",
   "+mojo/shell",
   "+sandbox/win/src",
 ]
diff --git a/device/devices_app/BUILD.gn b/device/devices_app/BUILD.gn
index 2601cf2..f189e6b 100644
--- a/device/devices_app/BUILD.gn
+++ b/device/devices_app/BUILD.gn
@@ -29,8 +29,8 @@ source_set("lib") {
 
   public_deps = [
     "//base",
-    "//mojo/application/public/cpp",
-    "//mojo/application/public/interfaces",
+    "//mojo/shell/public/cpp",
+    "//mojo/shell/public/interfaces",
   ]
 }
 
@@ -43,7 +43,7 @@ if (!is_component_build) {
     deps = [
       "//base",
       "//device/devices_app/public/cpp:factory",
-      "//mojo/application/public/cpp",
+      "//mojo/shell/public/cpp",
     ]
 
     public_deps = [
@@ -62,7 +62,7 @@ if (!is_component_build) {
 
     deps = [
       "//base",
-      "//mojo/application/public/cpp:test_support",
+      "//mojo/shell/public/cpp:test_support",
     ]
 
     public_deps = [
diff --git a/device/devices_app/DEPS b/device/devices_app/DEPS
index 8fbdc29..7256f77 100644
--- a/device/devices_app/DEPS
+++ b/device/devices_app/DEPS
@@ -1,4 +1,4 @@
 include_rules = [
-  "+mojo/application/public",
+  "+mojo/shell/public",
   "+mojo/common",
 ]
diff --git a/device/devices_app/devices_app.cc b/device/devices_app/devices_app.cc
index 7c392ad..0279629 100644
--- a/device/devices_app/devices_app.cc
+++ b/device/devices_app/devices_app.cc
@@ -17,9 +17,9 @@
 #include "device/core/device_client.h"
 #include "device/devices_app/usb/device_manager_impl.h"
 #include "device/usb/usb_service.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 #include "url/gurl.h"
 
 namespace device {
diff --git a/device/devices_app/devices_app.h b/device/devices_app/devices_app.h
index f561929..3c6a838 100644
--- a/device/devices_app/devices_app.h
+++ b/device/devices_app/devices_app.h
@@ -11,8 +11,8 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/interface_factory.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 
 namespace mojo {
 class ApplicationImpl;
diff --git a/device/devices_app/devices_apptest.cc b/device/devices_app/devices_apptest.cc
index b6b1503..e2d2a33 100644
--- a/device/devices_app/devices_apptest.cc
+++ b/device/devices_app/devices_apptest.cc
@@ -10,8 +10,8 @@
 #include "base/run_loop.h"
 #include "device/devices_app/devices_app.h"
 #include "device/devices_app/usb/public/interfaces/device_manager.mojom.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_test_base.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
 
 namespace device {
 namespace {
diff --git a/device/devices_app/main.cc b/device/devices_app/main.cc
index 3541552..a43d8ff 100644
--- a/device/devices_app/main.cc
+++ b/device/devices_app/main.cc
@@ -4,9 +4,9 @@
 
 #include "base/sequenced_task_runner.h"
 #include "device/devices_app/public/cpp/devices_app_factory.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(
diff --git a/docs/mojo_in_chromium.md b/docs/mojo_in_chromium.md
index 0823e69..fe9fda3 100644
--- a/docs/mojo_in_chromium.md
+++ b/docs/mojo_in_chromium.md
@@ -336,7 +336,7 @@ interface ServiceProvider {
 ```
 
 Definitions for these interfaces can be found in
-`/mojo/application/public/interfaces`. Also note that `mojo::URLRequest` is a
+`/mojo/shell/public/interfaces`. Also note that `mojo::URLRequest` is a
 Mojo struct defined in
 `/mojo/services/network/public/interfaces/url_loader.mojom`.
 
@@ -383,7 +383,7 @@ interface Application {
 Of course, in Chromium and Mandoline environments this interface is obscured
 from application code and applications should generally just implement
 `mojo::ApplicationDelegate` (defined in
-`/mojo/application/public/cpp/application_delegate.h`.) We'll see a concrete
+`/mojo/shell/public/cpp/application_delegate.h`.) We'll see a concrete
 example of this in the next section,
 [Your First Mojo Application](#Your-First-Mojo-Application).
 
@@ -489,7 +489,7 @@ Let's update `main.cc` with the following contents:
 
 ```cpp
 #include "components/hello/hello_app.h"
-#include "mojo/application/public/cpp/application_runner.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 #include "third_party/mojo/src/mojo/public/c/system/main.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
@@ -535,8 +535,8 @@ mojom("interfaces") {
 
 #include "base/macros.h"
 #include "components/hello/public/interfaces/greeter.mojom.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/interface_factory.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 
 namespace hello {
 
@@ -569,7 +569,7 @@ class HelloApp : public mojo::ApplicationDelegate,
 ```cpp
 #include "base/macros.h"
 #include "components/hello/hello_app.h"
-#include "mojo/application/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_connection.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
 
@@ -635,8 +635,8 @@ source_set("lib") {
   deps = [
     "//base",
     "//components/hello/public/interfaces",
-    "//mojo/application/public/cpp",
     "//mojo/environment:chromium",
+    "//mojo/shell/public/cpp",
   ]
 }
 
@@ -680,8 +680,8 @@ First let's introduce some test code:
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "components/hello/public/interfaces/greeter.mojom.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_test_base.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
 
 namespace hello {
 namespace {
@@ -735,7 +735,7 @@ mojo_native_application("apptests") {
   ]
   deps = [
     "//base",
-    "//mojo/application/public/cpp:test_support",
+    "//mojo/shell/public/cpp:test_support",
   ]
   public_deps = [
     "//components/hello/public/interfaces",
@@ -784,7 +784,7 @@ This is exploited by the definition of
 `mojo::ApplicationConnection::ConnectToService<T>`, which uses `T::Name_` as the
 name of the service to connect to. The type `T` in this context is inferred from
 the `InterfacePtr<T>*` argument. You can inspect the definition of
-`ConnectToService` in `/mojo/application/public/cpp/application_connection.h`
+`ConnectToService` in `/mojo/shell/public/cpp/application_connection.h`
 for additional clarity.
 
 We could have instead written this code as:
diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn
index 8e8723d..3874b03 100644
--- a/extensions/BUILD.gn
+++ b/extensions/BUILD.gn
@@ -191,9 +191,9 @@ test("extensions_unittests") {
     "//extensions/renderer",
     "//extensions/strings",
     "//extensions/utility",
-    "//mojo/application/public/interfaces",
     "//mojo/environment:chromium",
     "//mojo/public/cpp/bindings",
+    "//mojo/shell/public/interfaces",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/leveldatabase",
diff --git a/extensions/browser/mojo/DEPS b/extensions/browser/mojo/DEPS
index c6b0111..c1bbc75 100644
--- a/extensions/browser/mojo/DEPS
+++ b/extensions/browser/mojo/DEPS
@@ -1,3 +1,3 @@
 include_rules = [
-  "+mojo/application/public/interfaces",
+  "+mojo/shell/public/interfaces",
 ]
diff --git a/extensions/browser/mojo/stash_backend_unittest.cc b/extensions/browser/mojo/stash_backend_unittest.cc
index f8f40d3..3f43954 100644
--- a/extensions/browser/mojo/stash_backend_unittest.cc
+++ b/extensions/browser/mojo/stash_backend_unittest.cc
@@ -12,7 +12,7 @@
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
diff --git a/mandoline/services/core_services/BUILD.gn b/mandoline/services/core_services/BUILD.gn
index db14fa2..45dd6db 100644
--- a/mandoline/services/core_services/BUILD.gn
+++ b/mandoline/services/core_services/BUILD.gn
@@ -52,12 +52,12 @@ source_set("sources") {
     "//components/clipboard:lib",
     "//components/filesystem:lib",
     "//components/web_view:lib",
-    "//mojo/application/public/cpp",
     "//mojo/logging",
     "//mojo/message_pump",
     "//mojo/public/cpp/bindings",
     "//mojo/services/tracing:lib",
     "//mojo/services/tracing/public/cpp",
+    "//mojo/shell/public/cpp",
     "//third_party/icu",
     "//url",
   ]
diff --git a/mandoline/services/core_services/DEPS b/mandoline/services/core_services/DEPS
index 0e9f66f..4b5deee 100644
--- a/mandoline/services/core_services/DEPS
+++ b/mandoline/services/core_services/DEPS
@@ -5,7 +5,7 @@ include_rules = [
   "+components/resource_provider",
   "+components/mus",
   "+components/web_view",
-  "+mojo/application",
+  "+mojo/shell",
   "+mojo/common",
   "+mojo/logging",
   "+mojo/message_pump",
diff --git a/mandoline/services/core_services/application_delegate_factory_default.cc b/mandoline/services/core_services/application_delegate_factory_default.cc
index d4c6d5b..d069134 100644
--- a/mandoline/services/core_services/application_delegate_factory_default.cc
+++ b/mandoline/services/core_services/application_delegate_factory_default.cc
@@ -4,7 +4,7 @@
 
 #include "mandoline/services/core_services/application_delegate_factory.h"
 
-#include "mojo/application/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
 
 namespace core_services {
 
diff --git a/mandoline/services/core_services/core_services_application_delegate.cc b/mandoline/services/core_services/core_services_application_delegate.cc
index 1f1d6fc..6beb088 100644
--- a/mandoline/services/core_services/core_services_application_delegate.cc
+++ b/mandoline/services/core_services/core_services_application_delegate.cc
@@ -15,13 +15,13 @@
 #include "components/filesystem/file_system_app.h"
 #include "components/web_view/web_view_application_delegate.h"
 #include "mandoline/services/core_services/application_delegate_factory.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/logging/init_logging.h"
 #include "mojo/message_pump/message_pump_mojo.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
 #include "mojo/services/tracing/tracing_app.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 #include "url/gurl.h"
 
 namespace core_services {
diff --git a/mandoline/services/core_services/core_services_application_delegate.h b/mandoline/services/core_services/core_services_application_delegate.h
index 168f068..eeb40c4b 100644
--- a/mandoline/services/core_services/core_services_application_delegate.h
+++ b/mandoline/services/core_services/core_services_application_delegate.h
@@ -9,11 +9,11 @@
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "components/clipboard/public/interfaces/clipboard.mojom.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/interface_factory_impl.h"
-#include "mojo/application/public/interfaces/content_handler.mojom.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/interface_factory_impl.h"
+#include "mojo/shell/public/interfaces/content_handler.mojom.h"
 
 namespace core_services {
 
diff --git a/mandoline/services/core_services/main.cc b/mandoline/services/core_services/main.cc
index 727ed41..1a40db7 100644
--- a/mandoline/services/core_services/main.cc
+++ b/mandoline/services/core_services/main.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "mandoline/services/core_services/core_services_application_delegate.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(
diff --git a/mandoline/services/updater/BUILD.gn b/mandoline/services/updater/BUILD.gn
index 441ec83..e2edf1f 100644
--- a/mandoline/services/updater/BUILD.gn
+++ b/mandoline/services/updater/BUILD.gn
@@ -16,9 +16,9 @@ mojo_native_application("updater") {
   deps = [
     "//base",
     "//components/update_client",
-    "//mojo/application/public/cpp",
     "//mojo/public/cpp/system",
     "//mojo/services/updater",
+    "//mojo/shell/public/cpp",
     "//url",
   ]
 }
diff --git a/mandoline/services/updater/DEPS b/mandoline/services/updater/DEPS
index 07502be..c10803d 100644
--- a/mandoline/services/updater/DEPS
+++ b/mandoline/services/updater/DEPS
@@ -1,6 +1,6 @@
 include_rules = [
   "+components/update_client",
-  "+mojo/application",
+  "+mojo/shell",
   "+mojo/common",
   "+mojo/public/c/system",
   "+mojo/public/cpp/bindings",
diff --git a/mandoline/services/updater/updater_app.cc b/mandoline/services/updater/updater_app.cc
index c74dee9..90f8b67 100644
--- a/mandoline/services/updater/updater_app.cc
+++ b/mandoline/services/updater/updater_app.cc
@@ -8,10 +8,10 @@
 
 #include "base/logging.h"
 #include "mandoline/services/updater/updater_impl.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 namespace updater {
 
diff --git a/mandoline/services/updater/updater_app.h b/mandoline/services/updater/updater_app.h
index 45b435c..21c8648 100644
--- a/mandoline/services/updater/updater_app.h
+++ b/mandoline/services/updater/updater_app.h
@@ -6,8 +6,8 @@
 #define MANDOLINE_SERVICES_UPDATER_UPDATER_APP_H_
 
 #include "base/macros.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/interface_factory.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 
 namespace mojo {
 class ApplicationConnection;
diff --git a/mandoline/services/updater/updater_impl.cc b/mandoline/services/updater/updater_impl.cc
index 9b40ec0..5761401 100644
--- a/mandoline/services/updater/updater_impl.cc
+++ b/mandoline/services/updater/updater_impl.cc
@@ -9,7 +9,7 @@
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "mandoline/services/updater/updater_app.h"
-#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 #include "url/gurl.h"
 
 namespace updater {
diff --git a/mandoline/services/updater/updater_impl.h b/mandoline/services/updater/updater_impl.h
index b8b7dbc..e1d5d78 100644
--- a/mandoline/services/updater/updater_impl.h
+++ b/mandoline/services/updater/updater_impl.h
@@ -6,9 +6,9 @@
 #define MANDOLINE_SERVICES_UPDATER_UPDATER_IMPL_H_
 
 #include "base/macros.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/services/updater/updater.mojom.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 namespace updater {
 
diff --git a/mandoline/ui/desktop_ui/BUILD.gn b/mandoline/ui/desktop_ui/BUILD.gn
index e84c565..d6ef96f 100644
--- a/mandoline/ui/desktop_ui/BUILD.gn
+++ b/mandoline/ui/desktop_ui/BUILD.gn
@@ -14,7 +14,7 @@ mojo_native_application("desktop_ui") {
   deps = [
     ":lib",
     "//mandoline/ui/common/resources",
-    "//mojo/application/public/cpp",
+    "//mojo/shell/public/cpp",
   ]
 
   resources = [ "$root_out_dir/mandoline_ui.pak" ]
@@ -39,12 +39,12 @@ source_set("lib") {
     "//base",
     "//components/web_view/public/cpp",
     "//components/web_view/public/interfaces",
-    "//mojo/application/public/cpp:sources",
     "//mojo/common:common_base",
     "//mojo/converters/geometry",
     "//mojo/public/cpp/bindings",
     "//mojo/services/tracing/public/cpp",
     "//mojo/services/tracing/public/interfaces",
+    "//mojo/shell/public/cpp:sources",
     "//skia",
     "//ui/gfx",
     "//ui/gfx/geometry",
@@ -64,8 +64,8 @@ mojo_native_application("mandoline_browser_apptests") {
 
   deps = [
     "//mandoline/ui/desktop_ui/public/interfaces",
-    "//mojo/application/public/cpp:sources",
-    "//mojo/application/public/cpp:test_support",
+    "//mojo/shell/public/cpp:sources",
+    "//mojo/shell/public/cpp:test_support",
   ]
 
   data_deps = [
diff --git a/mandoline/ui/desktop_ui/DEPS b/mandoline/ui/desktop_ui/DEPS
index 690cc702..18d3a99 100644
--- a/mandoline/ui/desktop_ui/DEPS
+++ b/mandoline/ui/desktop_ui/DEPS
@@ -2,7 +2,7 @@ include_rules = [
   "+components/mus",
   "+components/web_view/public",
   "+mandoline/services",
-  "+mojo/application",
+  "+mojo/shell",
   "+mojo/common",
   "+mojo/converters",
   "+mojo/public",
diff --git a/mandoline/ui/desktop_ui/browser_apptest.cc b/mandoline/ui/desktop_ui/browser_apptest.cc
index ccc35e7..6cc6729 100644
--- a/mandoline/ui/desktop_ui/browser_apptest.cc
+++ b/mandoline/ui/desktop_ui/browser_apptest.cc
@@ -4,8 +4,8 @@
 
 #include "base/macros.h"
 #include "mandoline/ui/desktop_ui/public/interfaces/launch_handler.mojom.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_test_base.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
 
 namespace mandoline {
 
diff --git a/mandoline/ui/desktop_ui/browser_manager.h b/mandoline/ui/desktop_ui/browser_manager.h
index 1fbf1dd..754e548 100644
--- a/mandoline/ui/desktop_ui/browser_manager.h
+++ b/mandoline/ui/desktop_ui/browser_manager.h
@@ -10,11 +10,11 @@
 #include "base/macros.h"
 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
 #include "mandoline/ui/desktop_ui/public/interfaces/launch_handler.mojom.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/connect.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/connect.h"
 #include "url/gurl.h"
 
 namespace mojo {
diff --git a/mandoline/ui/desktop_ui/browser_window.h b/mandoline/ui/desktop_ui/browser_window.h
index 701fec9..fff5f7f 100644
--- a/mandoline/ui/desktop_ui/browser_window.h
+++ b/mandoline/ui/desktop_ui/browser_window.h
@@ -16,8 +16,8 @@
 #include "mandoline/ui/desktop_ui/find_bar_delegate.h"
 #include "mandoline/ui/desktop_ui/public/interfaces/omnibox.mojom.h"
 #include "mandoline/ui/desktop_ui/public/interfaces/view_embedder.mojom.h"
-#include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/common/weak_binding_set.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 #include "url/gurl.h"
 
 namespace mojo {
diff --git a/mandoline/ui/desktop_ui/main.cc b/mandoline/ui/desktop_ui/main.cc
index 558d3af..648e7dd 100644
--- a/mandoline/ui/desktop_ui/main.cc
+++ b/mandoline/ui/desktop_ui/main.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "mandoline/ui/desktop_ui/browser_manager.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(new mandoline::BrowserManager);
diff --git a/mandoline/ui/desktop_ui/public/interfaces/BUILD.gn b/mandoline/ui/desktop_ui/public/interfaces/BUILD.gn
index 335f170..5dc313f 100644
--- a/mandoline/ui/desktop_ui/public/interfaces/BUILD.gn
+++ b/mandoline/ui/desktop_ui/public/interfaces/BUILD.gn
@@ -15,7 +15,7 @@ mojom("interfaces") {
 
   deps = [
     "//components/mus/public/interfaces",
-    "//mojo/application/public/interfaces",
     "//mojo/services/network/public/interfaces",
+    "//mojo/shell/public/interfaces",
   ]
 }
diff --git a/mandoline/ui/omnibox/BUILD.gn b/mandoline/ui/omnibox/BUILD.gn
index 42c1fdb..2872afe 100644
--- a/mandoline/ui/omnibox/BUILD.gn
+++ b/mandoline/ui/omnibox/BUILD.gn
@@ -12,7 +12,7 @@ mojo_native_application("omnibox") {
   deps = [
     ":lib",
     "//mandoline/ui/common/resources",
-    "//mojo/application/public/cpp",
+    "//mojo/shell/public/cpp",
   ]
 
   resources = [ "$root_out_dir/mandoline_ui.pak" ]
@@ -29,11 +29,11 @@ source_set("lib") {
     "//components/mus/public/cpp",
     "//components/url_formatter",
     "//mandoline/ui/desktop_ui/public/interfaces",
-    "//mojo/application/public/cpp:sources",
     "//mojo/common",
     "//mojo/converters/geometry",
     "//mojo/public/cpp/bindings",
     "//mojo/services/tracing/public/cpp",
+    "//mojo/shell/public/cpp:sources",
     "//skia",
     "//ui/gfx/geometry",
     "//ui/mojo/init",
diff --git a/mandoline/ui/omnibox/DEPS b/mandoline/ui/omnibox/DEPS
index 838b0a6..cdb91f5 100644
--- a/mandoline/ui/omnibox/DEPS
+++ b/mandoline/ui/omnibox/DEPS
@@ -1,7 +1,7 @@
 include_rules = [
   "+components/mus/public",
   "+components/url_formatter",
-  "+mojo/application",
+  "+mojo/shell",
   "+mojo/common",
   "+mojo/converters",
   "+mojo/public",
diff --git a/mandoline/ui/omnibox/main.cc b/mandoline/ui/omnibox/main.cc
index 35049c3..1feee98 100644
--- a/mandoline/ui/omnibox/main.cc
+++ b/mandoline/ui/omnibox/main.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "mandoline/ui/omnibox/omnibox_application.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(new mandoline::OmniboxApplication);
diff --git a/mandoline/ui/omnibox/omnibox_application.cc b/mandoline/ui/omnibox/omnibox_application.cc
index bfbe69c..dec5c76 100644
--- a/mandoline/ui/omnibox/omnibox_application.cc
+++ b/mandoline/ui/omnibox/omnibox_application.cc
@@ -14,8 +14,8 @@
 #include "components/mus/public/cpp/window_tree_delegate.h"
 #include "components/url_formatter/url_fixer.h"
 #include "mandoline/ui/desktop_ui/public/interfaces/view_embedder.mojom.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/common/common_type_converters.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 #include "ui/mojo/init/ui_init.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/textfield/textfield.h"
diff --git a/mandoline/ui/omnibox/omnibox_application.h b/mandoline/ui/omnibox/omnibox_application.h
index eeeea7f..d98d8b4 100644
--- a/mandoline/ui/omnibox/omnibox_application.h
+++ b/mandoline/ui/omnibox/omnibox_application.h
@@ -7,9 +7,9 @@
 
 #include "base/macros.h"
 #include "mandoline/ui/desktop_ui/public/interfaces/omnibox.mojom.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 
 namespace mojo {
 class ApplicationImpl;
diff --git a/mandoline/ui/phone_ui/BUILD.gn b/mandoline/ui/phone_ui/BUILD.gn
index 21de685..216138e 100644
--- a/mandoline/ui/phone_ui/BUILD.gn
+++ b/mandoline/ui/phone_ui/BUILD.gn
@@ -13,7 +13,7 @@ mojo_native_application("phone_ui") {
   deps = [
     ":lib",
     "//components/web_view:web_view",
-    "//mojo/application/public/cpp",
+    "//mojo/shell/public/cpp",
   ]
 }
 
@@ -30,10 +30,10 @@ source_set("lib") {
     "//components/web_view/public/cpp",
     "//components/web_view/public/interfaces",
     "//mandoline/ui/desktop_ui/public/interfaces",
-    "//mojo/application/public/cpp",
     "//mojo/common",
     "//mojo/converters/geometry",
     "//mojo/public/cpp/bindings",
+    "//mojo/shell/public/cpp",
     "//ui/gfx/geometry",
     "//url",
   ]
diff --git a/mandoline/ui/phone_ui/DEPS b/mandoline/ui/phone_ui/DEPS
index 9286b44..d58cbb3 100644
--- a/mandoline/ui/phone_ui/DEPS
+++ b/mandoline/ui/phone_ui/DEPS
@@ -1,7 +1,7 @@
 include_rules = [
   "+components/mus",
   "+components/web_view/public",
-  "+mojo/application",
+  "+mojo/shell",
   "+mojo/common",
   "+mojo/converters",
   "+mojo/public",
diff --git a/mandoline/ui/phone_ui/main.cc b/mandoline/ui/phone_ui/main.cc
index 7744a4d..7052e63 100644
--- a/mandoline/ui/phone_ui/main.cc
+++ b/mandoline/ui/phone_ui/main.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "mandoline/ui/phone_ui/phone_browser_application_delegate.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(
diff --git a/mandoline/ui/phone_ui/phone_browser_application_delegate.cc b/mandoline/ui/phone_ui/phone_browser_application_delegate.cc
index b9fa5e9..12accb1 100644
--- a/mandoline/ui/phone_ui/phone_browser_application_delegate.cc
+++ b/mandoline/ui/phone_ui/phone_browser_application_delegate.cc
@@ -8,10 +8,10 @@
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/mus/public/cpp/window_tree_host_factory.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 #include "ui/gfx/geometry/size.h"
 #include "url/gurl.h"
 
diff --git a/mandoline/ui/phone_ui/phone_browser_application_delegate.h b/mandoline/ui/phone_ui/phone_browser_application_delegate.h
index 0da7ce0..0aef775 100644
--- a/mandoline/ui/phone_ui/phone_browser_application_delegate.h
+++ b/mandoline/ui/phone_ui/phone_browser_application_delegate.h
@@ -16,9 +16,9 @@
 #include "components/web_view/public/interfaces/web_view.mojom.h"
 // TODO(beng): move this file somewhere common.
 #include "mandoline/ui/desktop_ui/public/interfaces/launch_handler.mojom.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/common/weak_binding_set.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 
 namespace mus {
 class View;
diff --git a/mash/DEPS b/mash/DEPS
index 525f2db..c2abdb2 100644
--- a/mash/DEPS
+++ b/mash/DEPS
@@ -2,7 +2,7 @@ include_rules = [
   "+components/mus/common/types.h",
   "+components/mus/common/util.h",
   "+components/mus/public",
-  "+mojo/application",
+  "+mojo/shell",
   "+mojo/common",
   "+mojo/converters",
   "+mojo/public",
diff --git a/mash/browser_driver/BUILD.gn b/mash/browser_driver/BUILD.gn
index a585925..d68bcef 100644
--- a/mash/browser_driver/BUILD.gn
+++ b/mash/browser_driver/BUILD.gn
@@ -18,8 +18,8 @@ mojo_native_application("browser_driver") {
     "//base",
     "//components/mus/public/cpp",
     "//components/mus/public/interfaces",
-    "//mojo/application/public/cpp",
-    "//mojo/application/public/cpp:sources",
     "//mojo/public/cpp/bindings",
+    "//mojo/shell/public/cpp",
+    "//mojo/shell/public/cpp:sources",
   ]
 }
diff --git a/mash/browser_driver/browser_driver_application_delegate.cc b/mash/browser_driver/browser_driver_application_delegate.cc
index fa04ab9..ebd41dc 100644
--- a/mash/browser_driver/browser_driver_application_delegate.cc
+++ b/mash/browser_driver/browser_driver_application_delegate.cc
@@ -8,8 +8,8 @@
 
 #include "base/bind.h"
 #include "components/mus/public/cpp/event_matcher.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 namespace mash {
 namespace browser_driver {
diff --git a/mash/browser_driver/browser_driver_application_delegate.h b/mash/browser_driver/browser_driver_application_delegate.h
index 229d0c9..039eff4 100644
--- a/mash/browser_driver/browser_driver_application_delegate.h
+++ b/mash/browser_driver/browser_driver_application_delegate.h
@@ -13,8 +13,8 @@
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/mus/public/interfaces/accelerator_registrar.mojom.h"
-#include "mojo/application/public/cpp/application_delegate.h"
 #include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
 
 namespace mojo {
 class ApplicationConnection;
diff --git a/mash/browser_driver/main.cc b/mash/browser_driver/main.cc
index 514178c..d37b648 100644
--- a/mash/browser_driver/main.cc
+++ b/mash/browser_driver/main.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "mash/browser_driver/browser_driver_application_delegate.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(
diff --git a/mash/example/views_examples/BUILD.gn b/mash/example/views_examples/BUILD.gn
index c250718..6758400 100644
--- a/mash/example/views_examples/BUILD.gn
+++ b/mash/example/views_examples/BUILD.gn
@@ -19,11 +19,11 @@ mojo_native_application("views_examples") {
   deps = [
     "//base",
     "//components/mus/public/interfaces",
-    "//mojo/application/public/cpp",
-    "//mojo/application/public/cpp:sources",
     "//mojo/converters/geometry",
     "//mojo/public/cpp/bindings",
     "//mojo/services/tracing/public/cpp",
+    "//mojo/shell/public/cpp",
+    "//mojo/shell/public/cpp:sources",
     "//skia",
     "//ui/gfx",
     "//ui/gfx/geometry",
diff --git a/mash/example/views_examples/main.cc b/mash/example/views_examples/main.cc
index 27c727bb..534382e 100644
--- a/mash/example/views_examples/main.cc
+++ b/mash/example/views_examples/main.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "mash/example/views_examples/views_examples_application_delegate.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(new ViewsExamplesApplicationDelegate);
diff --git a/mash/example/views_examples/views_examples_application_delegate.cc b/mash/example/views_examples/views_examples_application_delegate.cc
index cf5f46f..092d6f0 100644
--- a/mash/example/views_examples/views_examples_application_delegate.cc
+++ b/mash/example/views_examples/views_examples_application_delegate.cc
@@ -4,8 +4,8 @@
 
 #include "mash/example/views_examples/views_examples_application_delegate.h"
 
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 #include "ui/views/examples/example_base.h"
 #include "ui/views/examples/examples_window.h"
 #include "ui/views/mus/aura_init.h"
diff --git a/mash/example/views_examples/views_examples_application_delegate.h b/mash/example/views_examples/views_examples_application_delegate.h
index 47fb91a..040343c 100644
--- a/mash/example/views_examples/views_examples_application_delegate.h
+++ b/mash/example/views_examples/views_examples_application_delegate.h
@@ -7,8 +7,8 @@
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/application/public/cpp/application_delegate.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
 
 namespace views {
 class AuraInit;
diff --git a/mash/example/window_type_launcher/BUILD.gn b/mash/example/window_type_launcher/BUILD.gn
index 2602af1..627af2a 100644
--- a/mash/example/window_type_launcher/BUILD.gn
+++ b/mash/example/window_type_launcher/BUILD.gn
@@ -22,14 +22,14 @@ executable("window_type_launcher") {
     "//base",
     "//base:base_static",
     "//components/mus/public/interfaces",
-    "//mojo/application/public/cpp",
-    "//mojo/application/public/interfaces",
     "//mojo/common:common_base",
     "//mojo/converters/geometry",
     "//mojo/message_pump",
     "//mojo/public/cpp/bindings",
     "//mojo/runner:init",
     "//mojo/runner/child:lib",
+    "//mojo/shell/public/cpp",
+    "//mojo/shell/public/interfaces",
     "//skia",
     "//third_party/mojo/src/mojo/edk/system",
     "//ui/aura",
diff --git a/mash/example/window_type_launcher/main.cc b/mash/example/window_type_launcher/main.cc
index 826820a..27d8cd3 100644
--- a/mash/example/window_type_launcher/main.cc
+++ b/mash/example/window_type_launcher/main.cc
@@ -14,11 +14,11 @@
 #include "base/threading/thread.h"
 #include "build/build_config.h"
 #include "mash/example/window_type_launcher/window_type_launcher.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/interfaces/application.mojom.h"
 #include "mojo/message_pump/message_pump_mojo.h"
 #include "mojo/runner/child/runner_connection.h"
 #include "mojo/runner/init.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/interfaces/application.mojom.h"
 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
 #include "third_party/mojo/src/mojo/edk/embedder/process_delegate.h"
 
diff --git a/mash/example/window_type_launcher/window_type_launcher.cc b/mash/example/window_type_launcher/window_type_launcher.cc
index 920f715..06812a6 100644
--- a/mash/example/window_type_launcher/window_type_launcher.cc
+++ b/mash/example/window_type_launcher/window_type_launcher.cc
@@ -6,9 +6,9 @@
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/layer.h"
diff --git a/mash/example/window_type_launcher/window_type_launcher.h b/mash/example/window_type_launcher/window_type_launcher.h
index fc07222..6e91df8 100644
--- a/mash/example/window_type_launcher/window_type_launcher.h
+++ b/mash/example/window_type_launcher/window_type_launcher.h
@@ -7,7 +7,7 @@
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/application/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
 
 namespace views {
 class AuraInit;
diff --git a/mash/quick_launch/BUILD.gn b/mash/quick_launch/BUILD.gn
index 17db5af..cb46e07 100644
--- a/mash/quick_launch/BUILD.gn
+++ b/mash/quick_launch/BUILD.gn
@@ -14,11 +14,11 @@ mojo_native_application("quick_launch") {
 
   deps = [
     "//base",
-    "//mojo/application/public/cpp",
-    "//mojo/application/public/cpp:sources",
-    "//mojo/application/public/interfaces",
     "//mojo/public/cpp/bindings",
     "//mojo/services/tracing/public/cpp",
+    "//mojo/shell/public/cpp",
+    "//mojo/shell/public/cpp:sources",
+    "//mojo/shell/public/interfaces",
     "//ui/views",
     "//ui/views/mus:for_mojo_application",
     "//url",
diff --git a/mash/quick_launch/quick_launch.cc b/mash/quick_launch/quick_launch.cc
index 8d2b0e8..f5e9744 100644
--- a/mash/quick_launch/quick_launch.cc
+++ b/mash/quick_launch/quick_launch.cc
@@ -5,11 +5,11 @@
 #include "base/macros.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
diff --git a/mash/shell/BUILD.gn b/mash/shell/BUILD.gn
index 6e629ba..2a4b763 100644
--- a/mash/shell/BUILD.gn
+++ b/mash/shell/BUILD.gn
@@ -18,9 +18,9 @@ mojo_native_application("shell") {
 
   deps = [
     "//base",
-    "//mojo/application/public/cpp",
-    "//mojo/application/public/cpp:sources",
     "//mojo/public/cpp/bindings",
+    "//mojo/shell/public/cpp",
+    "//mojo/shell/public/cpp:sources",
   ]
 
   data_deps = [
diff --git a/mash/shell/main.cc b/mash/shell/main.cc
index 1e257b8..06cdc36 100644
--- a/mash/shell/main.cc
+++ b/mash/shell/main.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "mash/shell/shell_application_delegate.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(new mash::shell::ShellApplicationDelegate);
diff --git a/mash/shell/shell_application_delegate.cc b/mash/shell/shell_application_delegate.cc
index df38cba..11f5cb7 100644
--- a/mash/shell/shell_application_delegate.cc
+++ b/mash/shell/shell_application_delegate.cc
@@ -5,8 +5,8 @@
 #include "mash/shell/shell_application_delegate.h"
 
 #include "base/bind.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 namespace mash {
 namespace shell {
diff --git a/mash/shell/shell_application_delegate.h b/mash/shell/shell_application_delegate.h
index 3b93781..cca181d 100644
--- a/mash/shell/shell_application_delegate.h
+++ b/mash/shell/shell_application_delegate.h
@@ -10,7 +10,7 @@
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/application/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
 
 namespace mojo {
 class ApplicationConnection;
diff --git a/mash/system_ui/BUILD.gn b/mash/system_ui/BUILD.gn
index 951b5dc..6252901 100644
--- a/mash/system_ui/BUILD.gn
+++ b/mash/system_ui/BUILD.gn
@@ -18,9 +18,9 @@ mojo_native_application("system_ui") {
     "//components/mus/public/cpp",
     "//components/mus/public/interfaces",
     "//mash/wm/public/interfaces",
-    "//mojo/application/public/cpp",
     "//mojo/common:common_base",
     "//mojo/services/tracing/public/cpp",
+    "//mojo/shell/public/cpp",
     "//skia",
     "//ui/aura",
     "//ui/views",
diff --git a/mash/system_ui/main.cc b/mash/system_ui/main.cc
index d36c2e0..0c5832b 100644
--- a/mash/system_ui/main.cc
+++ b/mash/system_ui/main.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "mash/system_ui/system_ui.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(new mash::system_ui::SystemUI);
diff --git a/mash/system_ui/system_ui.cc b/mash/system_ui/system_ui.cc
index 8f589dc..6761365 100644
--- a/mash/system_ui/system_ui.cc
+++ b/mash/system_ui/system_ui.cc
@@ -9,8 +9,8 @@
 #include "base/macros.h"
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "mash/wm/public/interfaces/container.mojom.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/mus/native_widget_mus.h"
diff --git a/mash/system_ui/system_ui.h b/mash/system_ui/system_ui.h
index ffab417..86bfb22 100644
--- a/mash/system_ui/system_ui.h
+++ b/mash/system_ui/system_ui.h
@@ -7,8 +7,8 @@
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/application/public/cpp/application_delegate.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
 
 namespace views {
 class AuraInit;
diff --git a/mash/task_viewer/BUILD.gn b/mash/task_viewer/BUILD.gn
index 1f5f219..3f78ab4 100644
--- a/mash/task_viewer/BUILD.gn
+++ b/mash/task_viewer/BUILD.gn
@@ -16,11 +16,11 @@ mojo_native_application("task_viewer") {
 
   deps = [
     "//base",
-    "//mojo/application/public/cpp",
-    "//mojo/application/public/cpp:sources",
-    "//mojo/application/public/interfaces",
     "//mojo/public/cpp/bindings",
     "//mojo/services/tracing/public/cpp",
+    "//mojo/shell/public/cpp",
+    "//mojo/shell/public/cpp:sources",
+    "//mojo/shell/public/interfaces",
     "//ui/views",
     "//ui/views/mus:for_mojo_application",
   ]
diff --git a/mash/task_viewer/main.cc b/mash/task_viewer/main.cc
index 28baa09..fe2e40d 100644
--- a/mash/task_viewer/main.cc
+++ b/mash/task_viewer/main.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "mash/task_viewer/task_viewer_application_delegate.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(
diff --git a/mash/task_viewer/task_viewer_application_delegate.cc b/mash/task_viewer/task_viewer_application_delegate.cc
index ca19cc6..7a6aa4b 100644
--- a/mash/task_viewer/task_viewer_application_delegate.cc
+++ b/mash/task_viewer/task_viewer_application_delegate.cc
@@ -12,10 +12,10 @@
 #include "base/process/process.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/interfaces/application_manager.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/interfaces/application_manager.mojom.h"
 #include "ui/base/models/table_model.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/label_button.h"
diff --git a/mash/task_viewer/task_viewer_application_delegate.h b/mash/task_viewer/task_viewer_application_delegate.h
index bb5bd8c..d7f7213 100644
--- a/mash/task_viewer/task_viewer_application_delegate.h
+++ b/mash/task_viewer/task_viewer_application_delegate.h
@@ -10,8 +10,8 @@
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/application/public/cpp/application_delegate.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
 
 namespace mojo {
 class ApplicationConnection;
diff --git a/mash/wallpaper/BUILD.gn b/mash/wallpaper/BUILD.gn
index f070860..f776d9f 100644
--- a/mash/wallpaper/BUILD.gn
+++ b/mash/wallpaper/BUILD.gn
@@ -16,11 +16,11 @@ mojo_native_application("wallpaper") {
     "//components/mus/public/cpp",
     "//components/mus/public/interfaces",
     "//mash/wm/public/interfaces",
-    "//mojo/application/public/cpp",
-    "//mojo/application/public/cpp:sources",
-    "//mojo/application/public/interfaces",
     "//mojo/public/cpp/bindings",
     "//mojo/services/tracing/public/cpp",
+    "//mojo/shell/public/cpp",
+    "//mojo/shell/public/cpp:sources",
+    "//mojo/shell/public/interfaces",
     "//ui/views",
     "//ui/views/mus:for_mojo_application",
     "//url",
diff --git a/mash/wallpaper/wallpaper.cc b/mash/wallpaper/wallpaper.cc
index a725cef..07e3571 100644
--- a/mash/wallpaper/wallpaper.cc
+++ b/mash/wallpaper/wallpaper.cc
@@ -5,12 +5,12 @@
 #include "base/macros.h"
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "mash/wm/public/interfaces/container.mojom.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/mus/native_widget_mus.h"
diff --git a/mash/wm/BUILD.gn b/mash/wm/BUILD.gn
index 882d3ac..9beaa14e 100644
--- a/mash/wm/BUILD.gn
+++ b/mash/wm/BUILD.gn
@@ -65,11 +65,11 @@ source_set("lib") {
     "//components/mus/public/interfaces",
     "//mash/wm/public/interfaces",
     "//mash/wm/resources",
-    "//mojo/application/public/cpp",
     "//mojo/common:common_base",
     "//mojo/converters/geometry",
     "//mojo/converters/input_events",
     "//mojo/services/tracing/public/cpp",
+    "//mojo/shell/public/cpp",
     "//skia",
     "//ui/aura",
     "//ui/events",
@@ -93,7 +93,7 @@ mojo_native_application("wm") {
   deps = [
     ":lib",
     ":resources",
-    "//mojo/application/public/cpp",
+    "//mojo/shell/public/cpp",
   ]
 
   data_deps = [
@@ -136,10 +136,10 @@ mojo_native_application("apptests") {
     "//components/mus/public/cpp",
     "//components/mus/public/cpp/tests:test_support",
     "//components/mus/public/interfaces",
-    "//mojo/application/public/cpp:sources",
-    "//mojo/application/public/cpp:test_support",
     "//mojo/common:common_base",
     "//mojo/converters/geometry",
+    "//mojo/shell/public/cpp:sources",
+    "//mojo/shell/public/cpp:test_support",
     "//ui/mojo/geometry:interfaces",
     "//ui/mojo/geometry:util",
   ]
diff --git a/mash/wm/accelerator_registrar_apptest.cc b/mash/wm/accelerator_registrar_apptest.cc
index 5d7c452..eaccd5b 100644
--- a/mash/wm/accelerator_registrar_apptest.cc
+++ b/mash/wm/accelerator_registrar_apptest.cc
@@ -11,9 +11,9 @@
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/interfaces/accelerator_registrar.mojom.h"
 #include "components/mus/public/interfaces/window_manager.mojom.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_test_base.h"
 #include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
 
 using mus::mojom::AcceleratorHandler;
 using mus::mojom::AcceleratorHandlerPtr;
diff --git a/mash/wm/main.cc b/mash/wm/main.cc
index 25202cd..07da84f 100644
--- a/mash/wm/main.cc
+++ b/mash/wm/main.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "mash/wm/window_manager_application.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(new mash::wm::WindowManagerApplication);
diff --git a/mash/wm/window_manager_application.cc b/mash/wm/window_manager_application.cc
index 414de00..748bc48 100644
--- a/mash/wm/window_manager_application.cc
+++ b/mash/wm/window_manager_application.cc
@@ -19,8 +19,8 @@
 #include "mash/wm/shelf_layout.h"
 #include "mash/wm/window_layout.h"
 #include "mash/wm/window_manager_impl.h"
-#include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
+#include "mojo/shell/public/cpp/application_connection.h"
 #include "ui/mojo/init/ui_init.h"
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/mus/display_converter.h"
diff --git a/mash/wm/window_manager_application.h b/mash/wm/window_manager_application.h
index c431bae..20593df 100644
--- a/mash/wm/window_manager_application.h
+++ b/mash/wm/window_manager_application.h
@@ -19,10 +19,10 @@
 #include "components/mus/public/interfaces/window_manager.mojom.h"
 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
 #include "mash/wm/public/interfaces/container.mojom.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/interface_factory_impl.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/interface_factory_impl.h"
 
 namespace ui {
 namespace mojo {
diff --git a/mash/wm/window_manager_apptest.cc b/mash/wm/window_manager_apptest.cc
index 8f9b0f0..0d44e52 100644
--- a/mash/wm/window_manager_apptest.cc
+++ b/mash/wm/window_manager_apptest.cc
@@ -12,8 +12,8 @@
 #include "components/mus/public/cpp/window_tree_delegate.h"
 #include "components/mus/public/interfaces/window_manager.mojom.h"
 #include "components/mus/public/interfaces/window_tree.mojom.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_test_base.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
 
 namespace mash {
 namespace wm {
diff --git a/mash/wm/window_manager_impl.cc b/mash/wm/window_manager_impl.cc
index 49ccf36..5195c1f 100644
--- a/mash/wm/window_manager_impl.cc
+++ b/mash/wm/window_manager_impl.cc
@@ -19,8 +19,8 @@
 #include "mash/wm/property_util.h"
 #include "mash/wm/public/interfaces/container.mojom.h"
 #include "mash/wm/window_manager_application.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 namespace mojo {
 
diff --git a/media/mojo/DEPS b/media/mojo/DEPS
index cc40af5..fc15194 100644
--- a/media/mojo/DEPS
+++ b/media/mojo/DEPS
@@ -1,5 +1,5 @@
 include_rules = [
-  "+mojo/application",
+  "+mojo/shell",
   "+mojo/common",
   "+mojo/converters",
   "+mojo/public",
diff --git a/media/mojo/services/BUILD.gn b/media/mojo/services/BUILD.gn
index eda7fb3..a724ac0 100644
--- a/media/mojo/services/BUILD.gn
+++ b/media/mojo/services/BUILD.gn
@@ -73,10 +73,10 @@ source_set("proxy") {
     "//base",
     "//media",
     "//media/mojo/interfaces",
-    "//mojo/application/public/interfaces",
     "//mojo/common",
     "//mojo/environment:chromium",
     "//mojo/public/c/system:for_component",
+    "//mojo/shell/public/interfaces",
   ]
 }
 
@@ -106,10 +106,10 @@ source_set("cdm_service") {
     "//base",
     "//media",
     "//media/mojo/interfaces",
-    "//mojo/application/public/interfaces",
     "//mojo/common",
     "//mojo/environment:chromium",
     "//mojo/public/c/system:for_component",
+    "//mojo/shell/public/interfaces",
   ]
 
   sources = [
@@ -169,8 +169,8 @@ source_set("application") {
     ":media_client",
     ":renderer_service",
     "//base",
-    "//mojo/application/public/cpp",
     "//mojo/public/c/system:for_component",
+    "//mojo/shell/public/cpp",
   ]
 }
 
@@ -220,7 +220,7 @@ mojo_native_application("media_apptests") {
   deps = [
     ":proxy",
     "//media/base:test_support",
-    "//mojo/application/public/cpp:test_support",
+    "//mojo/shell/public/cpp:test_support",
     "//testing/gmock",
     "//testing/gtest",
   ]
diff --git a/media/mojo/services/android_mojo_media_client.cc b/media/mojo/services/android_mojo_media_client.cc
index b2bf99d..dd9a745 100644
--- a/media/mojo/services/android_mojo_media_client.cc
+++ b/media/mojo/services/android_mojo_media_client.cc
@@ -11,7 +11,7 @@
 #include "media/base/media.h"
 #include "media/mojo/interfaces/provision_fetcher.mojom.h"
 #include "media/mojo/services/mojo_provision_fetcher.h"
-#include "mojo/application/public/cpp/connect.h"
+#include "mojo/shell/public/cpp/connect.h"
 
 namespace media {
 
diff --git a/media/mojo/services/main.cc b/media/mojo/services/main.cc
index f3582d4..1fb7a63 100644
--- a/media/mojo/services/main.cc
+++ b/media/mojo/services/main.cc
@@ -4,8 +4,8 @@
 
 #include "media/mojo/services/mojo_media_application.h"
 #include "media/mojo/services/mojo_media_client.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 MojoResult MojoMain(MojoHandle mojo_handle) {
   // Create MojoMediaApplication and enable logging.
diff --git a/media/mojo/services/media_apptest.cc b/media/mojo/services/media_apptest.cc
index be5e4ab..6def35e 100644
--- a/media/mojo/services/media_apptest.cc
+++ b/media/mojo/services/media_apptest.cc
@@ -20,9 +20,9 @@
 #include "media/mojo/interfaces/service_factory.mojom.h"
 #include "media/mojo/services/media_type_converters.h"
 #include "media/mojo/services/mojo_demuxer_stream_impl.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_test_base.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using testing::Exactly;
diff --git a/media/mojo/services/mojo_cdm.cc b/media/mojo/services/mojo_cdm.cc
index 31dd4a7..0b29b92 100644
--- a/media/mojo/services/mojo_cdm.cc
+++ b/media/mojo/services/mojo_cdm.cc
@@ -16,8 +16,8 @@
 #include "media/mojo/interfaces/decryptor.mojom.h"
 #include "media/mojo/services/media_type_converters.h"
 #include "media/mojo/services/mojo_decryptor.h"
-#include "mojo/application/public/cpp/connect.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
+#include "mojo/shell/public/cpp/connect.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
 #include "url/gurl.h"
 
 namespace media {
diff --git a/media/mojo/services/mojo_cdm_factory.cc b/media/mojo/services/mojo_cdm_factory.cc
index 063044e..ecf99d1 100644
--- a/media/mojo/services/mojo_cdm_factory.cc
+++ b/media/mojo/services/mojo_cdm_factory.cc
@@ -14,8 +14,8 @@
 #include "media/cdm/aes_decryptor.h"
 #include "media/mojo/interfaces/service_factory.mojom.h"
 #include "media/mojo/services/mojo_cdm.h"
-#include "mojo/application/public/cpp/connect.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
+#include "mojo/shell/public/cpp/connect.h"
 
 namespace media {
 
diff --git a/media/mojo/services/mojo_cdm_service.h b/media/mojo/services/mojo_cdm_service.h
index 2eabaa8..76dd115 100644
--- a/media/mojo/services/mojo_cdm_service.h
+++ b/media/mojo/services/mojo_cdm_service.h
@@ -17,8 +17,8 @@
 #include "media/mojo/services/mojo_cdm_promise.h"
 #include "media/mojo/services/mojo_cdm_service_context.h"
 #include "media/mojo/services/mojo_decryptor_service.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
 
 namespace media {
 
diff --git a/media/mojo/services/mojo_decryptor.cc b/media/mojo/services/mojo_decryptor.cc
index 7dd8136..d1d116f 100644
--- a/media/mojo/services/mojo_decryptor.cc
+++ b/media/mojo/services/mojo_decryptor.cc
@@ -15,7 +15,7 @@
 #include "media/base/video_frame.h"
 #include "media/mojo/interfaces/decryptor.mojom.h"
 #include "media/mojo/services/media_type_converters.h"
-#include "mojo/application/public/cpp/connect.h"
+#include "mojo/shell/public/cpp/connect.h"
 
 namespace media {
 
diff --git a/media/mojo/services/mojo_media_application.cc b/media/mojo/services/mojo_media_application.cc
index 2770fc8..501cf93 100644
--- a/media/mojo/services/mojo_media_application.cc
+++ b/media/mojo/services/mojo_media_application.cc
@@ -10,8 +10,8 @@
 #include "media/base/media_log.h"
 #include "media/mojo/services/mojo_media_client.h"
 #include "media/mojo/services/service_factory_impl.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 namespace media {
 
diff --git a/media/mojo/services/mojo_media_application.h b/media/mojo/services/mojo_media_application.h
index ccf86e1..e760dfe 100644
--- a/media/mojo/services/mojo_media_application.h
+++ b/media/mojo/services/mojo_media_application.h
@@ -4,8 +4,8 @@
 
 #include "base/memory/ref_counted.h"
 #include "media/mojo/interfaces/service_factory.mojom.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/interface_factory_impl.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/interface_factory_impl.h"
 #include "url/gurl.h"
 
 namespace media {
diff --git a/media/mojo/services/mojo_renderer_impl.cc b/media/mojo/services/mojo_renderer_impl.cc
index 4403a30..93d49d4 100644
--- a/media/mojo/services/mojo_renderer_impl.cc
+++ b/media/mojo/services/mojo_renderer_impl.cc
@@ -13,8 +13,8 @@
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/demuxer_stream_provider.h"
 #include "media/mojo/services/mojo_demuxer_stream_impl.h"
-#include "mojo/application/public/cpp/connect.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
+#include "mojo/shell/public/cpp/connect.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
 
 namespace media {
 
diff --git a/media/mojo/services/service_factory_impl.cc b/media/mojo/services/service_factory_impl.cc
index fe62213..4d38c47b 100644
--- a/media/mojo/services/service_factory_impl.cc
+++ b/media/mojo/services/service_factory_impl.cc
@@ -11,8 +11,8 @@
 #include "media/mojo/services/mojo_cdm_service.h"
 #include "media/mojo/services/mojo_media_client.h"
 #include "media/mojo/services/mojo_renderer_service.h"
-#include "mojo/application/public/cpp/app_lifetime_helper.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
+#include "mojo/shell/public/cpp/app_lifetime_helper.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
 
 namespace media {
 
diff --git a/media/test/BUILD.gn b/media/test/BUILD.gn
index 8c853c3..21749a9 100644
--- a/media/test/BUILD.gn
+++ b/media/test/BUILD.gn
@@ -101,7 +101,7 @@ source_set("mojo_pipeline_integration_tests") {
       "//media/mojo/interfaces",
       "//media/mojo/services:proxy",
       "//media/mojo/services:renderer_service",
-      "//mojo/application/public/cpp:test_support",
+      "//mojo/shell/public/cpp:test_support",
       "//testing/gtest",
       "//ui/gfx:test_support",
       "//ui/gfx/geometry",
diff --git a/media/test/DEPS b/media/test/DEPS
index e402e7f..2590b53 100644
--- a/media/test/DEPS
+++ b/media/test/DEPS
@@ -1,3 +1,3 @@
 include_rules = [
-  "+mojo/application/public/cpp",
+  "+mojo/shell/public/cpp",
 ]
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
index c684661..47fc08d 100644
--- a/media/test/pipeline_integration_test.cc
+++ b/media/test/pipeline_integration_test.cc
@@ -35,9 +35,9 @@
 #include "media/mojo/interfaces/renderer.mojom.h"
 #include "media/mojo/interfaces/service_factory.mojom.h"
 #include "media/mojo/services/mojo_renderer_impl.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_test_base.h"
-#include "mojo/application/public/cpp/connect.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
+#include "mojo/shell/public/cpp/connect.h"
 
 // TODO(dalecurtis): The mojo renderer is in another process, so we have no way
 // currently to get hashes for video and audio samples.  This also means that
diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn
index abd063e..df7e878 100644
--- a/mojo/BUILD.gn
+++ b/mojo/BUILD.gn
@@ -71,10 +71,10 @@ group("tests") {
   testonly = true
   deps = [
     "//ipc/mojo:ipc_mojo_unittests",
-    "//mojo/application/public/cpp/tests:mojo_public_application_unittests",
     "//mojo/common:mojo_common_unittests",
     "//mojo/converters/surfaces/tests:mojo_surfaces_lib_unittests",
     "//mojo/edk/js/test:js_unittests",
+    "//mojo/shell/public/cpp/tests:mojo_public_application_unittests",
 
     # TODO(use_chrome_edk):
     #"//mojo/edk/js/test:js_integration_tests2",
diff --git a/mojo/common/DEPS b/mojo/common/DEPS
index 6dd6560..21f3b0d 100644
--- a/mojo/common/DEPS
+++ b/mojo/common/DEPS
@@ -1,7 +1,7 @@
 include_rules = [
   # common must not depend on embedder.
   "-mojo",
-  "+mojo/application/public/cpp",
+  "+mojo/shell/public/cpp",
   "+mojo/common",
   "+mojo/message_pump",
   "+mojo/public",
diff --git a/mojo/mojo_base.gyp b/mojo/mojo_base.gyp
index b814cf5..dd9a649 100644
--- a/mojo/mojo_base.gyp
+++ b/mojo/mojo_base.gyp
@@ -204,11 +204,11 @@
       'type': 'none',
       'variables': {
         'mojom_files': [
-          'application/public/interfaces/application.mojom',
-          'application/public/interfaces/application_manager.mojom',
-          'application/public/interfaces/content_handler.mojom',
-          'application/public/interfaces/service_provider.mojom',
-          'application/public/interfaces/shell.mojom',
+          'shell/public/interfaces/application.mojom',
+          'shell/public/interfaces/application_manager.mojom',
+          'shell/public/interfaces/content_handler.mojom',
+          'shell/public/interfaces/service_provider.mojom',
+          'shell/public/interfaces/shell.mojom',
         ],
       },
       'dependencies': [
@@ -220,32 +220,32 @@
       'includes': [ '../third_party/mojo/mojom_bindings_generator_explicit.gypi' ],
     },
     {
-      # GN version: //mojo/application/public/cpp
+      # GN version: //mojo/shell/public/cpp
       'target_name': 'mojo_application_base',
       'type': 'static_library',
       'sources': [
-        'application/public/cpp/app_lifetime_helper.h',
-        'application/public/cpp/application_connection.h',
-        'application/public/cpp/application_delegate.h',
-        'application/public/cpp/application_impl.h',
-        'application/public/cpp/application_runner.h',
-        'application/public/cpp/connect.h',
-        'application/public/cpp/initialize_base_and_icu.cc',
-        'application/public/cpp/initialize_base_and_icu.h',
-        'application/public/cpp/interface_factory.h',
-        'application/public/cpp/interface_factory_impl.h',
-        'application/public/cpp/lib/app_lifetime_helper.cc',
-        'application/public/cpp/lib/application_delegate.cc',
-        'application/public/cpp/lib/application_impl.cc',
-        'application/public/cpp/lib/application_runner.cc',
-        'application/public/cpp/lib/interface_factory_connector.h',
-        'application/public/cpp/lib/service_connector_registry.cc',
-        'application/public/cpp/lib/service_connector_registry.h',
-        'application/public/cpp/lib/service_provider_impl.cc',
-        'application/public/cpp/lib/service_registry.cc',
-        'application/public/cpp/lib/service_registry.h',
-        'application/public/cpp/service_connector.h',
-        'application/public/cpp/service_provider_impl.h',
+        'shell/public/cpp/app_lifetime_helper.h',
+        'shell/public/cpp/application_connection.h',
+        'shell/public/cpp/application_delegate.h',
+        'shell/public/cpp/application_impl.h',
+        'shell/public/cpp/application_runner.h',
+        'shell/public/cpp/connect.h',
+        'shell/public/cpp/initialize_base_and_icu.cc',
+        'shell/public/cpp/initialize_base_and_icu.h',
+        'shell/public/cpp/interface_factory.h',
+        'shell/public/cpp/interface_factory_impl.h',
+        'shell/public/cpp/lib/app_lifetime_helper.cc',
+        'shell/public/cpp/lib/application_delegate.cc',
+        'shell/public/cpp/lib/application_impl.cc',
+        'shell/public/cpp/lib/application_runner.cc',
+        'shell/public/cpp/lib/interface_factory_connector.h',
+        'shell/public/cpp/lib/service_connector_registry.cc',
+        'shell/public/cpp/lib/service_connector_registry.h',
+        'shell/public/cpp/lib/service_provider_impl.cc',
+        'shell/public/cpp/lib/service_registry.cc',
+        'shell/public/cpp/lib/service_registry.h',
+        'shell/public/cpp/service_connector.h',
+        'shell/public/cpp/service_provider_impl.h',
       ],
       'dependencies': [
         '../base/base.gyp:base_i18n',
@@ -281,7 +281,7 @@
       ],
     },
     {
-      # GN version: //mojo/application/public/cpp/tests
+      # GN version: //mojo/shell/public/cpp/tests
       'target_name': 'mojo_public_application_unittests',
       'type': 'executable',
       'dependencies': [
@@ -293,7 +293,7 @@
         '../third_party/mojo/mojo_public.gyp:mojo_environment_standalone',
       ],
       'sources': [
-        'application/public/cpp/tests/service_registry_unittest.cc',
+        'shell/public/cpp/tests/service_registry_unittest.cc',
       ],
     },
   ],
diff --git a/mojo/public/cpp/bindings/tests/versioning_apptest.cc b/mojo/public/cpp/bindings/tests/versioning_apptest.cc
index faf86a6..26dca60 100644
--- a/mojo/public/cpp/bindings/tests/versioning_apptest.cc
+++ b/mojo/public/cpp/bindings/tests/versioning_apptest.cc
@@ -5,10 +5,10 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_test_base.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "mojo/public/interfaces/bindings/tests/versioning_test_client.mojom.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
 
 namespace mojo {
 namespace test {
diff --git a/mojo/public/cpp/bindings/tests/versioning_test_service.cc b/mojo/public/cpp/bindings/tests/versioning_test_service.cc
index 42953c8..cd41541 100644
--- a/mojo/public/cpp/bindings/tests/versioning_test_service.cc
+++ b/mojo/public/cpp/bindings/tests/versioning_test_service.cc
@@ -6,14 +6,14 @@
 
 #include <map>
 
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_runner.h"
-#include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "mojo/public/interfaces/bindings/tests/versioning_test_service.mojom.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_runner.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 
 namespace mojo {
 namespace test {
diff --git a/mojo/runner/BUILD.gn b/mojo/runner/BUILD.gn
index 4166e29..ca7205c 100644
--- a/mojo/runner/BUILD.gn
+++ b/mojo/runner/BUILD.gn
@@ -128,7 +128,6 @@ source_set("lib") {
     "//components/devtools_service/public/cpp",
     "//components/devtools_service/public/interfaces",
     "//components/tracing:startup_tracing",
-    "//mojo/application/public/cpp",
     "//mojo/message_pump",
     "//mojo/runner/child:interfaces",
     "//mojo/runner/host:lib",
@@ -137,6 +136,7 @@ source_set("lib") {
     "//mojo/services/tracing/public/interfaces",
     "//mojo/shell",
     "//mojo/shell/package_manager",
+    "//mojo/shell/public/cpp",
     "//mojo/util:filename_util",
     "//third_party/mojo/src/mojo/edk/system",
     "//ui/gl",
@@ -172,7 +172,7 @@ source_set("lib") {
       ":jni_headers",
       ":run_android_application_function",
       "//components/mus/gles2",
-      "//mojo/application/public/cpp:content_handler",
+      "//mojo/shell/public/cpp:content_handler",
     ]
   } else {
     sources += [
diff --git a/mojo/runner/android/android_handler.cc b/mojo/runner/android/android_handler.cc
index 463d505..55522d4 100644
--- a/mojo/runner/android/android_handler.cc
+++ b/mojo/runner/android/android_handler.cc
@@ -14,11 +14,11 @@
 #include "base/logging.h"
 #include "base/scoped_native_library.h"
 #include "jni/AndroidHandler_jni.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/common/data_pipe_utils.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/runner/android/run_android_application_function.h"
 #include "mojo/runner/host/native_application_support.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 #include "mojo/util/filename_util.h"
 #include "url/gurl.h"
 
diff --git a/mojo/runner/android/android_handler.h b/mojo/runner/android/android_handler.h
index c81d2a8..43a535f 100644
--- a/mojo/runner/android/android_handler.h
+++ b/mojo/runner/android/android_handler.h
@@ -7,10 +7,10 @@
 
 #include <jni.h>
 
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/content_handler_factory.h"
-#include "mojo/application/public/cpp/interface_factory_impl.h"
-#include "mojo/application/public/interfaces/content_handler.mojom.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/content_handler_factory.h"
+#include "mojo/shell/public/cpp/interface_factory_impl.h"
+#include "mojo/shell/public/interfaces/content_handler.mojom.h"
 
 namespace base {
 class FilePath;
diff --git a/mojo/runner/android/android_handler_loader.h b/mojo/runner/android/android_handler_loader.h
index 24ada8d..8c8e4e4 100644
--- a/mojo/runner/android/android_handler_loader.h
+++ b/mojo/runner/android/android_handler_loader.h
@@ -8,9 +8,9 @@
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/runner/android/android_handler.h"
 #include "mojo/shell/application_loader.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 namespace mojo {
 namespace runner {
diff --git a/mojo/runner/android/background_application_loader_unittest.cc b/mojo/runner/android/background_application_loader_unittest.cc
index f99e44c..7201a63 100644
--- a/mojo/runner/android/background_application_loader_unittest.cc
+++ b/mojo/runner/android/background_application_loader_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "mojo/runner/android/background_application_loader.h"
 
-#include "mojo/application/public/interfaces/application.mojom.h"
+#include "mojo/shell/public/interfaces/application.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
diff --git a/mojo/runner/child/BUILD.gn b/mojo/runner/child/BUILD.gn
index 7ba5fb7..7a40f6c 100644
--- a/mojo/runner/child/BUILD.gn
+++ b/mojo/runner/child/BUILD.gn
@@ -22,9 +22,9 @@ source_set("lib") {
   deps = [
     ":interfaces",
     "//base",
-    "//mojo/application/public/interfaces",
     "//mojo/message_pump",
     "//mojo/platform_handle:platform_handle_impl",
+    "//mojo/shell/public/interfaces",
     "//third_party/mojo/src/mojo/edk/system",
   ]
 }
@@ -35,7 +35,7 @@ mojom("interfaces") {
   ]
 
   deps = [
-    "//mojo/application/public/interfaces",
+    "//mojo/shell/public/interfaces",
   ]
 
   import_dirs = [ "//mojo/services" ]
@@ -53,10 +53,10 @@ source_set("test_native_main") {
 
   deps = [
     "//base",
-    "//mojo/application/public/cpp",
     "//mojo/gles2",
     "//mojo/message_pump",
     "//mojo/runner/child:lib",
+    "//mojo/shell/public/cpp",
     "//third_party/mojo/src/mojo/edk/system",
   ]
 }
@@ -67,7 +67,7 @@ mojom("apptest_interfaces") {
   ]
 
   deps = [
-    "//mojo/application/public/interfaces",
+    "//mojo/shell/public/interfaces",
   ]
 
   import_dirs = [ "//mojo/services" ]
@@ -86,10 +86,10 @@ mojo_native_application("apptests") {
     ":apptest_interfaces",
     "//base",
     "//base/test:test_config",
-    "//mojo/application/public/cpp:sources",
-    "//mojo/application/public/cpp:test_support",
     "//mojo/common:common_base",
     "//mojo/converters/network:network",
+    "//mojo/shell/public/cpp:sources",
+    "//mojo/shell/public/cpp:test_support",
   ]
 
   data_deps = [
@@ -110,7 +110,7 @@ executable("native_target") {
     ":lib",
     ":test_native_main",
     "//base",
-    "//mojo/application/public/cpp",
     "//mojo/common:common_base",
+    "//mojo/shell/public/cpp",
   ]
 }
diff --git a/mojo/runner/child/child_controller.mojom b/mojo/runner/child/child_controller.mojom
index ece1e67..741723e 100644
--- a/mojo/runner/child/child_controller.mojom
+++ b/mojo/runner/child/child_controller.mojom
@@ -4,7 +4,7 @@
 
 module mojo.runner;
 
-import "mojo/application/public/interfaces/application.mojom";
+import "mojo/shell/public/interfaces/application.mojom";
 
 interface ChildController {
   // Starts the app.
diff --git a/mojo/runner/child/native_apptest.cc b/mojo/runner/child/native_apptest.cc
index cc47edb..15c2564 100644
--- a/mojo/runner/child/native_apptest.cc
+++ b/mojo/runner/child/native_apptest.cc
@@ -4,10 +4,10 @@
 
 #include "base/bind.h"
 #include "base/macros.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_test_base.h"
 #include "mojo/converters/network/network_type_converters.h"
 #include "mojo/runner/child/test_native_service.mojom.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
 
 namespace mojo {
 namespace runner {
diff --git a/mojo/runner/child/native_apptest_target.cc b/mojo/runner/child/native_apptest_target.cc
index 052040f..9b3cae6 100644
--- a/mojo/runner/child/native_apptest_target.cc
+++ b/mojo/runner/child/native_apptest_target.cc
@@ -7,14 +7,14 @@
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/macros.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/runner/child/test_native_main.h"
 #include "mojo/runner/child/test_native_service.mojom.h"
 #include "mojo/runner/init.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 
 namespace {
 
diff --git a/mojo/runner/child/runner_connection.h b/mojo/runner/child/runner_connection.h
index 68202e1..83423dd 100644
--- a/mojo/runner/child/runner_connection.h
+++ b/mojo/runner/child/runner_connection.h
@@ -6,7 +6,7 @@
 #define MOJO_RUNNER_CHILD_RUNNER_CONNECTION_H_
 
 #include "base/macros.h"
-#include "mojo/application/public/interfaces/application.mojom.h"
+#include "mojo/shell/public/interfaces/application.mojom.h"
 
 namespace mojo {
 namespace runner {
diff --git a/mojo/runner/child/test_native_main.cc b/mojo/runner/child/test_native_main.cc
index 19ea8df..85248b6 100644
--- a/mojo/runner/child/test_native_main.cc
+++ b/mojo/runner/child/test_native_main.cc
@@ -12,11 +12,11 @@
 #include "base/process/launch.h"
 #include "base/threading/thread.h"
 #include "build/build_config.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/message_pump/message_pump_mojo.h"
 #include "mojo/runner/child/runner_connection.h"
 #include "mojo/runner/init.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
 #include "third_party/mojo/src/mojo/edk/embedder/process_delegate.h"
 
diff --git a/mojo/runner/context.cc b/mojo/runner/context.cc
index 3709b88..657d99a 100644
--- a/mojo/runner/context.cc
+++ b/mojo/runner/context.cc
@@ -28,9 +28,6 @@
 #include "components/devtools_service/public/cpp/switches.h"
 #include "components/devtools_service/public/interfaces/devtools_service.mojom.h"
 #include "components/tracing/tracing_switches.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/runner/host/in_process_native_runner.h"
 #include "mojo/runner/host/out_of_process_native_runner.h"
@@ -44,6 +41,9 @@
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/connect_to_application_params.h"
 #include "mojo/shell/package_manager/package_manager_impl.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 #include "mojo/shell/query_util.h"
 #include "mojo/shell/switches.h"
 #include "mojo/util/filename_util.h"
diff --git a/mojo/runner/shell_apptest.cc b/mojo/runner/shell_apptest.cc
index 69e8a19..b1c57da 100644
--- a/mojo/runner/shell_apptest.cc
+++ b/mojo/runner/shell_apptest.cc
@@ -12,8 +12,6 @@
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_test_base.h"
 #include "mojo/common/data_pipe_utils.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "mojo/runner/kPingable.h"
@@ -22,6 +20,8 @@
 #include "mojo/services/http_server/public/interfaces/http_server.mojom.h"
 #include "mojo/services/http_server/public/interfaces/http_server_factory.mojom.h"
 #include "mojo/services/network/public/interfaces/net_address.mojom.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
 
 namespace mojo {
 namespace {
diff --git a/mojo/runner/test/BUILD.gn b/mojo/runner/test/BUILD.gn
index bd94a9d..7d9dc14 100644
--- a/mojo/runner/test/BUILD.gn
+++ b/mojo/runner/test/BUILD.gn
@@ -22,7 +22,7 @@ mojo_native_application("pingable_app") {
 
   deps = [
     ":bindings",
-    "//mojo/application/public/cpp",
     "//mojo/public/cpp/bindings:callback",
+    "//mojo/shell/public/cpp",
   ]
 }
diff --git a/mojo/runner/test/pingable_app.cc b/mojo/runner/test/pingable_app.cc
index 2930a51..e53a11c 100644
--- a/mojo/runner/test/pingable_app.cc
+++ b/mojo/runner/test/pingable_app.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_runner.h"
-#include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/bindings/callback.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/runner/test/pingable.mojom.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_runner.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 
 namespace mojo {
 
diff --git a/mojo/services/network/BUILD.gn b/mojo/services/network/BUILD.gn
index 286760d..e5c3ef2 100644
--- a/mojo/services/network/BUILD.gn
+++ b/mojo/services/network/BUILD.gn
@@ -93,7 +93,6 @@ source_set("lib") {
   deps = [
     "//base",
     "//components/filesystem/public/interfaces",
-    "//mojo/application/public/cpp",
     "//mojo/common:common_base",
     "//mojo/common:url_type_converters",
     "//mojo/message_pump",
@@ -101,6 +100,7 @@ source_set("lib") {
     "//mojo/services/network/public/cpp",
     "//mojo/services/network/public/interfaces",
     "//mojo/services/tracing/public/cpp",
+    "//mojo/shell/public/cpp",
     "//net",
     "//net:extras",
     "//net:http_server",
@@ -119,11 +119,11 @@ source_set("sources") {
   deps = [
     ":lib",
     "//base",
-    "//mojo/application/public/cpp",
     "//mojo/public/c/system:for_shared_library",
     "//mojo/public/cpp/bindings:bindings",
     "//mojo/services/network/public/cpp",
     "//mojo/services/network/public/interfaces",
+    "//mojo/shell/public/cpp",
   ]
 }
 
@@ -141,13 +141,13 @@ mojo_native_application("apptests") {
     ":lib",
     ":network",
     "//base",
-    "//mojo/application/public/cpp:sources",
-    "//mojo/application/public/cpp:test_support",
     "//mojo/common:common_base",
     "//mojo/message_pump",
     "//mojo/public/cpp/bindings:callback",
     "//mojo/services/network/public/cpp",
     "//mojo/services/network/public/interfaces",
+    "//mojo/shell/public/cpp:sources",
+    "//mojo/shell/public/cpp:test_support",
     "//net",
     "//net:test_support",
     "//testing/gtest",
diff --git a/mojo/services/network/DEPS b/mojo/services/network/DEPS
index fa4edaa..d7b3016 100644
--- a/mojo/services/network/DEPS
+++ b/mojo/services/network/DEPS
@@ -1,7 +1,7 @@
 include_rules = [
   "+base",
   "+components/filesystem/public/interfaces",
-  "+mojo/application",
+  "+mojo/shell",
   "+mojo/common",
   "+mojo/message_pump",
   "+mojo/services",
diff --git a/mojo/services/network/cookie_store_impl.h b/mojo/services/network/cookie_store_impl.h
index e3466f9..0fe7d2e 100644
--- a/mojo/services/network/cookie_store_impl.h
+++ b/mojo/services/network/cookie_store_impl.h
@@ -6,9 +6,9 @@
 #define MOJO_SERVICES_NETWORK_COOKIE_STORE_IMPL_H_
 
 #include "base/macros.h"
-#include "mojo/application/public/cpp/app_lifetime_helper.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/services/network/public/interfaces/cookie_store.mojom.h"
+#include "mojo/shell/public/cpp/app_lifetime_helper.h"
 #include "url/gurl.h"
 
 namespace mojo {
diff --git a/mojo/services/network/http_server_apptest.cc b/mojo/services/network/http_server_apptest.cc
index 22e87e2..f630f76 100644
--- a/mojo/services/network/http_server_apptest.cc
+++ b/mojo/services/network/http_server_apptest.cc
@@ -15,9 +15,6 @@
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_test_base.h"
 #include "mojo/common/data_pipe_utils.h"
 #include "mojo/services/network/net_address_type_converters.h"
 #include "mojo/services/network/public/cpp/web_socket_read_queue.h"
@@ -29,6 +26,9 @@
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
 #include "mojo/services/network/public/interfaces/web_socket.mojom.h"
 #include "mojo/services/network/public/interfaces/web_socket_factory.mojom.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
diff --git a/mojo/services/network/http_server_impl.h b/mojo/services/network/http_server_impl.h
index 72a2d79..d4fb67c 100644
--- a/mojo/services/network/http_server_impl.h
+++ b/mojo/services/network/http_server_impl.h
@@ -10,9 +10,9 @@
 #include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/application/public/cpp/app_lifetime_helper.h"
 #include "mojo/services/network/public/interfaces/http_server.mojom.h"
 #include "mojo/services/network/public/interfaces/net_address.mojom.h"
+#include "mojo/shell/public/cpp/app_lifetime_helper.h"
 #include "net/server/http_server.h"
 
 namespace net {
diff --git a/mojo/services/network/main.cc b/mojo/services/network/main.cc
index 45216b1..3ae88bc 100644
--- a/mojo/services/network/main.cc
+++ b/mojo/services/network/main.cc
@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 #include "base/message_loop/message_loop.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/services/network/network_service_delegate.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(new mojo::NetworkServiceDelegate);
diff --git a/mojo/services/network/network_service_delegate.cc b/mojo/services/network/network_service_delegate.cc
index f228bef..fff5950 100644
--- a/mojo/services/network/network_service_delegate.cc
+++ b/mojo/services/network/network_service_delegate.cc
@@ -14,13 +14,13 @@
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
-#include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/message_pump/message_pump_mojo.h"
 #include "mojo/services/network/cookie_store_impl.h"
 #include "mojo/services/network/network_service_delegate_observer.h"
 #include "mojo/services/network/network_service_impl.h"
 #include "mojo/services/network/url_loader_factory_impl.h"
 #include "mojo/services/network/web_socket_factory_impl.h"
+#include "mojo/shell/public/cpp/application_connection.h"
 #include "mojo/util/capture_util.h"
 #include "sql/mojo/mojo_vfs.h"
 
diff --git a/mojo/services/network/network_service_delegate.h b/mojo/services/network/network_service_delegate.h
index 16b2f96..948795f 100644
--- a/mojo/services/network/network_service_delegate.h
+++ b/mojo/services/network/network_service_delegate.h
@@ -8,15 +8,15 @@
 #include "base/observer_list.h"
 #include "base/threading/thread.h"
 #include "components/filesystem/public/interfaces/file_system.mojom.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/services/network/network_context.h"
 #include "mojo/services/network/public/interfaces/cookie_store.mojom.h"
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
 #include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h"
 #include "mojo/services/network/public/interfaces/web_socket_factory.mojom.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 
 namespace sql {
 class ScopedMojoFilesystemVFS;
diff --git a/mojo/services/network/network_service_impl.h b/mojo/services/network/network_service_impl.h
index fd6455c..1b3531e 100644
--- a/mojo/services/network/network_service_impl.h
+++ b/mojo/services/network/network_service_impl.h
@@ -6,9 +6,9 @@
 #define MOJO_SERVICES_NETWORK_NETWORK_SERVICE_IMPL_H_
 
 #include "base/compiler_specific.h"
-#include "mojo/application/public/cpp/app_lifetime_helper.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
+#include "mojo/shell/public/cpp/app_lifetime_helper.h"
 #include "url/gurl.h"
 
 namespace mojo {
diff --git a/mojo/services/network/public/cpp/BUILD.gn b/mojo/services/network/public/cpp/BUILD.gn
index 80262fc..6bb891b 100644
--- a/mojo/services/network/public/cpp/BUILD.gn
+++ b/mojo/services/network/public/cpp/BUILD.gn
@@ -16,10 +16,10 @@ source_set("cpp") {
   deps = [
     "../interfaces",
     "//base",
-    "//mojo/application/public/cpp",
     "//mojo/environment:chromium",
     "//mojo/message_pump",
     "//mojo/public/c/system",
     "//mojo/public/cpp/system",
+    "//mojo/shell/public/cpp",
   ]
 }
diff --git a/mojo/services/network/tcp_bound_socket_impl.h b/mojo/services/network/tcp_bound_socket_impl.h
index 17d4a001..268f436 100644
--- a/mojo/services/network/tcp_bound_socket_impl.h
+++ b/mojo/services/network/tcp_bound_socket_impl.h
@@ -6,9 +6,9 @@
 #define MOJO_SERVICES_NETWORK_TCP_BOUND_SOCKET_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "mojo/application/public/cpp/app_lifetime_helper.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/services/network/public/interfaces/tcp_bound_socket.mojom.h"
+#include "mojo/shell/public/cpp/app_lifetime_helper.h"
 #include "net/socket/tcp_socket.h"
 
 namespace mojo {
diff --git a/mojo/services/network/tcp_connected_socket_impl.h b/mojo/services/network/tcp_connected_socket_impl.h
index 15d72f3..62b9a14 100644
--- a/mojo/services/network/tcp_connected_socket_impl.h
+++ b/mojo/services/network/tcp_connected_socket_impl.h
@@ -7,10 +7,10 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "mojo/application/public/cpp/app_lifetime_helper.h"
 #include "mojo/message_pump/handle_watcher.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/services/network/public/interfaces/tcp_connected_socket.mojom.h"
+#include "mojo/shell/public/cpp/app_lifetime_helper.h"
 #include "net/socket/tcp_socket.h"
 
 namespace mojo {
diff --git a/mojo/services/network/tcp_server_socket_impl.h b/mojo/services/network/tcp_server_socket_impl.h
index 84ce309..184f96d 100644
--- a/mojo/services/network/tcp_server_socket_impl.h
+++ b/mojo/services/network/tcp_server_socket_impl.h
@@ -6,9 +6,9 @@
 #define MOJO_SERVICES_NETWORK_TCP_SERVER_SOCKET_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "mojo/application/public/cpp/app_lifetime_helper.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/services/network/public/interfaces/tcp_server_socket.mojom.h"
+#include "mojo/shell/public/cpp/app_lifetime_helper.h"
 #include "net/base/ip_endpoint.h"
 #include "net/socket/tcp_socket.h"
 
diff --git a/mojo/services/network/udp_socket_apptest.cc b/mojo/services/network/udp_socket_apptest.cc
index b7e98d4..17388a4 100644
--- a/mojo/services/network/udp_socket_apptest.cc
+++ b/mojo/services/network/udp_socket_apptest.cc
@@ -10,13 +10,13 @@
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_test_base.h"
 #include "mojo/public/cpp/bindings/callback.h"
 #include "mojo/services/network/public/cpp/udp_socket_wrapper.h"
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
 #include "mojo/services/network/public/interfaces/udp_socket.mojom.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
 #include "net/base/net_errors.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/mojo/services/network/udp_socket_impl.h b/mojo/services/network/udp_socket_impl.h
index c238c21..edc2a66 100644
--- a/mojo/services/network/udp_socket_impl.h
+++ b/mojo/services/network/udp_socket_impl.h
@@ -12,9 +12,9 @@
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "mojo/application/public/cpp/app_lifetime_helper.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/services/network/public/interfaces/udp_socket.mojom.h"
+#include "mojo/shell/public/cpp/app_lifetime_helper.h"
 #include "net/base/ip_endpoint.h"
 #include "net/udp/udp_socket.h"
 
diff --git a/mojo/services/network/url_loader_factory_impl.h b/mojo/services/network/url_loader_factory_impl.h
index 7a67cee..a290cd4 100644
--- a/mojo/services/network/url_loader_factory_impl.h
+++ b/mojo/services/network/url_loader_factory_impl.h
@@ -7,9 +7,9 @@
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "mojo/application/public/cpp/app_lifetime_helper.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h"
+#include "mojo/shell/public/cpp/app_lifetime_helper.h"
 
 namespace mojo {
 class NetworkContext;
diff --git a/mojo/services/network/url_loader_impl.h b/mojo/services/network/url_loader_impl.h
index c972f60..86ba68c 100644
--- a/mojo/services/network/url_loader_impl.h
+++ b/mojo/services/network/url_loader_impl.h
@@ -9,10 +9,10 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "mojo/application/public/cpp/app_lifetime_helper.h"
 #include "mojo/message_pump/handle_watcher.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
+#include "mojo/shell/public/cpp/app_lifetime_helper.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request.h"
 
diff --git a/mojo/services/network/url_loader_impl_apptest.cc b/mojo/services/network/url_loader_impl_apptest.cc
index d3d68c6..90e7c96 100644
--- a/mojo/services/network/url_loader_impl_apptest.cc
+++ b/mojo/services/network/url_loader_impl_apptest.cc
@@ -9,11 +9,11 @@
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
-#include "mojo/application/public/cpp/application_test_base.h"
 #include "mojo/message_pump/message_pump_mojo.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/services/network/network_context.h"
 #include "mojo/services/network/url_loader_impl.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request_job.h"
 #include "net/url_request/url_request_job_factory_impl.h"
diff --git a/mojo/services/network/web_socket_factory_impl.h b/mojo/services/network/web_socket_factory_impl.h
index 97d60c5..f820373 100644
--- a/mojo/services/network/web_socket_factory_impl.h
+++ b/mojo/services/network/web_socket_factory_impl.h
@@ -7,9 +7,9 @@
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "mojo/application/public/cpp/app_lifetime_helper.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/services/network/public/interfaces/web_socket_factory.mojom.h"
+#include "mojo/shell/public/cpp/app_lifetime_helper.h"
 
 namespace mojo {
 class NetworkContext;
diff --git a/mojo/services/network/web_socket_impl.h b/mojo/services/network/web_socket_impl.h
index 881b165..26a2036 100644
--- a/mojo/services/network/web_socket_impl.h
+++ b/mojo/services/network/web_socket_impl.h
@@ -8,9 +8,9 @@
 #include <stdint.h>
 
 #include "base/memory/scoped_ptr.h"
-#include "mojo/application/public/cpp/app_lifetime_helper.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/services/network/public/interfaces/web_socket.mojom.h"
+#include "mojo/shell/public/cpp/app_lifetime_helper.h"
 
 namespace net {
 class WebSocketChannel;
diff --git a/mojo/services/test_service/BUILD.gn b/mojo/services/test_service/BUILD.gn
index 36647da..d35ae11 100644
--- a/mojo/services/test_service/BUILD.gn
+++ b/mojo/services/test_service/BUILD.gn
@@ -38,7 +38,7 @@ mojo_native_application("test_app") {
     ":bindings",
     "//base",
     "//base:i18n",
-    "//mojo/application/public/cpp",
+    "//mojo/shell/public/cpp",
   ]
 }
 
@@ -58,6 +58,6 @@ mojo_native_application("test_request_tracker_app") {
     ":bindings",
     "//base",
     "//base:i18n",
-    "//mojo/application/public/cpp",
+    "//mojo/shell/public/cpp",
   ]
 }
diff --git a/mojo/services/test_service/DEPS b/mojo/services/test_service/DEPS
index e402e7f..2590b53 100644
--- a/mojo/services/test_service/DEPS
+++ b/mojo/services/test_service/DEPS
@@ -1,3 +1,3 @@
 include_rules = [
-  "+mojo/application/public/cpp",
+  "+mojo/shell/public/cpp",
 ]
diff --git a/mojo/services/test_service/test_request_tracker_application.cc b/mojo/services/test_service/test_request_tracker_application.cc
index 5168cfa..d2cdbc9 100644
--- a/mojo/services/test_service/test_request_tracker_application.cc
+++ b/mojo/services/test_service/test_request_tracker_application.cc
@@ -7,10 +7,10 @@
 #include <assert.h>
 #include <utility>
 
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/services/test_service/test_time_service_impl.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 namespace mojo {
 namespace test {
diff --git a/mojo/services/test_service/test_request_tracker_application.h b/mojo/services/test_service/test_request_tracker_application.h
index a009f62..ac07075 100644
--- a/mojo/services/test_service/test_request_tracker_application.h
+++ b/mojo/services/test_service/test_request_tracker_application.h
@@ -5,10 +5,10 @@
 #ifndef SERVICES_TEST_SERVICE_TEST_REQUEST_TRACKER_APPLICATION_H_
 #define SERVICES_TEST_SERVICE_TEST_REQUEST_TRACKER_APPLICATION_H_
 
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/interface_factory_impl.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "mojo/services/test_service/test_request_tracker_impl.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/interface_factory_impl.h"
 
 namespace mojo {
 class ApplicationImpl;
diff --git a/mojo/services/test_service/test_service_application.cc b/mojo/services/test_service/test_service_application.cc
index 1f1cfe6..a39cb2d 100644
--- a/mojo/services/test_service/test_service_application.cc
+++ b/mojo/services/test_service/test_service_application.cc
@@ -7,11 +7,11 @@
 #include <assert.h>
 #include <utility>
 
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/services/test_service/test_service_impl.h"
 #include "mojo/services/test_service/test_time_service_impl.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 namespace mojo {
 namespace test {
diff --git a/mojo/services/test_service/test_service_application.h b/mojo/services/test_service/test_service_application.h
index 4ad5559..42b476c 100644
--- a/mojo/services/test_service/test_service_application.h
+++ b/mojo/services/test_service/test_service_application.h
@@ -5,9 +5,9 @@
 #ifndef SERVICES_TEST_SERVICE_TEST_SERVICE_APPLICATION_H_
 #define SERVICES_TEST_SERVICE_TEST_SERVICE_APPLICATION_H_
 
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/public/cpp/system/macros.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 
 namespace mojo {
 class ApplicationConnection;
diff --git a/mojo/services/test_service/test_service_impl.cc b/mojo/services/test_service/test_service_impl.cc
index 998c99c..3429e0c0 100644
--- a/mojo/services/test_service/test_service_impl.cc
+++ b/mojo/services/test_service/test_service_impl.cc
@@ -11,10 +11,10 @@
 #include "base/bind.h"
 #include "base/i18n/time_formatting.h"
 #include "base/strings/utf_string_conversions.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/services/test_service/test_service_application.h"
 #include "mojo/services/test_service/test_time_service_impl.h"
 #include "mojo/services/test_service/tracked_service.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 namespace mojo {
 namespace test {
diff --git a/mojo/services/test_service/test_time_service_impl.cc b/mojo/services/test_service/test_time_service_impl.cc
index f7a6d13..485be00 100644
--- a/mojo/services/test_service/test_time_service_impl.cc
+++ b/mojo/services/test_service/test_time_service_impl.cc
@@ -9,9 +9,9 @@
 #include <utility>
 
 #include "base/time/time.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/services/test_service/test_request_tracker.mojom.h"
 #include "mojo/services/test_service/tracked_service.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 namespace mojo {
 namespace test {
diff --git a/mojo/services/tracing/BUILD.gn b/mojo/services/tracing/BUILD.gn
index 4c8421e..14fed0f 100644
--- a/mojo/services/tracing/BUILD.gn
+++ b/mojo/services/tracing/BUILD.gn
@@ -13,8 +13,8 @@ mojo_native_application("tracing") {
 
   deps = [
     ":lib",
-    "//mojo/application/public/cpp",
     "//mojo/public/cpp/system",
+    "//mojo/shell/public/cpp",
   ]
 }
 
@@ -30,8 +30,8 @@ source_set("lib") {
 
   deps = [
     "//base",
-    "//mojo/application/public/cpp",
     "//mojo/common:common_base",
     "//mojo/services/tracing/public/interfaces",
+    "//mojo/shell/public/cpp",
   ]
 }
diff --git a/mojo/services/tracing/DEPS b/mojo/services/tracing/DEPS
index bfc9a9e..72513eb 100644
--- a/mojo/services/tracing/DEPS
+++ b/mojo/services/tracing/DEPS
@@ -1,3 +1,3 @@
 include_rules = [
-  "+mojo/application",
+  "+mojo/shell",
 ]
diff --git a/mojo/services/tracing/main.cc b/mojo/services/tracing/main.cc
index 1810d1b..c338c97 100644
--- a/mojo/services/tracing/main.cc
+++ b/mojo/services/tracing/main.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/services/tracing/tracing_app.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(new tracing::TracingApp);
diff --git a/mojo/services/tracing/public/cpp/BUILD.gn b/mojo/services/tracing/public/cpp/BUILD.gn
index 02eed11..38b3cfe 100644
--- a/mojo/services/tracing/public/cpp/BUILD.gn
+++ b/mojo/services/tracing/public/cpp/BUILD.gn
@@ -14,8 +14,8 @@ source_set("cpp") {
 
   deps = [
     "//base",
-    "//mojo/application/public/cpp",
     "//mojo/public/cpp/bindings",
     "//mojo/services/tracing/public/interfaces",
+    "//mojo/shell/public/cpp",
   ]
 }
diff --git a/mojo/services/tracing/public/cpp/trace_provider_impl.cc b/mojo/services/tracing/public/cpp/trace_provider_impl.cc
index e9190f5..d37149e 100644
--- a/mojo/services/tracing/public/cpp/trace_provider_impl.cc
+++ b/mojo/services/tracing/public/cpp/trace_provider_impl.cc
@@ -12,8 +12,8 @@
 #include "base/time/time.h"
 #include "base/trace_event/trace_config.h"
 #include "base/trace_event/trace_event.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 namespace mojo {
 
diff --git a/mojo/services/tracing/public/cpp/tracing_impl.cc b/mojo/services/tracing/public/cpp/tracing_impl.cc
index 4b0872d..b0fd154 100644
--- a/mojo/services/tracing/public/cpp/tracing_impl.cc
+++ b/mojo/services/tracing/public/cpp/tracing_impl.cc
@@ -10,7 +10,7 @@
 #include "base/synchronization/lock.h"
 #include "base/threading/platform_thread.h"
 #include "base/trace_event/trace_event_impl.h"
-#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 #ifdef NDEBUG
 #include "base/command_line.h"
diff --git a/mojo/services/tracing/public/cpp/tracing_impl.h b/mojo/services/tracing/public/cpp/tracing_impl.h
index b832ef49..97944e8 100644
--- a/mojo/services/tracing/public/cpp/tracing_impl.h
+++ b/mojo/services/tracing/public/cpp/tracing_impl.h
@@ -6,9 +6,9 @@
 #define MOJO_SERVICES_TRACING_PUBLIC_CPP_TRACING_IMPL_H_
 
 #include "base/macros.h"
-#include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/services/tracing/public/cpp/trace_provider_impl.h"
 #include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 
 namespace mojo {
 
diff --git a/mojo/services/tracing/tracing_app.cc b/mojo/services/tracing/tracing_app.cc
index e559470..01e8dd5 100644
--- a/mojo/services/tracing/tracing_app.cc
+++ b/mojo/services/tracing/tracing_app.cc
@@ -12,7 +12,7 @@
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
-#include "mojo/application/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_connection.h"
 
 namespace tracing {
 
diff --git a/mojo/services/tracing/tracing_app.h b/mojo/services/tracing/tracing_app.h
index a1e0749..926c096 100644
--- a/mojo/services/tracing/tracing_app.h
+++ b/mojo/services/tracing/tracing_app.h
@@ -10,14 +10,14 @@
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/common/weak_interface_ptr_set.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
 #include "mojo/services/tracing/trace_data_sink.h"
 #include "mojo/services/tracing/trace_recorder_impl.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 
 namespace tracing {
 
diff --git a/mojo/shell/BUILD.gn b/mojo/shell/BUILD.gn
index 202d4dd..dee5ebb 100644
--- a/mojo/shell/BUILD.gn
+++ b/mojo/shell/BUILD.gn
@@ -42,18 +42,18 @@ source_set("shell") {
 
   public_deps = [
     "//base",
-    "//mojo/application/public/interfaces",
     "//mojo/common",
     "//mojo/public/cpp/bindings",
     "//mojo/services/network/public/interfaces",
     "//mojo/services/updater",
+    "//mojo/shell/public/interfaces",
     "//url",
   ]
   deps = [
     "//base/third_party/dynamic_annotations",
     "//crypto:crypto",
-    "//mojo/application/public/cpp:sources",
     "//mojo/environment:chromium",
+    "//mojo/shell/public/cpp:sources",
     "//mojo/util:filename_util",
     "//third_party/mojo/src/mojo/edk/system",
     "//url",
@@ -72,8 +72,8 @@ source_set("test_support") {
   deps = [
     ":shell",
     ":test_bindings",
-    "//mojo/application/public/cpp",
-    "//mojo/application/public/interfaces",
+    "//mojo/shell/public/cpp",
+    "//mojo/shell/public/interfaces",
     "//testing/gtest",
   ]
 }
@@ -95,11 +95,11 @@ test("mojo_shell_unittests") {
     ":test_bindings",
     ":test_support",
     "//base",
-    "//mojo/application/public/cpp",
     "//mojo/edk/system:test_utils",
     "//mojo/public/cpp/system",
     "//mojo/shell/fetcher",
     "//mojo/shell/package_manager",
+    "//mojo/shell/public/cpp",
     "//mojo/util:filename_util",
     "//testing/gtest",
     "//third_party/mojo/src/mojo/edk/test:run_all_unittests",
@@ -127,11 +127,11 @@ mojo_native_application("apptests") {
     ":test_bindings",
     "//base",
     "//base/test:test_config",
-    "//mojo/application/public/cpp:sources",
-    "//mojo/application/public/cpp:test_support",
-    "//mojo/application/public/interfaces",
     "//mojo/common:common_base",
     "//mojo/converters/network",
+    "//mojo/shell/public/cpp:sources",
+    "//mojo/shell/public/cpp:test_support",
+    "//mojo/shell/public/interfaces",
   ]
 
   data_deps = [
@@ -151,12 +151,12 @@ executable("application_manager_apptest_driver") {
     ":test_bindings",
     "//base",
     "//base:base_static",
-    "//mojo/application/public/cpp",
-    "//mojo/application/public/interfaces",
     "//mojo/common:common_base",
     "//mojo/converters/network",
     "//mojo/runner:init",
     "//mojo/runner/child:test_native_main",
+    "//mojo/shell/public/cpp",
+    "//mojo/shell/public/interfaces",
     "//third_party/mojo/src/mojo/edk/system",
   ]
 }
@@ -171,9 +171,9 @@ executable("application_manager_apptest_target") {
   deps = [
     ":test_bindings",
     "//base",
-    "//mojo/application/public/cpp",
     "//mojo/common:common_base",
     "//mojo/converters/network",
     "//mojo/runner/child:test_native_main",
+    "//mojo/shell/public/cpp",
   ]
 }
diff --git a/mojo/shell/application_instance.cc b/mojo/shell/application_instance.cc
index 4043529..0d709af 100644
--- a/mojo/shell/application_instance.cc
+++ b/mojo/shell/application_instance.cc
@@ -11,10 +11,10 @@
 #include "base/atomic_sequence_num.h"
 #include "base/bind.h"
 #include "base/stl_util.h"
-#include "mojo/application/public/interfaces/content_handler.mojom.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/common/url_type_converters.h"
 #include "mojo/shell/application_manager.h"
+#include "mojo/shell/public/interfaces/content_handler.mojom.h"
 
 namespace mojo {
 namespace shell {
diff --git a/mojo/shell/application_instance.h b/mojo/shell/application_instance.h
index a7795eb..ddfaf4c 100644
--- a/mojo/shell/application_instance.h
+++ b/mojo/shell/application_instance.h
@@ -13,13 +13,13 @@
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process/process_handle.h"
-#include "mojo/application/public/interfaces/application.mojom.h"
-#include "mojo/application/public/interfaces/application_manager.mojom.h"
-#include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/shell/capability_filter.h"
 #include "mojo/shell/connect_to_application_params.h"
 #include "mojo/shell/identity.h"
+#include "mojo/shell/public/interfaces/application.mojom.h"
+#include "mojo/shell/public/interfaces/application_manager.mojom.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "url/gurl.h"
 
 namespace mojo {
diff --git a/mojo/shell/application_loader.h b/mojo/shell/application_loader.h
index f464ab1..add330c 100644
--- a/mojo/shell/application_loader.h
+++ b/mojo/shell/application_loader.h
@@ -6,9 +6,9 @@
 #define SHELL_APPLICATION_MANAGER_APPLICATION_LOADER_H_
 
 #include "base/callback.h"
-#include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "url/gurl.h"
 
 namespace mojo {
diff --git a/mojo/shell/application_manager.h b/mojo/shell/application_manager.h
index ebe825e..2000bc4 100644
--- a/mojo/shell/application_manager.h
+++ b/mojo/shell/application_manager.h
@@ -12,10 +12,6 @@
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "mojo/application/public/interfaces/application.mojom.h"
-#include "mojo/application/public/interfaces/application_manager.mojom.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
-#include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/common/weak_interface_ptr_set.h"
 #include "mojo/public/cpp/bindings/interface_ptr_info.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
@@ -25,6 +21,10 @@
 #include "mojo/shell/fetcher.h"
 #include "mojo/shell/identity.h"
 #include "mojo/shell/native_runner.h"
+#include "mojo/shell/public/interfaces/application.mojom.h"
+#include "mojo/shell/public/interfaces/application_manager.mojom.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "url/gurl.h"
 
 namespace base {
diff --git a/mojo/shell/application_manager_apptest.cc b/mojo/shell/application_manager_apptest.cc
index ca9c9e4..fa9a8f6 100644
--- a/mojo/shell/application_manager_apptest.cc
+++ b/mojo/shell/application_manager_apptest.cc
@@ -11,12 +11,12 @@
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/process/process_handle.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_test_base.h"
-#include "mojo/application/public/cpp/interface_factory.h"
-#include "mojo/application/public/interfaces/application_manager.mojom.h"
 #include "mojo/converters/network/network_type_converters.h"
 #include "mojo/shell/application_manager_apptests.mojom.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
+#include "mojo/shell/public/interfaces/application_manager.mojom.h"
 
 using mojo::shell::test::mojom::CreateInstanceForHandleTest;
 
diff --git a/mojo/shell/application_manager_apptest_driver.cc b/mojo/shell/application_manager_apptest_driver.cc
index e92aa7d..9de6d41 100644
--- a/mojo/shell/application_manager_apptest_driver.cc
+++ b/mojo/shell/application_manager_apptest_driver.cc
@@ -18,11 +18,6 @@
 #include "base/path_service.h"
 #include "base/process/process.h"
 #include "base/thread_task_runner_handle.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/interface_factory.h"
-#include "mojo/application/public/interfaces/application_manager.mojom.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/converters/network/network_type_converters.h"
 #include "mojo/edk/embedder/embedder.h"
@@ -30,6 +25,11 @@
 #include "mojo/runner/child/test_native_main.h"
 #include "mojo/runner/init.h"
 #include "mojo/shell/application_manager_apptests.mojom.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
+#include "mojo/shell/public/interfaces/application_manager.mojom.h"
 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
 #include "third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h"
 #include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h"
diff --git a/mojo/shell/application_manager_apptest_target.cc b/mojo/shell/application_manager_apptest_target.cc
index e57721b..62534fd 100644
--- a/mojo/shell/application_manager_apptest_target.cc
+++ b/mojo/shell/application_manager_apptest_target.cc
@@ -5,12 +5,12 @@
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/macros.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/runner/child/test_native_main.h"
 #include "mojo/runner/init.h"
 #include "mojo/shell/application_manager_apptests.mojom.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 using mojo::shell::test::mojom::CreateInstanceForHandleTestPtr;
 
diff --git a/mojo/shell/application_manager_unittest.cc b/mojo/shell/application_manager_unittest.cc
index 6da5557..d63972c 100644
--- a/mojo/shell/application_manager_unittest.cc
+++ b/mojo/shell/application_manager_unittest.cc
@@ -12,16 +12,16 @@
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/interface_factory.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/connect_util.h"
 #include "mojo/shell/fetcher.h"
 #include "mojo/shell/package_manager.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
 #include "mojo/shell/test.mojom.h"
 #include "mojo/shell/test_package_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/mojo/shell/capability_filter_test.cc b/mojo/shell/capability_filter_test.cc
index 8fc0c118..7f384be 100644
--- a/mojo/shell/capability_filter_test.cc
+++ b/mojo/shell/capability_filter_test.cc
@@ -9,15 +9,15 @@
 #include "base/macros.h"
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/connect.h"
-#include "mojo/application/public/cpp/interface_factory.h"
-#include "mojo/application/public/cpp/service_provider_impl.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/package_manager.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/connect.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
+#include "mojo/shell/public/cpp/service_provider_impl.h"
 
 namespace mojo {
 namespace shell {
diff --git a/mojo/shell/capability_filter_test.h b/mojo/shell/capability_filter_test.h
index 291ec1b..7ead2a97 100644
--- a/mojo/shell/capability_filter_test.h
+++ b/mojo/shell/capability_filter_test.h
@@ -6,10 +6,10 @@
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
-#include "mojo/application/public/cpp/application_delegate.h"
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/application_manager.h"
 #include "mojo/shell/capability_filter_unittest.mojom.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
diff --git a/mojo/shell/connect_to_application_params.h b/mojo/shell/connect_to_application_params.h
index 0fce753..c911552 100644
--- a/mojo/shell/connect_to_application_params.h
+++ b/mojo/shell/connect_to_application_params.h
@@ -10,11 +10,11 @@
 
 #include "base/callback.h"
 #include "base/macros.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
-#include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
 #include "mojo/shell/identity.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "url/gurl.h"
 
 namespace mojo {
diff --git a/mojo/shell/fetcher/BUILD.gn b/mojo/shell/fetcher/BUILD.gn
index e634cc8..48cfe0f5 100644
--- a/mojo/shell/fetcher/BUILD.gn
+++ b/mojo/shell/fetcher/BUILD.gn
@@ -22,19 +22,19 @@ source_set("fetcher") {
 
   public_deps = [
     "//base",
-    "//mojo/application/public/interfaces",
     "//mojo/common",
     "//mojo/public/cpp/bindings",
     "//mojo/services/network/public/interfaces",
     "//mojo/services/updater",
+    "//mojo/shell/public/interfaces",
     "//url",
   ]
   deps = [
     "//base/third_party/dynamic_annotations",
     "//crypto:crypto",
-    "//mojo/application/public/cpp:sources",
     "//mojo/environment:chromium",
     "//mojo/shell",
+    "//mojo/shell/public/cpp:sources",
     "//mojo/util:filename_util",
     "//net",
     "//third_party/mojo/src/mojo/edk/system",
diff --git a/mojo/shell/fetcher/about_fetcher_unittest.cc b/mojo/shell/fetcher/about_fetcher_unittest.cc
index 907462c..93c27c4 100644
--- a/mojo/shell/fetcher/about_fetcher_unittest.cc
+++ b/mojo/shell/fetcher/about_fetcher_unittest.cc
@@ -14,15 +14,15 @@
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/interface_factory.h"
-#include "mojo/application/public/interfaces/content_handler.mojom.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/application_manager.h"
 #include "mojo/shell/package_manager/package_manager_impl.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
+#include "mojo/shell/public/interfaces/content_handler.mojom.h"
 #include "mojo/util/filename_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/mojo/shell/native_runner.h b/mojo/shell/native_runner.h
index 00ccfd9..68b8279 100644
--- a/mojo/shell/native_runner.h
+++ b/mojo/shell/native_runner.h
@@ -8,8 +8,8 @@
 #include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process/process_handle.h"
-#include "mojo/application/public/interfaces/application.mojom.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
+#include "mojo/shell/public/interfaces/application.mojom.h"
 
 #if defined(OS_WIN)
 #undef DELETE
diff --git a/mojo/shell/package_manager.h b/mojo/shell/package_manager.h
index f0c8839..147c25d 100644
--- a/mojo/shell/package_manager.h
+++ b/mojo/shell/package_manager.h
@@ -7,10 +7,10 @@
 
 #include <stdint.h>
 
-#include "mojo/application/public/interfaces/application.mojom.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
 #include "mojo/shell/capability_filter.h"
 #include "mojo/shell/fetcher.h"
+#include "mojo/shell/public/interfaces/application.mojom.h"
 
 class GURL;
 
diff --git a/mojo/shell/package_manager/BUILD.gn b/mojo/shell/package_manager/BUILD.gn
index 7a11e75..3d6b72c 100644
--- a/mojo/shell/package_manager/BUILD.gn
+++ b/mojo/shell/package_manager/BUILD.gn
@@ -30,9 +30,9 @@ test("unittests") {
   deps = [
     ":package_manager",
     "//base",
-    "//mojo/application/public/cpp",
     "//mojo/shell",
     "//mojo/shell:test_support",
+    "//mojo/shell/public/cpp",
     "//testing/gtest",
     "//third_party/mojo/src/mojo/edk/test:run_all_unittests",
     "//url",
diff --git a/mojo/shell/package_manager/capability_filter_content_handler_unittest.cc b/mojo/shell/package_manager/capability_filter_content_handler_unittest.cc
index 57298ec..3ab4b9d 100644
--- a/mojo/shell/package_manager/capability_filter_content_handler_unittest.cc
+++ b/mojo/shell/package_manager/capability_filter_content_handler_unittest.cc
@@ -8,15 +8,15 @@
 
 #include "base/macros.h"
 #include "base/path_service.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/interface_factory.h"
-#include "mojo/application/public/interfaces/content_handler.mojom.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/shell/capability_filter_test.h"
 #include "mojo/shell/fetcher.h"
 #include "mojo/shell/package_manager/package_manager_impl.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
+#include "mojo/shell/public/interfaces/content_handler.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
diff --git a/mojo/shell/package_manager/content_handler_connection.h b/mojo/shell/package_manager/content_handler_connection.h
index 92b5929..3b94d78 100644
--- a/mojo/shell/package_manager/content_handler_connection.h
+++ b/mojo/shell/package_manager/content_handler_connection.h
@@ -11,8 +11,8 @@
 
 #include "base/callback.h"
 #include "base/macros.h"
-#include "mojo/application/public/interfaces/content_handler.mojom.h"
 #include "mojo/shell/identity.h"
+#include "mojo/shell/public/interfaces/content_handler.mojom.h"
 #include "url/gurl.h"
 
 namespace mojo {
diff --git a/mojo/shell/package_manager/content_handler_unittest.cc b/mojo/shell/package_manager/content_handler_unittest.cc
index fce2d31..89d7c83 100644
--- a/mojo/shell/package_manager/content_handler_unittest.cc
+++ b/mojo/shell/package_manager/content_handler_unittest.cc
@@ -13,18 +13,18 @@
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/interface_factory.h"
-#include "mojo/application/public/interfaces/content_handler.mojom.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/application_manager.h"
 #include "mojo/shell/connect_util.h"
 #include "mojo/shell/fetcher.h"
 #include "mojo/shell/package_manager/package_manager_impl.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
+#include "mojo/shell/public/interfaces/content_handler.mojom.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
 #include "mojo/shell/test_package_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/mojo/shell/package_manager/package_manager_impl.cc b/mojo/shell/package_manager/package_manager_impl.cc
index 9b95c3e..93bbe85 100644
--- a/mojo/shell/package_manager/package_manager_impl.cc
+++ b/mojo/shell/package_manager/package_manager_impl.cc
@@ -9,7 +9,6 @@
 #include <utility>
 
 #include "base/bind.h"
-#include "mojo/application/public/interfaces/content_handler.mojom.h"
 #include "mojo/shell/application_manager.h"
 #include "mojo/shell/connect_util.h"
 #include "mojo/shell/fetcher/about_fetcher.h"
@@ -18,6 +17,7 @@
 #include "mojo/shell/fetcher/network_fetcher.h"
 #include "mojo/shell/fetcher/switches.h"
 #include "mojo/shell/package_manager/content_handler_connection.h"
+#include "mojo/shell/public/interfaces/content_handler.mojom.h"
 #include "mojo/shell/query_util.h"
 #include "mojo/shell/switches.h"
 #include "mojo/util/filename_util.h"
diff --git a/mojo/application/public/cpp/BUILD.gn b/mojo/shell/public/cpp/BUILD.gn
index 990aae3..55cd782 100644
--- a/mojo/application/public/cpp/BUILD.gn
+++ b/mojo/shell/public/cpp/BUILD.gn
@@ -53,9 +53,9 @@ source_set("sources") {
 
   public_deps = [
     "//base",
-    "//mojo/application/public/interfaces",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",
+    "//mojo/shell/public/interfaces",
   ]
 }
 
@@ -75,9 +75,9 @@ source_set("content_handler") {
 
     # TODO: this code should not depend on base.
     "//base",
-    "//mojo/application/public/interfaces:interfaces_cpp_sources",
     "//mojo/message_pump",
     "//mojo/services/network/public/interfaces",
+    "//mojo/shell/public/interfaces:interfaces_cpp_sources",
   ]
 }
 
@@ -97,11 +97,11 @@ source_set("test_support") {
   deps = [
     "//base",
     "//base/test:test_support",
-    "//mojo/application/public/interfaces:interfaces_cpp_sources",
     "//mojo/logging",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/environment",
     "//mojo/public/cpp/system",
+    "//mojo/shell/public/interfaces:interfaces_cpp_sources",
   ]
 
   data_deps = []
diff --git a/mojo/application/public/cpp/app_lifetime_helper.h b/mojo/shell/public/cpp/app_lifetime_helper.h
index be9f886..ae2503f 100644
--- a/mojo/application/public/cpp/app_lifetime_helper.h
+++ b/mojo/shell/public/cpp/app_lifetime_helper.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_PUBLIC_CPP_APP_LIFETIME_HELPER_H_
-#define MOJO_APPLICATION_PUBLIC_CPP_APP_LIFETIME_HELPER_H_
+#ifndef MOJO_SHELL_PUBLIC_CPP_APP_LIFETIME_HELPER_H_
+#define MOJO_SHELL_PUBLIC_CPP_APP_LIFETIME_HELPER_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
@@ -78,4 +78,4 @@ class AppLifetimeHelper {
 
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_PUBLIC_CPP_APP_LIFETIME_HELPER_H_
+#endif  // MOJO_SHELL_PUBLIC_CPP_APP_LIFETIME_HELPER_H_
diff --git a/mojo/application/public/cpp/application_connection.h b/mojo/shell/public/cpp/application_connection.h
index b194f72..64d613d 100644
--- a/mojo/application/public/cpp/application_connection.h
+++ b/mojo/shell/public/cpp/application_connection.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_CONNECTION_H_
-#define MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_CONNECTION_H_
+#ifndef MOJO_SHELL_PUBLIC_CPP_APPLICATION_CONNECTION_H_
+#define MOJO_SHELL_PUBLIC_CPP_APPLICATION_CONNECTION_H_
 
 #include <stdint.h>
 
@@ -11,8 +11,8 @@
 #include <utility>
 
 #include "base/memory/weak_ptr.h"
-#include "mojo/application/public/cpp/lib/interface_factory_connector.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
+#include "mojo/shell/public/cpp/lib/interface_factory_connector.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
 
 namespace mojo {
 
@@ -141,4 +141,4 @@ class ApplicationConnection {
 
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_CONNECTION_H_
+#endif  // MOJO_SHELL_PUBLIC_CPP_APPLICATION_CONNECTION_H_
diff --git a/mojo/application/public/cpp/application_delegate.h b/mojo/shell/public/cpp/application_delegate.h
index a378490..219091f 100644
--- a/mojo/application/public/cpp/application_delegate.h
+++ b/mojo/shell/public/cpp/application_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_DELEGATE_H_
-#define MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_DELEGATE_H_
+#ifndef MOJO_SHELL_PUBLIC_CPP_APPLICATION_DELEGATE_H_
+#define MOJO_SHELL_PUBLIC_CPP_APPLICATION_DELEGATE_H_
 
 #include <string>
 
@@ -51,4 +51,4 @@ class ApplicationDelegate {
 
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_DELEGATE_H_
+#endif  // MOJO_SHELL_PUBLIC_CPP_APPLICATION_DELEGATE_H_
diff --git a/mojo/application/public/cpp/application_impl.h b/mojo/shell/public/cpp/application_impl.h
index 3081990..3853bab 100644
--- a/mojo/application/public/cpp/application_impl.h
+++ b/mojo/shell/public/cpp/application_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_IMPL_H_
-#define MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_IMPL_H_
+#ifndef MOJO_SHELL_PUBLIC_CPP_APPLICATION_IMPL_H_
+#define MOJO_SHELL_PUBLIC_CPP_APPLICATION_IMPL_H_
 
 #include <utility>
 #include <vector>
@@ -11,15 +11,15 @@
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
-#include "mojo/application/public/cpp/app_lifetime_helper.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/lib/service_registry.h"
-#include "mojo/application/public/interfaces/application.mojom.h"
-#include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/callback.h"
 #include "mojo/public/cpp/system/core.h"
+#include "mojo/shell/public/cpp/app_lifetime_helper.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/lib/service_registry.h"
+#include "mojo/shell/public/interfaces/application.mojom.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 
 namespace mojo {
 
@@ -183,4 +183,4 @@ class ApplicationImpl : public Application {
 
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_IMPL_H_
+#endif  // MOJO_SHELL_PUBLIC_CPP_APPLICATION_IMPL_H_
diff --git a/mojo/application/public/cpp/application_runner.h b/mojo/shell/public/cpp/application_runner.h
index 09835cb..10eb0a7 100644
--- a/mojo/application/public/cpp/application_runner.h
+++ b/mojo/shell/public/cpp/application_runner.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_RUNNER_H_
-#define MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_RUNNER_H_
+#ifndef MOJO_SHELL_PUBLIC_CPP_APPLICATION_RUNNER_H_
+#define MOJO_SHELL_PUBLIC_CPP_APPLICATION_RUNNER_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ -60,4 +60,4 @@ class ApplicationRunner {
 
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_RUNNER_H_
+#endif  // MOJO_SHELL_PUBLIC_CPP_APPLICATION_RUNNER_H_
diff --git a/mojo/application/public/cpp/application_test_base.h b/mojo/shell/public/cpp/application_test_base.h
index 5b0fab1..55b9ea9 100644
--- a/mojo/application/public/cpp/application_test_base.h
+++ b/mojo/shell/public/cpp/application_test_base.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_TEST_BASE_H_
-#define MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_TEST_BASE_H_
+#ifndef MOJO_SHELL_PUBLIC_CPP_APPLICATION_TEST_BASE_H_
+#define MOJO_SHELL_PUBLIC_CPP_APPLICATION_TEST_BASE_H_
 
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/interfaces/application.mojom.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/cpp/bindings/string.h"
 #include "mojo/public/cpp/system/macros.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/interfaces/application.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
@@ -56,4 +56,4 @@ class ApplicationTestBase : public testing::Test {
 
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_TEST_BASE_H_
+#endif  // MOJO_SHELL_PUBLIC_CPP_APPLICATION_TEST_BASE_H_
diff --git a/mojo/application/public/cpp/connect.h b/mojo/shell/public/cpp/connect.h
index 214e220..acc496c 100644
--- a/mojo/application/public/cpp/connect.h
+++ b/mojo/shell/public/cpp/connect.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_PUBLIC_CPP_CONNECT_H_
-#define MOJO_APPLICATION_PUBLIC_CPP_CONNECT_H_
+#ifndef MOJO_SHELL_PUBLIC_CPP_CONNECT_H_
+#define MOJO_SHELL_PUBLIC_CPP_CONNECT_H_
 
 #include <utility>
 
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
 
 namespace mojo {
 
@@ -22,4 +22,4 @@ inline void ConnectToService(ServiceProvider* service_provider,
 
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_PUBLIC_CPP_CONNECT_H_
+#endif  // MOJO_SHELL_PUBLIC_CPP_CONNECT_H_
diff --git a/mojo/application/public/cpp/content_handler_factory.h b/mojo/shell/public/cpp/content_handler_factory.h
index f27c175..4bcb81e 100644
--- a/mojo/application/public/cpp/content_handler_factory.h
+++ b/mojo/shell/public/cpp/content_handler_factory.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_PUBLIC_CPP_CONTENT_HANDLER_FACTORY_H_
-#define MOJO_APPLICATION_PUBLIC_CPP_CONTENT_HANDLER_FACTORY_H_
+#ifndef MOJO_SHELL_PUBLIC_CPP_CONTENT_HANDLER_FACTORY_H_
+#define MOJO_SHELL_PUBLIC_CPP_CONTENT_HANDLER_FACTORY_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/application/public/cpp/interface_factory.h"
-#include "mojo/application/public/interfaces/content_handler.mojom.h"
-#include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
+#include "mojo/shell/public/interfaces/content_handler.mojom.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 
 namespace mojo {
 
@@ -78,4 +78,4 @@ make_handled_factory_holder(A* value) {
 
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_PUBLIC_CPP_CONTENT_HANDLER_FACTORY_H_
+#endif  // MOJO_SHELL_PUBLIC_CPP_CONTENT_HANDLER_FACTORY_H_
diff --git a/mojo/application/public/cpp/initialize_base_and_icu.cc b/mojo/shell/public/cpp/initialize_base_and_icu.cc
index 2ec37df..2ec37df 100644
--- a/mojo/application/public/cpp/initialize_base_and_icu.cc
+++ b/mojo/shell/public/cpp/initialize_base_and_icu.cc
diff --git a/mojo/application/public/cpp/interface_factory.h b/mojo/shell/public/cpp/interface_factory.h
index c7dd839..7f8f26e 100644
--- a/mojo/application/public/cpp/interface_factory.h
+++ b/mojo/shell/public/cpp/interface_factory.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_PUBLIC_CPP_INTERFACE_FACTORY_H_
-#define MOJO_APPLICATION_PUBLIC_CPP_INTERFACE_FACTORY_H_
+#ifndef MOJO_SHELL_PUBLIC_CPP_INTERFACE_FACTORY_H_
+#define MOJO_SHELL_PUBLIC_CPP_INTERFACE_FACTORY_H_
 
 #include "mojo/public/cpp/bindings/interface_request.h"
 
@@ -27,4 +27,4 @@ class InterfaceFactory {
 
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_PUBLIC_CPP_INTERFACE_FACTORY_H_
+#endif  // MOJO_SHELL_PUBLIC_CPP_INTERFACE_FACTORY_H_
diff --git a/mojo/application/public/cpp/interface_factory_impl.h b/mojo/shell/public/cpp/interface_factory_impl.h
index d4cf1c2..7de2449 100644
--- a/mojo/application/public/cpp/interface_factory_impl.h
+++ b/mojo/shell/public/cpp/interface_factory_impl.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_PUBLIC_CPP_INTERFACE_FACTORY_IMPL_H_
-#define MOJO_APPLICATION_PUBLIC_CPP_INTERFACE_FACTORY_IMPL_H_
+#ifndef MOJO_SHELL_PUBLIC_CPP_INTERFACE_FACTORY_IMPL_H_
+#define MOJO_SHELL_PUBLIC_CPP_INTERFACE_FACTORY_IMPL_H_
 
-#include "mojo/application/public/cpp/interface_factory.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 
 namespace mojo {
 
@@ -46,4 +46,4 @@ class InterfaceFactoryImplWithContext : public InterfaceFactory<Interface> {
 
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_PUBLIC_CPP_INTERFACE_FACTORY_IMPL_H_
+#endif  // MOJO_SHELL_PUBLIC_CPP_INTERFACE_FACTORY_IMPL_H_
diff --git a/mojo/application/public/cpp/lazy_interface_ptr.h b/mojo/shell/public/cpp/lazy_interface_ptr.h
index 30f406e..0497dc2 100644
--- a/mojo/application/public/cpp/lazy_interface_ptr.h
+++ b/mojo/shell/public/cpp/lazy_interface_ptr.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_PUBLIC_CPP_LAZY_INTERFACE_PTR_H_
-#define MOJO_APPLICATION_PUBLIC_CPP_LAZY_INTERFACE_PTR_H_
+#ifndef MOJO_SHELL_PUBLIC_CPP_LAZY_INTERFACE_PTR_H_
+#define MOJO_SHELL_PUBLIC_CPP_LAZY_INTERFACE_PTR_H_
 
-#include "mojo/application/public/cpp/connect.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
+#include "mojo/shell/public/cpp/connect.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
 
 namespace mojo {
 
@@ -43,4 +43,4 @@ class LazyInterfacePtr : public InterfacePtr<Interface> {
 
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_PUBLIC_CPP_LAZY_INTERFACE_PTR_H_
+#endif  // MOJO_SHELL_PUBLIC_CPP_LAZY_INTERFACE_PTR_H_
diff --git a/mojo/application/public/cpp/lib/app_lifetime_helper.cc b/mojo/shell/public/cpp/lib/app_lifetime_helper.cc
index 74c7ee8..0772412a 100644
--- a/mojo/application/public/cpp/lib/app_lifetime_helper.cc
+++ b/mojo/shell/public/cpp/lib/app_lifetime_helper.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/application/public/cpp/app_lifetime_helper.h"
+#include "mojo/shell/public/cpp/app_lifetime_helper.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
-#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 namespace mojo {
 
diff --git a/mojo/application/public/cpp/lib/application_delegate.cc b/mojo/shell/public/cpp/lib/application_delegate.cc
index fd7c356..41ba51c 100644
--- a/mojo/application/public/cpp/lib/application_delegate.cc
+++ b/mojo/shell/public/cpp/lib/application_delegate.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 "mojo/application/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
 
 namespace mojo {
 
diff --git a/mojo/application/public/cpp/lib/application_impl.cc b/mojo/shell/public/cpp/lib/application_impl.cc
index b1f6224..e48483f 100644
--- a/mojo/application/public/cpp/lib/application_impl.cc
+++ b/mojo/shell/public/cpp/lib/application_impl.cc
@@ -7,12 +7,12 @@
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/lib/service_registry.h"
 #include "mojo/converters/network/network_type_converters.h"
 #include "mojo/public/cpp/bindings/interface_ptr.h"
 #include "mojo/public/cpp/environment/logging.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/lib/service_registry.h"
 
 namespace mojo {
 
diff --git a/mojo/application/public/cpp/lib/application_runner.cc b/mojo/shell/public/cpp/lib/application_runner.cc
index d3ac30c..02380c6 100644
--- a/mojo/application/public/cpp/lib/application_runner.cc
+++ b/mojo/shell/public/cpp/lib/application_runner.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/application/public/cpp/application_runner.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/process/launch.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/message_pump/message_pump_mojo.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 namespace mojo {
 
diff --git a/mojo/application/public/cpp/lib/application_test_base.cc b/mojo/shell/public/cpp/lib/application_test_base.cc
index bd8df6d..d1b2cfa 100644
--- a/mojo/application/public/cpp/lib/application_test_base.cc
+++ b/mojo/shell/public/cpp/lib/application_test_base.cc
@@ -6,12 +6,12 @@
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_test_base.h"
-#include "mojo/application/public/interfaces/application.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/system/message_pipe.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
+#include "mojo/shell/public/interfaces/application.mojom.h"
 
 namespace mojo {
 namespace test {
diff --git a/mojo/application/public/cpp/lib/application_test_main.cc b/mojo/shell/public/cpp/lib/application_test_main.cc
index 146e915..470846c 100644
--- a/mojo/application/public/cpp/lib/application_test_main.cc
+++ b/mojo/shell/public/cpp/lib/application_test_main.cc
@@ -5,10 +5,10 @@
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/test/test_timeouts.h"
-#include "mojo/application/public/cpp/application_runner.h"
-#include "mojo/application/public/cpp/application_test_base.h"
 #include "mojo/logging/init_logging.h"
 #include "mojo/public/c/system/main.h"
+#include "mojo/shell/public/cpp/application_runner.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
 
 MojoResult MojoMain(MojoHandle handle) {
   // An AtExitManager instance is needed to construct message loops.
diff --git a/mojo/application/public/cpp/lib/content_handler_factory.cc b/mojo/shell/public/cpp/lib/content_handler_factory.cc
index d4cb54c..c810354 100644
--- a/mojo/application/public/cpp/lib/content_handler_factory.cc
+++ b/mojo/shell/public/cpp/lib/content_handler_factory.cc
@@ -12,14 +12,14 @@
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/platform_thread.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_runner.h"
-#include "mojo/application/public/cpp/content_handler_factory.h"
-#include "mojo/application/public/cpp/interface_factory_impl.h"
 #include "mojo/message_pump/message_pump_mojo.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_runner.h"
+#include "mojo/shell/public/cpp/content_handler_factory.h"
+#include "mojo/shell/public/cpp/interface_factory_impl.h"
 
 namespace mojo {
 
diff --git a/mojo/application/public/cpp/lib/init_commandline.cc b/mojo/shell/public/cpp/lib/init_commandline.cc
index a61797b..a61797b 100644
--- a/mojo/application/public/cpp/lib/init_commandline.cc
+++ b/mojo/shell/public/cpp/lib/init_commandline.cc
diff --git a/mojo/application/public/cpp/lib/interface_factory_connector.h b/mojo/shell/public/cpp/lib/interface_factory_connector.h
index cd99dff..5ef7eaa 100644
--- a/mojo/application/public/cpp/lib/interface_factory_connector.h
+++ b/mojo/shell/public/cpp/lib/interface_factory_connector.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_PUBLIC_CPP_LIB_INTERFACE_FACTORY_CONNECTOR_H_
-#define MOJO_APPLICATION_PUBLIC_CPP_LIB_INTERFACE_FACTORY_CONNECTOR_H_
+#ifndef MOJO_SHELL_PUBLIC_CPP_LIB_INTERFACE_FACTORY_CONNECTOR_H_
+#define MOJO_SHELL_PUBLIC_CPP_LIB_INTERFACE_FACTORY_CONNECTOR_H_
 
 #include <utility>
 
-#include "mojo/application/public/cpp/interface_factory.h"
-#include "mojo/application/public/cpp/service_connector.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
+#include "mojo/shell/public/cpp/service_connector.h"
 
 namespace mojo {
 namespace internal {
@@ -36,4 +36,4 @@ class InterfaceFactoryConnector : public ServiceConnector {
 }  // namespace internal
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_PUBLIC_CPP_LIB_INTERFACE_FACTORY_CONNECTOR_H_
+#endif  // MOJO_SHELL_PUBLIC_CPP_LIB_INTERFACE_FACTORY_CONNECTOR_H_
diff --git a/mojo/application/public/cpp/lib/service_connector_registry.cc b/mojo/shell/public/cpp/lib/service_connector_registry.cc
index 58f9fc7..edc91e0 100644
--- a/mojo/application/public/cpp/lib/service_connector_registry.cc
+++ b/mojo/shell/public/cpp/lib/service_connector_registry.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/application/public/cpp/lib/service_connector_registry.h"
+#include "mojo/shell/public/cpp/lib/service_connector_registry.h"
 
 #include <utility>
 
-#include "mojo/application/public/cpp/service_connector.h"
+#include "mojo/shell/public/cpp/service_connector.h"
 
 namespace mojo {
 namespace internal {
diff --git a/mojo/application/public/cpp/lib/service_connector_registry.h b/mojo/shell/public/cpp/lib/service_connector_registry.h
index b196353..9475436 100644
--- a/mojo/application/public/cpp/lib/service_connector_registry.h
+++ b/mojo/shell/public/cpp/lib/service_connector_registry.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_PUBLIC_CPP_LIB_SERVICE_CONNECTOR_REGISTRY_H_
-#define MOJO_APPLICATION_PUBLIC_CPP_LIB_SERVICE_CONNECTOR_REGISTRY_H_
+#ifndef MOJO_SHELL_PUBLIC_CPP_LIB_SERVICE_CONNECTOR_REGISTRY_H_
+#define MOJO_SHELL_PUBLIC_CPP_LIB_SERVICE_CONNECTOR_REGISTRY_H_
 
 #include <map>
 #include <string>
@@ -59,4 +59,4 @@ class ServiceConnectorRegistry {
 }  // namespace internal
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_PUBLIC_CPP_LIB_SERVICE_CONNECTOR_REGISTRY_H_
+#endif  // MOJO_SHELL_PUBLIC_CPP_LIB_SERVICE_CONNECTOR_REGISTRY_H_
diff --git a/mojo/application/public/cpp/lib/service_provider_impl.cc b/mojo/shell/public/cpp/lib/service_provider_impl.cc
index 03e57ef..4a411a2 100644
--- a/mojo/application/public/cpp/lib/service_provider_impl.cc
+++ b/mojo/shell/public/cpp/lib/service_provider_impl.cc
@@ -4,9 +4,9 @@
 
 #include <utility>
 
-#include "mojo/application/public/cpp/service_connector.h"
-#include "mojo/application/public/cpp/service_provider_impl.h"
 #include "mojo/public/cpp/environment/logging.h"
+#include "mojo/shell/public/cpp/service_connector.h"
+#include "mojo/shell/public/cpp/service_provider_impl.h"
 
 namespace mojo {
 
diff --git a/mojo/application/public/cpp/lib/service_registry.cc b/mojo/shell/public/cpp/lib/service_registry.cc
index 808cef2..09f71de 100644
--- a/mojo/application/public/cpp/lib/service_registry.cc
+++ b/mojo/shell/public/cpp/lib/service_registry.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 "mojo/application/public/cpp/lib/service_registry.h"
+#include "mojo/shell/public/cpp/lib/service_registry.h"
 
 #include <stdint.h>
 
@@ -10,8 +10,8 @@
 
 #include "base/bind.h"
 #include "base/logging.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/service_connector.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/service_connector.h"
 
 namespace mojo {
 namespace internal {
diff --git a/mojo/application/public/cpp/lib/service_registry.h b/mojo/shell/public/cpp/lib/service_registry.h
index b0339dd..1c2abc9 100644
--- a/mojo/application/public/cpp/lib/service_registry.h
+++ b/mojo/shell/public/cpp/lib/service_registry.h
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_
-#define MOJO_APPLICATION_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_
+#ifndef MOJO_SHELL_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_
+#define MOJO_SHELL_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_
 
 #include <stdint.h>
 
 #include <set>
 #include <string>
 
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/lib/service_connector_registry.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
-#include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/lib/service_connector_registry.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 
 namespace mojo {
 namespace internal {
@@ -80,4 +80,4 @@ class ServiceRegistry : public ServiceProvider, public ApplicationConnection {
 }  // namespace internal
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_
+#endif  // MOJO_SHELL_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_
diff --git a/mojo/application/public/cpp/service_connector.h b/mojo/shell/public/cpp/service_connector.h
index 3a7d656..8856e3f 100644
--- a/mojo/application/public/cpp/service_connector.h
+++ b/mojo/shell/public/cpp/service_connector.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_PUBLIC_CPP_SERVICE_CONNECTOR_H_
-#define MOJO_APPLICATION_PUBLIC_CPP_SERVICE_CONNECTOR_H_
+#ifndef MOJO_SHELL_PUBLIC_CPP_SERVICE_CONNECTOR_H_
+#define MOJO_SHELL_PUBLIC_CPP_SERVICE_CONNECTOR_H_
 
 #include <string>
 
@@ -27,4 +27,4 @@ class ServiceConnector {
 
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_PUBLIC_CPP_SERVICE_CONNECTOR_H_
+#endif  // MOJO_SHELL_PUBLIC_CPP_SERVICE_CONNECTOR_H_
diff --git a/mojo/application/public/cpp/service_provider_impl.h b/mojo/shell/public/cpp/service_provider_impl.h
index 0a9fb77..2d5ed75 100644
--- a/mojo/application/public/cpp/service_provider_impl.h
+++ b/mojo/shell/public/cpp/service_provider_impl.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_PUBLIC_CPP_SERVICE_PROVIDER_IMPL_H_
-#define MOJO_APPLICATION_PUBLIC_CPP_SERVICE_PROVIDER_IMPL_H_
+#ifndef MOJO_SHELL_PUBLIC_CPP_SERVICE_PROVIDER_IMPL_H_
+#define MOJO_SHELL_PUBLIC_CPP_SERVICE_PROVIDER_IMPL_H_
 
 #include <string>
 
-#include "mojo/application/public/cpp/lib/interface_factory_connector.h"
-#include "mojo/application/public/cpp/lib/service_connector_registry.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/shell/public/cpp/lib/interface_factory_connector.h"
+#include "mojo/shell/public/cpp/lib/service_connector_registry.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
 
 namespace mojo {
 
@@ -47,4 +47,4 @@ class ServiceProviderImpl : public ServiceProvider {
 
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_PUBLIC_CPP_SERVICE_PROVIDER_IMPL_H_
+#endif  // MOJO_SHELL_PUBLIC_CPP_SERVICE_PROVIDER_IMPL_H_
diff --git a/mojo/application/public/cpp/tests/BUILD.gn b/mojo/shell/public/cpp/tests/BUILD.gn
index 29b35d8..51da838 100644
--- a/mojo/application/public/cpp/tests/BUILD.gn
+++ b/mojo/shell/public/cpp/tests/BUILD.gn
@@ -11,7 +11,7 @@ test("mojo_public_application_unittests") {
 
   deps = [
     "//base",
-    "//mojo/application/public/cpp",
+    "//mojo/shell/public/cpp",
     "//testing/gtest",
     "//third_party/mojo/src/mojo/edk/test:run_all_unittests",
   ]
diff --git a/mojo/application/public/cpp/tests/service_registry_unittest.cc b/mojo/shell/public/cpp/tests/service_registry_unittest.cc
index 98ce637..349e9aa 100644
--- a/mojo/application/public/cpp/tests/service_registry_unittest.cc
+++ b/mojo/shell/public/cpp/tests/service_registry_unittest.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/application/public/cpp/lib/service_registry.h"
+#include "mojo/shell/public/cpp/lib/service_registry.h"
 
 #include "base/memory/scoped_ptr.h"
-#include "mojo/application/public/cpp/service_connector.h"
+#include "mojo/shell/public/cpp/service_connector.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
diff --git a/mojo/application/public/interfaces/BUILD.gn b/mojo/shell/public/interfaces/BUILD.gn
index 1aa7fc5..1aa7fc5 100644
--- a/mojo/application/public/interfaces/BUILD.gn
+++ b/mojo/shell/public/interfaces/BUILD.gn
diff --git a/mojo/application/public/interfaces/application.mojom b/mojo/shell/public/interfaces/application.mojom
index 34ed7be..f0a8724 100644
--- a/mojo/application/public/interfaces/application.mojom
+++ b/mojo/shell/public/interfaces/application.mojom
@@ -4,8 +4,8 @@
 
 module mojo;
 
-import "mojo/application/public/interfaces/service_provider.mojom";
-import "mojo/application/public/interfaces/shell.mojom";
+import "mojo/shell/public/interfaces/service_provider.mojom";
+import "mojo/shell/public/interfaces/shell.mojom";
 
 // This is the primary interface implemented by every Mojo application. It
 // allows the application to receive its startup arguments from the shell, and
diff --git a/mojo/application/public/interfaces/application_manager.mojom b/mojo/shell/public/interfaces/application_manager.mojom
index 84d7e58..02d059a 100644
--- a/mojo/application/public/interfaces/application_manager.mojom
+++ b/mojo/shell/public/interfaces/application_manager.mojom
@@ -4,7 +4,7 @@
 
 module mojo.shell.mojom;
 
-import "mojo/application/public/interfaces/shell.mojom";
+import "mojo/shell/public/interfaces/shell.mojom";
 
 struct ApplicationInfo {
   int32 id;
diff --git a/mojo/application/public/interfaces/content_handler.mojom b/mojo/shell/public/interfaces/content_handler.mojom
index 7494a7b..5fdb826 100644
--- a/mojo/application/public/interfaces/content_handler.mojom
+++ b/mojo/shell/public/interfaces/content_handler.mojom
@@ -4,7 +4,7 @@
 
 module mojo;
 
-import "mojo/application/public/interfaces/application.mojom";
+import "mojo/shell/public/interfaces/application.mojom";
 import "network/public/interfaces/url_loader.mojom";
 
 // Interface implemented by content handlers. To avoid race conditions with
diff --git a/mojo/application/public/interfaces/service_provider.mojom b/mojo/shell/public/interfaces/service_provider.mojom
index 8c81879..8c81879 100644
--- a/mojo/application/public/interfaces/service_provider.mojom
+++ b/mojo/shell/public/interfaces/service_provider.mojom
diff --git a/mojo/application/public/interfaces/shell.mojom b/mojo/shell/public/interfaces/shell.mojom
index e38f93c..b70b9fe 100644
--- a/mojo/application/public/interfaces/shell.mojom
+++ b/mojo/shell/public/interfaces/shell.mojom
@@ -4,7 +4,7 @@
 
 module mojo;
 
-import "mojo/application/public/interfaces/service_provider.mojom";
+import "mojo/shell/public/interfaces/service_provider.mojom";
 import "network/public/interfaces/url_loader.mojom";
 
 // Specifies a whitelist of applications and services an application can connect
diff --git a/mojo/application/public/java/BUILD.gn b/mojo/shell/public/java/BUILD.gn
index 7caa8e7..a89d0fc 100644
--- a/mojo/application/public/java/BUILD.gn
+++ b/mojo/shell/public/java/BUILD.gn
@@ -14,8 +14,8 @@ android_library("application") {
     "src/org/chromium/mojo/application/ShellHelper.java",
   ]
   deps = [
-    "//mojo/application/public/interfaces:interfaces_java",
     "//mojo/public/java:bindings",
     "//mojo/public/java:system",
+    "//mojo/shell/public/interfaces:interfaces_java",
   ]
 }
diff --git a/mojo/application/public/java/src/org/chromium/mojo/application/ApplicationConnection.java b/mojo/shell/public/java/src/org/chromium/mojo/application/ApplicationConnection.java
index 6b0e548..6b0e548 100644
--- a/mojo/application/public/java/src/org/chromium/mojo/application/ApplicationConnection.java
+++ b/mojo/shell/public/java/src/org/chromium/mojo/application/ApplicationConnection.java
diff --git a/mojo/application/public/java/src/org/chromium/mojo/application/ApplicationDelegate.java b/mojo/shell/public/java/src/org/chromium/mojo/application/ApplicationDelegate.java
index 72b1c62..72b1c62 100644
--- a/mojo/application/public/java/src/org/chromium/mojo/application/ApplicationDelegate.java
+++ b/mojo/shell/public/java/src/org/chromium/mojo/application/ApplicationDelegate.java
diff --git a/mojo/application/public/java/src/org/chromium/mojo/application/ApplicationImpl.java b/mojo/shell/public/java/src/org/chromium/mojo/application/ApplicationImpl.java
index 7768b8d..7768b8d 100644
--- a/mojo/application/public/java/src/org/chromium/mojo/application/ApplicationImpl.java
+++ b/mojo/shell/public/java/src/org/chromium/mojo/application/ApplicationImpl.java
diff --git a/mojo/application/public/java/src/org/chromium/mojo/application/ApplicationRunner.java b/mojo/shell/public/java/src/org/chromium/mojo/application/ApplicationRunner.java
index 1a903b4..1a903b4 100644
--- a/mojo/application/public/java/src/org/chromium/mojo/application/ApplicationRunner.java
+++ b/mojo/shell/public/java/src/org/chromium/mojo/application/ApplicationRunner.java
diff --git a/mojo/application/public/java/src/org/chromium/mojo/application/ServiceFactoryBinder.java b/mojo/shell/public/java/src/org/chromium/mojo/application/ServiceFactoryBinder.java
index 462d74e..462d74e 100644
--- a/mojo/application/public/java/src/org/chromium/mojo/application/ServiceFactoryBinder.java
+++ b/mojo/shell/public/java/src/org/chromium/mojo/application/ServiceFactoryBinder.java
diff --git a/mojo/application/public/java/src/org/chromium/mojo/application/ShellHelper.java b/mojo/shell/public/java/src/org/chromium/mojo/application/ShellHelper.java
index 705e22e..705e22e 100644
--- a/mojo/application/public/java/src/org/chromium/mojo/application/ShellHelper.java
+++ b/mojo/shell/public/java/src/org/chromium/mojo/application/ShellHelper.java
diff --git a/mojo/shell/shell_application_delegate.cc b/mojo/shell/shell_application_delegate.cc
index 650740d..1dbac46 100644
--- a/mojo/shell/shell_application_delegate.cc
+++ b/mojo/shell/shell_application_delegate.cc
@@ -9,8 +9,8 @@
 #include <utility>
 
 #include "base/process/process.h"
-#include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/shell/application_manager.h"
+#include "mojo/shell/public/cpp/application_connection.h"
 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
 
 namespace mojo {
diff --git a/mojo/shell/shell_application_delegate.h b/mojo/shell/shell_application_delegate.h
index d2dd94b..d610b1a 100644
--- a/mojo/shell/shell_application_delegate.h
+++ b/mojo/shell/shell_application_delegate.h
@@ -5,14 +5,14 @@
 #ifndef MOJO_SHELL_SHELL_APPLICATION_DELEGATE_H_
 #define MOJO_SHELL_SHELL_APPLICATION_DELEGATE_H_
 
-#include "mojo/application/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
 
 #include <stdint.h>
 
 #include "base/macros.h"
-#include "mojo/application/public/cpp/interface_factory.h"
-#include "mojo/application/public/interfaces/application_manager.mojom.h"
 #include "mojo/common/weak_binding_set.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
+#include "mojo/shell/public/interfaces/application_manager.mojom.h"
 
 namespace mojo {
 namespace shell {
diff --git a/mojo/shell/shell_application_loader.cc b/mojo/shell/shell_application_loader.cc
index 0370a98..6040517 100644
--- a/mojo/shell/shell_application_loader.cc
+++ b/mojo/shell/shell_application_loader.cc
@@ -6,7 +6,7 @@
 
 #include <utility>
 
-#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 #include "mojo/shell/shell_application_delegate.h"
 
 namespace mojo {
diff --git a/mojo/shell/static_application_loader.cc b/mojo/shell/static_application_loader.cc
index 023d312..b609fcd 100644
--- a/mojo/shell/static_application_loader.cc
+++ b/mojo/shell/static_application_loader.cc
@@ -12,10 +12,10 @@
 #include "base/task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/simple_thread.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_runner.h"
-#include "mojo/application/public/interfaces/application.mojom.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_runner.h"
+#include "mojo/shell/public/interfaces/application.mojom.h"
 
 namespace mojo {
 namespace shell {
diff --git a/sql/mojo/BUILD.gn b/sql/mojo/BUILD.gn
index 0ce00d87..b7a3793 100644
--- a/sql/mojo/BUILD.gn
+++ b/sql/mojo/BUILD.gn
@@ -19,9 +19,9 @@ source_set("mojo") {
     "//base",
     "//base/third_party/dynamic_annotations",
     "//components/filesystem/public/interfaces",
-    "//mojo/application/public/cpp",
     "//mojo/common",
     "//mojo/platform_handle",
+    "//mojo/shell/public/cpp",
     "//third_party/sqlite",
   ]
 }
@@ -51,9 +51,9 @@ mojo_native_application("apptests") {
     "//base",
     "//base/test:test_support",
     "//components/filesystem/public/interfaces",
-    "//mojo/application/public/cpp:sources",
-    "//mojo/application/public/cpp:test_support",
     "//mojo/public/cpp/bindings",
+    "//mojo/shell/public/cpp:sources",
+    "//mojo/shell/public/cpp:test_support",
     "//sql",
     "//sql:redirection_header",
     "//sql:test_support",
diff --git a/sql/mojo/DEPS b/sql/mojo/DEPS
index be63411..9dd7c02 100644
--- a/sql/mojo/DEPS
+++ b/sql/mojo/DEPS
@@ -1,6 +1,6 @@
 include_rules = [
   "+components/filesystem",
-  "+mojo/application",
+  "+mojo/shell",
   "+mojo/public",
   "+mojo/util",
 ]
diff --git a/sql/mojo/sql_test_base.cc b/sql/mojo/sql_test_base.cc
index 1df6096..72aaa64 100644
--- a/sql/mojo/sql_test_base.cc
+++ b/sql/mojo/sql_test_base.cc
@@ -8,7 +8,7 @@
 #include <stdint.h>
 #include <utility>
 
-#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 #include "mojo/util/capture_util.h"
 #include "sql/mojo/mojo_vfs.h"
 #include "sql/test/test_helpers.h"
diff --git a/sql/mojo/sql_test_base.h b/sql/mojo/sql_test_base.h
index 6494752..2fba5aa 100644
--- a/sql/mojo/sql_test_base.h
+++ b/sql/mojo/sql_test_base.h
@@ -9,8 +9,8 @@
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/filesystem/public/interfaces/file_system.mojom.h"
-#include "mojo/application/public/cpp/application_test_base.h"
 #include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
 #include "sql/connection.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/sql/mojo/vfs_unittest.cc b/sql/mojo/vfs_unittest.cc
index dc6a1ee..e51f1bd 100644
--- a/sql/mojo/vfs_unittest.cc
+++ b/sql/mojo/vfs_unittest.cc
@@ -8,8 +8,8 @@
 
 #include "base/macros.h"
 #include "components/filesystem/public/interfaces/file_system.mojom.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_test_base.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
 #include "mojo/util/capture_util.h"
 #include "sql/mojo/mojo_vfs.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/ui/views/mus/BUILD.gn b/ui/views/mus/BUILD.gn
index d0cf453..ee697e4 100644
--- a/ui/views/mus/BUILD.gn
+++ b/ui/views/mus/BUILD.gn
@@ -52,8 +52,6 @@ component("mus") {
     "//components/mus/public/interfaces",
     "//components/resource_provider/public/cpp",
     "//components/resource_provider/public/interfaces",
-    "//mojo/application/public/cpp",
-    "//mojo/application/public/interfaces",
     "//mojo/converters/geometry",
     "//mojo/converters/ime",
     "//mojo/converters/input_events",
@@ -62,6 +60,8 @@ component("mus") {
     "//mojo/platform_handle:for_component",
     "//mojo/public/c/system:for_component",
     "//mojo/public/cpp/bindings",
+    "//mojo/shell/public/cpp",
+    "//mojo/shell/public/interfaces",
     "//skia",
     "//third_party/icu",
     "//ui/aura",
diff --git a/ui/views/mus/DEPS b/ui/views/mus/DEPS
index 447d4b4..22b8edb 100644
--- a/ui/views/mus/DEPS
+++ b/ui/views/mus/DEPS
@@ -6,7 +6,7 @@ include_rules = [
   "+components/gpu",
   "+components/mus",
   "+components/resource_provider",
-  "+mojo/application/public",
+  "+mojo/shell/public",
   "+mojo/cc",
   "+mojo/converters",
   "+mojo/public",
diff --git a/ui/views/mus/aura_init.cc b/ui/views/mus/aura_init.cc
index 8050d00..f7f30b0 100644
--- a/ui/views/mus/aura_init.cc
+++ b/ui/views/mus/aura_init.cc
@@ -11,7 +11,7 @@
 #include "base/path_service.h"
 #include "build/build_config.h"
 #include "components/resource_provider/public/cpp/resource_loader.h"
-#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 #include "ui/aura/env.h"
 #include "ui/base/ime/input_method_initializer.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/ui/views/mus/surface_binding.cc b/ui/views/mus/surface_binding.cc
index e7568da..ed4aedf 100644
--- a/ui/views/mus/surface_binding.cc
+++ b/ui/views/mus/surface_binding.cc
@@ -23,12 +23,12 @@
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/mus/public/interfaces/gpu.mojom.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/connect.h"
-#include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
 #include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/connect.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "ui/views/mus/window_tree_host_mus.h"
 
 namespace views {
diff --git a/ui/views/mus/surface_context_factory.cc b/ui/views/mus/surface_context_factory.cc
index f83de28..0d5bfee 100644
--- a/ui/views/mus/surface_context_factory.cc
+++ b/ui/views/mus/surface_context_factory.cc
@@ -8,7 +8,7 @@
 #include "cc/resources/shared_bitmap_manager.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "components/mus/public/cpp/window.h"
-#include "mojo/application/public/interfaces/shell.mojom.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "ui/compositor/reflector.h"
 #include "ui/gl/gl_bindings.h"
 
diff --git a/ui/views/mus/window_manager_connection.cc b/ui/views/mus/window_manager_connection.cc
index bd16be5..2865347 100644
--- a/ui/views/mus/window_manager_connection.cc
+++ b/ui/views/mus/window_manager_connection.cc
@@ -11,10 +11,10 @@
 #include "base/threading/thread_restrictions.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/mus/public/interfaces/window_tree.mojom.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/network/network_type_converters.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/geometry/rect.h"
diff --git a/ui/views/mus/window_tree_host_mus.cc b/ui/views/mus/window_tree_host_mus.cc
index 269b14e..6edb53d 100644
--- a/ui/views/mus/window_tree_host_mus.cc
+++ b/ui/views/mus/window_tree_host_mus.cc
@@ -5,7 +5,7 @@
 #include "ui/views/mus/window_tree_host_mus.h"
 
 #include "components/bitmap_uploader/bitmap_uploader.h"
-#include "mojo/application/public/interfaces/shell.mojom.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/view_prop.h"
author	ben <ben@chromium.org>	2016-01-11 18:44:08 -0800
committer	Commit bot <commit-bot@chromium.org>	2016-01-12 02:44:59 +0000
commit	273c1e30241a8a5509ad9b307380ed8600ba82d8 (patch)
tree	25da3f1a02f1f9d5f129ba8d794d20b51355a07b
parent	9c1122c7163411be938195ba546460ba54d33b00 (diff)
download	chromium_src-273c1e30241a8a5509ad9b307380ed8600ba82d8.zip chromium_src-273c1e30241a8a5509ad9b307380ed8600ba82d8.tar.gz chromium_src-273c1e30241a8a5509ad9b307380ed8600ba82d8.tar.bz2