diff --git a/packages/flutter/example/widgets/piano.dart b/packages/flutter/example/widgets/piano.dart
index 23737e210b2..658d63527e5 100644
--- a/packages/flutter/example/widgets/piano.dart
+++ b/packages/flutter/example/widgets/piano.dart
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:mojom/media/media.mojom.dart';
-import 'package:mojom/mojo/url_response.mojom.dart';
+import 'package:mojo/mojo/url_response.mojom.dart';
 import 'package:sky/mojo/net/fetch.dart';
 import 'package:sky/mojo/shell.dart' as shell;
 import 'package:sky/rendering/box.dart';
 import 'package:sky/rendering/flex.dart';
 import 'package:sky/theme/colors.dart' as colors;
 import 'package:sky/widgets/basic.dart';
+import 'package:sky_services/media/media.mojom.dart';
 
 // All of these sounds are marked as public domain at soundbible.
 const String chimes = "http://soundbible.com/grab.php?id=2030&type=wav";
diff --git a/packages/flutter/lib/editing/editable_string.dart b/packages/flutter/lib/editing/editable_string.dart
index 728788ec52d..e9331b4cce0 100644
--- a/packages/flutter/lib/editing/editable_string.dart
+++ b/packages/flutter/lib/editing/editable_string.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:mojom/keyboard/keyboard.mojom.dart';
+import 'package:mojo_services/keyboard/keyboard.mojom.dart';
 
 typedef void StringUpdated();
 
diff --git a/packages/flutter/lib/mojo/activity.dart b/packages/flutter/lib/mojo/activity.dart
index 3cb231b9daf..bfa5b66d319 100644
--- a/packages/flutter/lib/mojo/activity.dart
+++ b/packages/flutter/lib/mojo/activity.dart
@@ -4,10 +4,10 @@
 
 import 'dart:sky';
 
-import 'package:mojom/activity/activity.mojom.dart';
 import 'package:sky/mojo/shell.dart' as shell;
+import 'package:sky_services/activity/activity.mojom.dart';
 
-export 'package:mojom/activity/activity.mojom.dart' show Intent, ComponentName, StringExtra;
+export 'package:sky_services/activity/activity.mojom.dart' show Intent, ComponentName, StringExtra;
 
 const int NEW_DOCUMENT = 0x00080000;
 const int NEW_TASK = 0x10000000;
diff --git a/packages/flutter/lib/mojo/asset_bundle.dart b/packages/flutter/lib/mojo/asset_bundle.dart
index 6845a8f44f5..056eb8b1a2c 100644
--- a/packages/flutter/lib/mojo/asset_bundle.dart
+++ b/packages/flutter/lib/mojo/asset_bundle.dart
@@ -8,7 +8,7 @@ import 'dart:sky.internals' as internals;
 import 'dart:typed_data';
 
 import 'package:mojo/core.dart' as core;
-import 'package:mojom/mojo/asset_bundle/asset_bundle.mojom.dart';
+import 'package:mojo_services/mojo/asset_bundle/asset_bundle.mojom.dart';
 import 'package:sky/mojo/net/fetch.dart';
 import 'package:sky/mojo/net/image_cache.dart' as image_cache;
 import 'package:sky/mojo/shell.dart' as shell;
diff --git a/packages/flutter/lib/mojo/embedder.dart b/packages/flutter/lib/mojo/embedder.dart
index 1bcf13ba231..1d61267c5ec 100644
--- a/packages/flutter/lib/mojo/embedder.dart
+++ b/packages/flutter/lib/mojo/embedder.dart
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import "dart:sky.internals" as internals;
+import 'dart:sky.internals' as internals;
 
-import "package:mojo/application.dart";
-import "package:mojo/bindings.dart" as bindings;
-import "package:mojo/core.dart" as core;
-import "package:mojom/mojo/service_provider.mojom.dart";
-import "package:mojom/mojo/service_registry.mojom.dart";
-import "package:mojom/mojo/shell.mojom.dart";
+import 'package:mojo/application.dart';
+import 'package:mojo/bindings.dart' as bindings;
+import 'package:mojo/core.dart' as core;
+import 'package:mojo/mojo/service_provider.mojom.dart';
+import 'package:mojo/mojo/shell.mojom.dart';
+import 'package:mojo_services/mojo/service_registry.mojom.dart';
 
 final _EmbedderImpl embedder = new _EmbedderImpl();
 
diff --git a/packages/flutter/lib/mojo/keyboard.dart b/packages/flutter/lib/mojo/keyboard.dart
index 3b640223673..8b5f4ccf5fb 100644
--- a/packages/flutter/lib/mojo/keyboard.dart
+++ b/packages/flutter/lib/mojo/keyboard.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:mojom/keyboard/keyboard.mojom.dart';
+import 'package:mojo_services/keyboard/keyboard.mojom.dart';
 import 'package:sky/mojo/shell.dart' as shell;
 
 class _KeyboardConnection {
diff --git a/packages/flutter/lib/mojo/net/fetch.dart b/packages/flutter/lib/mojo/net/fetch.dart
index 2ee166d1ca3..56a3b222382 100644
--- a/packages/flutter/lib/mojo/net/fetch.dart
+++ b/packages/flutter/lib/mojo/net/fetch.dart
@@ -6,10 +6,10 @@ import 'dart:async';
 import 'dart:typed_data';
 
 import 'package:mojo/core.dart' as core;
-import 'package:mojom/mojo/network_service.mojom.dart';
-import 'package:mojom/mojo/url_loader.mojom.dart';
-import 'package:mojom/mojo/url_request.mojom.dart';
-import 'package:mojom/mojo/url_response.mojom.dart';
+import 'package:mojo/mojo/url_request.mojom.dart';
+import 'package:mojo/mojo/url_response.mojom.dart';
+import 'package:mojo_services/mojo/network_service.mojom.dart';
+import 'package:mojo_services/mojo/url_loader.mojom.dart';
 import 'package:sky/mojo/shell.dart' as shell;
 
 NetworkServiceProxy _initNetworkService() {
diff --git a/packages/flutter/lib/mojo/net/image_cache.dart b/packages/flutter/lib/mojo/net/image_cache.dart
index 4ab394176b1..56723b6ad6f 100644
--- a/packages/flutter/lib/mojo/net/image_cache.dart
+++ b/packages/flutter/lib/mojo/net/image_cache.dart
@@ -6,7 +6,7 @@ import 'dart:async';
 import 'dart:collection';
 import 'dart:sky' as sky;
 
-import 'package:mojom/mojo/url_response.mojom.dart';
+import 'package:mojo/mojo/url_response.mojom.dart';
 import 'package:sky/mojo/net/fetch.dart';
 
 final HashMap<String, Future<sky.Image>> _cache =
diff --git a/packages/flutter/lib/mojo/shell.dart b/packages/flutter/lib/mojo/shell.dart
index ddd15028497..916c162ad77 100644
--- a/packages/flutter/lib/mojo/shell.dart
+++ b/packages/flutter/lib/mojo/shell.dart
@@ -6,7 +6,7 @@ import 'dart:sky.internals' as internals;
 
 import 'package:mojo/application.dart';
 import 'package:mojo/core.dart' as core;
-import 'package:mojom/mojo/service_provider.mojom.dart';
+import 'package:mojo/mojo/service_provider.mojom.dart';
 import 'package:sky/mojo/embedder.dart';
 
 ApplicationConnection _initConnection() {