diff --git a/BUILD.gn b/BUILD.gn
index 961a57025028731e6043c186b3c397e9033fd089..368f601f0704e34cc88e3fdcf979e661c4d624e3 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -9,6 +9,7 @@ group("sky") {
testonly = true
deps = [
+ "//sky/sdk",
"//sky/engine/platform:platform_unittests",
"//sky/engine/web:sky_unittests",
"//sky/engine/wtf:unittests",
diff --git a/engine/bindings/BUILD.gn b/engine/bindings/BUILD.gn
index fd6a30c645f00004ef1ab4a3299c302728ea39a0..f711219aa963d1377498b51bbbd09d99caf4b659 100644
--- a/engine/bindings/BUILD.gn
+++ b/engine/bindings/BUILD.gn
@@ -60,10 +60,10 @@ action("generate_snapshot_bin") {
inputs = [
"//dart/runtime/tools/create_snapshot_bin.py",
"//sky/engine/bindings/builtin.dart",
- "//mojo/public/dart/internal.dart",
- "//mojo/public/dart/src/handle_watcher.dart",
- "//mojo/public/dart/src/natives.dart",
- "//mojo/public/dart/src/timer_queue.dart",
+ "//mojo/public/dart/lib/internal.dart",
+ "//mojo/public/dart/lib/src/handle_watcher.dart",
+ "//mojo/public/dart/lib/src/natives.dart",
+ "//mojo/public/dart/lib/src/timer_queue.dart",
"snapshot.dart",
]
vm_isolate_snapshot = "$target_gen_dir/vm_isolate_snapshot.bin"
@@ -75,7 +75,7 @@ action("generate_snapshot_bin") {
builtin_path = rebase_path("//sky/engine/bindings/builtin.dart")
dart_sky_path = rebase_path("$bindings_output_dir/dart_sky.dart")
- internal_path = rebase_path("//mojo/public/dart/internal.dart")
+ internal_path = rebase_path("//mojo/public/dart/lib/internal.dart")
gen_snapshot_dir =
get_label_info("//dart/runtime/bin:gen_snapshot($host_toolchain)",
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..5e55a633226ae2743a5127766a7243e850c4f0ec
--- /dev/null
+++ b/sdk/BUILD.gn
@@ -0,0 +1,86 @@
+# Copyright 2015 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//mojo/public/dart/rules.gni")
+
+dart_pkg("sdk") {
+ sources = [
+ "CHANGELOG.md",
+ "bin/init.dart",
+ "lib/assets/.gitignore",
+ "lib/assets/material-design-icons.sha1",
+ "lib/download_material_design_icons",
+ "lib/framework/README.md",
+ "lib/framework/animation/animated_value.dart",
+ "lib/framework/animation/curves.dart",
+ "lib/framework/animation/fling_curve.dart",
+ "lib/framework/animation/generators.dart",
+ "lib/framework/animation/mechanics.dart",
+ "lib/framework/animation/scroll_behavior.dart",
+ "lib/framework/components/action_bar.dart",
+ "lib/framework/components/animated_component.dart",
+ "lib/framework/components/button.dart",
+ "lib/framework/components/button_base.dart",
+ "lib/framework/components/checkbox.dart",
+ "lib/framework/components/drawer.dart",
+ "lib/framework/components/drawer_header.dart",
+ "lib/framework/components/fixed_height_scrollable.dart",
+ "lib/framework/components/floating_action_button.dart",
+ "lib/framework/components/icon.dart",
+ "lib/framework/components/icon_button.dart",
+ "lib/framework/components/ink_splash.dart",
+ "lib/framework/components/ink_well.dart",
+ "lib/framework/components/input.dart",
+ "lib/framework/components/material.dart",
+ "lib/framework/components/menu_divider.dart",
+ "lib/framework/components/menu_item.dart",
+ "lib/framework/components/modal_overlay.dart",
+ "lib/framework/components/popup_menu.dart",
+ "lib/framework/components/popup_menu_item.dart",
+ "lib/framework/components/radio.dart",
+ "lib/framework/components/scaffold.dart",
+ "lib/framework/components/scrollable.dart",
+ "lib/framework/debug/shake-to-reload.sky",
+ "lib/framework/debug/tracing.dart",
+ "lib/framework/editing/editable_string.dart",
+ "lib/framework/editing/editable_text.dart",
+ "lib/framework/editing/keyboard.dart",
+ "lib/framework/elements/animation/controller.dart",
+ "lib/framework/elements/animation/timer.dart",
+ "lib/framework/elements/material-element.sky",
+ "lib/framework/elements/shadow.sky",
+ "lib/framework/elements/sky-box.sky",
+ "lib/framework/elements/sky-button.sky",
+ "lib/framework/elements/sky-checkbox.sky",
+ "lib/framework/elements/sky-drawer-header.sky",
+ "lib/framework/elements/sky-drawer.sky",
+ "lib/framework/elements/sky-element.sky",
+ "lib/framework/elements/sky-icon.sky",
+ "lib/framework/elements/sky-ink-splash.sky",
+ "lib/framework/elements/sky-input.sky",
+ "lib/framework/elements/sky-menu-divider.sky",
+ "lib/framework/elements/sky-menu-item.sky",
+ "lib/framework/elements/sky-radio.sky",
+ "lib/framework/elements/sky-scrollable.sky",
+ "lib/framework/elements/sky-toolbar.sky",
+ "lib/framework/embedder.dart",
+ "lib/framework/fn.dart",
+ "lib/framework/layout.dart",
+ "lib/framework/layouts/block.dart",
+ "lib/framework/net/fetch.dart",
+ "lib/framework/node.dart",
+ "lib/framework/reflect.dart",
+ "lib/framework/shell.dart",
+ "lib/framework/theme/colors.dart",
+ "lib/framework/theme/shadows.dart",
+ "lib/framework/theme/typography.dart",
+ "lib/framework/theme/view_configuration.dart",
+ "lib/sky_tool",
+ "pubspec.yaml",
+ ]
+
+ deps = [
+ "//sky/services/testing:bindings",
+ ]
+}
diff --git a/sdk/packages/sky/CHANGELOG.md b/sdk/CHANGELOG.md
similarity index 100%
rename from sdk/packages/sky/CHANGELOG.md
rename to sdk/CHANGELOG.md
diff --git a/sdk/README.md b/sdk/README.md
deleted file mode 100644
index 987807a8deabdb04d477d39cca422b7de1ace8a0..0000000000000000000000000000000000000000
--- a/sdk/README.md
+++ /dev/null
@@ -1,223 +0,0 @@
-Contributing
-============
-
-[sky_sdk](https://github.com/domokit/sky_sdk) is generated from the
-[mojo repository](https://github.com/domokit/mojo) using
-[deploy_sdk.py](https://github.com/domokit/mojo/blob/master/sky/tools/deploy_sdk.py)
-Static files (including this README.md) are located under
-[sky/sdk](https://github.com/domokit/mojo/tree/master/sky/sdk). Pull
-requests and issue reports are glady accepted at the
-[mojo repository](https://github.com/domokit/mojo)!
-
-Sky
-===
-
-Sky is an experimental, high-performance UI framework for mobile apps. Sky helps
-you create apps with beautiful user interfaces and high-quality interactive
-design that run smoothly at 120 Hz.
-
-Sky consists of two components:
-
-1. *The Sky engine.* The engine is the core of the system. Written in C++, the
- engine provides the muscle of the Sky system. The engine provides
- several primitives, including a soft real-time scheduler and a hierarchical,
- retained-mode graphics system, that let you build high-quality apps.
-
-2. *The Sky framework.* The [framework](packages/sky/lib/framework) makes it
- easy to build apps using Sky by providing familiar user interface widgets,
- such as buttons, infinite lists, and animations, on top of the engine using
- Dart. These extensible components follow a functional programming style
- inspired by [React](http://facebook.github.io/react/).
-
-We're still iterating on Sky heavily, which means the framework and underlying
-engine are both likely to change in incompatible ways several times, but if
-you're interested in trying out the system, this document can help you get
-started.
-
-Examples
---------
-
-Sky uses Dart and Sky applications are
-[Dart Packages](https://www.dartlang.org/docs/tutorials/shared-pkgs/).
-Application creation starts by creating a new directory and
-adding a [pubspec.yaml](https://www.dartlang.org/tools/pub/pubspec.html):
-
- pubspec.yaml for your app:
-```yaml
-name: your_app_name
-dependencies:
- sky: any
-```
-
-Once the pubspec is in place, create a `lib` directory (where your dart code
-will go), ensure that the 'dart' and 'pub' executables are on your $PATH and
-run the following:
-
-`pub get && pub run sky:init`.
-
-Currently the Sky Engine assumes the entry point for your application is a
-`main` function located inside a `main.sky` file at the root of the package.
-`.sky` is an html-like format:
-```
-
-
-
-```
-
-The rest of the application then goes inside the `lib` directory of the package
-thus `lib/main.dart` would be:
-
-```dart
-import 'package:sky/framework/fn.dart';
-
-class HelloWorldApp extends App {
- UINode build() {
- return new Text('Hello, world!');
- }
-}
-```
-
-Execution starts in `main`, which creates the `HelloWorldApp`. The framework
-then marks `HelloWorldApp` as dirty, which schedules it to build during the next
-animation frame. Each animation frame, the framework calls `build` on all the
-dirty components and diffs the virtual `UINode` hierarchy returned this frame
-with the hierarchy returned last frame. Any differences are then applied as
-mutations to the physical hierarchy retained by the engine.
-
-Skip down to "Running a Sky application" to learn how to load and run this
-example on your device.
-
-For examples, please see the [examples directory](examples/).
-
-Services
---------
-
-Sky apps can access services from the host operating system using Mojo IPC. For
-example, you can access the network using the `network_service.mojom` interface.
-Although you can use these low-level interfaces directly, you might prefer to
-access these services via libraries in the framework. For example, the
-`fetch.dart` library wraps the underlying `network_service.mojom` in an
-ergonomic interface:
-
-```dart
-import 'package:sky/framework/net/fetch.dart';
-
-main() async {
- Response response = await fetch('example.txt');
- print(response.bodyAsString());
-}
-```
-
-Set up your computer
---------------------
-
-1. Install the Dart SDK:
- - https://www.dartlang.org/tools/download.html
-
-2. Install the ``adb`` tool from the Android SDK:
- - https://developer.android.com/sdk/installing/index.html
-
-3. Install the Sky SDK:
- - ``git clone https://github.com/domokit/sky_sdk.git``
-
-4. Ensure that $DART_SDK is set to the path of your Dart SDK and 'adb'
- (inside 'platform-tools' in the android sdk) is in your $PATH.
-
-Set up your device
-------------------
-
-Currently Sky requires an Android device running the Lollipop (or newer) version
-of the Android operating system.
-
-1. Enable developer mode on your device by visiting ``Settings > About phone``
- and tapping the ``Build number`` field five times.
-
-2. Enable ``USB debugging`` in ``Settings > Developer options``.
-
-3. Using a USB cable, plug your phone into your computer. If prompted on your
- device, authorize your computer to access your device.
-
-Running a Sky application
--------------------------
-
-The `sky` pub package includes a `sky_tool` script to assist in running
-Sky applications inside the `SkyDemo.apk` harness. The sky_tool script expects
-to be run from the root directory of your application pub package. To run
-one of the examples in this SDK, try:
-
-1. ``cd examples/stocks``
-
-2. ``pub get`` to set up a copy of the sky package in the app directory.
-
-3. ``./packages/sky/sky_tool start`` to start the dev server and upload your
- app to the device.
- (NOTE: add a ``--install`` flag to install SkyDemo.apk if not already
- installed on the device.)
-
-4. Use ``adb logcat`` to view any errors or Dart print() output from the app.
- ``adb logcat -s chromium`` can be used to filter only adb messages from
- `SkyDemo.apk` (which for
- [legacy reasons](https://github.com/domokit/mojo/issues/129) still uses the
- android log tag 'chromium').
-
-Measuring Performance
----------------------
-
-Sky has support for generating trace files compatible with
-[Chrome's about:tracing](https://www.chromium.org/developers/how-tos/trace-event-profiling-tool).
-
-`packages/sky/sky_tool start_tracing` and `packages/sky/sky_tool stop_tracing`
-are the commands to use.
-
-Due to https://github.com/domokit/mojo/issues/127 tracing currently
-requires root access on the device.
-
-Debugging
----------
-
-Dart's [Observatory](https://www.dartlang.org/tools/observatory/)
-(VM Debugger & Profiler) support in Sky is
-[in progress](https://codereview.chromium.org/1107803002) and should
-be released shortly after Dart Summit 2015.
-
-Building a standalone MyApp
----------------------------
-
-Although it is possible to bundle the Sky Engine in your own app (instead of
-running your code inside SkyDemo.apk), right now doing so is difficult.
-
-There is one example of doing so if you're feeling brave:
-https://github.com/domokit/mojo/tree/master/sky/apk/stocks
-
-Eventually we plan to make this much easier and support platforms other than
-Android, but that work is yet in progress.
-
-Adding Services to MyApp
-------------------------
-
-[Mojo IPC](https://github.com/domokit/mojo) is an inter-process-communication
-system designed to provide cross-thread, cross-process, and language-agnostic
-communication between applications. Sky uses Mojo IPC to make it possible
-to write UI code in Dart and yet depend on networking code, etc. written in
-another language. Services are replicable, meaning that Dart code
-written to use the `network_service` remains portable to any platform
-(iOS, Android, etc.) by simply providing a 'natively' written `network_service`.
-
-Embedders of the Sky Engine and consumers of the Sky Framework can use this
-same mechanism to expose not only existing services like the
-[Keyboard](https://github.com/domokit/mojo/blob/master/mojo/services/keyboard/public/interfaces/keyboard.mojom)
-service to allow Sky Framework Dart code to interface with the underlying
-platform's Keyboard, but also to expose any additional non-Dart business logic
-to Sky/Dart UI code.
-
-As and example, [SkyApplication](https://github.com/domokit/mojo/blob/master/sky/shell/org/domokit/sky/shell/SkyApplication.java)
-exposes a mojo `network_service` (required by Sky Engine C++ code)
-[SkyDemoApplication](https://github.com/domokit/mojo/blob/master/sky/apk/demo/org/domokit/sky/demo/SkyDemoApplication.java)
-additionally exposes `keyboard_service` and `sensor_service` for use by the Sky
-Framework from Dart.
diff --git a/sdk/packages/sky/bin/init.dart b/sdk/bin/init.dart
similarity index 100%
rename from sdk/packages/sky/bin/init.dart
rename to sdk/bin/init.dart
diff --git a/assets/.gitignore b/sdk/lib/assets/.gitignore
similarity index 100%
rename from assets/.gitignore
rename to sdk/lib/assets/.gitignore
diff --git a/assets/material-design-icons.sha1 b/sdk/lib/assets/material-design-icons.sha1
similarity index 100%
rename from assets/material-design-icons.sha1
rename to sdk/lib/assets/material-design-icons.sha1
diff --git a/sdk/packages/sky/lib/download_material_design_icons b/sdk/lib/download_material_design_icons
similarity index 100%
rename from sdk/packages/sky/lib/download_material_design_icons
rename to sdk/lib/download_material_design_icons
diff --git a/framework/README.md b/sdk/lib/framework/README.md
similarity index 100%
rename from framework/README.md
rename to sdk/lib/framework/README.md
diff --git a/framework/animation/animated_value.dart b/sdk/lib/framework/animation/animated_value.dart
similarity index 100%
rename from framework/animation/animated_value.dart
rename to sdk/lib/framework/animation/animated_value.dart
diff --git a/framework/animation/curves.dart b/sdk/lib/framework/animation/curves.dart
similarity index 100%
rename from framework/animation/curves.dart
rename to sdk/lib/framework/animation/curves.dart
diff --git a/framework/animation/fling_curve.dart b/sdk/lib/framework/animation/fling_curve.dart
similarity index 100%
rename from framework/animation/fling_curve.dart
rename to sdk/lib/framework/animation/fling_curve.dart
diff --git a/framework/animation/generators.dart b/sdk/lib/framework/animation/generators.dart
similarity index 100%
rename from framework/animation/generators.dart
rename to sdk/lib/framework/animation/generators.dart
diff --git a/framework/animation/mechanics.dart b/sdk/lib/framework/animation/mechanics.dart
similarity index 100%
rename from framework/animation/mechanics.dart
rename to sdk/lib/framework/animation/mechanics.dart
diff --git a/framework/animation/scroll_behavior.dart b/sdk/lib/framework/animation/scroll_behavior.dart
similarity index 100%
rename from framework/animation/scroll_behavior.dart
rename to sdk/lib/framework/animation/scroll_behavior.dart
diff --git a/framework/components/action_bar.dart b/sdk/lib/framework/components/action_bar.dart
similarity index 100%
rename from framework/components/action_bar.dart
rename to sdk/lib/framework/components/action_bar.dart
diff --git a/framework/components/animated_component.dart b/sdk/lib/framework/components/animated_component.dart
similarity index 100%
rename from framework/components/animated_component.dart
rename to sdk/lib/framework/components/animated_component.dart
diff --git a/framework/components/button.dart b/sdk/lib/framework/components/button.dart
similarity index 100%
rename from framework/components/button.dart
rename to sdk/lib/framework/components/button.dart
diff --git a/framework/components/button_base.dart b/sdk/lib/framework/components/button_base.dart
similarity index 100%
rename from framework/components/button_base.dart
rename to sdk/lib/framework/components/button_base.dart
diff --git a/framework/components/checkbox.dart b/sdk/lib/framework/components/checkbox.dart
similarity index 100%
rename from framework/components/checkbox.dart
rename to sdk/lib/framework/components/checkbox.dart
diff --git a/framework/components/drawer.dart b/sdk/lib/framework/components/drawer.dart
similarity index 100%
rename from framework/components/drawer.dart
rename to sdk/lib/framework/components/drawer.dart
diff --git a/framework/components/drawer_header.dart b/sdk/lib/framework/components/drawer_header.dart
similarity index 100%
rename from framework/components/drawer_header.dart
rename to sdk/lib/framework/components/drawer_header.dart
diff --git a/framework/components/fixed_height_scrollable.dart b/sdk/lib/framework/components/fixed_height_scrollable.dart
similarity index 100%
rename from framework/components/fixed_height_scrollable.dart
rename to sdk/lib/framework/components/fixed_height_scrollable.dart
diff --git a/framework/components/floating_action_button.dart b/sdk/lib/framework/components/floating_action_button.dart
similarity index 100%
rename from framework/components/floating_action_button.dart
rename to sdk/lib/framework/components/floating_action_button.dart
diff --git a/framework/components/icon.dart b/sdk/lib/framework/components/icon.dart
similarity index 100%
rename from framework/components/icon.dart
rename to sdk/lib/framework/components/icon.dart
diff --git a/framework/components/icon_button.dart b/sdk/lib/framework/components/icon_button.dart
similarity index 100%
rename from framework/components/icon_button.dart
rename to sdk/lib/framework/components/icon_button.dart
diff --git a/framework/components/ink_splash.dart b/sdk/lib/framework/components/ink_splash.dart
similarity index 100%
rename from framework/components/ink_splash.dart
rename to sdk/lib/framework/components/ink_splash.dart
diff --git a/framework/components/ink_well.dart b/sdk/lib/framework/components/ink_well.dart
similarity index 100%
rename from framework/components/ink_well.dart
rename to sdk/lib/framework/components/ink_well.dart
diff --git a/framework/components/input.dart b/sdk/lib/framework/components/input.dart
similarity index 100%
rename from framework/components/input.dart
rename to sdk/lib/framework/components/input.dart
diff --git a/framework/components/material.dart b/sdk/lib/framework/components/material.dart
similarity index 100%
rename from framework/components/material.dart
rename to sdk/lib/framework/components/material.dart
diff --git a/framework/components/menu_divider.dart b/sdk/lib/framework/components/menu_divider.dart
similarity index 100%
rename from framework/components/menu_divider.dart
rename to sdk/lib/framework/components/menu_divider.dart
diff --git a/framework/components/menu_item.dart b/sdk/lib/framework/components/menu_item.dart
similarity index 100%
rename from framework/components/menu_item.dart
rename to sdk/lib/framework/components/menu_item.dart
diff --git a/framework/components/modal_overlay.dart b/sdk/lib/framework/components/modal_overlay.dart
similarity index 100%
rename from framework/components/modal_overlay.dart
rename to sdk/lib/framework/components/modal_overlay.dart
diff --git a/framework/components/popup_menu.dart b/sdk/lib/framework/components/popup_menu.dart
similarity index 100%
rename from framework/components/popup_menu.dart
rename to sdk/lib/framework/components/popup_menu.dart
diff --git a/framework/components/popup_menu_item.dart b/sdk/lib/framework/components/popup_menu_item.dart
similarity index 100%
rename from framework/components/popup_menu_item.dart
rename to sdk/lib/framework/components/popup_menu_item.dart
diff --git a/framework/components/radio.dart b/sdk/lib/framework/components/radio.dart
similarity index 100%
rename from framework/components/radio.dart
rename to sdk/lib/framework/components/radio.dart
diff --git a/framework/components/scaffold.dart b/sdk/lib/framework/components/scaffold.dart
similarity index 100%
rename from framework/components/scaffold.dart
rename to sdk/lib/framework/components/scaffold.dart
diff --git a/framework/components/scrollable.dart b/sdk/lib/framework/components/scrollable.dart
similarity index 100%
rename from framework/components/scrollable.dart
rename to sdk/lib/framework/components/scrollable.dart
diff --git a/framework/debug/shake-to-reload.sky b/sdk/lib/framework/debug/shake-to-reload.sky
similarity index 100%
rename from framework/debug/shake-to-reload.sky
rename to sdk/lib/framework/debug/shake-to-reload.sky
diff --git a/framework/debug/tracing.dart b/sdk/lib/framework/debug/tracing.dart
similarity index 100%
rename from framework/debug/tracing.dart
rename to sdk/lib/framework/debug/tracing.dart
diff --git a/framework/editing/editable_string.dart b/sdk/lib/framework/editing/editable_string.dart
similarity index 100%
rename from framework/editing/editable_string.dart
rename to sdk/lib/framework/editing/editable_string.dart
diff --git a/framework/editing/editable_text.dart b/sdk/lib/framework/editing/editable_text.dart
similarity index 100%
rename from framework/editing/editable_text.dart
rename to sdk/lib/framework/editing/editable_text.dart
diff --git a/framework/editing/keyboard.dart b/sdk/lib/framework/editing/keyboard.dart
similarity index 100%
rename from framework/editing/keyboard.dart
rename to sdk/lib/framework/editing/keyboard.dart
diff --git a/framework/elements/animation/controller.dart b/sdk/lib/framework/elements/animation/controller.dart
similarity index 100%
rename from framework/elements/animation/controller.dart
rename to sdk/lib/framework/elements/animation/controller.dart
diff --git a/framework/elements/animation/timer.dart b/sdk/lib/framework/elements/animation/timer.dart
similarity index 100%
rename from framework/elements/animation/timer.dart
rename to sdk/lib/framework/elements/animation/timer.dart
diff --git a/framework/elements/material-element.sky b/sdk/lib/framework/elements/material-element.sky
similarity index 100%
rename from framework/elements/material-element.sky
rename to sdk/lib/framework/elements/material-element.sky
diff --git a/framework/elements/shadow.sky b/sdk/lib/framework/elements/shadow.sky
similarity index 100%
rename from framework/elements/shadow.sky
rename to sdk/lib/framework/elements/shadow.sky
diff --git a/framework/elements/sky-box.sky b/sdk/lib/framework/elements/sky-box.sky
similarity index 100%
rename from framework/elements/sky-box.sky
rename to sdk/lib/framework/elements/sky-box.sky
diff --git a/framework/elements/sky-button.sky b/sdk/lib/framework/elements/sky-button.sky
similarity index 100%
rename from framework/elements/sky-button.sky
rename to sdk/lib/framework/elements/sky-button.sky
diff --git a/framework/elements/sky-checkbox.sky b/sdk/lib/framework/elements/sky-checkbox.sky
similarity index 100%
rename from framework/elements/sky-checkbox.sky
rename to sdk/lib/framework/elements/sky-checkbox.sky
diff --git a/framework/elements/sky-drawer-header.sky b/sdk/lib/framework/elements/sky-drawer-header.sky
similarity index 100%
rename from framework/elements/sky-drawer-header.sky
rename to sdk/lib/framework/elements/sky-drawer-header.sky
diff --git a/framework/elements/sky-drawer.sky b/sdk/lib/framework/elements/sky-drawer.sky
similarity index 100%
rename from framework/elements/sky-drawer.sky
rename to sdk/lib/framework/elements/sky-drawer.sky
diff --git a/framework/elements/sky-element.sky b/sdk/lib/framework/elements/sky-element.sky
similarity index 100%
rename from framework/elements/sky-element.sky
rename to sdk/lib/framework/elements/sky-element.sky
diff --git a/framework/elements/sky-icon.sky b/sdk/lib/framework/elements/sky-icon.sky
similarity index 100%
rename from framework/elements/sky-icon.sky
rename to sdk/lib/framework/elements/sky-icon.sky
diff --git a/framework/elements/sky-ink-splash.sky b/sdk/lib/framework/elements/sky-ink-splash.sky
similarity index 100%
rename from framework/elements/sky-ink-splash.sky
rename to sdk/lib/framework/elements/sky-ink-splash.sky
diff --git a/framework/elements/sky-input.sky b/sdk/lib/framework/elements/sky-input.sky
similarity index 100%
rename from framework/elements/sky-input.sky
rename to sdk/lib/framework/elements/sky-input.sky
diff --git a/framework/elements/sky-menu-divider.sky b/sdk/lib/framework/elements/sky-menu-divider.sky
similarity index 100%
rename from framework/elements/sky-menu-divider.sky
rename to sdk/lib/framework/elements/sky-menu-divider.sky
diff --git a/framework/elements/sky-menu-item.sky b/sdk/lib/framework/elements/sky-menu-item.sky
similarity index 100%
rename from framework/elements/sky-menu-item.sky
rename to sdk/lib/framework/elements/sky-menu-item.sky
diff --git a/framework/elements/sky-radio.sky b/sdk/lib/framework/elements/sky-radio.sky
similarity index 100%
rename from framework/elements/sky-radio.sky
rename to sdk/lib/framework/elements/sky-radio.sky
diff --git a/framework/elements/sky-scrollable.sky b/sdk/lib/framework/elements/sky-scrollable.sky
similarity index 100%
rename from framework/elements/sky-scrollable.sky
rename to sdk/lib/framework/elements/sky-scrollable.sky
diff --git a/framework/elements/sky-toolbar.sky b/sdk/lib/framework/elements/sky-toolbar.sky
similarity index 100%
rename from framework/elements/sky-toolbar.sky
rename to sdk/lib/framework/elements/sky-toolbar.sky
diff --git a/framework/embedder.dart b/sdk/lib/framework/embedder.dart
similarity index 93%
rename from framework/embedder.dart
rename to sdk/lib/framework/embedder.dart
index 702b49da8f4494f28f0f14e7513b1cf4cd921bdb..22fb423612e99c3ab6a96a60093760d2436d4a80 100644
--- a/framework/embedder.dart
+++ b/sdk/lib/framework/embedder.dart
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-import "package:mojo/public/dart/application.dart";
+import "package:mojo/application.dart";
import "dart:sky.internals" as internals;
-import "package:mojo/public/dart/bindings.dart" as bindings;
-import "package:mojo/public/dart/core.dart" as core;
+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/shell.mojom.dart";
import "package:mojom/mojo/service_registry.mojom.dart";
diff --git a/framework/fn.dart b/sdk/lib/framework/fn.dart
similarity index 100%
rename from framework/fn.dart
rename to sdk/lib/framework/fn.dart
diff --git a/framework/layout.dart b/sdk/lib/framework/layout.dart
similarity index 100%
rename from framework/layout.dart
rename to sdk/lib/framework/layout.dart
diff --git a/framework/layouts/block.dart b/sdk/lib/framework/layouts/block.dart
similarity index 100%
rename from framework/layouts/block.dart
rename to sdk/lib/framework/layouts/block.dart
diff --git a/framework/net/fetch.dart b/sdk/lib/framework/net/fetch.dart
similarity index 95%
rename from framework/net/fetch.dart
rename to sdk/lib/framework/net/fetch.dart
index c2f231b33f7589a08c0f7ccf282497d27040f114..3089535dd8e5a1a191820a89876940dd9d955a40 100644
--- a/framework/net/fetch.dart
+++ b/sdk/lib/framework/net/fetch.dart
@@ -6,7 +6,7 @@ import '../shell.dart' as shell;
import 'dart:async';
import 'dart:sky' as sky;
import 'dart:typed_data';
-import 'package:mojo/public/dart/core.dart' as core;
+import 'package:mojo/core.dart' as core;
import 'package:mojom/mojo/network_service.mojom.dart';
import 'package:mojom/mojo/url_loader.mojom.dart';
diff --git a/framework/node.dart b/sdk/lib/framework/node.dart
similarity index 100%
rename from framework/node.dart
rename to sdk/lib/framework/node.dart
diff --git a/framework/reflect.dart b/sdk/lib/framework/reflect.dart
similarity index 100%
rename from framework/reflect.dart
rename to sdk/lib/framework/reflect.dart
diff --git a/framework/shell.dart b/sdk/lib/framework/shell.dart
similarity index 89%
rename from framework/shell.dart
rename to sdk/lib/framework/shell.dart
index b5a9ea2bf1a915dd4fc8b33480e3145e41a0cb03..e9ff1b75980744b2f68bd5e2aa1619b48a45ec6b 100644
--- a/framework/shell.dart
+++ b/sdk/lib/framework/shell.dart
@@ -4,8 +4,8 @@
import "dart:sky.internals" as internals;
import "embedder.dart";
-import "package:mojo/public/dart/application.dart";
-import 'package:mojo/public/dart/core.dart' as core;
+import "package:mojo/application.dart";
+import 'package:mojo/core.dart' as core;
import "package:mojom/mojo/service_provider.mojom.dart";
ApplicationConnection _initConnection() {
diff --git a/framework/theme/colors.dart b/sdk/lib/framework/theme/colors.dart
similarity index 100%
rename from framework/theme/colors.dart
rename to sdk/lib/framework/theme/colors.dart
diff --git a/framework/theme/shadows.dart b/sdk/lib/framework/theme/shadows.dart
similarity index 100%
rename from framework/theme/shadows.dart
rename to sdk/lib/framework/theme/shadows.dart
diff --git a/framework/theme/typography.dart b/sdk/lib/framework/theme/typography.dart
similarity index 100%
rename from framework/theme/typography.dart
rename to sdk/lib/framework/theme/typography.dart
diff --git a/framework/theme/view_configuration.dart b/sdk/lib/framework/theme/view_configuration.dart
similarity index 100%
rename from framework/theme/view_configuration.dart
rename to sdk/lib/framework/theme/view_configuration.dart
diff --git a/sdk/packages/sky/lib/sky_tool b/sdk/lib/sky_tool
similarity index 100%
rename from sdk/packages/sky/lib/sky_tool
rename to sdk/lib/sky_tool
diff --git a/sdk/packages/mojo/CHANGELOG.md b/sdk/packages/mojo/CHANGELOG.md
deleted file mode 100644
index 8f37b0bfea6c6bb9f25f1022ad4280c044636980..0000000000000000000000000000000000000000
--- a/sdk/packages/mojo/CHANGELOG.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-## 0.0.5+dart-summit-1
-
- - Branched from mojo trunk to stabalize for Dart summit.
diff --git a/sdk/packages/mojo/pubspec.yaml b/sdk/packages/mojo/pubspec.yaml
deleted file mode 100644
index f368c8aba00ec670dc620e3083a37a6f129031f4..0000000000000000000000000000000000000000
--- a/sdk/packages/mojo/pubspec.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Chromium Authors
-description: Dart files to support executing inside Mojo.
-name: mojo
-homepage: https://github.com/domokit/mojo
-version: 0.0.5
diff --git a/sdk/packages/sky/pubspec.yaml b/sdk/pubspec.yaml
similarity index 100%
rename from sdk/packages/sky/pubspec.yaml
rename to sdk/pubspec.yaml
diff --git a/tests/services/iframe-embed-vmc.sky b/tests/services/iframe-embed-vmc.sky
index 6fe8ed06d3f1909d45d67666042845b967fa1912..fddaab5e28c144e968ffdfdb7b6a092e7f332207 100644
--- a/tests/services/iframe-embed-vmc.sky
+++ b/tests/services/iframe-embed-vmc.sky
@@ -8,9 +8,9 @@ import 'dart:sky';
import 'dart:sky.internals' as internals;
import 'dart:typed_data';
-import 'package:mojo/public/dart/application.dart';
-import 'package:mojo/public/dart/bindings.dart';
-import 'package:mojo/public/dart/core.dart';
+import 'package:mojo/application.dart';
+import 'package:mojo/bindings.dart';
+import 'package:mojo/core.dart';
import 'package:mojom/mojo/shell.mojom.dart' as shell_mojom;
import 'package:mojom/mojo/input_events.mojom.dart' as input_events;
import 'package:mojom/mojo/view_manager.mojom.dart' as view_manager;
diff --git a/tests/services/network.sky b/tests/services/network.sky
index 810db1550f35151783ac2a8790abde9fb166dceb..2f64bf62bbdaae4634b80e435493b0aa4e622578 100644
--- a/tests/services/network.sky
+++ b/tests/services/network.sky
@@ -1,16 +1,17 @@
#!mojo mojo:sky_viewer