diff --git a/docs/public-docs-package/index.js b/docs/public-docs-package/index.js
index 54a3ae6665..ee8823d845 100644
--- a/docs/public-docs-package/index.js
+++ b/docs/public-docs-package/index.js
@@ -6,16 +6,10 @@ module.exports = new Package('angular-v2-public-docs', [basePackage])
 .config(function(readTypeScriptModules) {
   readTypeScriptModules.sourceFiles = [
     'angular2/lifecycle_hooks.ts',
-    'angular2/metadata.ts',
-    'angular2/change_detection.ts',
     'angular2/core.ts',
-    'angular2/di.ts',
-    'angular2/directives.ts',
     'angular2/http.ts',
-    'angular2/forms.ts',
     'angular2/router.ts',
-    'angular2/test.ts',
-    'angular2/pipes.ts'
+    'angular2/test.ts'
   ];
   readTypeScriptModules.hidePrivateMembers = true;
 })
diff --git a/docs/typescript-definition-package/index.js b/docs/typescript-definition-package/index.js
index 72e00e01ae..c1669cbd34 100644
--- a/docs/typescript-definition-package/index.js
+++ b/docs/typescript-definition-package/index.js
@@ -52,9 +52,11 @@ module.exports = new Package('angular-v2-docs', [jsdocPackage, nunjucksPackage,
       id: 'angular2/angular2',
       references: ['../es6-promise/es6-promise.d.ts', '../rx/rx.d.ts'],
       modules: {
-        'angular2/angular2': {namespace: 'ng', id: 'angular2/angular2'},
+        'angular2/angular2': {namespace: 'ng', id: 'angular2/angular2'}
+        /* TODO(jeffbcross): re-implement with @jteplitz as part of #3926,
         'angular2/web_worker/worker': {namespace: 'ngWorker', id: 'angular2/web_worker/worker'},
         'angular2/web_worker/ui': {namespace: 'ngUi', id: 'angular2/web_worker/ui'}
+        */
       }
     },
     {
@@ -79,7 +81,7 @@ module.exports = new Package('angular-v2-docs', [jsdocPackage, nunjucksPackage,
         Injector: 'ng.Injector',
         Predicate: 'ng.Predicate',
         ElementRef: 'ng.ElementRef',
-
+        DebugElement: 'ng.DebugElement'
       },
       modules: {'angular2/test_lib': {namespace: 'ngTestLib', id: 'angular2/test_lib'}}
     }
diff --git a/modules/angular2/angular2.dart b/modules/angular2/angular2.dart
index 9743f18b29..8aa91e6e76 100644
--- a/modules/angular2/angular2.dart
+++ b/modules/angular2/angular2.dart
@@ -5,4 +5,4 @@ library angular2;
  *
  * This library does not include `bootstrap`. Import `bootstrap.dart` instead.
  */
-export 'package:angular2/angular2_exports.dart';
+export 'package:angular2/core.dart';
diff --git a/modules/angular2/angular2.ts b/modules/angular2/angular2.ts
index 5bec573b44..2f2a1ebc4c 100644
--- a/modules/angular2/angular2.ts
+++ b/modules/angular2/angular2.ts
@@ -1,18 +1,4 @@
-/**
- * The `angular2` is the single place to import all of the individual types.
- */
-
-// TODO(someone familiar with systemjs): the exports below are copied from
-// angular2_exports.ts. Re-exporting from angular2_exports.ts causes systemjs
-// to resolve imports very very very slowly. See also a similar notice in
-// bootstrap.ts
-export * from './metadata';
-export * from './change_detection';
 export * from './core';
-export * from './di';
-export * from './directives';
-export * from './forms';
-export * from './render';
 export * from './profile';
-export {bootstrap} from 'angular2/src/core/application';
 export * from './lifecycle_hooks';
+export * from './bootstrap';
diff --git a/modules/angular2/bootstrap.ts b/modules/angular2/bootstrap.ts
index 76f53dbada..8a9456270b 100644
--- a/modules/angular2/bootstrap.ts
+++ b/modules/angular2/bootstrap.ts
@@ -1,16 +1,5 @@
 /**
- * Contains everything you need to bootstrap your application.
+ * This file is only used for dart applications and for internal examples
+ * that compile with both JavaScript and Dart.
  */
-export {bootstrap} from 'angular2/src/core/application';
-
-// TODO(someone familiar with systemjs): the exports below are copied from
-// angular2_exports.ts. Re-exporting from angular2_exports.ts causes systemjs
-// to resolve imports very very very slowly. See also a similar notice in
-// angular2.ts
-export * from './metadata';
-export * from './change_detection';
-export * from './core';
-export * from './di';
-export * from './directives';
-export * from './forms';
-export * from './render';
+export {bootstrap} from 'angular2/src/core/bootstrap';
diff --git a/modules/angular2/bootstrap_static.dart b/modules/angular2/bootstrap_static.dart
index dee16ac0a7..5297bb9bd6 100644
--- a/modules/angular2/bootstrap_static.dart
+++ b/modules/angular2/bootstrap_static.dart
@@ -1,4 +1,3 @@
 library angular2.bootstrap_static;
 
-export 'angular2_exports.dart';
 export 'src/core/application_static.dart';
diff --git a/modules/angular2/core.dart b/modules/angular2/core.dart
index 3522b1b37f..5495aed20d 100644
--- a/modules/angular2/core.dart
+++ b/modules/angular2/core.dart
@@ -1,31 +1,21 @@
 library angular2.core;
 
-export 'package:angular2/src/core/application_tokens.dart' show APP_COMPONENT;
-export 'package:angular2/src/core/application_ref.dart' show ApplicationRef;
-
-// Compiler Related Dependencies.
-export 'package:angular2/src/core/services/app_root_url.dart' show AppRootUrl;
-export 'package:angular2/src/core/services/url_resolver.dart' show UrlResolver;
-export 'package:angular2/src/core/compiler/component_url_mapper.dart'
-    show ComponentUrlMapper;
-export 'package:angular2/src/core/compiler/directive_resolver.dart'
-    show DirectiveResolver;
-export 'package:angular2/src/core/compiler/compiler.dart' show Compiler;
-
-export 'package:angular2/src/core/compiler/view_manager.dart' show AppViewManager;
-export 'package:angular2/src/core/compiler/query_list.dart' show QueryList;
-export 'package:angular2/src/core/compiler/dynamic_component_loader.dart'
-    show DynamicComponentLoader;
-export 'package:angular2/src/core/life_cycle/life_cycle.dart' show LifeCycle;
-
-export 'package:angular2/src/core/compiler/element_ref.dart' show ElementRef;
-export 'package:angular2/src/core/compiler/template_ref.dart' show TemplateRef;
-export 'package:angular2/src/core/compiler/view_ref.dart'
-    show ViewRef, HostViewRef, ProtoViewRef;
-export 'package:angular2/src/core/compiler/view_container_ref.dart'
-    show ViewContainerRef;
-export 'package:angular2/src/core/compiler/dynamic_component_loader.dart'
-    show ComponentRef;
-
-export 'package:angular2/src/core/zone/ng_zone.dart' show NgZone;
-export 'package:angular2/src/core/facade/async.dart' show Stream, EventEmitter;
+// Public Core API
+export 'package:angular2/src/core/util.dart';
+export 'package:angular2/src/core/di.dart';
+export 'package:angular2/src/core/pipes.dart';
+export 'package:angular2/src/core/facade.dart';
+// Do not export application for dart. Must import from angular2/bootstrap
+//export 'package:angular2/src/core/application.dart';
+export 'package:angular2/src/core/services.dart';
+export 'package:angular2/src/core/compiler.dart';
+export 'package:angular2/src/core/lifecycle.dart';
+export 'package:angular2/src/core/zone.dart';
+//Do not export render for dart. Must import from angular2/render
+//export 'package:angular2/src/core/render.dart';
+export 'package:angular2/src/core/directives.dart';
+export 'package:angular2/src/core/forms.dart';
+//Do not export debug for dart.
+//export 'package:angular2/src/core/debug.dart';
+export 'package:angular2/src/core/metadata.dart';
+export 'package:angular2/src/core/change_detection.dart';
diff --git a/modules/angular2/core.ts b/modules/angular2/core.ts
index f8fbb63a6a..8ce24ae25e 100644
--- a/modules/angular2/core.ts
+++ b/modules/angular2/core.ts
@@ -1,31 +1,20 @@
 /**
  * @module
  * @description
- * Define angular core API here.
+ * Starting point to import all public core APIs.
  */
-export {APP_COMPONENT} from 'angular2/src/core/application_tokens';
-export {Type} from 'angular2/src/core/facade/lang';
-export {ApplicationRef} from 'angular2/src/core/application_ref';
-
-
-// Compiler Related Dependencies.
-export {AppRootUrl} from 'angular2/src/core/services/app_root_url';
-export {UrlResolver} from 'angular2/src/core/services/url_resolver';
-export {ComponentUrlMapper} from 'angular2/src/core/compiler/component_url_mapper';
-export {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver';
-export {Compiler} from 'angular2/src/core/compiler/compiler';
-
-export {AppViewManager} from 'angular2/src/core/compiler/view_manager';
-export {QueryList} from 'angular2/src/core/compiler/query_list';
-export {DynamicComponentLoader} from 'angular2/src/core/compiler/dynamic_component_loader';
-export {LifeCycle} from 'angular2/src/core/life_cycle/life_cycle';
-
-export {ElementRef} from 'angular2/src/core/compiler/element_ref';
-export {TemplateRef} from 'angular2/src/core/compiler/template_ref';
-export {ViewRef, HostViewRef, ProtoViewRef} from 'angular2/src/core/compiler/view_ref';
-export {ViewContainerRef} from 'angular2/src/core/compiler/view_container_ref';
-export {ComponentRef} from 'angular2/src/core/compiler/dynamic_component_loader';
-
-export {NgZone} from 'angular2/src/core/zone/ng_zone';
-export {Observable, EventEmitter} from 'angular2/src/core/facade/async';
-export {Predicate} from 'angular2/src/core/facade/collection';
+export * from './src/core/metadata';
+export * from './src/core/util';
+export * from './src/core/di';
+export * from './src/core/pipes';
+export * from './src/core/facade';
+export * from './src/core/application';
+export * from './src/core/services';
+export * from './src/core/compiler';
+export * from './src/core/lifecycle';
+export * from './src/core/zone';
+export * from './src/core/render';
+export * from './src/core/directives';
+export * from './src/core/forms';
+export * from './src/core/debug';
+export * from './src/core/change_detection';
diff --git a/modules/angular2/http.ts b/modules/angular2/http.ts
index 8388833168..6bb008b357 100644
--- a/modules/angular2/http.ts
+++ b/modules/angular2/http.ts
@@ -4,7 +4,7 @@
  * The http module provides services to perform http requests. To get started, see the {@link Http}
  * class.
  */
-import {bind, Binding} from 'angular2/di';
+import {bind, Binding} from 'angular2/core';
 import {Http, Jsonp} from './src/http/http';
 import {XHRBackend, XHRConnection} from './src/http/backends/xhr_backend';
 import {JSONPBackend, JSONPConnection} from './src/http/backends/jsonp_backend';
diff --git a/modules/angular2/render.ts b/modules/angular2/render.ts
index 7165218ebe..bef53faf0c 100644
--- a/modules/angular2/render.ts
+++ b/modules/angular2/render.ts
@@ -1,21 +1,7 @@
 /**
- * @module
- * @description
- * This module provides advanced support for extending dom strategy.
+ * This file is only used for dart applications and for internal examples
+ * that compile with both JavaScript and Dart.
+ *
+ * JavaScript users should import from angular2/core.
  */
-
-export {
-  RenderDirectiveMetadata,
-  DomRenderer,
-  RenderEventDispatcher,
-  Renderer,
-  RenderElementRef,
-  RenderViewRef,
-  RenderProtoViewRef,
-  RenderFragmentRef,
-  RenderViewWithFragments,
-  ViewDefinition,
-  DOCUMENT,
-  APP_ID,
-  MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE
-} from './src/core/render/render';
+export * from './src/core/render';
diff --git a/modules/angular2/router.ts b/modules/angular2/router.ts
index a1f6a22a3f..21d3a8169b 100644
--- a/modules/angular2/router.ts
+++ b/modules/angular2/router.ts
@@ -33,7 +33,7 @@ import {RouteRegistry} from './src/router/route_registry';
 import {Pipeline} from './src/router/pipeline';
 import {Location} from './src/router/location';
 import {APP_COMPONENT} from './src/core/application_tokens';
-import {Binding} from './di';
+import {Binding} from './core';
 import {CONST_EXPR} from './src/core/facade/lang';
 
 export const ROUTER_DIRECTIVES: any[] = CONST_EXPR([RouterOutlet, RouterLink]);
diff --git a/modules/angular2/src/core/application.dart b/modules/angular2/src/core/application.dart
index 96c4a1694b..0e4b71958f 100644
--- a/modules/angular2/src/core/application.dart
+++ b/modules/angular2/src/core/application.dart
@@ -1,4 +1,4 @@
-library angular2.application;
+library angular2.src.core.application;
 
 import 'dart:async';
 
diff --git a/modules/angular2/src/core/application.ts b/modules/angular2/src/core/application.ts
index 6d4ad8a88d..3431e4b945 100644
--- a/modules/angular2/src/core/application.ts
+++ b/modules/angular2/src/core/application.ts
@@ -1,2 +1,3 @@
-export {commonBootstrap as bootstrap} from './application_common';
+// Public API for Application
 export {ApplicationRef} from './application_ref';
+export {APP_COMPONENT} from './application_tokens';
diff --git a/modules/angular2/src/core/application_common.ts b/modules/angular2/src/core/application_common.ts
index c4597e03bb..861360c7b5 100644
--- a/modules/angular2/src/core/application_common.ts
+++ b/modules/angular2/src/core/application_common.ts
@@ -1,4 +1,6 @@
-import {Injector, bind, OpaqueToken, Binding} from 'angular2/di';
+import {DEFAULT_PIPES} from 'angular2/src/core/pipes';
+import {FORM_BINDINGS} from 'angular2/src/core/forms';
+import {bind, Binding, Injector, OpaqueToken} from 'angular2/src/core/di';
 import {
   NumberWrapper,
   Type,
@@ -25,7 +27,6 @@ import {
   KeyValueDiffers,
   defaultKeyValueDiffers
 } from 'angular2/src/core/change_detection/change_detection';
-import {DEFAULT_PIPES} from 'angular2/pipes';
 import {ExceptionHandler} from './exception_handler';
 import {ViewLoader} from 'angular2/src/core/render/dom/compiler/view_loader';
 import {StyleUrlResolver} from 'angular2/src/core/render/dom/compiler/style_url_resolver';
@@ -156,7 +157,8 @@ function _injectorBindings(appComponentType): Array<Type | Binding | any[]> {
     DynamicComponentLoader,
     Testability,
     AnchorBasedAppRootUrl,
-    bind(AppRootUrl).toAlias(AnchorBasedAppRootUrl)
+    bind(AppRootUrl).toAlias(AnchorBasedAppRootUrl),
+    FORM_BINDINGS
   ];
 }
 
diff --git a/modules/angular2/src/core/application_ref.ts b/modules/angular2/src/core/application_ref.ts
index 1550dc4a4c..92e750e878 100644
--- a/modules/angular2/src/core/application_ref.ts
+++ b/modules/angular2/src/core/application_ref.ts
@@ -1,5 +1,5 @@
 import {ComponentRef} from 'angular2/src/core/compiler/dynamic_component_loader';
-import {Injector} from 'angular2/di';
+import {Injector} from 'angular2/src/core/di';
 import {Type} from 'angular2/src/core/facade/lang';
 /**
  * Represents a Angular's representation of an Application.
diff --git a/modules/angular2/src/core/application_static.dart b/modules/angular2/src/core/application_static.dart
index e48cb9f345..bf1ec9aa74 100644
--- a/modules/angular2/src/core/application_static.dart
+++ b/modules/angular2/src/core/application_static.dart
@@ -1,4 +1,4 @@
-library angular2.application_static;
+library angular2.src.core.application_static;
 
 import 'dart:async';
 import 'application_common.dart';
diff --git a/modules/angular2/src/core/application_tokens.ts b/modules/angular2/src/core/application_tokens.ts
index 98cc09c041..c27b7c5a37 100644
--- a/modules/angular2/src/core/application_tokens.ts
+++ b/modules/angular2/src/core/application_tokens.ts
@@ -1,4 +1,4 @@
-import {OpaqueToken} from 'angular2/di';
+import {OpaqueToken} from 'angular2/src/core/di';
 import {CONST_EXPR} from 'angular2/src/core/facade/lang';
 
 /**
diff --git a/modules/angular2/src/core/bootstrap.dart b/modules/angular2/src/core/bootstrap.dart
new file mode 100644
index 0000000000..447b11c7ad
--- /dev/null
+++ b/modules/angular2/src/core/bootstrap.dart
@@ -0,0 +1,21 @@
+library angular2.src.core.bootstrap;
+
+import 'dart:async';
+
+import 'application_ref.dart';
+import 'package:angular2/src/core/reflection/reflection.dart' show reflector;
+import 'package:angular2/src/core/reflection/reflection_capabilities.dart'
+    show ReflectionCapabilities;
+import 'application_common.dart';
+
+/// Starts an application from a root component. This implementation uses
+/// mirrors. Angular 2 transformer automatically replaces this method with a
+/// static implementation (see `application_static.dart`) that does not use
+/// mirrors and produces a faster and more compact JS code.
+///
+/// See [commonBootstrap] for detailed documentation.
+Future<ApplicationRef> bootstrap(Type appComponentType,
+    [List componentInjectableBindings]) {
+  reflector.reflectionCapabilities = new ReflectionCapabilities();
+  return commonBootstrap(appComponentType, componentInjectableBindings);
+}
diff --git a/modules/angular2/src/core/bootstrap.ts b/modules/angular2/src/core/bootstrap.ts
new file mode 100644
index 0000000000..de60e5a36d
--- /dev/null
+++ b/modules/angular2/src/core/bootstrap.ts
@@ -0,0 +1,4 @@
+// Note: This file only exists so that Dart users can import
+// bootstrap from angular2/bootstrap. JS users should import
+// from angular2/core.
+export {commonBootstrap as bootstrap} from './application_common';
diff --git a/modules/angular2/src/core/change_detection.ts b/modules/angular2/src/core/change_detection.ts
index 380ddd8c10..b131dcfb66 100644
--- a/modules/angular2/src/core/change_detection.ts
+++ b/modules/angular2/src/core/change_detection.ts
@@ -24,4 +24,4 @@ export {
   KeyValueDiffer,
   KeyValueDifferFactory
 
-} from 'angular2/src/core/change_detection/change_detection';
+} from './change_detection/change_detection';
diff --git a/modules/angular2/src/core/change_detection/change_detection.ts b/modules/angular2/src/core/change_detection/change_detection.ts
index 449ecf11ee..4bd3aeb13e 100644
--- a/modules/angular2/src/core/change_detection/change_detection.ts
+++ b/modules/angular2/src/core/change_detection/change_detection.ts
@@ -11,7 +11,7 @@ import {
   ChangeDetectorDefinition,
   ChangeDetectorGenConfig
 } from './interfaces';
-import {Injector, Inject, Injectable, OpaqueToken, Optional, Binding} from 'angular2/di';
+import {Injector, Inject, Injectable, OpaqueToken, Optional, Binding} from 'angular2/src/core/di';
 import {StringMap, StringMapWrapper} from 'angular2/src/core/facade/collection';
 import {
   CONST,
diff --git a/modules/angular2/src/core/change_detection/differs/iterable_differs.ts b/modules/angular2/src/core/change_detection/differs/iterable_differs.ts
index acebc00a5c..c4445ac883 100644
--- a/modules/angular2/src/core/change_detection/differs/iterable_differs.ts
+++ b/modules/angular2/src/core/change_detection/differs/iterable_differs.ts
@@ -1,7 +1,7 @@
 import {isBlank, isPresent, BaseException, CONST} from 'angular2/src/core/facade/lang';
 import {ListWrapper} from 'angular2/src/core/facade/collection';
 import {ChangeDetectorRef} from '../change_detector_ref';
-import {Binding, SkipSelfMetadata, OptionalMetadata, Injectable} from 'angular2/di';
+import {Binding, SkipSelfMetadata, OptionalMetadata, Injectable} from 'angular2/src/core/di';
 
 export interface IterableDiffer {
   diff(object: Object): any;
diff --git a/modules/angular2/src/core/change_detection/differs/keyvalue_differs.ts b/modules/angular2/src/core/change_detection/differs/keyvalue_differs.ts
index 3f6812c301..8fa871e65b 100644
--- a/modules/angular2/src/core/change_detection/differs/keyvalue_differs.ts
+++ b/modules/angular2/src/core/change_detection/differs/keyvalue_differs.ts
@@ -1,7 +1,7 @@
 import {isBlank, isPresent, BaseException, CONST} from 'angular2/src/core/facade/lang';
 import {ListWrapper} from 'angular2/src/core/facade/collection';
 import {ChangeDetectorRef} from '../change_detector_ref';
-import {Binding, SkipSelfMetadata, OptionalMetadata, Injectable} from 'angular2/di';
+import {Binding, SkipSelfMetadata, OptionalMetadata, Injectable} from 'angular2/src/core/di';
 
 export interface KeyValueDiffer {
   diff(object: Object);
diff --git a/modules/angular2/src/core/change_detection/observable_facade.dart b/modules/angular2/src/core/change_detection/observable_facade.dart
index 4f48465ceb..31591ddb03 100644
--- a/modules/angular2/src/core/change_detection/observable_facade.dart
+++ b/modules/angular2/src/core/change_detection/observable_facade.dart
@@ -1,3 +1,5 @@
+library change_detection.observable_facade;
+
 import 'package:observe/observe.dart';
 
 bool isObservable(value) => value is Observable;
\ No newline at end of file
diff --git a/modules/angular2/src/core/compiler.ts b/modules/angular2/src/core/compiler.ts
new file mode 100644
index 0000000000..11be5c9879
--- /dev/null
+++ b/modules/angular2/src/core/compiler.ts
@@ -0,0 +1,22 @@
+// Public API for compiler
+export {
+  AfterContentInit,
+  AfterContentChecked,
+  AfterViewInit,
+  AfterViewChecked,
+  OnChanges,
+  OnDestroy,
+  OnInit,
+  DoCheck
+} from './compiler/interfaces';
+export {ComponentUrlMapper} from './compiler/component_url_mapper';
+export {DirectiveResolver} from './compiler/directive_resolver';
+export {Compiler} from './compiler/compiler';
+export {AppViewManager} from './compiler/view_manager';
+export {QueryList} from './compiler/query_list';
+export {DynamicComponentLoader} from './compiler/dynamic_component_loader';
+export {ElementRef} from './compiler/element_ref';
+export {TemplateRef} from './compiler/template_ref';
+export {ViewRef, HostViewRef, ProtoViewRef} from './compiler/view_ref';
+export {ViewContainerRef} from './compiler/view_container_ref';
+export {ComponentRef} from './compiler/dynamic_component_loader';
diff --git a/modules/angular2/src/core/compiler/compiler.ts b/modules/angular2/src/core/compiler/compiler.ts
index fcea65b4e0..d946b25836 100644
--- a/modules/angular2/src/core/compiler/compiler.ts
+++ b/modules/angular2/src/core/compiler/compiler.ts
@@ -1,4 +1,5 @@
-import {Binding, resolveForwardRef, Injectable, Inject} from 'angular2/di';
+import {Binding, resolveForwardRef, Injectable, Inject} from 'angular2/src/core/di';
+import {DEFAULT_PIPES_TOKEN} from 'angular2/src/core/pipes';
 import {
   Type,
   isBlank,
@@ -20,7 +21,7 @@ import {ProtoViewRef} from './view_ref';
 import {DirectiveBinding} from './element_injector';
 import {ViewResolver} from './view_resolver';
 import {PipeResolver} from './pipe_resolver';
-import {ViewMetadata} from 'angular2/metadata';
+import {ViewMetadata} from 'angular2/src/core/metadata';
 import {ComponentUrlMapper} from './component_url_mapper';
 import {ProtoViewFactory} from './proto_view_factory';
 import {UrlResolver} from 'angular2/src/core/services/url_resolver';
@@ -28,7 +29,6 @@ import {AppRootUrl} from 'angular2/src/core/services/app_root_url';
 import {ElementBinder} from './element_binder';
 import {wtfStartTimeRange, wtfEndTimeRange} from '../profile/profile';
 import {PipeBinding} from '../pipes/pipe_binding';
-import {DEFAULT_PIPES_TOKEN} from 'angular2/pipes';
 
 import {
   RenderDirectiveMetadata,
diff --git a/modules/angular2/src/core/compiler/component_url_mapper.ts b/modules/angular2/src/core/compiler/component_url_mapper.ts
index ce5bddf9bc..a2497f75e2 100644
--- a/modules/angular2/src/core/compiler/component_url_mapper.ts
+++ b/modules/angular2/src/core/compiler/component_url_mapper.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 import {Type, isPresent} from 'angular2/src/core/facade/lang';
 import {Map, MapWrapper} from 'angular2/src/core/facade/collection';
 import {reflector} from 'angular2/src/core/reflection/reflection';
diff --git a/modules/angular2/src/core/compiler/directive_resolver.ts b/modules/angular2/src/core/compiler/directive_resolver.ts
index 41713b96a3..c70cf06982 100644
--- a/modules/angular2/src/core/compiler/directive_resolver.ts
+++ b/modules/angular2/src/core/compiler/directive_resolver.ts
@@ -1,4 +1,4 @@
-import {resolveForwardRef, Injectable} from 'angular2/di';
+import {resolveForwardRef, Injectable} from 'angular2/src/core/di';
 import {Type, isPresent, BaseException, stringify} from 'angular2/src/core/facade/lang';
 import {ListWrapper, StringMap, StringMapWrapper} from 'angular2/src/core/facade/collection';
 import {
@@ -8,7 +8,7 @@ import {
   EventMetadata,
   HostBindingMetadata,
   HostListenerMetadata
-} from 'angular2/metadata';
+} from 'angular2/src/core/metadata';
 import {reflector} from 'angular2/src/core/reflection/reflection';
 
 /**
diff --git a/modules/angular2/src/core/compiler/dynamic_component_loader.ts b/modules/angular2/src/core/compiler/dynamic_component_loader.ts
index 8caca3a974..47eda0efc2 100644
--- a/modules/angular2/src/core/compiler/dynamic_component_loader.ts
+++ b/modules/angular2/src/core/compiler/dynamic_component_loader.ts
@@ -1,4 +1,4 @@
-import {Key, Injector, ResolvedBinding, Binding, bind, Injectable} from 'angular2/di';
+import {Key, Injector, ResolvedBinding, Binding, bind, Injectable} from 'angular2/src/core/di';
 import {Compiler} from './compiler';
 import {Type, BaseException, stringify, isPresent} from 'angular2/src/core/facade/lang';
 import {Promise} from 'angular2/src/core/facade/async';
diff --git a/modules/angular2/src/core/compiler/element_injector.ts b/modules/angular2/src/core/compiler/element_injector.ts
index 76c6bf23af..0dca524f7e 100644
--- a/modules/angular2/src/core/compiler/element_injector.ts
+++ b/modules/angular2/src/core/compiler/element_injector.ts
@@ -24,7 +24,7 @@ import {
   CyclicDependencyError,
   resolveForwardRef,
   DependencyProvider
-} from 'angular2/di';
+} from 'angular2/src/core/di';
 import {
   InjectorInlineStrategy,
   InjectorDynamicStrategy,
diff --git a/modules/angular2/src/core/compiler/pipe_resolver.ts b/modules/angular2/src/core/compiler/pipe_resolver.ts
index 68abbb3695..d7e79c94e9 100644
--- a/modules/angular2/src/core/compiler/pipe_resolver.ts
+++ b/modules/angular2/src/core/compiler/pipe_resolver.ts
@@ -1,6 +1,6 @@
-import {resolveForwardRef, Injectable} from 'angular2/di';
+import {resolveForwardRef, Injectable} from 'angular2/src/core/di';
 import {Type, isPresent, BaseException, stringify} from 'angular2/src/core/facade/lang';
-import {PipeMetadata} from '../metadata/directives';
+import {PipeMetadata} from 'angular2/src/core/metadata';
 import {reflector} from 'angular2/src/core/reflection/reflection';
 
 /**
diff --git a/modules/angular2/src/core/compiler/proto_view_factory.ts b/modules/angular2/src/core/compiler/proto_view_factory.ts
index a193190c83..6224cc5023 100644
--- a/modules/angular2/src/core/compiler/proto_view_factory.ts
+++ b/modules/angular2/src/core/compiler/proto_view_factory.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 
 import {ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection';
 import {
diff --git a/modules/angular2/src/core/compiler/view_container_ref.ts b/modules/angular2/src/core/compiler/view_container_ref.ts
index 8a70ac69a3..7d4c31b20e 100644
--- a/modules/angular2/src/core/compiler/view_container_ref.ts
+++ b/modules/angular2/src/core/compiler/view_container_ref.ts
@@ -1,5 +1,5 @@
 import {ListWrapper} from 'angular2/src/core/facade/collection';
-import {ResolvedBinding} from 'angular2/di';
+import {ResolvedBinding} from 'angular2/src/core/di';
 import {isPresent, isBlank} from 'angular2/src/core/facade/lang';
 
 import * as avmModule from './view_manager';
diff --git a/modules/angular2/src/core/compiler/view_listener.ts b/modules/angular2/src/core/compiler/view_listener.ts
index 360960203c..b78bd95eda 100644
--- a/modules/angular2/src/core/compiler/view_listener.ts
+++ b/modules/angular2/src/core/compiler/view_listener.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 import * as viewModule from './view';
 
 /**
diff --git a/modules/angular2/src/core/compiler/view_manager.ts b/modules/angular2/src/core/compiler/view_manager.ts
index e2900375d5..d3b21f1a8b 100644
--- a/modules/angular2/src/core/compiler/view_manager.ts
+++ b/modules/angular2/src/core/compiler/view_manager.ts
@@ -1,4 +1,4 @@
-import {Injector, Binding, Injectable, ResolvedBinding} from 'angular2/di';
+import {Injector, Binding, Injectable, ResolvedBinding} from 'angular2/src/core/di';
 import {isPresent, isBlank, BaseException} from 'angular2/src/core/facade/lang';
 import * as viewModule from './view';
 import {ElementRef} from './element_ref';
diff --git a/modules/angular2/src/core/compiler/view_manager_utils.ts b/modules/angular2/src/core/compiler/view_manager_utils.ts
index cc41078ca9..876024166a 100644
--- a/modules/angular2/src/core/compiler/view_manager_utils.ts
+++ b/modules/angular2/src/core/compiler/view_manager_utils.ts
@@ -1,4 +1,4 @@
-import {Injector, Binding, Injectable, ResolvedBinding} from 'angular2/di';
+import {Injector, Binding, Injectable, ResolvedBinding} from 'angular2/src/core/di';
 import {ListWrapper, MapWrapper, Map, StringMapWrapper} from 'angular2/src/core/facade/collection';
 import * as eli from './element_injector';
 import {isPresent, isBlank, BaseException} from 'angular2/src/core/facade/lang';
diff --git a/modules/angular2/src/core/compiler/view_pool.ts b/modules/angular2/src/core/compiler/view_pool.ts
index e37994bddc..bee4f23250 100644
--- a/modules/angular2/src/core/compiler/view_pool.ts
+++ b/modules/angular2/src/core/compiler/view_pool.ts
@@ -1,4 +1,4 @@
-import {Inject, Injectable, OpaqueToken} from 'angular2/di';
+import {Inject, Injectable, OpaqueToken} from 'angular2/src/core/di';
 
 import {ListWrapper, MapWrapper, Map} from 'angular2/src/core/facade/collection';
 import {isPresent, isBlank, CONST_EXPR} from 'angular2/src/core/facade/lang';
diff --git a/modules/angular2/src/core/compiler/view_resolver.ts b/modules/angular2/src/core/compiler/view_resolver.ts
index 6a829e7def..419dc73438 100644
--- a/modules/angular2/src/core/compiler/view_resolver.ts
+++ b/modules/angular2/src/core/compiler/view_resolver.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 import {ViewMetadata} from '../metadata/view';
 
 import {Type, stringify, isBlank, BaseException} from 'angular2/src/core/facade/lang';
diff --git a/modules/angular2/src/core/debug.ts b/modules/angular2/src/core/debug.ts
index 883be0dbed..2dc562ad3d 100644
--- a/modules/angular2/src/core/debug.ts
+++ b/modules/angular2/src/core/debug.ts
@@ -1,5 +1,2 @@
-export * from './src/core/debug/debug_element';
-export {
-  inspectNativeElement,
-  ELEMENT_PROBE_BINDINGS
-} from './src/core/debug/debug_element_view_listener';
+export * from './debug/debug_element';
+export {inspectNativeElement, ELEMENT_PROBE_BINDINGS} from './debug/debug_element_view_listener';
diff --git a/modules/angular2/src/core/debug/debug_element_view_listener.ts b/modules/angular2/src/core/debug/debug_element_view_listener.ts
index e3cb8d9a63..61dcd49ff5 100644
--- a/modules/angular2/src/core/debug/debug_element_view_listener.ts
+++ b/modules/angular2/src/core/debug/debug_element_view_listener.ts
@@ -1,6 +1,6 @@
 import {CONST_EXPR, isPresent, NumberWrapper, StringWrapper} from 'angular2/src/core/facade/lang';
 import {MapWrapper, Map, ListWrapper} from 'angular2/src/core/facade/collection';
-import {Injectable, bind, Binding} from 'angular2/di';
+import {Injectable, bind, Binding} from 'angular2/src/core/di';
 import {AppViewListener} from 'angular2/src/core/compiler/view_listener';
 import {AppView} from 'angular2/src/core/compiler/view';
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
diff --git a/modules/angular2/src/core/di.ts b/modules/angular2/src/core/di.ts
index e7b172547d..582f6be5a1 100644
--- a/modules/angular2/src/core/di.ts
+++ b/modules/angular2/src/core/di.ts
@@ -12,12 +12,12 @@ export {
   HostMetadata,
   SkipSelfMetadata,
   DependencyMetadata
-} from './src/core/di/metadata';
+} from './di/metadata';
 
 // we have to reexport * because Dart and TS export two different sets of types
-export * from './src/core/di/decorators';
+export * from './di/decorators';
 
-export {forwardRef, resolveForwardRef, ForwardRefFn} from './src/core/di/forward_ref';
+export {forwardRef, resolveForwardRef, ForwardRefFn} from './di/forward_ref';
 export {
   Injector,
   ProtoInjector,
@@ -25,7 +25,7 @@ export {
   DependencyProvider,
   Visibility,
   UNDEFINED
-} from './src/core/di/injector';
+} from './di/injector';
 export {
   Binding,
   BindingBuilder,
@@ -33,8 +33,8 @@ export {
   ResolvedFactory,
   Dependency,
   bind
-} from './src/core/di/binding';
-export {Key, KeyRegistry, TypeLiteral} from './src/core/di/key';
+} from './di/binding';
+export {Key, KeyRegistry, TypeLiteral} from './di/key';
 export {
   NoBindingError,
   AbstractBindingError,
@@ -43,5 +43,5 @@ export {
   InvalidBindingError,
   NoAnnotationError,
   OutOfBoundsError
-} from './src/core/di/exceptions';
-export {OpaqueToken} from './src/core/di/opaque_token';
+} from './di/exceptions';
+export {OpaqueToken} from './di/opaque_token';
diff --git a/modules/angular2/src/core/di/di_transformer.dart b/modules/angular2/src/core/di/di_transformer.dart
index 67d6aeacde..94fa04feae 100644
--- a/modules/angular2/src/core/di/di_transformer.dart
+++ b/modules/angular2/src/core/di/di_transformer.dart
@@ -1,3 +1,3 @@
 library angular2.di_transformer_dart;
 
-export 'src/transform/di_transformer.dart';
+export '../../transform/di_transformer.dart';
diff --git a/modules/angular2/src/core/directives.dart b/modules/angular2/src/core/directives.dart
new file mode 100644
index 0000000000..bea027f416
--- /dev/null
+++ b/modules/angular2/src/core/directives.dart
@@ -0,0 +1,11 @@
+library angular2.src.core.directives;
+
+export './directives/ng_class.dart';
+export './directives/ng_for.dart';
+export './directives/ng_if.dart';
+export './directives/ng_non_bindable.dart';
+export './directives/ng_style.dart';
+export './directives/ng_switch.dart';
+
+//Dart Only
+export './directives/observable_list_diff.dart';
diff --git a/modules/angular2/src/core/directives.ts b/modules/angular2/src/core/directives.ts
index 94ab8d63b7..71faad8335 100644
--- a/modules/angular2/src/core/directives.ts
+++ b/modules/angular2/src/core/directives.ts
@@ -4,19 +4,19 @@
  * Common directives shipped with Angular.
  */
 
-import {CONST_EXPR, Type} from './src/core/facade/lang';
-import {NgClass} from './src/core/directives/ng_class';
-import {NgFor} from './src/core/directives/ng_for';
-import {NgIf} from './src/core/directives/ng_if';
-import {NgNonBindable} from './src/core/directives/ng_non_bindable';
-import {NgSwitch, NgSwitchWhen, NgSwitchDefault} from './src/core/directives/ng_switch';
+import {CONST_EXPR, Type} from './facade/lang';
+import {NgClass} from './directives/ng_class';
+import {NgFor} from './directives/ng_for';
+import {NgIf} from './directives/ng_if';
+import {NgNonBindable} from './directives/ng_non_bindable';
+import {NgSwitch, NgSwitchWhen, NgSwitchDefault} from './directives/ng_switch';
 
-export * from './src/core/directives/ng_class';
-export * from './src/core/directives/ng_for';
-export * from './src/core/directives/ng_if';
-export * from './src/core/directives/ng_non_bindable';
-export * from './src/core/directives/ng_style';
-export * from './src/core/directives/ng_switch';
+export * from './directives/ng_class';
+export * from './directives/ng_for';
+export * from './directives/ng_if';
+export * from './directives/ng_non_bindable';
+export * from './directives/ng_style';
+export * from './directives/ng_switch';
 
 /**
  * A collection of the Angular core directives that are likely to be used in each and every Angular
diff --git a/modules/angular2/src/core/directives/ng_class.ts b/modules/angular2/src/core/directives/ng_class.ts
index 2a5fe65ec5..779e82024a 100644
--- a/modules/angular2/src/core/directives/ng_class.ts
+++ b/modules/angular2/src/core/directives/ng_class.ts
@@ -1,14 +1,14 @@
 import {isPresent, isString, StringWrapper, isBlank} from 'angular2/src/core/facade/lang';
-import {Directive} from 'angular2/metadata';
 import {DoCheck, OnDestroy} from 'angular2/lifecycle_hooks';
-import {ElementRef} from 'angular2/core';
-import {Renderer} from 'angular2/src/core/render/api';
+import {Directive} from 'angular2/src/core/metadata';
+import {ElementRef} from 'angular2/src/core/compiler';
 import {
-  KeyValueDiffer,
   IterableDiffer,
   IterableDiffers,
+  KeyValueDiffer,
   KeyValueDiffers
-} from 'angular2/change_detection';
+} from 'angular2/src/core/change_detection';
+import {Renderer} from 'angular2/src/core/render';
 import {
   ListWrapper,
   StringMapWrapper,
diff --git a/modules/angular2/src/core/directives/ng_for.ts b/modules/angular2/src/core/directives/ng_for.ts
index a2b74c638e..62da35517b 100644
--- a/modules/angular2/src/core/directives/ng_for.ts
+++ b/modules/angular2/src/core/directives/ng_for.ts
@@ -1,7 +1,11 @@
-import {Directive} from 'angular2/metadata';
 import {DoCheck} from 'angular2/lifecycle_hooks';
-import {ViewContainerRef, ViewRef, TemplateRef} from 'angular2/core';
-import {ChangeDetectorRef, IterableDiffer, IterableDiffers} from 'angular2/change_detection';
+import {Directive} from 'angular2/src/core/metadata';
+import {
+  ChangeDetectorRef,
+  IterableDiffer,
+  IterableDiffers
+} from 'angular2/src/core/change_detection';
+import {ViewContainerRef, TemplateRef, ViewRef} from 'angular2/src/core/compiler';
 import {isPresent, isBlank} from 'angular2/src/core/facade/lang';
 
 /**
diff --git a/modules/angular2/src/core/directives/ng_if.ts b/modules/angular2/src/core/directives/ng_if.ts
index c5c2a6a316..3656ae8a65 100644
--- a/modules/angular2/src/core/directives/ng_if.ts
+++ b/modules/angular2/src/core/directives/ng_if.ts
@@ -1,5 +1,5 @@
-import {Directive} from 'angular2/metadata';
-import {ViewContainerRef, TemplateRef} from 'angular2/core';
+import {Directive} from 'angular2/src/core/metadata';
+import {ViewContainerRef, TemplateRef} from 'angular2/src/core/compiler';
 import {isBlank} from 'angular2/src/core/facade/lang';
 
 /**
diff --git a/modules/angular2/src/core/directives/ng_non_bindable.ts b/modules/angular2/src/core/directives/ng_non_bindable.ts
index 3608098fe5..b5c06552bd 100644
--- a/modules/angular2/src/core/directives/ng_non_bindable.ts
+++ b/modules/angular2/src/core/directives/ng_non_bindable.ts
@@ -1,4 +1,4 @@
-import {Directive} from 'angular2/metadata';
+import {Directive} from 'angular2/src/core/metadata';
 
 /**
  * The `NgNonBindable` directive tells Angular not to compile or bind the contents of the current
diff --git a/modules/angular2/src/core/directives/ng_style.ts b/modules/angular2/src/core/directives/ng_style.ts
index 97d7ed9fb6..aca889132e 100644
--- a/modules/angular2/src/core/directives/ng_style.ts
+++ b/modules/angular2/src/core/directives/ng_style.ts
@@ -1,9 +1,12 @@
-import {Directive} from 'angular2/metadata';
 import {DoCheck} from 'angular2/lifecycle_hooks';
-import {ElementRef} from 'angular2/core';
-import {KeyValueDiffer, KeyValueDiffers} from 'angular2/change_detection';
+import {
+  KeyValueDiffer,
+  KeyValueDiffers,
+} from 'angular2/src/core/change_detection';
+import {ElementRef} from 'angular2/src/core/compiler';
+import {Directive} from 'angular2/src/core/metadata';
+import {Renderer} from 'angular2/src/core/render';
 import {isPresent, isBlank, print} from 'angular2/src/core/facade/lang';
-import {Renderer} from 'angular2/src/core/render/api';
 
 /**
  * Adds or removes styles based on an {expression}.
diff --git a/modules/angular2/src/core/directives/ng_switch.ts b/modules/angular2/src/core/directives/ng_switch.ts
index 3bdae00c8a..51374e0d64 100644
--- a/modules/angular2/src/core/directives/ng_switch.ts
+++ b/modules/angular2/src/core/directives/ng_switch.ts
@@ -1,6 +1,6 @@
-import {Directive} from 'angular2/metadata';
-import {Host} from 'angular2/di';
-import {ViewContainerRef, TemplateRef} from 'angular2/core';
+import {Directive} from 'angular2/src/core/metadata';
+import {Host} from 'angular2/src/core/di';
+import {ViewContainerRef, TemplateRef} from 'angular2/src/core/compiler';
 import {isPresent, isBlank, normalizeBlank, CONST_EXPR} from 'angular2/src/core/facade/lang';
 import {ListWrapper, Map} from 'angular2/src/core/facade/collection';
 
diff --git a/modules/angular2/src/core/directives/observable_list_diff.dart b/modules/angular2/src/core/directives/observable_list_diff.dart
index ac9800d92a..cca7057fac 100644
--- a/modules/angular2/src/core/directives/observable_list_diff.dart
+++ b/modules/angular2/src/core/directives/observable_list_diff.dart
@@ -1,7 +1,7 @@
 library angular2.directives.observable_list_iterable_diff;
 
 import 'package:observe/observe.dart' show ObservableList;
-import 'package:angular2/change_detection.dart';
+import 'package:angular2/core.dart';
 import 'package:angular2/src/core/change_detection/differs/default_iterable_differ.dart';
 import 'dart:async';
 
diff --git a/modules/angular2/src/core/exception_handler.ts b/modules/angular2/src/core/exception_handler.ts
index d660f67ad2..66d389b863 100644
--- a/modules/angular2/src/core/exception_handler.ts
+++ b/modules/angular2/src/core/exception_handler.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 import {isPresent, isBlank, print, BaseException} from 'angular2/src/core/facade/lang';
 import {ListWrapper, isListLikeIterable} from 'angular2/src/core/facade/collection';
 
diff --git a/modules/angular2/src/core/facade.ts b/modules/angular2/src/core/facade.ts
new file mode 100644
index 0000000000..d772e9362a
--- /dev/null
+++ b/modules/angular2/src/core/facade.ts
@@ -0,0 +1,4 @@
+// Public API for Facade
+export {Type} from './facade/lang';
+export {Observable, EventEmitter} from './facade/async';
+export {Predicate} from './facade/collection';
diff --git a/modules/angular2/src/core/facade/async.ts b/modules/angular2/src/core/facade/async.ts
index 2b391f4258..17f07f3826 100644
--- a/modules/angular2/src/core/facade/async.ts
+++ b/modules/angular2/src/core/facade/async.ts
@@ -1,5 +1,4 @@
-/// <reference path="../../../typings/rx/rx.d.ts" />
-
+///<reference path="../../../typings/tsd.d.ts" />
 import {global, isPresent} from 'angular2/src/core/facade/lang';
 import * as Rx from 'rx';
 
diff --git a/modules/angular2/src/core/facade/lang.ts b/modules/angular2/src/core/facade/lang.ts
index 4141969bd5..fa76926f6d 100644
--- a/modules/angular2/src/core/facade/lang.ts
+++ b/modules/angular2/src/core/facade/lang.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../../globals.d.ts" />
+/// <reference path="../../../manual_typings/globals.d.ts" />
 
 // TODO(jteplitz602): Load WorkerGlobalScope from lib.webworker.d.ts file #3492
 declare var WorkerGlobalScope;
diff --git a/modules/angular2/src/core/forms.ts b/modules/angular2/src/core/forms.ts
index d49a41da01..c91f5beae4 100644
--- a/modules/angular2/src/core/forms.ts
+++ b/modules/angular2/src/core/forms.ts
@@ -12,31 +12,31 @@
  *
  */
 
-export {AbstractControl, Control, ControlGroup, ControlArray} from './src/forms/model';
+export {AbstractControl, Control, ControlGroup, ControlArray} from './forms/model';
 
-export {AbstractControlDirective} from './src/forms/directives/abstract_control_directive';
-export {Form} from './src/forms/directives/form_interface';
-export {ControlContainer} from './src/forms/directives/control_container';
-export {NgControlName} from './src/forms/directives/ng_control_name';
-export {NgFormControl} from './src/forms/directives/ng_form_control';
-export {NgModel} from './src/forms/directives/ng_model';
-export {NgControl} from './src/forms/directives/ng_control';
-export {NgControlGroup} from './src/forms/directives/ng_control_group';
-export {NgFormModel} from './src/forms/directives/ng_form_model';
-export {NgForm} from './src/forms/directives/ng_form';
-export {ControlValueAccessor} from './src/forms/directives/control_value_accessor';
-export {DefaultValueAccessor} from './src/forms/directives/default_value_accessor';
-export {CheckboxControlValueAccessor} from './src/forms/directives/checkbox_value_accessor';
+export {AbstractControlDirective} from './forms/directives/abstract_control_directive';
+export {Form} from './forms/directives/form_interface';
+export {ControlContainer} from './forms/directives/control_container';
+export {NgControlName} from './forms/directives/ng_control_name';
+export {NgFormControl} from './forms/directives/ng_form_control';
+export {NgModel} from './forms/directives/ng_model';
+export {NgControl} from './forms/directives/ng_control';
+export {NgControlGroup} from './forms/directives/ng_control_group';
+export {NgFormModel} from './forms/directives/ng_form_model';
+export {NgForm} from './forms/directives/ng_form';
+export {ControlValueAccessor} from './forms/directives/control_value_accessor';
+export {DefaultValueAccessor} from './forms/directives/default_value_accessor';
+export {CheckboxControlValueAccessor} from './forms/directives/checkbox_value_accessor';
 export {
   NgSelectOption,
   SelectControlValueAccessor
-} from './src/forms/directives/select_control_value_accessor';
-export {FORM_DIRECTIVES} from './src/forms/directives';
-export {NG_VALIDATORS, Validators} from './src/forms/validators';
-export {DefaultValidators} from './src/forms/directives/validators';
-export {FormBuilder} from './src/forms/form_builder';
+} from './forms/directives/select_control_value_accessor';
+export {FORM_DIRECTIVES} from './forms/directives';
+export {NG_VALIDATORS, Validators} from './forms/validators';
+export {DefaultValidators} from './forms/directives/validators';
+export {FormBuilder} from './forms/form_builder';
 
-import {FormBuilder} from './src/forms/form_builder';
-import {CONST_EXPR, Type} from './src/core/facade/lang';
+import {FormBuilder} from './forms/form_builder';
+import {CONST_EXPR, Type} from './facade/lang';
 
 export const FORM_BINDINGS: Type[] = CONST_EXPR([FormBuilder]);
diff --git a/modules/angular2/src/core/forms/directives/checkbox_value_accessor.ts b/modules/angular2/src/core/forms/directives/checkbox_value_accessor.ts
index e98666c65a..6d67597a22 100644
--- a/modules/angular2/src/core/forms/directives/checkbox_value_accessor.ts
+++ b/modules/angular2/src/core/forms/directives/checkbox_value_accessor.ts
@@ -1,7 +1,7 @@
-import {Renderer} from 'angular2/render';
-import {Directive} from 'angular2/metadata';
-import {ElementRef} from 'angular2/core';
-import {Self} from 'angular2/di';
+import {Directive} from 'angular2/src/core/metadata';
+import {Renderer} from 'angular2/src/core/render';
+import {ElementRef} from 'angular2/src/core/compiler';
+import {Self} from 'angular2/src/core/di';
 
 import {NgControl} from './ng_control';
 import {ControlValueAccessor} from './control_value_accessor';
diff --git a/modules/angular2/src/core/forms/directives/default_value_accessor.ts b/modules/angular2/src/core/forms/directives/default_value_accessor.ts
index 6be63b3ea4..c46e4bd790 100644
--- a/modules/angular2/src/core/forms/directives/default_value_accessor.ts
+++ b/modules/angular2/src/core/forms/directives/default_value_accessor.ts
@@ -1,7 +1,7 @@
-import {Renderer} from 'angular2/render';
-import {Directive} from 'angular2/metadata';
-import {ElementRef} from 'angular2/core';
-import {Self} from 'angular2/di';
+import {Directive} from 'angular2/src/core/metadata';
+import {ElementRef} from 'angular2/src/core/compiler';
+import {Renderer} from 'angular2/src/core/render';
+import {Self} from 'angular2/src/core/di';
 import {NgControl} from './ng_control';
 import {ControlValueAccessor} from './control_value_accessor';
 import {isBlank, isPresent} from 'angular2/src/core/facade/lang';
diff --git a/modules/angular2/src/core/forms/directives/ng_control_group.ts b/modules/angular2/src/core/forms/directives/ng_control_group.ts
index 819350a73e..0090108fa9 100644
--- a/modules/angular2/src/core/forms/directives/ng_control_group.ts
+++ b/modules/angular2/src/core/forms/directives/ng_control_group.ts
@@ -1,6 +1,6 @@
-import {Directive} from 'angular2/metadata';
 import {OnInit, OnDestroy} from 'angular2/lifecycle_hooks';
-import {Inject, Host, SkipSelf, forwardRef, Binding} from 'angular2/di';
+import {Directive} from 'angular2/src/core/metadata';
+import {Inject, Host, SkipSelf, forwardRef, Binding} from 'angular2/src/core/di';
 import {ListWrapper} from 'angular2/src/core/facade/collection';
 import {CONST_EXPR} from 'angular2/src/core/facade/lang';
 
diff --git a/modules/angular2/src/core/forms/directives/ng_control_name.ts b/modules/angular2/src/core/forms/directives/ng_control_name.ts
index 16887938a0..a9e99d9cfa 100644
--- a/modules/angular2/src/core/forms/directives/ng_control_name.ts
+++ b/modules/angular2/src/core/forms/directives/ng_control_name.ts
@@ -1,10 +1,9 @@
 import {CONST_EXPR} from 'angular2/src/core/facade/lang';
 import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async';
 import {StringMap} from 'angular2/src/core/facade/collection';
-
-import {Query, Directive} from 'angular2/metadata';
-import {forwardRef, Host, SkipSelf, Binding, Inject, Optional} from 'angular2/di';
 import {OnChanges, OnDestroy} from 'angular2/lifecycle_hooks';
+import {Query, Directive} from 'angular2/src/core/metadata';
+import {forwardRef, Host, SkipSelf, Binding, Inject, Optional} from 'angular2/src/core/di';
 
 import {ControlContainer} from './control_container';
 import {NgControl} from './ng_control';
diff --git a/modules/angular2/src/core/forms/directives/ng_form.ts b/modules/angular2/src/core/forms/directives/ng_form.ts
index c8ef4cf60b..7c4cabc1b4 100644
--- a/modules/angular2/src/core/forms/directives/ng_form.ts
+++ b/modules/angular2/src/core/forms/directives/ng_form.ts
@@ -6,8 +6,8 @@ import {
 } from 'angular2/src/core/facade/async';
 import {StringMapWrapper, ListWrapper} from 'angular2/src/core/facade/collection';
 import {isPresent, isBlank, CONST_EXPR} from 'angular2/src/core/facade/lang';
-import {Directive} from 'angular2/metadata';
-import {forwardRef, Binding} from 'angular2/di';
+import {Directive} from 'angular2/src/core/metadata';
+import {forwardRef, Binding} from 'angular2/src/core/di';
 import {NgControl} from './ng_control';
 import {Form} from './form_interface';
 import {NgControlGroup} from './ng_control_group';
diff --git a/modules/angular2/src/core/forms/directives/ng_form_control.ts b/modules/angular2/src/core/forms/directives/ng_form_control.ts
index 64d83b7084..02d7925fef 100644
--- a/modules/angular2/src/core/forms/directives/ng_form_control.ts
+++ b/modules/angular2/src/core/forms/directives/ng_form_control.ts
@@ -1,10 +1,8 @@
 import {CONST_EXPR} from 'angular2/src/core/facade/lang';
 import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async';
-
-import {Query, Directive} from 'angular2/metadata';
-import {forwardRef, Binding, Inject, Optional} from 'angular2/di';
 import {OnChanges} from 'angular2/lifecycle_hooks';
-
+import {Query, Directive} from 'angular2/src/core/metadata';
+import {forwardRef, Binding, Inject, Optional} from 'angular2/src/core/di';
 import {NgControl} from './ng_control';
 import {Control} from '../model';
 import {Validators, NG_VALIDATORS} from '../validators';
diff --git a/modules/angular2/src/core/forms/directives/ng_form_model.ts b/modules/angular2/src/core/forms/directives/ng_form_model.ts
index 5eb5f31ff4..e205774218 100644
--- a/modules/angular2/src/core/forms/directives/ng_form_model.ts
+++ b/modules/angular2/src/core/forms/directives/ng_form_model.ts
@@ -2,9 +2,9 @@ import {CONST_EXPR} from 'angular2/src/core/facade/lang';
 import {ListWrapper} from 'angular2/src/core/facade/collection';
 import {ObservableWrapper, EventEmitter} from 'angular2/src/core/facade/async';
 
-import {Directive} from 'angular2/metadata';
 import {OnChanges} from 'angular2/lifecycle_hooks';
-import {forwardRef, Binding} from 'angular2/di';
+import {Directive} from 'angular2/src/core/metadata';
+import {forwardRef, Binding} from 'angular2/src/core/di';
 import {NgControl} from './ng_control';
 import {NgControlGroup} from './ng_control_group';
 import {ControlContainer} from './control_container';
diff --git a/modules/angular2/src/core/forms/directives/ng_model.ts b/modules/angular2/src/core/forms/directives/ng_model.ts
index 53d7373b60..882e5c729f 100644
--- a/modules/angular2/src/core/forms/directives/ng_model.ts
+++ b/modules/angular2/src/core/forms/directives/ng_model.ts
@@ -1,10 +1,10 @@
 import {CONST_EXPR} from 'angular2/src/core/facade/lang';
 import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async';
 
-import {Query, Directive} from 'angular2/metadata';
-import {forwardRef, Binding, Inject, Optional} from 'angular2/di';
 import {OnChanges} from 'angular2/lifecycle_hooks';
 
+import {Query, Directive} from 'angular2/src/core/metadata';
+import {forwardRef, Binding, Inject, Optional} from 'angular2/src/core/di';
 import {NgControl} from './ng_control';
 import {Control} from '../model';
 import {Validators, NG_VALIDATORS} from '../validators';
diff --git a/modules/angular2/src/core/forms/directives/select_control_value_accessor.ts b/modules/angular2/src/core/forms/directives/select_control_value_accessor.ts
index c741889ffb..0965020abf 100644
--- a/modules/angular2/src/core/forms/directives/select_control_value_accessor.ts
+++ b/modules/angular2/src/core/forms/directives/select_control_value_accessor.ts
@@ -1,7 +1,7 @@
-import {Renderer} from 'angular2/render';
-import {ElementRef, QueryList} from 'angular2/core';
-import {Self} from 'angular2/di';
-import {Query, Directive} from 'angular2/metadata';
+import {Self} from 'angular2/src/core/di';
+import {Renderer} from 'angular2/src/core/render';
+import {ElementRef, QueryList} from 'angular2/src/core/compiler';
+import {Query, Directive} from 'angular2/src/core/metadata';
 
 import {NgControl} from './ng_control';
 import {ControlValueAccessor} from './control_value_accessor';
diff --git a/modules/angular2/src/core/forms/directives/shared.ts b/modules/angular2/src/core/forms/directives/shared.ts
index 6db96ae262..ab82ce26f1 100644
--- a/modules/angular2/src/core/forms/directives/shared.ts
+++ b/modules/angular2/src/core/forms/directives/shared.ts
@@ -5,8 +5,8 @@ import {ControlContainer} from './control_container';
 import {NgControl} from './ng_control';
 import {Control} from '../model';
 import {Validators} from '../validators';
-import {Renderer} from 'angular2/render';
-import {ElementRef, QueryList} from 'angular2/core';
+import {ElementRef, QueryList} from 'angular2/src/core/compiler';
+import {Renderer} from 'angular2/src/core/render';
 
 
 export function controlPath(name: string, parent: ControlContainer): string[] {
diff --git a/modules/angular2/src/core/forms/directives/validators.ts b/modules/angular2/src/core/forms/directives/validators.ts
index 677e223ff5..01ece4e391 100644
--- a/modules/angular2/src/core/forms/directives/validators.ts
+++ b/modules/angular2/src/core/forms/directives/validators.ts
@@ -1,6 +1,6 @@
-import {forwardRef, OpaqueToken, Binding} from 'angular2/di';
+import {forwardRef, Binding, OpaqueToken} from 'angular2/src/core/di';
 import {CONST_EXPR} from 'angular2/src/core/facade/lang';
-import {Directive} from 'angular2/metadata';
+import {Directive} from 'angular2/src/core/metadata';
 import {Validators, NG_VALIDATORS} from '../validators';
 
 const DEFAULT_VALIDATORS =
diff --git a/modules/angular2/src/core/forms/form_builder.ts b/modules/angular2/src/core/forms/form_builder.ts
index 40bb613d90..cc3d538943 100644
--- a/modules/angular2/src/core/forms/form_builder.ts
+++ b/modules/angular2/src/core/forms/form_builder.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 import {StringMapWrapper, ListWrapper} from 'angular2/src/core/facade/collection';
 import {isPresent, isArray} from 'angular2/src/core/facade/lang';
 import * as modelModule from './model';
@@ -11,7 +11,7 @@ import * as modelModule from './model';
  *
  * ```
  * import {Component, View, bootstrap} from 'angular2/angular2';
- * import {FormBuilder, Validators, FORM_DIRECTIVES, ControlGroup} from 'angular2/forms';
+ * import {FormBuilder, Validators, FORM_DIRECTIVES, ControlGroup} from 'angular2/core';
  *
  * @Component({
  *   selector: 'login-comp',
diff --git a/modules/angular2/src/core/forms/validators.ts b/modules/angular2/src/core/forms/validators.ts
index 7c8e31861f..9666583a08 100644
--- a/modules/angular2/src/core/forms/validators.ts
+++ b/modules/angular2/src/core/forms/validators.ts
@@ -1,7 +1,7 @@
 import {isBlank, isPresent} from 'angular2/src/core/facade/lang';
 import {CONST_EXPR} from 'angular2/src/core/facade/lang';
 import {ListWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
-import {OpaqueToken} from 'angular2/di';
+import {OpaqueToken} from 'angular2/src/core/di';
 
 import * as modelModule from './model';
 
diff --git a/modules/angular2/src/core/life_cycle/life_cycle.ts b/modules/angular2/src/core/life_cycle/life_cycle.ts
index 419f8b0f16..00d1c7628d 100644
--- a/modules/angular2/src/core/life_cycle/life_cycle.ts
+++ b/modules/angular2/src/core/life_cycle/life_cycle.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 import {ChangeDetector} from 'angular2/src/core/change_detection/change_detection';
 import {NgZone} from 'angular2/src/core/zone/ng_zone';
 import {isPresent, BaseException} from 'angular2/src/core/facade/lang';
diff --git a/modules/angular2/src/core/lifecycle.ts b/modules/angular2/src/core/lifecycle.ts
new file mode 100644
index 0000000000..7e00d7053d
--- /dev/null
+++ b/modules/angular2/src/core/lifecycle.ts
@@ -0,0 +1,2 @@
+// Public API for LifeCycle
+export {LifeCycle} from './life_cycle/life_cycle';
diff --git a/modules/angular2/src/core/metadata.ts b/modules/angular2/src/core/metadata.ts
index 1c53d1c212..5807481df0 100644
--- a/modules/angular2/src/core/metadata.ts
+++ b/modules/angular2/src/core/metadata.ts
@@ -21,7 +21,6 @@ export {
 
 export {ViewMetadata, ViewEncapsulation} from './metadata/view';
 
-
 import {
   QueryMetadata,
   ViewQueryMetadata,
diff --git a/modules/angular2/src/core/metadata/di.ts b/modules/angular2/src/core/metadata/di.ts
index c8a08247fc..c61dd4ea0b 100644
--- a/modules/angular2/src/core/metadata/di.ts
+++ b/modules/angular2/src/core/metadata/di.ts
@@ -6,8 +6,7 @@ import {
   StringWrapper,
   isString
 } from 'angular2/src/core/facade/lang';
-import {DependencyMetadata} from 'angular2/src/core/di/metadata';
-import {resolveForwardRef} from 'angular2/di';
+import {DependencyMetadata, resolveForwardRef} from 'angular2/src/core/di';
 
 /**
  * Specifies that a constant attribute value should be injected.
diff --git a/modules/angular2/src/core/metadata/directives.ts b/modules/angular2/src/core/metadata/directives.ts
index 4cbdb171df..613c433257 100644
--- a/modules/angular2/src/core/metadata/directives.ts
+++ b/modules/angular2/src/core/metadata/directives.ts
@@ -1,6 +1,6 @@
 import {CONST, CONST_EXPR} from 'angular2/src/core/facade/lang';
+import {ChangeDetectionStrategy} from 'angular2/src/core/change_detection';
 import {InjectableMetadata} from 'angular2/src/core/di/metadata';
-import {ChangeDetectionStrategy} from 'angular2/change_detection';
 
 /**
  * Directives allow you to attach behavior to elements in the DOM.
diff --git a/modules/angular2/src/core/pipes.ts b/modules/angular2/src/core/pipes.ts
index 2cdd08f106..a597f8c891 100644
--- a/modules/angular2/src/core/pipes.ts
+++ b/modules/angular2/src/core/pipes.ts
@@ -4,11 +4,11 @@
  * This module provides advanced support for extending change detection.
  */
 
-export {UpperCasePipe} from './src/core/pipes/uppercase_pipe';
-export {LowerCasePipe} from './src/core/pipes/lowercase_pipe';
-export {AsyncPipe} from './src/core/pipes/async_pipe';
-export {JsonPipe} from './src/core/pipes/json_pipe';
-export {DatePipe} from './src/core/pipes/date_pipe';
-export {DecimalPipe, PercentPipe, CurrencyPipe} from './src/core/pipes/number_pipe';
-export {LimitToPipe} from './src/core/pipes/limit_to_pipe';
-export {DEFAULT_PIPES_TOKEN, DEFAULT_PIPES} from './src/core/pipes/default_pipes';
+export {AsyncPipe} from './pipes/async_pipe';
+export {DatePipe} from './pipes/date_pipe';
+export {DEFAULT_PIPES, DEFAULT_PIPES_TOKEN} from './pipes/default_pipes';
+export {JsonPipe} from './pipes/json_pipe';
+export {LimitToPipe} from './pipes/limit_to_pipe';
+export {LowerCasePipe} from './pipes/lowercase_pipe';
+export {NumberPipe, DecimalPipe, PercentPipe, CurrencyPipe} from './pipes/number_pipe';
+export {UpperCasePipe} from './pipes/uppercase_pipe';
diff --git a/modules/angular2/src/core/pipes/async_pipe.ts b/modules/angular2/src/core/pipes/async_pipe.ts
index 08b0ae6963..7835aee1cc 100644
--- a/modules/angular2/src/core/pipes/async_pipe.ts
+++ b/modules/angular2/src/core/pipes/async_pipe.ts
@@ -1,13 +1,15 @@
 import {isBlank, isPresent, isPromise, CONST, BaseException} from 'angular2/src/core/facade/lang';
-import {Observable, Promise, ObservableWrapper} from 'angular2/src/core/facade/async';
-import {Injectable} from 'angular2/di';
+import {Promise, ObservableWrapper, Observable} from 'angular2/src/core/facade/async';
+import {Pipe} from 'angular2/src/core/metadata';
+import {Injectable} from 'angular2/src/core/di';
+import {
+  ChangeDetectorRef,
+  PipeOnDestroy,
+  PipeTransform,
+  WrappedValue
+} from 'angular2/src/core/change_detection';
 
-import {PipeTransform, PipeOnDestroy, WrappedValue} from 'angular2/change_detection';
 import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
-import {ChangeDetectorRef} from 'angular2/change_detection';
-
-import {Pipe} from '../metadata';
-
 
 class ObservableStrategy {
   createSubscription(async: any, updateLatestValue: any): any {
diff --git a/modules/angular2/src/core/pipes/date_pipe.ts b/modules/angular2/src/core/pipes/date_pipe.ts
index 9f35e644c2..646a8c8de6 100644
--- a/modules/angular2/src/core/pipes/date_pipe.ts
+++ b/modules/angular2/src/core/pipes/date_pipe.ts
@@ -9,13 +9,13 @@ import {
   FunctionWrapper
 } from 'angular2/src/core/facade/lang';
 import {DateFormatter} from 'angular2/src/core/facade/intl';
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
+import {Pipe} from 'angular2/src/core/metadata';
+import {PipeTransform, WrappedValue} from 'angular2/src/core/change_detection';
 import {StringMapWrapper, ListWrapper} from 'angular2/src/core/facade/collection';
 
-import {PipeTransform, WrappedValue} from 'angular2/change_detection';
 import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
 
-import {Pipe} from '../metadata';
 
 // TODO: move to a global configable location along with other i18n components.
 var defaultLocale: string = 'en-US';
diff --git a/modules/angular2/src/core/pipes/default_pipes.ts b/modules/angular2/src/core/pipes/default_pipes.ts
index 47b0ed489a..c95d9c2312 100644
--- a/modules/angular2/src/core/pipes/default_pipes.ts
+++ b/modules/angular2/src/core/pipes/default_pipes.ts
@@ -7,7 +7,7 @@ import {DatePipe} from './date_pipe';
 import {DecimalPipe, PercentPipe, CurrencyPipe} from './number_pipe';
 
 import {CONST_EXPR} from 'angular2/src/core/facade/lang';
-import {Binding, OpaqueToken} from 'angular2/di';
+import {Binding, OpaqueToken} from 'angular2/src/core/di';
 
 const DEFAULT_PIPES_LIST = CONST_EXPR([
   AsyncPipe,
@@ -21,7 +21,7 @@ const DEFAULT_PIPES_LIST = CONST_EXPR([
   DatePipe
 ]);
 
-export const DEFAULT_PIPES_TOKEN = CONST_EXPR(new OpaqueToken("Default Pipes"));
+export const DEFAULT_PIPES_TOKEN: OpaqueToken = CONST_EXPR(new OpaqueToken("Default Pipes"));
 
-export const DEFAULT_PIPES =
+export const DEFAULT_PIPES: Binding =
     CONST_EXPR(new Binding(DEFAULT_PIPES_TOKEN, {toValue: DEFAULT_PIPES_LIST}));
diff --git a/modules/angular2/src/core/pipes/json_pipe.ts b/modules/angular2/src/core/pipes/json_pipe.ts
index 2f1e3577fd..092d8b301d 100644
--- a/modules/angular2/src/core/pipes/json_pipe.ts
+++ b/modules/angular2/src/core/pipes/json_pipe.ts
@@ -1,9 +1,7 @@
 import {isBlank, isPresent, Json, CONST} from 'angular2/src/core/facade/lang';
-import {Injectable} from 'angular2/di';
-
-import {PipeTransform, WrappedValue} from 'angular2/change_detection';
-
-import {Pipe} from '../metadata';
+import {Injectable} from 'angular2/src/core/di';
+import {PipeTransform, WrappedValue} from 'angular2/src/core/change_detection';
+import {Pipe} from 'angular2/src/core/metadata';
 
 /**
  * Implements json transforms to any object.
diff --git a/modules/angular2/src/core/pipes/limit_to_pipe.ts b/modules/angular2/src/core/pipes/limit_to_pipe.ts
index 1a47377ba9..4065559ce6 100644
--- a/modules/angular2/src/core/pipes/limit_to_pipe.ts
+++ b/modules/angular2/src/core/pipes/limit_to_pipe.ts
@@ -8,13 +8,11 @@ import {
 } from 'angular2/src/core/facade/lang';
 import {ListWrapper} from 'angular2/src/core/facade/collection';
 import {Math} from 'angular2/src/core/facade/math';
-import {Injectable} from 'angular2/di';
-
-import {PipeTransform, WrappedValue} from 'angular2/change_detection';
+import {PipeTransform, WrappedValue} from 'angular2/src/core/change_detection';
+import {Injectable} from 'angular2/src/core/di';
+import {Pipe} from 'angular2/src/core/metadata';
 import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
 
-import {Pipe} from '../metadata';
-
 /**
  * Creates a new Array or String containing only a prefix/suffix of the
  * elements.
diff --git a/modules/angular2/src/core/pipes/lowercase_pipe.ts b/modules/angular2/src/core/pipes/lowercase_pipe.ts
index fae1916c33..04abc6c906 100644
--- a/modules/angular2/src/core/pipes/lowercase_pipe.ts
+++ b/modules/angular2/src/core/pipes/lowercase_pipe.ts
@@ -1,12 +1,10 @@
 import {isString, StringWrapper, CONST, isBlank} from 'angular2/src/core/facade/lang';
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
+import {PipeTransform, WrappedValue} from 'angular2/src/core/change_detection';
+import {Pipe} from 'angular2/src/core/metadata';
 
-import {PipeTransform, WrappedValue} from 'angular2/change_detection';
 import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
 
-
-import {Pipe} from '../metadata';
-
 /**
  * Implements lowercase transforms to text.
  *
diff --git a/modules/angular2/src/core/pipes/number_pipe.ts b/modules/angular2/src/core/pipes/number_pipe.ts
index 5c447fa2b9..f8a5dae636 100644
--- a/modules/angular2/src/core/pipes/number_pipe.ts
+++ b/modules/angular2/src/core/pipes/number_pipe.ts
@@ -10,14 +10,13 @@ import {
   FunctionWrapper
 } from 'angular2/src/core/facade/lang';
 import {NumberFormatter, NumberFormatStyle} from 'angular2/src/core/facade/intl';
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
+import {PipeTransform, WrappedValue} from 'angular2/src/core/change_detection';
+import {Pipe} from 'angular2/src/core/metadata';
 import {ListWrapper} from 'angular2/src/core/facade/collection';
 
-import {PipeTransform, WrappedValue} from 'angular2/change_detection';
 import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
 
-import {Pipe} from '../metadata';
-
 var defaultLocale: string = 'en-US';
 var _re = RegExpWrapper.create('^(\\d+)?\\.((\\d+)(\\-(\\d+))?)?$');
 
diff --git a/modules/angular2/src/core/pipes/pipe_binding.ts b/modules/angular2/src/core/pipes/pipe_binding.ts
index 13996a1f7b..2708d07866 100644
--- a/modules/angular2/src/core/pipes/pipe_binding.ts
+++ b/modules/angular2/src/core/pipes/pipe_binding.ts
@@ -1,6 +1,6 @@
 import {Type} from 'angular2/src/core/facade/lang';
-import {Key, ResolvedBinding, Binding} from 'angular2/di';
 import {ResolvedFactory, resolveBinding} from 'angular2/src/core/di/binding';
+import {Key, ResolvedBinding, Binding} from 'angular2/src/core/di';
 import {PipeMetadata} from '../metadata/directives';
 
 export class PipeBinding extends ResolvedBinding {
diff --git a/modules/angular2/src/core/pipes/pipes.ts b/modules/angular2/src/core/pipes/pipes.ts
index 465058a38b..b2151569fe 100644
--- a/modules/angular2/src/core/pipes/pipes.ts
+++ b/modules/angular2/src/core/pipes/pipes.ts
@@ -1,5 +1,12 @@
 import {isBlank, isPresent, BaseException, CONST, Type} from 'angular2/src/core/facade/lang';
-import {Injectable, OptionalMetadata, SkipSelfMetadata, Binding, Injector, bind} from 'angular2/di';
+import {
+  Injectable,
+  OptionalMetadata,
+  SkipSelfMetadata,
+  Binding,
+  Injector,
+  bind
+} from 'angular2/src/core/di';
 import {PipeBinding} from './pipe_binding';
 import * as cd from 'angular2/src/core/change_detection/pipes';
 
diff --git a/modules/angular2/src/core/pipes/uppercase_pipe.ts b/modules/angular2/src/core/pipes/uppercase_pipe.ts
index cd811ca1c5..a46243f682 100644
--- a/modules/angular2/src/core/pipes/uppercase_pipe.ts
+++ b/modules/angular2/src/core/pipes/uppercase_pipe.ts
@@ -1,11 +1,9 @@
 import {isString, StringWrapper, CONST, isBlank} from 'angular2/src/core/facade/lang';
-import {Injectable} from 'angular2/di';
-
-import {PipeTransform, WrappedValue} from 'angular2/change_detection';
+import {Pipe} from 'angular2/src/core/metadata';
+import {Injectable} from 'angular2/src/core/di';
+import {PipeTransform, WrappedValue} from 'angular2/src/core/change_detection';
 import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
 
-import {Pipe} from '../metadata';
-
 /**
  * Implements uppercase transforms to text.
  *
diff --git a/modules/angular2/src/core/platform_bindings.dart b/modules/angular2/src/core/platform_bindings.dart
index b4cbf94990..57fe126789 100644
--- a/modules/angular2/src/core/platform_bindings.dart
+++ b/modules/angular2/src/core/platform_bindings.dart
@@ -1,7 +1,7 @@
-library angular2.platform_bindings;
+library angular2.src.core.platform_bindings;
 
 
-import 'package:angular2/di.dart';
+import 'package:angular2/core.dart';
 import './exception_handler.dart';
 import 'package:angular2/src/core/dom/dom_adapter.dart';
 
diff --git a/modules/angular2/src/core/platform_bindings.ts b/modules/angular2/src/core/platform_bindings.ts
index dbbe450c38..6ac771e32e 100644
--- a/modules/angular2/src/core/platform_bindings.ts
+++ b/modules/angular2/src/core/platform_bindings.ts
@@ -1,4 +1,4 @@
-import {bind} from 'angular2/di';
+import {bind} from 'angular2/src/core/di';
 import {ExceptionHandler} from './exception_handler';
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 
diff --git a/modules/angular2/src/core/render.ts b/modules/angular2/src/core/render.ts
new file mode 100644
index 0000000000..1aaa3c872d
--- /dev/null
+++ b/modules/angular2/src/core/render.ts
@@ -0,0 +1,16 @@
+// Public API for render
+export {
+  RenderDirectiveMetadata,
+  DomRenderer,
+  RenderEventDispatcher,
+  Renderer,
+  RenderElementRef,
+  RenderViewRef,
+  RenderProtoViewRef,
+  RenderFragmentRef,
+  RenderViewWithFragments,
+  ViewDefinition,
+  DOCUMENT,
+  APP_ID,
+  MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE
+} from './render/render';
diff --git a/modules/angular2/src/core/render/dom/compiler/compiler.ts b/modules/angular2/src/core/render/dom/compiler/compiler.ts
index 03733af10c..5bd5ed7a17 100644
--- a/modules/angular2/src/core/render/dom/compiler/compiler.ts
+++ b/modules/angular2/src/core/render/dom/compiler/compiler.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable, Inject} from 'angular2/src/core/di';
 
 import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async';
 import {BaseException, isPresent, isBlank} from 'angular2/src/core/facade/lang';
@@ -22,7 +22,6 @@ import {Parser} from 'angular2/src/core/change_detection/change_detection';
 import * as pvm from '../view/proto_view_merger';
 import {CssSelector} from './selector';
 import {DOCUMENT, APP_ID} from '../dom_tokens';
-import {Inject} from 'angular2/di';
 import {SharedStylesHost} from '../view/shared_styles_host';
 import {prependAll} from '../util';
 import {TemplateCloner} from '../template_cloner';
diff --git a/modules/angular2/src/core/render/dom/compiler/style_inliner.ts b/modules/angular2/src/core/render/dom/compiler/style_inliner.ts
index 948abf00d7..3c1ac8123b 100644
--- a/modules/angular2/src/core/render/dom/compiler/style_inliner.ts
+++ b/modules/angular2/src/core/render/dom/compiler/style_inliner.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 import {XHR} from 'angular2/src/core/render/xhr';
 import {ListWrapper} from 'angular2/src/core/facade/collection';
 
diff --git a/modules/angular2/src/core/render/dom/compiler/style_url_resolver.ts b/modules/angular2/src/core/render/dom/compiler/style_url_resolver.ts
index 9a092f73d8..6a85e6fcd4 100644
--- a/modules/angular2/src/core/render/dom/compiler/style_url_resolver.ts
+++ b/modules/angular2/src/core/render/dom/compiler/style_url_resolver.ts
@@ -1,7 +1,7 @@
 // Some of the code comes from WebComponents.JS
 // https://github.com/webcomponents/webcomponentsjs/blob/master/src/HTMLImports/path.js
 
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 import {RegExp, RegExpWrapper, StringWrapper} from 'angular2/src/core/facade/lang';
 import {UrlResolver} from 'angular2/src/core/services/url_resolver';
 
diff --git a/modules/angular2/src/core/render/dom/compiler/view_loader.ts b/modules/angular2/src/core/render/dom/compiler/view_loader.ts
index 44bb49081d..0ae093a7ef 100644
--- a/modules/angular2/src/core/render/dom/compiler/view_loader.ts
+++ b/modules/angular2/src/core/render/dom/compiler/view_loader.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 import {
   isBlank,
   isPresent,
diff --git a/modules/angular2/src/core/render/dom/dom_renderer.ts b/modules/angular2/src/core/render/dom/dom_renderer.ts
index f5a7263ffd..b3a475d1ca 100644
--- a/modules/angular2/src/core/render/dom/dom_renderer.ts
+++ b/modules/angular2/src/core/render/dom/dom_renderer.ts
@@ -1,4 +1,4 @@
-import {Inject, Injectable, OpaqueToken} from 'angular2/di';
+import {Inject, Injectable, OpaqueToken} from 'angular2/src/core/di';
 import {
   isPresent,
   isBlank,
diff --git a/modules/angular2/src/core/render/dom/dom_tokens.ts b/modules/angular2/src/core/render/dom/dom_tokens.ts
index 57eaab7b0b..addb20037c 100644
--- a/modules/angular2/src/core/render/dom/dom_tokens.ts
+++ b/modules/angular2/src/core/render/dom/dom_tokens.ts
@@ -1,4 +1,4 @@
-import {OpaqueToken, Binding} from 'angular2/di';
+import {OpaqueToken, Binding} from 'angular2/src/core/di';
 import {CONST_EXPR, StringWrapper, Math} from 'angular2/src/core/facade/lang';
 
 export const DOCUMENT: OpaqueToken = CONST_EXPR(new OpaqueToken('DocumentToken'));
diff --git a/modules/angular2/src/core/render/dom/events/event_manager.ts b/modules/angular2/src/core/render/dom/events/event_manager.ts
index 7ef193a646..f7229a72e8 100644
--- a/modules/angular2/src/core/render/dom/events/event_manager.ts
+++ b/modules/angular2/src/core/render/dom/events/event_manager.ts
@@ -8,7 +8,7 @@ import {
 import {ListWrapper} from 'angular2/src/core/facade/collection';
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 import {NgZone} from 'angular2/src/core/zone/ng_zone';
-import {Injectable, Inject, OpaqueToken} from 'angular2/di';
+import {Injectable, Inject, OpaqueToken} from 'angular2/src/core/di';
 
 export const EVENT_MANAGER_PLUGINS: OpaqueToken =
     CONST_EXPR(new OpaqueToken("EventManagerPlugins"));
diff --git a/modules/angular2/src/core/render/dom/events/hammer_gestures.dart b/modules/angular2/src/core/render/dom/events/hammer_gestures.dart
index bddddd3a5e..7a8a42db85 100644
--- a/modules/angular2/src/core/render/dom/events/hammer_gestures.dart
+++ b/modules/angular2/src/core/render/dom/events/hammer_gestures.dart
@@ -3,7 +3,7 @@ library angular.events;
 import 'dart:html';
 import './hammer_common.dart';
 import 'package:angular2/src/core/facade/lang.dart' show BaseException;
-import "package:angular2/di.dart" show Injectable;
+import "package:angular2/src/core/di.dart" show Injectable;
 
 import 'dart:js' as js;
 
diff --git a/modules/angular2/src/core/render/dom/events/hammer_gestures.ts b/modules/angular2/src/core/render/dom/events/hammer_gestures.ts
index fabcc145b2..666682e50c 100644
--- a/modules/angular2/src/core/render/dom/events/hammer_gestures.ts
+++ b/modules/angular2/src/core/render/dom/events/hammer_gestures.ts
@@ -2,7 +2,7 @@
 
 import {HammerGesturesPluginCommon} from './hammer_common';
 import {isPresent, BaseException} from 'angular2/src/core/facade/lang';
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 
 @Injectable()
 export class HammerGesturesPlugin extends HammerGesturesPluginCommon {
diff --git a/modules/angular2/src/core/render/dom/events/key_events.ts b/modules/angular2/src/core/render/dom/events/key_events.ts
index 2492df3627..ee1a476fc6 100644
--- a/modules/angular2/src/core/render/dom/events/key_events.ts
+++ b/modules/angular2/src/core/render/dom/events/key_events.ts
@@ -10,7 +10,7 @@ import {
 import {StringMapWrapper, ListWrapper} from 'angular2/src/core/facade/collection';
 import {EventManagerPlugin} from './event_manager';
 import {NgZone} from 'angular2/src/core/zone/ng_zone';
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 
 var modifierKeys = ['alt', 'control', 'meta', 'shift'];
 var modifierKeyGetters: StringMap<string, Function> = {
diff --git a/modules/angular2/src/core/render/dom/template_cloner.ts b/modules/angular2/src/core/render/dom/template_cloner.ts
index 2d979431b9..a41e19fec7 100644
--- a/modules/angular2/src/core/render/dom/template_cloner.ts
+++ b/modules/angular2/src/core/render/dom/template_cloner.ts
@@ -1,5 +1,5 @@
 import {isString} from 'angular2/src/core/facade/lang';
-import {Injectable, Inject} from 'angular2/di';
+import {Injectable, Inject} from 'angular2/src/core/di';
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 import {MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE} from './dom_tokens';
 
diff --git a/modules/angular2/src/core/render/dom/view/shared_styles_host.ts b/modules/angular2/src/core/render/dom/view/shared_styles_host.ts
index 23810dada3..a5ab44a1c1 100644
--- a/modules/angular2/src/core/render/dom/view/shared_styles_host.ts
+++ b/modules/angular2/src/core/render/dom/view/shared_styles_host.ts
@@ -1,5 +1,5 @@
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
-import {Inject, Injectable} from 'angular2/di';
+import {Inject, Injectable} from 'angular2/src/core/di';
 import {SetWrapper} from 'angular2/src/core/facade/collection';
 import {DOCUMENT} from '../dom_tokens';
 
diff --git a/modules/angular2/src/core/render/xhr_impl.dart b/modules/angular2/src/core/render/xhr_impl.dart
index bf22d64345..078c730b40 100644
--- a/modules/angular2/src/core/render/xhr_impl.dart
+++ b/modules/angular2/src/core/render/xhr_impl.dart
@@ -2,7 +2,7 @@ library angular2.src.services.xhr_impl;
 
 import 'dart:async' show Future;
 import 'dart:html' show HttpRequest;
-import 'package:angular2/di.dart';
+import 'package:angular2/core.dart';
 import './xhr.dart' show XHR;
 
 @Injectable()
diff --git a/modules/angular2/src/core/render/xhr_impl.ts b/modules/angular2/src/core/render/xhr_impl.ts
index 4e213d380b..ecb1384eea 100644
--- a/modules/angular2/src/core/render/xhr_impl.ts
+++ b/modules/angular2/src/core/render/xhr_impl.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 import {Promise, PromiseWrapper, PromiseCompleter} from 'angular2/src/core/facade/async';
 import {isPresent} from 'angular2/src/core/facade/lang';
 import {XHR} from './xhr';
diff --git a/modules/angular2/src/core/services.ts b/modules/angular2/src/core/services.ts
new file mode 100644
index 0000000000..095c4b65ac
--- /dev/null
+++ b/modules/angular2/src/core/services.ts
@@ -0,0 +1,3 @@
+// Public API for Services
+export {AppRootUrl} from 'angular2/src/core/services/app_root_url';
+export {UrlResolver} from 'angular2/src/core/services/url_resolver';
diff --git a/modules/angular2/src/core/services/anchor_based_app_root_url.ts b/modules/angular2/src/core/services/anchor_based_app_root_url.ts
index e77abf9308..3b5855eeba 100644
--- a/modules/angular2/src/core/services/anchor_based_app_root_url.ts
+++ b/modules/angular2/src/core/services/anchor_based_app_root_url.ts
@@ -1,6 +1,6 @@
 import {AppRootUrl} from "angular2/src/core/services/app_root_url";
 import {DOM} from "angular2/src/core/dom/dom_adapter";
-import {Injectable} from "angular2/di";
+import {Injectable} from "angular2/src/core/di";
 
 /**
  * Extension of {@link AppRootUrl} that uses a DOM anchor tag to set the root url to
diff --git a/modules/angular2/src/core/services/app_root_url.ts b/modules/angular2/src/core/services/app_root_url.ts
index e378430108..3f730aea81 100644
--- a/modules/angular2/src/core/services/app_root_url.ts
+++ b/modules/angular2/src/core/services/app_root_url.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 import {isBlank} from 'angular2/src/core/facade/lang';
 
 /**
diff --git a/modules/angular2/src/core/services/url_resolver.dart b/modules/angular2/src/core/services/url_resolver.dart
index 739b868d9d..249588376d 100644
--- a/modules/angular2/src/core/services/url_resolver.dart
+++ b/modules/angular2/src/core/services/url_resolver.dart
@@ -1,6 +1,6 @@
 library angular2.src.services.url_resolver;
 
-import 'package:angular2/di.dart' show Injectable;
+import 'package:angular2/src/core/di.dart' show Injectable;
 
 @Injectable()
 class UrlResolver {
diff --git a/modules/angular2/src/core/services/url_resolver.ts b/modules/angular2/src/core/services/url_resolver.ts
index 5f8bfb649b..88c5f5ba91 100644
--- a/modules/angular2/src/core/services/url_resolver.ts
+++ b/modules/angular2/src/core/services/url_resolver.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 import {
   isPresent,
   isBlank,
diff --git a/modules/angular2/src/core/testability/testability.ts b/modules/angular2/src/core/testability/testability.ts
index d94da62271..f9cc1ffe12 100644
--- a/modules/angular2/src/core/testability/testability.ts
+++ b/modules/angular2/src/core/testability/testability.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 import {Map, MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection';
 import {StringWrapper, isBlank, BaseException} from 'angular2/src/core/facade/lang';
diff --git a/modules/angular2/src/core/util.ts b/modules/angular2/src/core/util.ts
new file mode 100644
index 0000000000..a0004ebcd8
--- /dev/null
+++ b/modules/angular2/src/core/util.ts
@@ -0,0 +1,2 @@
+// Public API for util
+export {Class, ClassDefinition, TypeDecorator} from './util/decorators';
\ No newline at end of file
diff --git a/modules/angular2/src/core/zone.ts b/modules/angular2/src/core/zone.ts
new file mode 100644
index 0000000000..ef99496e1d
--- /dev/null
+++ b/modules/angular2/src/core/zone.ts
@@ -0,0 +1,2 @@
+// Public API for Zone
+export {NgZone} from './zone/ng_zone';
diff --git a/modules/angular2/src/http/backends/browser_jsonp.ts b/modules/angular2/src/http/backends/browser_jsonp.ts
index abc31dc20c..5c0114ff92 100644
--- a/modules/angular2/src/http/backends/browser_jsonp.ts
+++ b/modules/angular2/src/http/backends/browser_jsonp.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 import {global} from 'angular2/src/core/facade/lang';
 
 let _nextRequestId = 0;
diff --git a/modules/angular2/src/http/backends/browser_xhr.ts b/modules/angular2/src/http/backends/browser_xhr.ts
index cb27b01a83..12b7389668 100644
--- a/modules/angular2/src/http/backends/browser_xhr.ts
+++ b/modules/angular2/src/http/backends/browser_xhr.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 
 // Make sure not to evaluate this in a non-browser environment!
 @Injectable()
diff --git a/modules/angular2/src/http/backends/jsonp_backend.ts b/modules/angular2/src/http/backends/jsonp_backend.ts
index 70934a62df..7ceb114f2d 100644
--- a/modules/angular2/src/http/backends/jsonp_backend.ts
+++ b/modules/angular2/src/http/backends/jsonp_backend.ts
@@ -3,7 +3,7 @@ import {ReadyStates, RequestMethods} from '../enums';
 import {Request} from '../static_request';
 import {Response} from '../static_response';
 import {ResponseOptions, BaseResponseOptions} from '../base_response_options';
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 import {BrowserJsonp} from './browser_jsonp';
 import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async';
 import {StringWrapper, isPresent, makeTypeError} from 'angular2/src/core/facade/lang';
diff --git a/modules/angular2/src/http/backends/mock_backend.ts b/modules/angular2/src/http/backends/mock_backend.ts
index 94ad145a55..35d64b13e7 100644
--- a/modules/angular2/src/http/backends/mock_backend.ts
+++ b/modules/angular2/src/http/backends/mock_backend.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 import {Request} from '../static_request';
 import {Response} from '../static_response';
 import {ReadyStates} from '../enums';
@@ -139,7 +139,7 @@ export class MockBackend implements ConnectionBackend {
    *
    * ```
    * import {MockBackend, Http, BaseRequestOptions} from 'angular2/http';
-   * import {Injector} from 'angular2/di';
+   * import {Injector} from 'angular2/core';
    *
    * it('should get a response', () => {
    *   var connection; //this will be set when a new connection is emitted from the backend.
diff --git a/modules/angular2/src/http/backends/xhr_backend.ts b/modules/angular2/src/http/backends/xhr_backend.ts
index 75f8ade07e..54e1070bed 100644
--- a/modules/angular2/src/http/backends/xhr_backend.ts
+++ b/modules/angular2/src/http/backends/xhr_backend.ts
@@ -3,7 +3,7 @@ import {ReadyStates, RequestMethods, ResponseTypes} from '../enums';
 import {Request} from '../static_request';
 import {Response} from '../static_response';
 import {ResponseOptions, BaseResponseOptions} from '../base_response_options';
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 import {BrowserXhr} from './browser_xhr';
 import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async';
 import {isPresent} from 'angular2/src/core/facade/lang';
diff --git a/modules/angular2/src/http/base_request_options.ts b/modules/angular2/src/http/base_request_options.ts
index 5547a43fcb..5f2b8ee53f 100644
--- a/modules/angular2/src/http/base_request_options.ts
+++ b/modules/angular2/src/http/base_request_options.ts
@@ -2,7 +2,7 @@ import {CONST_EXPR, CONST, isPresent, isString} from 'angular2/src/core/facade/l
 import {Headers} from './headers';
 import {RequestModesOpts, RequestMethods, RequestCacheOpts, RequestCredentialsOpts} from './enums';
 import {RequestOptionsArgs} from './interfaces';
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 import {URLSearchParams} from './url_search_params';
 
 /**
diff --git a/modules/angular2/src/http/base_response_options.ts b/modules/angular2/src/http/base_response_options.ts
index 77935a5b52..3751687496 100644
--- a/modules/angular2/src/http/base_response_options.ts
+++ b/modules/angular2/src/http/base_response_options.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 import {isPresent, isJsObject} from 'angular2/src/core/facade/lang';
 import {Headers} from './headers';
 import {ResponseTypes} from './enums';
diff --git a/modules/angular2/src/router/hash_location_strategy.ts b/modules/angular2/src/router/hash_location_strategy.ts
index 364d9f6d20..25e2c24a99 100644
--- a/modules/angular2/src/router/hash_location_strategy.ts
+++ b/modules/angular2/src/router/hash_location_strategy.ts
@@ -1,5 +1,5 @@
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 import {LocationStrategy} from './location_strategy';
 import {EventListener, History, Location} from 'angular2/src/core/facade/browser';
 
diff --git a/modules/angular2/src/router/location.ts b/modules/angular2/src/router/location.ts
index bdb40e2cec..c7df8d2848 100644
--- a/modules/angular2/src/router/location.ts
+++ b/modules/angular2/src/router/location.ts
@@ -2,7 +2,7 @@ import {LocationStrategy} from './location_strategy';
 import {StringWrapper, isPresent, CONST_EXPR} from 'angular2/src/core/facade/lang';
 import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async';
 import {BaseException, isBlank} from 'angular2/src/core/facade/lang';
-import {OpaqueToken, Injectable, Optional, Inject} from 'angular2/di';
+import {OpaqueToken, Injectable, Optional, Inject} from 'angular2/src/core/di';
 
 export const APP_BASE_HREF: OpaqueToken = CONST_EXPR(new OpaqueToken('appBaseHref'));
 
diff --git a/modules/angular2/src/router/path_location_strategy.ts b/modules/angular2/src/router/path_location_strategy.ts
index 5f0506d082..42525a4032 100644
--- a/modules/angular2/src/router/path_location_strategy.ts
+++ b/modules/angular2/src/router/path_location_strategy.ts
@@ -1,5 +1,5 @@
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 import {EventListener, History, Location} from 'angular2/src/core/facade/browser';
 import {LocationStrategy} from './location_strategy';
 
diff --git a/modules/angular2/src/router/pipeline.ts b/modules/angular2/src/router/pipeline.ts
index 49159655f2..cb04ef113c 100644
--- a/modules/angular2/src/router/pipeline.ts
+++ b/modules/angular2/src/router/pipeline.ts
@@ -1,7 +1,7 @@
 import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async';
 import {ListWrapper} from 'angular2/src/core/facade/collection';
 import {Instruction} from './instruction';
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 
 /**
  * Responsible for performing each step of navigation.
diff --git a/modules/angular2/src/router/route_data.ts b/modules/angular2/src/router/route_data.ts
index e2674efdbe..12999206c5 100644
--- a/modules/angular2/src/router/route_data.ts
+++ b/modules/angular2/src/router/route_data.ts
@@ -1,4 +1,4 @@
-import {OpaqueToken} from 'angular2/di';
+import {OpaqueToken} from 'angular2/src/core/di';
 import {CONST_EXPR} from 'angular2/src/core/facade/lang';
 
 export const ROUTE_DATA: OpaqueToken = CONST_EXPR(new OpaqueToken('routeData'));
diff --git a/modules/angular2/src/router/route_registry.ts b/modules/angular2/src/router/route_registry.ts
index 43aecb1391..e7ffa30f60 100644
--- a/modules/angular2/src/router/route_registry.ts
+++ b/modules/angular2/src/router/route_registry.ts
@@ -30,7 +30,7 @@ import {
   RouteDefinition
 } from './route_config_impl';
 import {reflector} from 'angular2/src/core/reflection/reflection';
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 import {normalizeRouteConfig} from './route_config_nomalizer';
 import {parser, Url, pathSegmentsToUrl} from './url_parser';
 
diff --git a/modules/angular2/src/router/router_outlet.ts b/modules/angular2/src/router/router_outlet.ts
index c0ceee72bb..cc653d1100 100644
--- a/modules/angular2/src/router/router_outlet.ts
+++ b/modules/angular2/src/router/router_outlet.ts
@@ -2,9 +2,9 @@ import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async';
 import {StringMapWrapper} from 'angular2/src/core/facade/collection';
 import {isBlank, isPresent, BaseException} from 'angular2/src/core/facade/lang';
 
-import {Directive, Attribute} from '../core/metadata';
-import {DynamicComponentLoader, ComponentRef, ElementRef} from 'angular2/core';
-import {Injector, bind, Dependency, UNDEFINED} from 'angular2/di';
+import {Directive, Attribute} from 'angular2/src/core/metadata';
+import {DynamicComponentLoader, ComponentRef, ElementRef} from 'angular2/src/core/compiler';
+import {Injector, bind, Dependency, UNDEFINED} from 'angular2/src/core/di';
 
 import * as routerMod from './router';
 import {ComponentInstruction, RouteParams} from './instruction';
diff --git a/modules/angular2/src/test_lib/test_component_builder.ts b/modules/angular2/src/test_lib/test_component_builder.ts
index 8379201d0d..dca9aa496e 100644
--- a/modules/angular2/src/test_lib/test_component_builder.ts
+++ b/modules/angular2/src/test_lib/test_component_builder.ts
@@ -1,4 +1,4 @@
-import {Injector, bind, Injectable} from 'angular2/di';
+import {Injector, bind, Injectable} from 'angular2/src/core/di';
 
 import {Type, isPresent, BaseException, isBlank} from 'angular2/src/core/facade/lang';
 import {Promise} from 'angular2/src/core/facade/async';
diff --git a/modules/angular2/src/test_lib/test_injector.ts b/modules/angular2/src/test_lib/test_injector.ts
index 8f3b31d3e9..bc18fa7afb 100644
--- a/modules/angular2/src/test_lib/test_injector.ts
+++ b/modules/angular2/src/test_lib/test_injector.ts
@@ -1,4 +1,5 @@
-import {bind, Binding} from 'angular2/di';
+import {bind, Binding} from 'angular2/src/core/di';
+import {DEFAULT_PIPES} from 'angular2/src/core/pipes';
 
 import {Compiler, CompilerCache} from 'angular2/src/core/compiler/compiler';
 import {Reflector, reflector} from 'angular2/src/core/reflection/reflection';
@@ -12,7 +13,6 @@ import {
   KeyValueDiffers,
   defaultKeyValueDiffers
 } from 'angular2/src/core/change_detection/change_detection';
-import {DEFAULT_PIPES} from 'angular2/pipes';
 import {ExceptionHandler} from 'angular2/src/core/exception_handler';
 import {ViewLoader} from 'angular2/src/core/render/dom/compiler/view_loader';
 import {ViewResolver} from 'angular2/src/core/compiler/view_resolver';
@@ -44,7 +44,8 @@ import {MockNgZone} from 'angular2/src/mock/ng_zone_mock';
 
 import {TestComponentBuilder} from './test_component_builder';
 
-import {Injector} from 'angular2/di';
+import {Injector} from 'angular2/src/core/di';
+import {ELEMENT_PROBE_BINDINGS} from 'angular2/src/core/debug';
 
 import {ListWrapper} from 'angular2/src/core/facade/collection';
 import {FunctionWrapper, Type} from 'angular2/src/core/facade/lang';
@@ -52,7 +53,6 @@ import {FunctionWrapper, Type} from 'angular2/src/core/facade/lang';
 import {AppViewPool, APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/compiler/view_pool';
 import {AppViewManager} from 'angular2/src/core/compiler/view_manager';
 import {AppViewManagerUtils} from 'angular2/src/core/compiler/view_manager_utils';
-import {ELEMENT_PROBE_BINDINGS} from 'angular2/debug';
 import {ProtoViewFactory} from 'angular2/src/core/compiler/proto_view_factory';
 import {RenderCompiler, Renderer} from 'angular2/src/core/render/api';
 import {
diff --git a/modules/angular2/src/test_lib/test_lib.ts b/modules/angular2/src/test_lib/test_lib.ts
index 048244489a..0dcaaa6398 100644
--- a/modules/angular2/src/test_lib/test_lib.ts
+++ b/modules/angular2/src/test_lib/test_lib.ts
@@ -5,7 +5,7 @@ import {StringMapWrapper} from 'angular2/src/core/facade/collection';
 import {global, isFunction} from 'angular2/src/core/facade/lang';
 import {NgZoneZone} from 'angular2/src/core/zone/ng_zone';
 
-import {bind} from 'angular2/di';
+import {bind} from 'angular2/src/core/di';
 import {ExceptionHandler} from 'angular2/src/core/exception_handler';
 
 import {createTestInjector, FunctionWithParamTokens, inject} from './test_injector';
diff --git a/modules/angular2/src/web_workers/shared/api.ts b/modules/angular2/src/web_workers/shared/api.ts
index 33dc657f35..9c3e924591 100644
--- a/modules/angular2/src/web_workers/shared/api.ts
+++ b/modules/angular2/src/web_workers/shared/api.ts
@@ -1,5 +1,5 @@
 import {CONST_EXPR} from "angular2/src/core/facade/lang";
-import {OpaqueToken} from "angular2/di";
+import {OpaqueToken} from "angular2/src/core/di";
 import {RenderElementRef, RenderViewRef} from "angular2/src/core/render/api";
 
 export const ON_WEB_WORKER = CONST_EXPR(new OpaqueToken('WebWorker.onWebWorker'));
diff --git a/modules/angular2/src/web_workers/shared/client_message_broker.ts b/modules/angular2/src/web_workers/shared/client_message_broker.ts
index c3d53126cf..c8c38c8e4d 100644
--- a/modules/angular2/src/web_workers/shared/client_message_broker.ts
+++ b/modules/angular2/src/web_workers/shared/client_message_broker.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../../globals.d.ts" />
+/// <reference path="../../../manual_typings/globals.d.ts" />
 import {MessageBus} from "angular2/src/web_workers/shared/message_bus";
 import {print, isPresent, DateWrapper, stringify} from "angular2/src/core/facade/lang";
 import {
@@ -10,7 +10,7 @@ import {
 } from "angular2/src/core/facade/async";
 import {ListWrapper, StringMapWrapper, MapWrapper} from "angular2/src/core/facade/collection";
 import {Serializer} from "angular2/src/web_workers/shared/serializer";
-import {Injectable} from "angular2/di";
+import {Injectable} from "angular2/src/core/di";
 import {Type, StringWrapper} from "angular2/src/core/facade/lang";
 export {Type} from "angular2/src/core/facade/lang";
 
diff --git a/modules/angular2/src/web_workers/shared/post_message_bus.ts b/modules/angular2/src/web_workers/shared/post_message_bus.ts
index a84a7c6b00..623129f30d 100644
--- a/modules/angular2/src/web_workers/shared/post_message_bus.ts
+++ b/modules/angular2/src/web_workers/shared/post_message_bus.ts
@@ -5,7 +5,7 @@ import {
 } from "angular2/src/web_workers/shared/message_bus";
 import {EventEmitter} from 'angular2/src/core/facade/async';
 import {StringMap, StringMapWrapper} from 'angular2/src/core/facade/collection';
-import {Injectable} from "angular2/di";
+import {Injectable} from "angular2/src/core/di";
 
 /**
  * A TypeScript implementation of {@link MessageBus} for communicating via JavaScript's
diff --git a/modules/angular2/src/web_workers/shared/render_proto_view_ref_store.ts b/modules/angular2/src/web_workers/shared/render_proto_view_ref_store.ts
index 880ed9b633..55a158f80d 100644
--- a/modules/angular2/src/web_workers/shared/render_proto_view_ref_store.ts
+++ b/modules/angular2/src/web_workers/shared/render_proto_view_ref_store.ts
@@ -1,4 +1,4 @@
-import {Injectable, Inject} from "angular2/di";
+import {Injectable, Inject} from "angular2/src/core/di";
 import {RenderProtoViewRef} from "angular2/src/core/render/api";
 import {ON_WEB_WORKER} from "angular2/src/web_workers/shared/api";
 
diff --git a/modules/angular2/src/web_workers/shared/render_view_with_fragments_store.ts b/modules/angular2/src/web_workers/shared/render_view_with_fragments_store.ts
index 6f04b17aaa..2aefdaa769 100644
--- a/modules/angular2/src/web_workers/shared/render_view_with_fragments_store.ts
+++ b/modules/angular2/src/web_workers/shared/render_view_with_fragments_store.ts
@@ -1,4 +1,4 @@
-import {Injectable, Inject} from "angular2/di";
+import {Injectable, Inject} from "angular2/src/core/di";
 import {
   RenderViewRef,
   RenderFragmentRef,
diff --git a/modules/angular2/src/web_workers/shared/serializer.ts b/modules/angular2/src/web_workers/shared/serializer.ts
index b5903e4af3..eeddf2246b 100644
--- a/modules/angular2/src/web_workers/shared/serializer.ts
+++ b/modules/angular2/src/web_workers/shared/serializer.ts
@@ -33,7 +33,7 @@ import {
 import {WebWorkerElementRef} from 'angular2/src/web_workers/shared/api';
 import {AST, ASTWithSource} from 'angular2/src/core/change_detection/change_detection';
 import {Parser} from "angular2/src/core/change_detection/parser/parser";
-import {Injectable} from "angular2/di";
+import {Injectable} from "angular2/src/core/di";
 import {RenderProtoViewRefStore} from 'angular2/src/web_workers/shared/render_proto_view_ref_store';
 import {
   RenderViewWithFragmentsStore
diff --git a/modules/angular2/src/web_workers/shared/service_message_broker.ts b/modules/angular2/src/web_workers/shared/service_message_broker.ts
index f5e0f0d020..d4bec431a9 100644
--- a/modules/angular2/src/web_workers/shared/service_message_broker.ts
+++ b/modules/angular2/src/web_workers/shared/service_message_broker.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 import {ListWrapper, Map, MapWrapper} from 'angular2/src/core/facade/collection';
 import {Serializer} from "angular2/src/web_workers/shared/serializer";
 import {isPresent, Type, FunctionWrapper} from "angular2/src/core/facade/lang";
diff --git a/modules/angular2/src/web_workers/ui/di_bindings.ts b/modules/angular2/src/web_workers/ui/di_bindings.ts
index 576857def6..9884936a75 100644
--- a/modules/angular2/src/web_workers/ui/di_bindings.ts
+++ b/modules/angular2/src/web_workers/ui/di_bindings.ts
@@ -1,6 +1,7 @@
 // TODO (jteplitz602): This whole file is nearly identical to core/application.ts.
 // There should be a way to refactor application so that this file is unnecessary. See #3277
-import {Injector, bind, Binding} from "angular2/di";
+import {Injector, bind, Binding} from "angular2/src/core/di";
+import {DEFAULT_PIPES} from 'angular2/src/core/pipes';
 import {Reflector, reflector} from 'angular2/src/core/reflection/reflection';
 import {
   Parser,
@@ -10,7 +11,6 @@ import {
   JitChangeDetection,
   PreGeneratedChangeDetection
 } from 'angular2/src/core/change_detection/change_detection';
-import {DEFAULT_PIPES} from 'angular2/pipes';
 import {
   EventManager,
   DomEventsPlugin,
diff --git a/modules/angular2/src/web_workers/ui/impl.ts b/modules/angular2/src/web_workers/ui/impl.ts
index e68c2a18f2..02f9708350 100644
--- a/modules/angular2/src/web_workers/ui/impl.ts
+++ b/modules/angular2/src/web_workers/ui/impl.ts
@@ -8,7 +8,7 @@
 import {createInjector} from "./di_bindings";
 import {MessageBus, MessageBusSink} from "angular2/src/web_workers/shared/message_bus";
 import {createNgZone} from 'angular2/src/core/application_common';
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter';
 import {wtfInit} from 'angular2/src/core/profile/wtf_init';
 import {WebWorkerSetup} from 'angular2/src/web_workers/ui/setup';
diff --git a/modules/angular2/src/web_workers/ui/renderer.ts b/modules/angular2/src/web_workers/ui/renderer.ts
index 219e260ef7..866a899269 100644
--- a/modules/angular2/src/web_workers/ui/renderer.ts
+++ b/modules/angular2/src/web_workers/ui/renderer.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 import {MessageBus} from 'angular2/src/web_workers/shared/message_bus';
 import {Serializer, PRIMITIVE} from 'angular2/src/web_workers/shared/serializer';
 import {
diff --git a/modules/angular2/src/web_workers/ui/setup.ts b/modules/angular2/src/web_workers/ui/setup.ts
index c08a78df38..cfcd017b58 100644
--- a/modules/angular2/src/web_workers/ui/setup.ts
+++ b/modules/angular2/src/web_workers/ui/setup.ts
@@ -2,8 +2,8 @@ import {SETUP_CHANNEL} from 'angular2/src/web_workers/shared/messaging_api';
 import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async';
 import {MessageBus} from 'angular2/src/web_workers/shared/message_bus';
 import {AnchorBasedAppRootUrl} from 'angular2/src/core/services/anchor_based_app_root_url';
-import {Injectable} from 'angular2/di';
 import {StringWrapper} from 'angular2/src/core/facade/lang';
+import {Injectable} from 'angular2/src/core/di';
 
 @Injectable()
 export class WebWorkerSetup {
diff --git a/modules/angular2/src/web_workers/ui/xhr_impl.ts b/modules/angular2/src/web_workers/ui/xhr_impl.ts
index a554fe43ff..e7e738883c 100644
--- a/modules/angular2/src/web_workers/ui/xhr_impl.ts
+++ b/modules/angular2/src/web_workers/ui/xhr_impl.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 import {PRIMITIVE} from 'angular2/src/web_workers/shared/serializer';
 import {XHR_CHANNEL} from 'angular2/src/web_workers/shared/messaging_api';
 import {XHR} from 'angular2/src/core/render/xhr';
diff --git a/modules/angular2/src/web_workers/worker/application.ts b/modules/angular2/src/web_workers/worker/application.ts
index 4234096564..0749b2027a 100644
--- a/modules/angular2/src/web_workers/worker/application.ts
+++ b/modules/angular2/src/web_workers/worker/application.ts
@@ -4,12 +4,11 @@ import {
   PostMessageBusSource
 } from 'angular2/src/web_workers/shared/post_message_bus';
 import {Type, BaseException} from "angular2/src/core/facade/lang";
-import {Binding} from "angular2/di";
+import {Binding, Injectable} from "angular2/src/core/di";
 import {Map} from 'angular2/src/core/facade/collection';
 import {Promise} from 'angular2/src/core/facade/async';
 import {bootstrapWebWorkerCommon} from "angular2/src/web_workers/worker/application_common";
 import {ApplicationRef} from "angular2/src/core/application_ref";
-import {Injectable} from "angular2/di";
 export * from "angular2/src/web_workers/shared/message_bus";
 
 // TODO(jteplitz602) remove this and compile with lib.webworker.d.ts (#3492)
diff --git a/modules/angular2/src/web_workers/worker/application_common.ts b/modules/angular2/src/web_workers/worker/application_common.ts
index a6b73e7a34..d9247cc1fa 100644
--- a/modules/angular2/src/web_workers/worker/application_common.ts
+++ b/modules/angular2/src/web_workers/worker/application_common.ts
@@ -1,4 +1,6 @@
-import {Injector, bind, OpaqueToken, Binding} from 'angular2/di';
+import {Injector, bind, OpaqueToken, Binding} from 'angular2/src/core/di';
+import {DEFAULT_PIPES} from 'angular2/src/core/pipes';
+import {FORM_BINDINGS} from 'angular2/src/core/forms';
 import {
   NumberWrapper,
   Type,
@@ -23,7 +25,6 @@ import {
   KeyValueDiffers,
   defaultKeyValueDiffers
 } from 'angular2/src/core/change_detection/change_detection';
-import {DEFAULT_PIPES} from 'angular2/pipes';
 import {ExceptionHandler} from 'angular2/src/core/exception_handler';
 import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver';
 import {StyleUrlResolver} from 'angular2/src/core/render/dom/compiler/style_url_resolver';
@@ -134,7 +135,8 @@ function _injectorBindings(appComponentType, bus: MessageBus, initData: StringMa
     ComponentUrlMapper,
     DynamicComponentLoader,
     bind(AppRootUrl).toValue(new AppRootUrl(initData['rootUrl'])),
-    WebWorkerEventDispatcher
+    WebWorkerEventDispatcher,
+    FORM_BINDINGS
   ];
 }
 
diff --git a/modules/angular2/src/web_workers/worker/event_dispatcher.ts b/modules/angular2/src/web_workers/worker/event_dispatcher.ts
index 2eec0efa1e..b9d52489cb 100644
--- a/modules/angular2/src/web_workers/worker/event_dispatcher.ts
+++ b/modules/angular2/src/web_workers/worker/event_dispatcher.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 import {Map, MapWrapper} from 'angular2/src/core/facade/collection';
 import {RenderViewRef, RenderEventDispatcher} from 'angular2/src/core/render/api';
 import {Serializer} from 'angular2/src/web_workers/shared/serializer';
diff --git a/modules/angular2/src/web_workers/worker/renderer.ts b/modules/angular2/src/web_workers/worker/renderer.ts
index 8917c9157d..2010c017d8 100644
--- a/modules/angular2/src/web_workers/worker/renderer.ts
+++ b/modules/angular2/src/web_workers/worker/renderer.ts
@@ -20,7 +20,7 @@ import {
   UiArguments
 } from "angular2/src/web_workers/shared/client_message_broker";
 import {isPresent, print, BaseException} from "angular2/src/core/facade/lang";
-import {Injectable} from "angular2/di";
+import {Injectable} from "angular2/src/core/di";
 import {
   RenderViewWithFragmentsStore,
   WebWorkerRenderViewRef
diff --git a/modules/angular2/src/web_workers/worker/xhr_impl.ts b/modules/angular2/src/web_workers/worker/xhr_impl.ts
index 6978f3938f..ca5bab5816 100644
--- a/modules/angular2/src/web_workers/worker/xhr_impl.ts
+++ b/modules/angular2/src/web_workers/worker/xhr_impl.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di';
 import {Promise} from 'angular2/src/core/facade/async';
 import {XHR} from 'angular2/src/core/render/xhr';
 import {
diff --git a/modules/angular2/test.ts b/modules/angular2/test.ts
index b21f4b4464..8378079cbe 100644
--- a/modules/angular2/test.ts
+++ b/modules/angular2/test.ts
@@ -10,4 +10,3 @@ export * from './src/test_lib/test_lib';
 export * from './src/test_lib/test_component_builder';
 export * from './src/test_lib/test_injector';
 export * from './src/test_lib/fake_async';
-export * from './debug';
diff --git a/modules/angular2/test/benchmark/transform/integration/hello_world.dart b/modules/angular2/test/benchmark/transform/integration/hello_world.dart
index e7151771b3..a4d35910fa 100644
--- a/modules/angular2/test/benchmark/transform/integration/hello_world.dart
+++ b/modules/angular2/test/benchmark/transform/integration/hello_world.dart
@@ -42,7 +42,7 @@ library examples.src.hello_world.index_common;
 
 import "package:angular2/bootstrap.dart"
     show bootstrap, Component, Directive, View, ElementRef;
-import "package:angular2/di.dart" show Injectable;
+import "package:angular2/core.dart" show Injectable;
 
 @Component(selector: "hello-app", services: const [GreetingService])
 @View(
diff --git a/modules/angular2/test/compiler/change_definition_factory_spec.ts b/modules/angular2/test/compiler/change_definition_factory_spec.ts
index d9a19bd890..0fcc802b7f 100644
--- a/modules/angular2/test/compiler/change_definition_factory_spec.ts
+++ b/modules/angular2/test/compiler/change_definition_factory_spec.ts
@@ -9,21 +9,14 @@ import {
   inject,
   it,
   xit,
-  TestComponentBuilder,
-  asNativeElements,
-  By
+  TestComponentBuilder
 } from 'angular2/test_lib';
-
 import {MapWrapper} from 'angular2/src/core/facade/collection';
 import {isBlank} from 'angular2/src/core/facade/lang';
-
 import {HtmlParser} from 'angular2/src/compiler/html_parser';
 import {DirectiveMetadata, TypeMetadata, ChangeDetectionMetadata} from 'angular2/src/compiler/api';
-
 import {MockSchemaRegistry} from './template_parser_spec';
-
 import {TemplateParser} from 'angular2/src/compiler/template_parser';
-
 import {
   Parser,
   Lexer,
@@ -38,10 +31,7 @@ import {
   BindingTarget,
   ChangeDetector
 } from 'angular2/src/core/change_detection/change_detection';
-
 import {Pipes} from 'angular2/src/core/change_detection/pipes';
-
-
 import {createChangeDetectorDefinitions} from 'angular2/src/compiler/change_definition_factory';
 
 export function main() {
diff --git a/modules/angular2/test/compiler/template_loader_spec.ts b/modules/angular2/test/compiler/template_loader_spec.ts
index 11bb454040..be96316911 100644
--- a/modules/angular2/test/compiler/template_loader_spec.ts
+++ b/modules/angular2/test/compiler/template_loader_spec.ts
@@ -9,9 +9,7 @@ import {
   inject,
   it,
   xit,
-  TestComponentBuilder,
-  asNativeElements,
-  By
+  TestComponentBuilder
 } from 'angular2/test_lib';
 
 import {HtmlParser} from 'angular2/src/compiler/html_parser';
diff --git a/modules/angular2/test/core/application_spec.ts b/modules/angular2/test/core/application_spec.ts
index 203fb1b90b..4c54034843 100644
--- a/modules/angular2/test/core/application_spec.ts
+++ b/modules/angular2/test/core/application_spec.ts
@@ -11,15 +11,15 @@ import {
   xit
 } from 'angular2/test_lib';
 import {isPresent, stringify} from 'angular2/src/core/facade/lang';
-import {bootstrap, ApplicationRef} from 'angular2/src/core/application';
-import {Component, Directive, View} from 'angular2/metadata';
+import {bootstrap} from 'angular2/bootstrap';
+import {Component, Directive, View} from 'angular2/src/core/metadata';
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
+import {DOCUMENT} from 'angular2/render';
 import {PromiseWrapper} from 'angular2/src/core/facade/async';
-import {bind, Inject, Injector} from 'angular2/di';
-import {LifeCycle} from 'angular2/core';
+import {bind, Inject, Injector, LifeCycle} from 'angular2/core';
+import {ApplicationRef} from 'angular2/src/core/application_ref';
 import {ExceptionHandler} from 'angular2/src/core/exception_handler';
 import {Testability, TestabilityRegistry} from 'angular2/src/core/testability/testability';
-import {DOCUMENT} from 'angular2/src/core/render/render';
 import {IS_DART} from '../platform';
 
 @Component({selector: 'hello-app'})
diff --git a/modules/angular2/test/core/change_detection/differs/iterable_differs_spec.ts b/modules/angular2/test/core/change_detection/differs/iterable_differs_spec.ts
index de0dba23bf..c35e5f4db2 100644
--- a/modules/angular2/test/core/change_detection/differs/iterable_differs_spec.ts
+++ b/modules/angular2/test/core/change_detection/differs/iterable_differs_spec.ts
@@ -1,7 +1,7 @@
 import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach} from 'angular2/test_lib';
 import {SpyIterableDifferFactory} from '../../spies';
 import {IterableDiffers} from 'angular2/src/core/change_detection/differs/iterable_differs';
-import {Injector, bind} from 'angular2/di';
+import {Injector, bind} from 'angular2/core';
 
 export function main() {
   describe('IterableDiffers', function() {
diff --git a/modules/angular2/test/core/compiler/compiler_spec.ts b/modules/angular2/test/core/compiler/compiler_spec.ts
index f1b7c62d1a..386a817cea 100644
--- a/modules/angular2/test/core/compiler/compiler_spec.ts
+++ b/modules/angular2/test/core/compiler/compiler_spec.ts
@@ -20,7 +20,7 @@ import {AppProtoView} from 'angular2/src/core/compiler/view';
 import {ElementBinder} from 'angular2/src/core/compiler/element_binder';
 import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver';
 import {PipeResolver} from 'angular2/src/core/compiler/pipe_resolver';
-import {Attribute, ViewMetadata, Component, Directive, Pipe} from 'angular2/metadata';
+import {Attribute, ViewMetadata, Component, Directive, Pipe} from 'angular2/src/core/metadata';
 import {internalProtoView} from 'angular2/src/core/compiler/view_ref';
 import {DirectiveBinding} from 'angular2/src/core/compiler/element_injector';
 import {ViewResolver} from 'angular2/src/core/compiler/view_resolver';
diff --git a/modules/angular2/test/core/compiler/directive_resolver_spec.ts b/modules/angular2/test/core/compiler/directive_resolver_spec.ts
index 68c233246d..4c338cd83f 100644
--- a/modules/angular2/test/core/compiler/directive_resolver_spec.ts
+++ b/modules/angular2/test/core/compiler/directive_resolver_spec.ts
@@ -7,7 +7,7 @@ import {
   Event,
   HostBinding,
   HostListener
-} from 'angular2/metadata';
+} from 'angular2/src/core/metadata';
 
 @Directive({selector: 'someDirective'})
 class SomeDirective {
diff --git a/modules/angular2/test/core/compiler/dynamic_component_loader_spec.ts b/modules/angular2/test/core/compiler/dynamic_component_loader_spec.ts
index 05630afb38..6751715202 100644
--- a/modules/angular2/test/core/compiler/dynamic_component_loader_spec.ts
+++ b/modules/angular2/test/core/compiler/dynamic_component_loader_spec.ts
@@ -13,15 +13,13 @@ import {
   it,
   xit,
   TestComponentBuilder,
-  RootTestComponent,
-  inspectElement,
-  By
+  RootTestComponent
 } from 'angular2/test_lib';
 
-import {Injector} from 'angular2/di';
-import {NgIf} from 'angular2/directives';
-import {Component, View, ViewMetadata} from 'angular2/metadata';
 import {OnDestroy} from 'angular2/lifecycle_hooks';
+import {Injector, NgIf} from 'angular2/core';
+import {inspectElement, By} from 'angular2/src/core/debug';
+import {Component, View, ViewMetadata} from 'angular2/src/core/metadata';
 import {DynamicComponentLoader} from 'angular2/src/core/compiler/dynamic_component_loader';
 import {ElementRef} from 'angular2/src/core/compiler/element_ref';
 import {DOCUMENT} from 'angular2/src/core/render/render';
diff --git a/modules/angular2/test/core/compiler/element_injector_spec.ts b/modules/angular2/test/core/compiler/element_injector_spec.ts
index 9bff98be77..cf002f2b3b 100644
--- a/modules/angular2/test/core/compiler/element_injector_spec.ts
+++ b/modules/angular2/test/core/compiler/element_injector_spec.ts
@@ -36,9 +36,9 @@ import {
   ViewQuery,
   ComponentMetadata,
   DirectiveMetadata
-} from 'angular2/metadata';
+} from 'angular2/src/core/metadata';
 import {OnDestroy} from 'angular2/lifecycle_hooks';
-import {bind, Injector, Binding, Optional, Inject, Injectable, Self, SkipSelf, InjectMetadata, Host, HostMetadata, SkipSelfMetadata} from 'angular2/di';
+import {bind, Injector, Binding, Optional, Inject, Injectable, Self, SkipSelf, InjectMetadata, Host, HostMetadata, SkipSelfMetadata} from 'angular2/core';
 import {ViewContainerRef} from 'angular2/src/core/compiler/view_container_ref';
 import {TemplateRef} from 'angular2/src/core/compiler/template_ref';
 import {ElementRef} from 'angular2/src/core/compiler/element_ref';
diff --git a/modules/angular2/test/core/compiler/integration_dart_spec.dart b/modules/angular2/test/core/compiler/integration_dart_spec.dart
index 4d6d15f191..cfd9ff3950 100644
--- a/modules/angular2/test/core/compiler/integration_dart_spec.dart
+++ b/modules/angular2/test/core/compiler/integration_dart_spec.dart
@@ -2,10 +2,10 @@
 library angular2.test.di.integration_dart_spec;
 
 import 'package:angular2/angular2.dart';
-import 'package:angular2/di.dart';
+import 'package:angular2/core.dart';
+import 'package:angular2/src/core/debug.dart';
 import 'package:angular2/test_lib.dart';
 import 'package:observe/observe.dart';
-import 'package:angular2/src/core/directives/observable_list_diff.dart';
 import 'package:angular2/src/core/change_detection/differs/default_iterable_differ.dart';
 import 'package:angular2/src/core/change_detection/change_detection.dart';
 
diff --git a/modules/angular2/test/core/compiler/integration_spec.ts b/modules/angular2/test/core/compiler/integration_spec.ts
index 2a60b1f923..a0336aeeec 100644
--- a/modules/angular2/test/core/compiler/integration_spec.ts
+++ b/modules/angular2/test/core/compiler/integration_spec.ts
@@ -52,8 +52,10 @@ import {
   Inject,
   Host,
   SkipSelf,
-  SkipSelfMetadata
-} from 'angular2/di';
+  SkipSelfMetadata,
+  NgIf,
+  NgFor
+} from 'angular2/core';
 
 import {
   PipeTransform,
@@ -76,13 +78,10 @@ import {
   Event,
   HostBinding,
   HostListener
-} from 'angular2/metadata';
+} from 'angular2/src/core/metadata';
 
 import {QueryList} from 'angular2/src/core/compiler/query_list';
 
-import {NgIf} from 'angular2/src/core/directives/ng_if';
-import {NgFor} from 'angular2/src/core/directives/ng_for';
-
 import {ViewContainerRef} from 'angular2/src/core/compiler/view_container_ref';
 import {ViewRef} from 'angular2/src/core/compiler/view_ref';
 
diff --git a/modules/angular2/test/core/compiler/projection_integration_spec.ts b/modules/angular2/test/core/compiler/projection_integration_spec.ts
index 31cc5d889e..2fdf95dd9e 100644
--- a/modules/angular2/test/core/compiler/projection_integration_spec.ts
+++ b/modules/angular2/test/core/compiler/projection_integration_spec.ts
@@ -17,23 +17,25 @@ import {
   TestComponentBuilder,
   RootTestComponent,
   fakeAsync,
-  tick,
-  By
+  tick
 } from 'angular2/test_lib';
 
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 
 import {
+  bind,
   forwardRef,
-  ViewContainerRef,
+  Component,
+  Directive,
   ElementRef,
   TemplateRef,
-  bind,
-  ViewEncapsulation
-} from 'angular2/angular2';
-import {Component, Directive, View, ViewMetadata} from 'angular2/metadata';
-
-import {MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE} from 'angular2/src/core/render/render';
+  View,
+  ViewContainerRef,
+  ViewEncapsulation,
+  ViewMetadata
+} from 'angular2/core';
+import {By} from 'angular2/src/core/debug';
+import {MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE} from 'angular2/src/core/render';
 
 export function main() {
   describe('projection', () => {
diff --git a/modules/angular2/test/core/compiler/proto_view_factory_spec.ts b/modules/angular2/test/core/compiler/proto_view_factory_spec.ts
index 843e70a655..bfb5003090 100644
--- a/modules/angular2/test/core/compiler/proto_view_factory_spec.ts
+++ b/modules/angular2/test/core/compiler/proto_view_factory_spec.ts
@@ -29,8 +29,8 @@ import {
   createDirectiveVariableBindings,
   createVariableLocations
 } from 'angular2/src/core/compiler/proto_view_factory';
-import {Component, Directive} from 'angular2/metadata';
-import {Key, Binding} from 'angular2/di';
+import {Component, Directive} from 'angular2/src/core/metadata';
+import {Key, Binding} from 'angular2/core';
 import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver';
 import {DirectiveBinding} from 'angular2/src/core/compiler/element_injector';
 import {
diff --git a/modules/angular2/test/core/compiler/query_integration_spec.ts b/modules/angular2/test/core/compiler/query_integration_spec.ts
index 74e628749a..86ccc5a67e 100644
--- a/modules/angular2/test/core/compiler/query_integration_spec.ts
+++ b/modules/angular2/test/core/compiler/query_integration_spec.ts
@@ -10,16 +10,24 @@ import {
   it,
   xit,
   TestComponentBuilder,
-  asNativeElements,
-  By
 } from 'angular2/test_lib';
 
 
-import {Injectable, Optional} from 'angular2/di';
-import {QueryList, TemplateRef} from 'angular2/core';
-import {Query, ViewQuery, Component, Directive, View} from 'angular2/metadata';
+import {
+  Component,
+  Directive,
+  Injectable,
+  NgIf,
+  NgFor,
+  Optional,
+  TemplateRef,
+  Query,
+  QueryList,
+  View,
+  ViewQuery
+} from 'angular2/core';
 
-import {NgIf, NgFor} from 'angular2/angular2';
+import {asNativeElements} from 'angular2/src/core/debug';
 
 import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter';
 
diff --git a/modules/angular2/test/core/compiler/view_manager_spec.ts b/modules/angular2/test/core/compiler/view_manager_spec.ts
index 670a95cd81..bc1f97add3 100644
--- a/modules/angular2/test/core/compiler/view_manager_spec.ts
+++ b/modules/angular2/test/core/compiler/view_manager_spec.ts
@@ -13,9 +13,8 @@ import {
   it,
   xit
 } from 'angular2/test_lib';
-
 import {SpyRenderer, SpyAppViewPool, SpyAppViewListener} from '../spies';
-import {Injector, bind} from 'angular2/di';
+import {Injector, bind} from 'angular2/core';
 
 import {
   AppProtoView,
diff --git a/modules/angular2/test/core/compiler/view_manager_utils_spec.ts b/modules/angular2/test/core/compiler/view_manager_utils_spec.ts
index debf75aded..9cc78eba5b 100644
--- a/modules/angular2/test/core/compiler/view_manager_utils_spec.ts
+++ b/modules/angular2/test/core/compiler/view_manager_utils_spec.ts
@@ -24,7 +24,7 @@ import {
   SpyPreBuiltObjects
 } from '../spies';
 
-import {Injector, bind} from 'angular2/di';
+import {Injector, bind} from 'angular2/core';
 import {isBlank, isPresent} from 'angular2/src/core/facade/lang';
 import {MapWrapper, ListWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
 
@@ -37,7 +37,7 @@ import {
   ProtoElementInjector
 } from 'angular2/src/core/compiler/element_injector';
 import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver';
-import {Component} from 'angular2/metadata';
+import {Component} from 'angular2/src/core/metadata';
 import {AppViewManagerUtils} from 'angular2/src/core/compiler/view_manager_utils';
 import {
   RenderProtoViewMergeMapping,
diff --git a/modules/angular2/test/core/debug/debug_element_spec.ts b/modules/angular2/test/core/debug/debug_element_spec.ts
index 3b2d523ee5..1e1e7640af 100644
--- a/modules/angular2/test/core/debug/debug_element_spec.ts
+++ b/modules/angular2/test/core/debug/debug_element_spec.ts
@@ -11,25 +11,21 @@ import {
   beforeEachBindings,
   it,
   xit,
-  TestComponentBuilder,
-  By,
-  Scope
+  TestComponentBuilder
 } from 'angular2/test_lib';
 
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 
-import {ListWrapper} from 'angular2/src/core/facade/collection';
 import {PromiseWrapper, EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async';
 
-import {Injectable} from 'angular2/di';
+import {Injectable, NgFor} from 'angular2/core';
+import {By, Scope} from 'angular2/src/core/debug';
 
 import {
   Directive,
   Component,
   View,
-} from 'angular2/metadata';
-
-import {NgFor} from 'angular2/src/core/directives/ng_for';
+} from 'angular2/src/core/metadata';
 
 @Injectable()
 class Logger {
diff --git a/modules/angular2/test/core/debug/debug_element_view_listener_spec.ts b/modules/angular2/test/core/debug/debug_element_view_listener_spec.ts
index 6260ee5889..596172e6e7 100644
--- a/modules/angular2/test/core/debug/debug_element_view_listener_spec.ts
+++ b/modules/angular2/test/core/debug/debug_element_view_listener_spec.ts
@@ -12,18 +12,11 @@ import {
   it,
   xit,
   TestComponentBuilder,
-  By,
-  Scope,
-  inspectNativeElement
 } from 'angular2/test_lib';
 import {global} from 'angular2/src/core/facade/lang';
 import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/compiler/view_pool';
-import {Injectable, bind} from 'angular2/di';
-import {
-  Directive,
-  Component,
-  View,
-} from 'angular2/metadata';
+import {bind, Component, Directive, Injectable, View} from 'angular2/core';
+import {inspectNativeElement} from 'angular2/src/core/debug';
 import {IS_DART} from '../../platform';
 
 @Component({selector: 'my-comp'})
diff --git a/modules/angular2/test/core/di/binding_dart_spec.dart b/modules/angular2/test/core/di/binding_dart_spec.dart
index ea4a2d1985..0fac5dbf6c 100644
--- a/modules/angular2/test/core/di/binding_dart_spec.dart
+++ b/modules/angular2/test/core/di/binding_dart_spec.dart
@@ -4,7 +4,7 @@ library angular2.test.di.binding_dart_spec;
 
 import 'dart:mirrors';
 import 'package:angular2/test_lib.dart';
-import 'package:angular2/di.dart';
+import 'package:angular2/core.dart';
 
 main() {
   describe('Binding', () {
diff --git a/modules/angular2/test/core/di/forward_ref_spec.ts b/modules/angular2/test/core/di/forward_ref_spec.ts
index fe43c2b0fd..e39e5b8935 100644
--- a/modules/angular2/test/core/di/forward_ref_spec.ts
+++ b/modules/angular2/test/core/di/forward_ref_spec.ts
@@ -9,7 +9,7 @@ import {
   it,
   xit,
 } from 'angular2/test_lib';
-import {forwardRef, resolveForwardRef} from 'angular2/di';
+import {forwardRef, resolveForwardRef} from 'angular2/core';
 import {Type} from 'angular2/src/core/facade/lang';
 
 export function main() {
diff --git a/modules/angular2/test/core/di/injector_dart_spec.dart b/modules/angular2/test/core/di/injector_dart_spec.dart
index ff6a756106..a54932e08e 100644
--- a/modules/angular2/test/core/di/injector_dart_spec.dart
+++ b/modules/angular2/test/core/di/injector_dart_spec.dart
@@ -2,7 +2,7 @@
 library angular2.test.di.injector_dart_spec;
 
 import 'package:angular2/test_lib.dart';
-import 'package:angular2/di.dart';
+import 'package:angular2/core.dart';
 
 main() {
   describe('Injector', () {
diff --git a/modules/angular2/test/core/di/injector_spec.ts b/modules/angular2/test/core/di/injector_spec.ts
index 40e5871708..1ab6839e2e 100644
--- a/modules/angular2/test/core/di/injector_spec.ts
+++ b/modules/angular2/test/core/di/injector_spec.ts
@@ -19,7 +19,7 @@ import {
   BindingWithVisibility,
   Visibility,
   Binding
-} from 'angular2/di';
+} from 'angular2/core';
 
 import {InjectorInlineStrategy, InjectorDynamicStrategy} from 'angular2/src/core/di/injector';
 
diff --git a/modules/angular2/test/core/di/key_dart_spec.dart b/modules/angular2/test/core/di/key_dart_spec.dart
index 47ae22cd72..7448a88e9c 100644
--- a/modules/angular2/test/core/di/key_dart_spec.dart
+++ b/modules/angular2/test/core/di/key_dart_spec.dart
@@ -2,7 +2,7 @@
 library angular2.test.di.key_dart_spec;
 
 import 'package:angular2/test_lib.dart';
-import 'package:angular2/di.dart';
+import 'package:angular2/core.dart';
 
 main() {
   describe('TypeLiteral', () {
diff --git a/modules/angular2/test/core/di/key_spec.ts b/modules/angular2/test/core/di/key_spec.ts
index 5f36b9231d..4134949cb9 100644
--- a/modules/angular2/test/core/di/key_spec.ts
+++ b/modules/angular2/test/core/di/key_spec.ts
@@ -1,5 +1,5 @@
 import {describe, iit, it, expect, beforeEach} from 'angular2/test_lib';
-import {Key, KeyRegistry} from 'angular2/di';
+import {Key, KeyRegistry} from 'angular2/core';
 
 export function main() {
   describe("key", function() {
diff --git a/modules/angular2/test/core/directive_lifecycle_integration_spec.ts b/modules/angular2/test/core/directive_lifecycle_integration_spec.ts
index e4d8a856b0..f0ed4e4ff0 100644
--- a/modules/angular2/test/core/directive_lifecycle_integration_spec.ts
+++ b/modules/angular2/test/core/directive_lifecycle_integration_spec.ts
@@ -13,7 +13,6 @@ import {
   TestComponentBuilder
 } from 'angular2/test_lib';
 
-import {Directive, Component, View, ViewMetadata} from 'angular2/metadata';
 import {
   OnChanges,
   OnInit,
@@ -23,6 +22,7 @@ import {
   AfterViewInit,
   AfterViewChecked
 } from 'angular2/lifecycle_hooks';
+import {Directive, Component, View, ViewMetadata} from 'angular2/src/core/metadata';
 
 export function main() {
   describe('directive lifecycle integration spec', () => {
diff --git a/modules/angular2/test/core/directives/ng_if_spec.ts b/modules/angular2/test/core/directives/ng_if_spec.ts
index cfdbaf5b54..97c4447ac2 100644
--- a/modules/angular2/test/core/directives/ng_if_spec.ts
+++ b/modules/angular2/test/core/directives/ng_if_spec.ts
@@ -1,7 +1,6 @@
 import {
   AsyncTestCompleter,
   TestComponentBuilder,
-  By,
   beforeEach,
   ddescribe,
   describe,
@@ -15,9 +14,8 @@ import {
 
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 
-import {Component, View} from 'angular2/angular2';
+import {Component, View, NgIf} from 'angular2/core';
 
-import {NgIf} from 'angular2/src/core/directives/ng_if';
 import {IS_DART} from '../../platform';
 
 export function main() {
diff --git a/modules/angular2/test/core/directives/non_bindable_spec.ts b/modules/angular2/test/core/directives/non_bindable_spec.ts
index 9907ad8d83..7f1190d8f2 100644
--- a/modules/angular2/test/core/directives/non_bindable_spec.ts
+++ b/modules/angular2/test/core/directives/non_bindable_spec.ts
@@ -1,7 +1,6 @@
 import {
   AsyncTestCompleter,
   TestComponentBuilder,
-  By,
   beforeEach,
   ddescribe,
   describe,
@@ -13,13 +12,9 @@ import {
   xit,
 } from 'angular2/test_lib';
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
-
-import {Component, Directive, View} from 'angular2/angular2';
-
+import {Component, Directive, NgNonBindable, View} from 'angular2/core';
 import {ElementRef} from 'angular2/src/core/compiler/element_ref';
 
-import {NgNonBindable} from 'angular2/src/core/directives/ng_non_bindable';
-
 export function main() {
   describe('non-bindable', () => {
     it('should not interpolate children',
diff --git a/modules/angular2/test/core/directives/observable_list_diff_spec.dart b/modules/angular2/test/core/directives/observable_list_diff_spec.dart
index 0097c55106..893ef26930 100644
--- a/modules/angular2/test/core/directives/observable_list_diff_spec.dart
+++ b/modules/angular2/test/core/directives/observable_list_diff_spec.dart
@@ -1,9 +1,8 @@
 library angular2.test.directives.observable_list_iterable_diff_spec;
 
 import 'package:angular2/test_lib.dart';
-import 'package:angular2/change_detection.dart';
 import 'package:observe/observe.dart' show ObservableList;
-import 'package:angular2/src/core/directives/observable_list_diff.dart';
+import 'package:angular2/core.dart' show ObservableListDiffFactory, ChangeDetectorRef;
 
 @proxy
 class SpyChangeDetectorRef extends SpyObject implements ChangeDetectorRef {
diff --git a/modules/angular2/test/core/forms/directives_spec.ts b/modules/angular2/test/core/forms/directives_spec.ts
index f7388d34f1..126889a428 100644
--- a/modules/angular2/test/core/forms/directives_spec.ts
+++ b/modules/angular2/test/core/forms/directives_spec.ts
@@ -26,7 +26,7 @@ import {
   NgModel,
   NgFormControl,
   DefaultValidators
-} from 'angular2/forms';
+} from 'angular2/core';
 
 class DummyControlValueAccessor implements ControlValueAccessor {
   writtenValue;
diff --git a/modules/angular2/test/core/forms/form_builder_spec.ts b/modules/angular2/test/core/forms/form_builder_spec.ts
index 02e33fbce8..e34db7b85a 100644
--- a/modules/angular2/test/core/forms/form_builder_spec.ts
+++ b/modules/angular2/test/core/forms/form_builder_spec.ts
@@ -9,7 +9,7 @@ import {
   afterEach,
   el
 } from 'angular2/test_lib';
-import {Control, FormBuilder, Validators} from 'angular2/forms';
+import {Control, FormBuilder, Validators} from 'angular2/core';
 
 export function main() {
   describe("Form Builder", () => {
diff --git a/modules/angular2/test/core/forms/integration_spec.ts b/modules/angular2/test/core/forms/integration_spec.ts
index 7ff6891d08..18d6c84f7e 100644
--- a/modules/angular2/test/core/forms/integration_spec.ts
+++ b/modules/angular2/test/core/forms/integration_spec.ts
@@ -3,7 +3,6 @@ import {
   afterEach,
   AsyncTestCompleter,
   TestComponentBuilder,
-  By,
   beforeEach,
   ddescribe,
   describe,
@@ -19,17 +18,18 @@ import {
 } from 'angular2/test_lib';
 
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
-import {NgIf, NgFor} from 'angular2/directives';
-
 import {
   Control,
   ControlGroup,
-  NgForm,
+  ControlValueAccessor,
   FORM_DIRECTIVES,
-  Validators,
   NgControl,
-  ControlValueAccessor
-} from 'angular2/forms';
+  NgIf,
+  NgFor,
+  NgForm,
+  Validators,
+} from 'angular2/core';
+import {By} from 'angular2/src/core/debug';
 
 export function main() {
   describe("integration tests", () => {
diff --git a/modules/angular2/test/core/forms/model_spec.ts b/modules/angular2/test/core/forms/model_spec.ts
index 04dbc06cb4..3279640464 100644
--- a/modules/angular2/test/core/forms/model_spec.ts
+++ b/modules/angular2/test/core/forms/model_spec.ts
@@ -13,7 +13,7 @@ import {
   tick,
   inject
 } from 'angular2/test_lib';
-import {ControlGroup, Control, ControlArray, Validators} from 'angular2/forms';
+import {ControlGroup, Control, ControlArray, Validators} from 'angular2/core';
 import {ObservableWrapper} from 'angular2/src/core/facade/async';
 
 export function main() {
diff --git a/modules/angular2/test/core/forms/validators_spec.ts b/modules/angular2/test/core/forms/validators_spec.ts
index f4d72f607a..b7f4911a40 100644
--- a/modules/angular2/test/core/forms/validators_spec.ts
+++ b/modules/angular2/test/core/forms/validators_spec.ts
@@ -9,7 +9,7 @@ import {
   afterEach,
   el
 } from 'angular2/test_lib';
-import {ControlGroup, Control, Validators} from 'angular2/forms';
+import {ControlGroup, Control, Validators} from 'angular2/core';
 
 export function main() {
   function validator(key: string, error: any) {
diff --git a/modules/angular2/test/core/forward_ref_integration_spec.ts b/modules/angular2/test/core/forward_ref_integration_spec.ts
index 2a7e57c3d8..912c33e9b7 100644
--- a/modules/angular2/test/core/forward_ref_integration_spec.ts
+++ b/modules/angular2/test/core/forward_ref_integration_spec.ts
@@ -1,7 +1,6 @@
 import {
   AsyncTestCompleter,
   TestComponentBuilder,
-  asNativeElements,
   beforeEach,
   ddescribe,
   describe,
@@ -11,10 +10,20 @@ import {
   it,
   xit
 } from 'angular2/test_lib';
-import {Directive, Component, Query, View} from 'angular2/metadata';
-import {QueryList, NgFor} from 'angular2/angular2';
-import {forwardRef, resolveForwardRef, bind, Inject} from 'angular2/di';
+import {
+  bind,
+  forwardRef,
+  resolveForwardRef,
+  Component,
+  Directive,
+  Inject,
+  NgFor,
+  Query,
+  QueryList,
+  View
+} from 'angular2/core';
 import {Type} from 'angular2/src/core/facade/lang';
+import {asNativeElements} from 'angular2/src/core/debug';
 
 export function main() {
   describe("forwardRef integration", function() {
diff --git a/modules/angular2/test/core/pipes/async_pipe_spec.ts b/modules/angular2/test/core/pipes/async_pipe_spec.ts
index 154c426127..c538d8a5cc 100644
--- a/modules/angular2/test/core/pipes/async_pipe_spec.ts
+++ b/modules/angular2/test/core/pipes/async_pipe_spec.ts
@@ -15,8 +15,7 @@ import {
 import {SpyChangeDetectorRef} from './spies';
 
 import {isBlank} from 'angular2/src/core/facade/lang';
-import {WrappedValue} from 'angular2/change_detection';
-import {AsyncPipe} from 'angular2/pipes';
+import {AsyncPipe, WrappedValue} from 'angular2/core';
 import {
   EventEmitter,
   ObservableWrapper,
diff --git a/modules/angular2/test/core/pipes/date_pipe_spec.ts b/modules/angular2/test/core/pipes/date_pipe_spec.ts
index c68813f331..b6e206648c 100644
--- a/modules/angular2/test/core/pipes/date_pipe_spec.ts
+++ b/modules/angular2/test/core/pipes/date_pipe_spec.ts
@@ -10,7 +10,7 @@ import {
   browserDetection
 } from 'angular2/test_lib';
 
-import {DatePipe} from 'angular2/pipes';
+import {DatePipe} from 'angular2/core';
 import {DateWrapper} from 'angular2/src/core/facade/lang';
 
 export function main() {
diff --git a/modules/angular2/test/core/pipes/json_pipe_spec.ts b/modules/angular2/test/core/pipes/json_pipe_spec.ts
index 75534bb804..9cb7e5286c 100644
--- a/modules/angular2/test/core/pipes/json_pipe_spec.ts
+++ b/modules/angular2/test/core/pipes/json_pipe_spec.ts
@@ -14,7 +14,7 @@ import {
 } from 'angular2/test_lib';
 import {Json, RegExp, NumberWrapper, StringWrapper} from 'angular2/src/core/facade/lang';
 
-import {JsonPipe} from 'angular2/pipes';
+import {JsonPipe} from 'angular2/core';
 
 export function main() {
   describe("JsonPipe", () => {
diff --git a/modules/angular2/test/core/pipes/limit_to_pipe_spec.ts b/modules/angular2/test/core/pipes/limit_to_pipe_spec.ts
index 3e50d3b43d..a57498e315 100644
--- a/modules/angular2/test/core/pipes/limit_to_pipe_spec.ts
+++ b/modules/angular2/test/core/pipes/limit_to_pipe_spec.ts
@@ -1,6 +1,6 @@
 import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach} from 'angular2/test_lib';
 
-import {LimitToPipe} from 'angular2/pipes';
+import {LimitToPipe} from 'angular2/core';
 
 export function main() {
   describe("LimitToPipe", () => {
diff --git a/modules/angular2/test/core/pipes/lowercase_pipe_spec.ts b/modules/angular2/test/core/pipes/lowercase_pipe_spec.ts
index 3f5ba4dec0..0f2c2e2a40 100644
--- a/modules/angular2/test/core/pipes/lowercase_pipe_spec.ts
+++ b/modules/angular2/test/core/pipes/lowercase_pipe_spec.ts
@@ -1,6 +1,6 @@
 import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach} from 'angular2/test_lib';
 
-import {LowerCasePipe} from 'angular2/pipes';
+import {LowerCasePipe} from 'angular2/core';
 
 export function main() {
   describe("LowerCasePipe", () => {
diff --git a/modules/angular2/test/core/pipes/number_pipe_spec.ts b/modules/angular2/test/core/pipes/number_pipe_spec.ts
index 7d7b0be948..66fd539417 100644
--- a/modules/angular2/test/core/pipes/number_pipe_spec.ts
+++ b/modules/angular2/test/core/pipes/number_pipe_spec.ts
@@ -10,7 +10,7 @@ import {
   browserDetection
 } from 'angular2/test_lib';
 
-import {DecimalPipe, PercentPipe, CurrencyPipe} from 'angular2/pipes';
+import {DecimalPipe, PercentPipe, CurrencyPipe} from 'angular2/core';
 
 export function main() {
   // TODO(mlaval): enable tests when Intl API is no longer used, see
diff --git a/modules/angular2/test/core/pipes/pipe_binding_spec.ts b/modules/angular2/test/core/pipes/pipe_binding_spec.ts
index 7cfc1ac092..32d1abb025 100644
--- a/modules/angular2/test/core/pipes/pipe_binding_spec.ts
+++ b/modules/angular2/test/core/pipes/pipe_binding_spec.ts
@@ -11,7 +11,7 @@ import {
 } from 'angular2/test_lib';
 
 import {PipeBinding} from 'angular2/src/core/pipes/pipe_binding';
-import {Pipe} from 'angular2/metadata';
+import {Pipe} from 'angular2/src/core/metadata';
 
 class MyPipe {}
 
diff --git a/modules/angular2/test/core/pipes/pipes_spec.ts b/modules/angular2/test/core/pipes/pipes_spec.ts
index e9792fcaea..32187fc286 100644
--- a/modules/angular2/test/core/pipes/pipes_spec.ts
+++ b/modules/angular2/test/core/pipes/pipes_spec.ts
@@ -10,11 +10,9 @@ import {
   afterEach
 } from 'angular2/test_lib';
 
-import {PipeTransform} from 'angular2/change_detection';
-import {Injector, Inject, bind} from 'angular2/di';
+import {Injector, Inject, bind, Pipe, PipeTransform} from 'angular2/core';
 import {ProtoPipes, Pipes} from 'angular2/src/core/pipes/pipes';
 import {PipeBinding} from 'angular2/src/core/pipes/pipe_binding';
-import {Pipe} from 'angular2/metadata';
 
 class PipeA implements PipeTransform {
   transform(a, b) {}
diff --git a/modules/angular2/test/core/pipes/uppercase_pipe_spec.ts b/modules/angular2/test/core/pipes/uppercase_pipe_spec.ts
index 1955a34879..7fbecba3c4 100644
--- a/modules/angular2/test/core/pipes/uppercase_pipe_spec.ts
+++ b/modules/angular2/test/core/pipes/uppercase_pipe_spec.ts
@@ -1,6 +1,6 @@
 import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach} from 'angular2/test_lib';
 
-import {UpperCasePipe} from 'angular2/pipes';
+import {UpperCasePipe} from 'angular2/core';
 
 export function main() {
   describe("UpperCasePipe", () => {
diff --git a/modules/angular2/test/core/render/dom/compiler/style_inliner_spec.ts b/modules/angular2/test/core/render/dom/compiler/style_inliner_spec.ts
index 96d6c5f4df..fbe76a8d85 100644
--- a/modules/angular2/test/core/render/dom/compiler/style_inliner_spec.ts
+++ b/modules/angular2/test/core/render/dom/compiler/style_inliner_spec.ts
@@ -19,7 +19,7 @@ import {Map, MapWrapper} from 'angular2/src/core/facade/collection';
 
 import {XHR} from 'angular2/src/core/render/xhr';
 
-import {bind} from 'angular2/di';
+import {bind} from 'angular2/core';
 
 export function main() {
   describe('StyleInliner', () => {
diff --git a/modules/angular2/test/core/render/dom/dom_testbed.ts b/modules/angular2/test/core/render/dom/dom_testbed.ts
index c1ca20f7ce..00777ae7ef 100644
--- a/modules/angular2/test/core/render/dom/dom_testbed.ts
+++ b/modules/angular2/test/core/render/dom/dom_testbed.ts
@@ -1,4 +1,4 @@
-import {Inject, Injectable} from 'angular2/di';
+import {Inject, Injectable} from 'angular2/core';
 import {isPresent} from 'angular2/src/core/facade/lang';
 import {MapWrapper, ListWrapper, Map} from 'angular2/src/core/facade/collection';
 import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async';
diff --git a/modules/angular2/test/core/spies.dart b/modules/angular2/test/core/spies.dart
index d21e41b337..101851af1e 100644
--- a/modules/angular2/test/core/spies.dart
+++ b/modules/angular2/test/core/spies.dart
@@ -1,6 +1,6 @@
 library core.spies;
 
-import 'package:angular2/di.dart';
+import 'package:angular2/core.dart';
 import 'package:angular2/src/core/change_detection/change_detection.dart';
 import 'package:angular2/src/core/render/api.dart';
 import 'package:angular2/src/core/compiler/directive_resolver.dart';
diff --git a/modules/angular2/test/http/backends/jsonp_backend_spec.ts b/modules/angular2/test/http/backends/jsonp_backend_spec.ts
index ba6f397047..193e48bb45 100644
--- a/modules/angular2/test/http/backends/jsonp_backend_spec.ts
+++ b/modules/angular2/test/http/backends/jsonp_backend_spec.ts
@@ -14,7 +14,7 @@ import {
 import {ObservableWrapper} from 'angular2/src/core/facade/async';
 import {BrowserJsonp} from 'angular2/src/http/backends/browser_jsonp';
 import {JSONPConnection, JSONPBackend} from 'angular2/src/http/backends/jsonp_backend';
-import {bind, Injector} from 'angular2/di';
+import {bind, Injector} from 'angular2/core';
 import {isPresent, StringWrapper} from 'angular2/src/core/facade/lang';
 import {TimerWrapper} from 'angular2/src/core/facade/async';
 import {Request} from 'angular2/src/http/static_request';
diff --git a/modules/angular2/test/http/backends/xhr_backend_spec.ts b/modules/angular2/test/http/backends/xhr_backend_spec.ts
index bd3dbbc8b5..4527565bd1 100644
--- a/modules/angular2/test/http/backends/xhr_backend_spec.ts
+++ b/modules/angular2/test/http/backends/xhr_backend_spec.ts
@@ -14,7 +14,7 @@ import {
 import {ObservableWrapper} from 'angular2/src/core/facade/async';
 import {BrowserXhr} from 'angular2/src/http/backends/browser_xhr';
 import {XHRConnection, XHRBackend} from 'angular2/src/http/backends/xhr_backend';
-import {bind, Injector} from 'angular2/di';
+import {bind, Injector} from 'angular2/core';
 import {Request} from 'angular2/src/http/static_request';
 import {Response} from 'angular2/src/http/static_response';
 import {Headers} from 'angular2/src/http/headers';
diff --git a/modules/angular2/test/http/http_spec.ts b/modules/angular2/test/http/http_spec.ts
index 9b1484d4f5..7f099ae1f7 100644
--- a/modules/angular2/test/http/http_spec.ts
+++ b/modules/angular2/test/http/http_spec.ts
@@ -11,7 +11,7 @@ import {
   xit,
   SpyObject
 } from 'angular2/test_lib';
-import {Injector, bind} from 'angular2/di';
+import {Injector, bind} from 'angular2/core';
 import {MockBackend, MockConnection} from 'angular2/src/http/backends/mock_backend';
 import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async';
 import {
diff --git a/modules/angular2/test/mock/view_resolver_mock_spec.ts b/modules/angular2/test/mock/view_resolver_mock_spec.ts
index 2e9cbd334e..5e1e2252b2 100644
--- a/modules/angular2/test/mock/view_resolver_mock_spec.ts
+++ b/modules/angular2/test/mock/view_resolver_mock_spec.ts
@@ -12,7 +12,7 @@ import {stringify} from 'angular2/src/core/facade/lang';
 
 import {MockViewResolver} from 'angular2/src/mock/view_resolver_mock';
 
-import {Component, View, ViewMetadata} from 'angular2/metadata';
+import {Component, View, ViewMetadata} from 'angular2/src/core/metadata';
 
 import {isBlank} from 'angular2/src/core/facade/lang';
 
diff --git a/modules/angular2/test/router/integration/lifecycle_hook_spec.ts b/modules/angular2/test/router/integration/lifecycle_hook_spec.ts
index 5a24268efe..c04f390d54 100644
--- a/modules/angular2/test/router/integration/lifecycle_hook_spec.ts
+++ b/modules/angular2/test/router/integration/lifecycle_hook_spec.ts
@@ -1,7 +1,6 @@
 import {
   AsyncTestCompleter,
   TestComponentBuilder,
-  asNativeElements,
   beforeEach,
   ddescribe,
   xdescribe,
@@ -15,8 +14,7 @@ import {
   xit
 } from 'angular2/test_lib';
 
-import {Injector, Inject, bind} from 'angular2/di';
-import {Component, View} from 'angular2/metadata';
+import {bind, Component, Injector, Inject, View} from 'angular2/core';
 import {isPresent} from 'angular2/src/core/facade/lang';
 import {
   Promise,
diff --git a/modules/angular2/test/router/integration/navigation_spec.ts b/modules/angular2/test/router/integration/navigation_spec.ts
index cb3eb4bffa..2dccf54f21 100644
--- a/modules/angular2/test/router/integration/navigation_spec.ts
+++ b/modules/angular2/test/router/integration/navigation_spec.ts
@@ -1,7 +1,6 @@
 import {
   AsyncTestCompleter,
   TestComponentBuilder,
-  asNativeElements,
   beforeEach,
   ddescribe,
   xdescribe,
@@ -15,8 +14,7 @@ import {
   xit
 } from 'angular2/test_lib';
 
-import {Injector, Inject, bind} from 'angular2/di';
-import {Component, View} from 'angular2/metadata';
+import {bind, Component, View, Injector, Inject} from 'angular2/core';
 import {CONST, NumberWrapper, isPresent, Json} from 'angular2/src/core/facade/lang';
 import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async';
 
diff --git a/modules/angular2/test/router/integration/router_integration_spec.ts b/modules/angular2/test/router/integration/router_integration_spec.ts
index abb0947065..06a8039be5 100644
--- a/modules/angular2/test/router/integration/router_integration_spec.ts
+++ b/modules/angular2/test/router/integration/router_integration_spec.ts
@@ -14,10 +14,10 @@ import {
   xit,
 } from 'angular2/test_lib';
 
-import {bootstrap} from 'angular2/src/core/application';
-import {Component, Directive, View} from 'angular2/metadata';
+import {bootstrap} from 'angular2/bootstrap';
+import {Component, Directive, View} from 'angular2/src/core/metadata';
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
-import {bind} from 'angular2/di';
+import {bind} from 'angular2/core';
 import {DOCUMENT} from 'angular2/src/core/render/render';
 import {RouteConfig, Route, Redirect} from 'angular2/src/router/route_config_decorator';
 import {PromiseWrapper} from 'angular2/src/core/facade/async';
diff --git a/modules/angular2/test/router/integration/router_link_spec.ts b/modules/angular2/test/router/integration/router_link_spec.ts
index 8c9d0e3d2b..f0353e14d2 100644
--- a/modules/angular2/test/router/integration/router_link_spec.ts
+++ b/modules/angular2/test/router/integration/router_link_spec.ts
@@ -13,13 +13,12 @@ import {
   xit,
   TestComponentBuilder,
   proxy,
-  SpyObject,
-  By
+  SpyObject
 } from 'angular2/test_lib';
 
 import {NumberWrapper} from 'angular2/src/core/facade/lang';
 
-import {bind, Component, View} from 'angular2/angular2';
+import {bind, Component, DirectiveResolver, View} from 'angular2/core';
 
 import {SpyLocation} from 'angular2/src/mock/location_mock';
 import {
@@ -35,7 +34,6 @@ import {
   RouteConfig,
   ROUTER_DIRECTIVES
 } from 'angular2/router';
-import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver';
 
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 
diff --git a/modules/angular2/test/router/location_spec.ts b/modules/angular2/test/router/location_spec.ts
index 51f91d1733..1fe0bd5f28 100644
--- a/modules/angular2/test/router/location_spec.ts
+++ b/modules/angular2/test/router/location_spec.ts
@@ -12,7 +12,7 @@ import {
   SpyObject
 } from 'angular2/test_lib';
 
-import {Injector, bind} from 'angular2/di';
+import {Injector, bind} from 'angular2/core';
 import {CONST_EXPR} from 'angular2/src/core/facade/lang';
 import {Location, APP_BASE_HREF} from 'angular2/src/router/location';
 import {LocationStrategy} from 'angular2/src/router/location_strategy';
diff --git a/modules/angular2/test/router/route_config_spec.ts b/modules/angular2/test/router/route_config_spec.ts
index 6cd0696dcd..7f3ca829b2 100644
--- a/modules/angular2/test/router/route_config_spec.ts
+++ b/modules/angular2/test/router/route_config_spec.ts
@@ -12,9 +12,9 @@ import {
 } from 'angular2/test_lib';
 
 import {bootstrap} from 'angular2/bootstrap';
-import {Component, Directive, View} from 'angular2/metadata';
+import {Component, Directive, View} from 'angular2/src/core/metadata';
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
-import {bind} from 'angular2/di';
+import {bind} from 'angular2/core';
 import {DOCUMENT} from 'angular2/src/core/render/render';
 import {Type} from 'angular2/src/core/facade/lang';
 
diff --git a/modules/angular2/test/router/router_link_spec.ts b/modules/angular2/test/router/router_link_spec.ts
index 443e108c57..bbb86323f3 100644
--- a/modules/angular2/test/router/router_link_spec.ts
+++ b/modules/angular2/test/router/router_link_spec.ts
@@ -11,13 +11,13 @@ import {
   beforeEachBindings,
   it,
   xit,
-  TestComponentBuilder,
-  By
+  TestComponentBuilder
 } from 'angular2/test_lib';
 
 import {SpyRouter, SpyLocation} from './spies';
 
-import {bind, Component, View} from 'angular2/angular2';
+import {bind, Component, View} from 'angular2/core';
+import {By} from 'angular2/src/core/debug';
 
 import {
   Location,
diff --git a/modules/angular2/test/router/router_spec.ts b/modules/angular2/test/router/router_spec.ts
index 1419cad5b8..765aed00d7 100644
--- a/modules/angular2/test/router/router_spec.ts
+++ b/modules/angular2/test/router/router_spec.ts
@@ -25,7 +25,7 @@ import {RouteRegistry} from 'angular2/src/router/route_registry';
 import {RouteConfig, AsyncRoute, Route} from 'angular2/src/router/route_config_decorator';
 import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver';
 
-import {bind} from 'angular2/di';
+import {bind} from 'angular2/core';
 
 export function main() {
   describe('Router', () => {
diff --git a/modules/angular2/test/test_lib/test_component_builder_spec.ts b/modules/angular2/test/test_lib/test_component_builder_spec.ts
index ce07ee59e8..8ba7c38651 100644
--- a/modules/angular2/test/test_lib/test_component_builder_spec.ts
+++ b/modules/angular2/test/test_lib/test_component_builder_spec.ts
@@ -14,11 +14,9 @@ import {
   TestComponentBuilder
 } from 'angular2/test_lib';
 
-import {Injectable} from 'angular2/di';
+import {Injectable, NgIf} from 'angular2/core';
 
-import {Directive, Component, View, ViewMetadata} from 'angular2/metadata';
-
-import {NgIf} from 'angular2/src/core/directives/ng_if';
+import {Directive, Component, View, ViewMetadata} from 'angular2/src/core/metadata';
 
 @Component({selector: 'child-comp'})
 @View({template: `<span>Original {{childBinding}}</span>`, directives: []})
diff --git a/modules/angular2/test/web_workers/shared/service_message_broker_spec.ts b/modules/angular2/test/web_workers/shared/service_message_broker_spec.ts
index 70adf38aa8..422bdb40ab 100644
--- a/modules/angular2/test/web_workers/shared/service_message_broker_spec.ts
+++ b/modules/angular2/test/web_workers/shared/service_message_broker_spec.ts
@@ -14,7 +14,7 @@ import {createPairedMessageBuses} from '../shared/web_worker_test_util';
 import {Serializer, PRIMITIVE} from 'angular2/src/web_workers/shared/serializer';
 import {ServiceMessageBroker} from 'angular2/src/web_workers/shared/service_message_broker';
 import {ObservableWrapper, PromiseWrapper} from 'angular2/src/core/facade/async';
-import {bind} from 'angular2/di';
+import {bind} from 'angular2/core';
 import {ON_WEB_WORKER} from 'angular2/src/web_workers/shared/api';
 import {RenderProtoViewRefStore} from 'angular2/src/web_workers/shared/render_proto_view_ref_store';
 import {
diff --git a/modules/angular2/test/web_workers/worker/event_dispatcher_spec.ts b/modules/angular2/test/web_workers/worker/event_dispatcher_spec.ts
index 8a1686884b..44ecbca7d2 100644
--- a/modules/angular2/test/web_workers/worker/event_dispatcher_spec.ts
+++ b/modules/angular2/test/web_workers/worker/event_dispatcher_spec.ts
@@ -13,7 +13,7 @@ import {
 import {Serializer} from 'angular2/src/web_workers/shared/serializer';
 import {NgZone} from 'angular2/src/core/zone/ng_zone';
 import {ON_WEB_WORKER} from 'angular2/src/web_workers/shared/api';
-import {bind} from 'angular2/di';
+import {bind} from 'angular2/core';
 import {RenderProtoViewRefStore} from 'angular2/src/web_workers/shared/render_proto_view_ref_store';
 import {
   RenderViewWithFragmentsStore,
diff --git a/modules/angular2/test/web_workers/worker/renderer_integration_spec.ts b/modules/angular2/test/web_workers/worker/renderer_integration_spec.ts
index 826c9b5ea5..c5adb4e688 100644
--- a/modules/angular2/test/web_workers/worker/renderer_integration_spec.ts
+++ b/modules/angular2/test/web_workers/worker/renderer_integration_spec.ts
@@ -10,7 +10,7 @@ import {
 } from "angular2/test_lib";
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 import {DomTestbed, TestRootView, elRef} from '../../core/render/dom/dom_testbed';
-import {bind} from 'angular2/di';
+import {bind} from 'angular2/core';
 import {WebWorkerCompiler, WebWorkerRenderer} from "angular2/src/web_workers/worker/renderer";
 import {
   ClientMessageBrokerFactory,
diff --git a/modules/angular2/web_worker/worker.ts b/modules/angular2/web_worker/worker.ts
index 6292d5d337..4296e93cd9 100644
--- a/modules/angular2/web_worker/worker.ts
+++ b/modules/angular2/web_worker/worker.ts
@@ -1,11 +1,25 @@
-export * from '../metadata';
 export * from '../lifecycle_hooks';
-export * from '../change_detection';
-export * from '../core';
-export * from '../di';
-export * from '../directives';
-export * from '../forms';
-export * from '../render';
+export * from '../src/core/metadata';
+export * from '../src/core/util';
+export * from '../src/core/di';
+export * from '../src/core/pipes';
+export * from '../src/core/facade';
+// Do not export application in web_worker,
+// web_worker exports its own
+// export * from '../src/core/application';
+export * from '../src/core/services';
+export * from '../src/core/compiler';
+export * from '../src/core/lifecycle';
+export * from '../src/core/zone';
+// Do not export render in web_worker
+// export * from '../src/core/render';
+// Add special import for just render API
+export * from '../src/core/render/api';
+export * from '../src/core/directives';
+export * from '../src/core/forms';
+export * from '../src/core/debug';
+export * from '../src/core/change_detection';
+
 export * from '../profile';
 export * from '../src/web_workers/worker/application';
 export * from '../src/web_workers/shared/client_message_broker';
diff --git a/modules/angular2_material/src/components/dialog/dialog.ts b/modules/angular2_material/src/components/dialog/dialog.ts
index 3bf70c54c7..774131db0e 100644
--- a/modules/angular2_material/src/components/dialog/dialog.ts
+++ b/modules/angular2_material/src/components/dialog/dialog.ts
@@ -1,16 +1,20 @@
 import {
+  bind,
+  forwardRef,
   Component,
-  Directive,
-  View,
-  ViewEncapsulation,
-  Host,
-  SkipSelf,
-  ElementRef,
-  DynamicComponentLoader,
   ComponentRef,
-  DomRenderer
-} from 'angular2/angular2';
-import {bind, Injectable, forwardRef, ResolvedBinding, Injector} from 'angular2/di';
+  Directive,
+  DynamicComponentLoader,
+  ElementRef,
+  Host,
+  Injectable,
+  ResolvedBinding,
+  SkipSelf,
+  Injector,
+  View,
+  ViewEncapsulation
+} from 'angular2/core';
+import {DomRenderer} from 'angular2/render';
 
 import {ObservableWrapper, Promise, PromiseWrapper} from 'angular2/src/core/facade/async';
 import {isPresent, Type} from 'angular2/src/core/facade/lang';
diff --git a/modules/benchmarks/src/compiler/compiler_benchmark.ts b/modules/benchmarks/src/compiler/compiler_benchmark.ts
index 526f9de767..e4bfc71258 100644
--- a/modules/benchmarks/src/compiler/compiler_benchmark.ts
+++ b/modules/benchmarks/src/compiler/compiler_benchmark.ts
@@ -13,7 +13,7 @@ import {Compiler, CompilerCache} from 'angular2/src/core/compiler/compiler';
 import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver';
 import {PipeResolver} from 'angular2/src/core/compiler/pipe_resolver';
 
-import {Component, Directive, View, ViewMetadata} from 'angular2/metadata';
+import {Component, Directive, View, ViewMetadata} from 'angular2/src/core/metadata';
 import {ViewResolver} from 'angular2/src/core/compiler/view_resolver';
 import {UrlResolver} from 'angular2/src/core/services/url_resolver';
 import {AppRootUrl} from 'angular2/src/core/services/app_root_url';
diff --git a/modules/benchmarks/src/costs/index.ts b/modules/benchmarks/src/costs/index.ts
index 22e4256e68..7c8de8caea 100644
--- a/modules/benchmarks/src/costs/index.ts
+++ b/modules/benchmarks/src/costs/index.ts
@@ -1,15 +1,16 @@
+import {bootstrap} from 'angular2/bootstrap';
 import {
-  bootstrap,
   Component,
   Directive,
   DynamicComponentLoader,
   ElementRef,
-  View
-} from 'angular2/bootstrap';
+  View,
+  NgIf,
+  NgFor
+} from 'angular2/core';
 import {LifeCycle} from 'angular2/src/core/life_cycle/life_cycle';
 import {ListWrapper} from 'angular2/src/core/facade/collection';
 import {getIntParameter, bindAction} from 'angular2/src/test_lib/benchmark_util';
-import {NgIf, NgFor} from 'angular2/directives';
 
 var testList = null;
 
diff --git a/modules/benchmarks/src/di/di_benchmark.ts b/modules/benchmarks/src/di/di_benchmark.ts
index 82c57a72ba..23865d4013 100644
--- a/modules/benchmarks/src/di/di_benchmark.ts
+++ b/modules/benchmarks/src/di/di_benchmark.ts
@@ -1,4 +1,4 @@
-import {Injectable, Injector, Key, bind} from "angular2/di";
+import {Injectable, Injector, Key, bind} from "angular2/core";
 import {reflector} from 'angular2/src/core/reflection/reflection';
 import {ReflectionCapabilities} from 'angular2/src/core/reflection/reflection_capabilities';
 import {getIntParameter, bindAction, microBenchmark} from 'angular2/src/test_lib/benchmark_util';
diff --git a/modules/benchmarks/src/element_injector/element_injector_benchmark.ts b/modules/benchmarks/src/element_injector/element_injector_benchmark.ts
index 062f557e5b..c367be3f93 100644
--- a/modules/benchmarks/src/element_injector/element_injector_benchmark.ts
+++ b/modules/benchmarks/src/element_injector/element_injector_benchmark.ts
@@ -1,6 +1,6 @@
 import {reflector} from 'angular2/src/core/reflection/reflection';
 import {ReflectionCapabilities} from 'angular2/src/core/reflection/reflection_capabilities';
-import {Injectable, Injector} from 'angular2/di';
+import {Injectable, Injector} from 'angular2/core';
 import {ProtoElementInjector, DirectiveBinding} from 'angular2/src/core/compiler/element_injector';
 import {getIntParameter, bindAction, microBenchmark} from 'angular2/src/test_lib/benchmark_util';
 import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter';
diff --git a/modules/benchmarks/src/largetable/largetable_benchmark.ts b/modules/benchmarks/src/largetable/largetable_benchmark.ts
index 94c593606c..2750c06b08 100644
--- a/modules/benchmarks/src/largetable/largetable_benchmark.ts
+++ b/modules/benchmarks/src/largetable/largetable_benchmark.ts
@@ -1,7 +1,3 @@
-import {bootstrap, Component, Directive, View} from 'angular2/bootstrap';
-
-import {LifeCycle} from 'angular2/src/core/life_cycle/life_cycle';
-
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 import {window, document, gc} from 'angular2/src/core/facade/browser';
 import {
@@ -11,14 +7,23 @@ import {
   windowProfile,
   windowProfileEnd
 } from 'angular2/src/test_lib/benchmark_util';
-
-import {NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault} from 'angular2/directives';
+import {bootstrap} from 'angular2/bootstrap';
+import {
+  Component,
+  Directive,
+  View,
+  bind,
+  NgFor,
+  NgSwitch,
+  NgSwitchWhen,
+  NgSwitchDefault,
+  LifeCycle
+} from 'angular2/core';
 import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter';
 import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/compiler/view_pool';
 
 import {ListWrapper} from 'angular2/src/core/facade/collection';
 
-import {bind} from 'angular2/di';
 import {Inject} from 'angular2/src/core/di/decorators';
 import {reflector} from 'angular2/src/core/reflection/reflection';
 
diff --git a/modules/benchmarks/src/naive_infinite_scroll/app.ts b/modules/benchmarks/src/naive_infinite_scroll/app.ts
index cdcd02d1ee..56ba7075e7 100644
--- a/modules/benchmarks/src/naive_infinite_scroll/app.ts
+++ b/modules/benchmarks/src/naive_infinite_scroll/app.ts
@@ -2,7 +2,7 @@ import {isPresent} from 'angular2/src/core/facade/lang';
 import {getIntParameter, bindAction} from 'angular2/src/test_lib/benchmark_util';
 import {TimerWrapper} from 'angular2/src/core/facade/async';
 import {ScrollAreaComponent} from './scroll_area';
-import {NgIf, NgFor} from 'angular2/directives';
+import {NgIf, NgFor} from 'angular2/core';
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 import {document} from 'angular2/src/core/facade/browser';
 
diff --git a/modules/benchmarks/src/naive_infinite_scroll/cells.ts b/modules/benchmarks/src/naive_infinite_scroll/cells.ts
index caeb995d72..15aa4f9b69 100644
--- a/modules/benchmarks/src/naive_infinite_scroll/cells.ts
+++ b/modules/benchmarks/src/naive_infinite_scroll/cells.ts
@@ -1,6 +1,6 @@
 import {ListWrapper, Map} from 'angular2/src/core/facade/collection';
 import {Company, Opportunity, Offering, Account, CustomDate, STATUS_LIST} from './common';
-import {NgFor} from 'angular2/directives';
+import {NgFor} from 'angular2/core';
 
 import {Component, Directive, View} from 'angular2/angular2';
 
diff --git a/modules/benchmarks/src/naive_infinite_scroll/index.ts b/modules/benchmarks/src/naive_infinite_scroll/index.ts
index 846bf1f7f2..b339662a50 100644
--- a/modules/benchmarks/src/naive_infinite_scroll/index.ts
+++ b/modules/benchmarks/src/naive_infinite_scroll/index.ts
@@ -3,7 +3,7 @@ import {bootstrap} from 'angular2/bootstrap';
 import {App} from './app';
 
 import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/compiler/view_pool';
-import {bind} from 'angular2/di';
+import {bind} from 'angular2/core';
 
 export function main() {
   bootstrap(App, createBindings());
diff --git a/modules/benchmarks/src/naive_infinite_scroll/scroll_area.ts b/modules/benchmarks/src/naive_infinite_scroll/scroll_area.ts
index 73d8b8a5f9..a616d5db31 100644
--- a/modules/benchmarks/src/naive_infinite_scroll/scroll_area.ts
+++ b/modules/benchmarks/src/naive_infinite_scroll/scroll_area.ts
@@ -14,7 +14,7 @@ import {
 } from './common';
 import {generateOfferings} from './random_data';
 import {ScrollItemComponent} from './scroll_item';
-import {NgFor} from 'angular2/directives';
+import {NgFor} from 'angular2/core';
 
 @Component({
   selector: 'scroll-area',
diff --git a/modules/benchmarks/src/static_tree/tree_benchmark.ts b/modules/benchmarks/src/static_tree/tree_benchmark.ts
index 5c49f01862..524e0fcb9a 100644
--- a/modules/benchmarks/src/static_tree/tree_benchmark.ts
+++ b/modules/benchmarks/src/static_tree/tree_benchmark.ts
@@ -1,11 +1,14 @@
+import {bootstrap} from 'angular2/bootstrap';
 import {
-  bootstrap,
   Compiler,
   Component,
   Directive,
   View,
-  ViewContainerRef
-} from 'angular2/bootstrap';
+  ViewContainerRef,
+  bind,
+  Binding,
+  NgIf
+} from 'angular2/core';
 
 import {LifeCycle} from 'angular2/src/core/life_cycle/life_cycle';
 import {reflector} from 'angular2/src/core/reflection/reflection';
@@ -19,10 +22,8 @@ import {
   windowProfile,
   windowProfileEnd
 } from 'angular2/src/test_lib/benchmark_util';
-import {NgIf} from 'angular2/directives';
 import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter';
 import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/compiler/view_pool';
-import {bind, Binding} from 'angular2/di';
 
 function createBindings(): Binding[] {
   var viewCacheCapacity = getStringParameter('viewcache') == 'true' ? 10000 : 0;
diff --git a/modules/benchmarks/src/tree/tree_benchmark.ts b/modules/benchmarks/src/tree/tree_benchmark.ts
index 1d6285b0aa..c21d82c8a3 100644
--- a/modules/benchmarks/src/tree/tree_benchmark.ts
+++ b/modules/benchmarks/src/tree/tree_benchmark.ts
@@ -1,11 +1,14 @@
+import {bootstrap} from 'angular2/bootstrap';
 import {
-  bootstrap,
   Compiler,
   Component,
   Directive,
   View,
-  ViewContainerRef
-} from 'angular2/bootstrap';
+  ViewContainerRef,
+  bind,
+  Binding,
+  NgIf
+} from 'angular2/core';
 
 import {LifeCycle} from 'angular2/src/core/life_cycle/life_cycle';
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
@@ -18,10 +21,8 @@ import {
   windowProfile,
   windowProfileEnd
 } from 'angular2/src/test_lib/benchmark_util';
-import {NgIf} from 'angular2/directives';
 import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter';
 import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/compiler/view_pool';
-import {bind, Binding} from 'angular2/di';
 
 function createBindings(): Binding[] {
   var viewCacheCapacity = getStringParameter('viewcache') == 'true' ? 10000 : 1;
diff --git a/modules/benchpress/benchpress.ts b/modules/benchpress/benchpress.ts
index 7215e59dd3..b188bb3b4c 100644
--- a/modules/benchpress/benchpress.ts
+++ b/modules/benchpress/benchpress.ts
@@ -1,6 +1,6 @@
 /// <reference path="../angular2/typings/node/node.d.ts" />
 
-import {bind} from 'angular2/di';
+import {bind} from 'angular2/src/core/di';
 import {Options} from './common';
 
 export * from './common';
diff --git a/modules/benchpress/common.ts b/modules/benchpress/common.ts
index 939bedb799..992491ecf7 100644
--- a/modules/benchpress/common.ts
+++ b/modules/benchpress/common.ts
@@ -19,4 +19,4 @@ export {MeasureValues} from './src/measure_values';
 export {MultiMetric} from './src/metric/multi_metric';
 export {MultiReporter} from './src/reporter/multi_reporter';
 
-export {bind, Injector, OpaqueToken} from 'angular2/di';
+export {bind, Injector, OpaqueToken} from 'angular2/src/core/di';
diff --git a/modules/benchpress/src/common_options.ts b/modules/benchpress/src/common_options.ts
index de2ef03c86..e724463456 100644
--- a/modules/benchpress/src/common_options.ts
+++ b/modules/benchpress/src/common_options.ts
@@ -1,4 +1,4 @@
-import {bind, Binding, OpaqueToken} from 'angular2/di';
+import {bind, Binding, OpaqueToken} from 'angular2/src/core/di';
 import {DateWrapper} from 'angular2/src/core/facade/lang';
 
 export class Options {
diff --git a/modules/benchpress/src/metric.ts b/modules/benchpress/src/metric.ts
index f6707a433c..917e498a79 100644
--- a/modules/benchpress/src/metric.ts
+++ b/modules/benchpress/src/metric.ts
@@ -1,4 +1,4 @@
-import {bind, Binding} from 'angular2/di';
+import {bind, Binding} from 'angular2/src/core/di';
 import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async';
 import {ABSTRACT, BaseException} from 'angular2/src/core/facade/lang';
 import {StringMap} from 'angular2/src/core/facade/collection';
diff --git a/modules/benchpress/src/metric/multi_metric.ts b/modules/benchpress/src/metric/multi_metric.ts
index fb263289ae..923b736100 100644
--- a/modules/benchpress/src/metric/multi_metric.ts
+++ b/modules/benchpress/src/metric/multi_metric.ts
@@ -1,4 +1,4 @@
-import {bind, Binding, Injector, OpaqueToken} from 'angular2/di';
+import {bind, Binding, Injector, OpaqueToken} from 'angular2/src/core/di';
 import {ListWrapper, StringMapWrapper, StringMap} from 'angular2/src/core/facade/collection';
 import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async';
 
diff --git a/modules/benchpress/src/metric/perflog_metric.ts b/modules/benchpress/src/metric/perflog_metric.ts
index 0dde50624d..cf10a0ad38 100644
--- a/modules/benchpress/src/metric/perflog_metric.ts
+++ b/modules/benchpress/src/metric/perflog_metric.ts
@@ -9,7 +9,7 @@ import {
   NumberWrapper
 } from 'angular2/src/core/facade/lang';
 import {ListWrapper, StringMap, StringMapWrapper} from 'angular2/src/core/facade/collection';
-import {bind, Binding, OpaqueToken} from 'angular2/di';
+import {bind, Binding, OpaqueToken} from 'angular2/src/core/di';
 
 import {WebDriverExtension, PerfLogFeatures} from '../web_driver_extension';
 import {Metric} from '../metric';
diff --git a/modules/benchpress/src/reporter.ts b/modules/benchpress/src/reporter.ts
index e9f7740bc0..7d8b0beb88 100644
--- a/modules/benchpress/src/reporter.ts
+++ b/modules/benchpress/src/reporter.ts
@@ -1,4 +1,4 @@
-import {bind, Binding} from 'angular2/di';
+import {bind, Binding} from 'angular2/src/core/di';
 import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async';
 import {ABSTRACT, BaseException} from 'angular2/src/core/facade/lang';
 import {MeasureValues} from './measure_values';
diff --git a/modules/benchpress/src/reporter/console_reporter.ts b/modules/benchpress/src/reporter/console_reporter.ts
index b07a905533..db2602d475 100644
--- a/modules/benchpress/src/reporter/console_reporter.ts
+++ b/modules/benchpress/src/reporter/console_reporter.ts
@@ -2,7 +2,7 @@ import {print, isPresent, isBlank, NumberWrapper} from 'angular2/src/core/facade
 import {StringMapWrapper, ListWrapper} from 'angular2/src/core/facade/collection';
 import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async';
 import {Math} from 'angular2/src/core/facade/math';
-import {bind, Binding, OpaqueToken} from 'angular2/di';
+import {bind, Binding, OpaqueToken} from 'angular2/src/core/di';
 
 import {Statistic} from '../statistic';
 import {Reporter} from '../reporter';
diff --git a/modules/benchpress/src/reporter/json_file_reporter.ts b/modules/benchpress/src/reporter/json_file_reporter.ts
index c50cf2c709..901a416b5e 100644
--- a/modules/benchpress/src/reporter/json_file_reporter.ts
+++ b/modules/benchpress/src/reporter/json_file_reporter.ts
@@ -1,7 +1,7 @@
 import {DateWrapper, isPresent, isBlank, Json} from 'angular2/src/core/facade/lang';
 import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async';
 
-import {bind, Binding, OpaqueToken} from 'angular2/di';
+import {bind, Binding, OpaqueToken} from 'angular2/src/core/di';
 
 import {Reporter} from '../reporter';
 import {SampleDescription} from '../sample_description';
diff --git a/modules/benchpress/src/reporter/multi_reporter.ts b/modules/benchpress/src/reporter/multi_reporter.ts
index 668762f173..7edb77a28a 100644
--- a/modules/benchpress/src/reporter/multi_reporter.ts
+++ b/modules/benchpress/src/reporter/multi_reporter.ts
@@ -1,4 +1,4 @@
-import {bind, Binding, Injector, OpaqueToken} from 'angular2/di';
+import {bind, Binding, Injector, OpaqueToken} from 'angular2/src/core/di';
 import {ListWrapper} from 'angular2/src/core/facade/collection';
 import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async';
 
diff --git a/modules/benchpress/src/runner.ts b/modules/benchpress/src/runner.ts
index bcb63c2b1c..24b56c6fce 100644
--- a/modules/benchpress/src/runner.ts
+++ b/modules/benchpress/src/runner.ts
@@ -1,4 +1,4 @@
-import {Injector, bind, Binding} from 'angular2/di';
+import {Injector, bind, Binding} from 'angular2/src/core/di';
 import {isPresent, isBlank} from 'angular2/src/core/facade/lang';
 import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async';
 
diff --git a/modules/benchpress/src/sample_description.ts b/modules/benchpress/src/sample_description.ts
index 8f83764d49..2788d2962f 100644
--- a/modules/benchpress/src/sample_description.ts
+++ b/modules/benchpress/src/sample_description.ts
@@ -1,5 +1,5 @@
 import {StringMapWrapper, ListWrapper, StringMap} from 'angular2/src/core/facade/collection';
-import {bind, Binding, OpaqueToken} from 'angular2/di';
+import {bind, Binding, OpaqueToken} from 'angular2/src/core/di';
 import {Validator} from './validator';
 import {Metric} from './metric';
 import {Options} from './common_options';
diff --git a/modules/benchpress/src/sampler.ts b/modules/benchpress/src/sampler.ts
index 1acbb106f7..2ec1f16d1f 100644
--- a/modules/benchpress/src/sampler.ts
+++ b/modules/benchpress/src/sampler.ts
@@ -1,7 +1,7 @@
 import {isPresent, isBlank, Date, DateWrapper} from 'angular2/src/core/facade/lang';
 import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async';
 import {StringMapWrapper, StringMap, ListWrapper} from 'angular2/src/core/facade/collection';
-import {bind, Binding, OpaqueToken} from 'angular2/di';
+import {bind, Binding, OpaqueToken} from 'angular2/src/core/di';
 
 import {Metric} from './metric';
 import {Validator} from './validator';
diff --git a/modules/benchpress/src/validator.ts b/modules/benchpress/src/validator.ts
index e58f0519f5..4b9bc663a3 100644
--- a/modules/benchpress/src/validator.ts
+++ b/modules/benchpress/src/validator.ts
@@ -1,4 +1,4 @@
-import {bind, Binding} from 'angular2/di';
+import {bind, Binding} from 'angular2/src/core/di';
 import {StringMap} from 'angular2/src/core/facade/collection';
 import {ABSTRACT, BaseException} from 'angular2/src/core/facade/lang';
 
diff --git a/modules/benchpress/src/validator/regression_slope_validator.ts b/modules/benchpress/src/validator/regression_slope_validator.ts
index 09b0420c62..8df70687b1 100644
--- a/modules/benchpress/src/validator/regression_slope_validator.ts
+++ b/modules/benchpress/src/validator/regression_slope_validator.ts
@@ -1,5 +1,5 @@
 import {ListWrapper, StringMap} from 'angular2/src/core/facade/collection';
-import {bind, Binding, OpaqueToken} from 'angular2/di';
+import {bind, Binding, OpaqueToken} from 'angular2/src/core/di';
 
 import {Validator} from '../validator';
 import {Statistic} from '../statistic';
diff --git a/modules/benchpress/src/validator/size_validator.ts b/modules/benchpress/src/validator/size_validator.ts
index d5b07c0c90..6384f1e533 100644
--- a/modules/benchpress/src/validator/size_validator.ts
+++ b/modules/benchpress/src/validator/size_validator.ts
@@ -1,5 +1,5 @@
 import {ListWrapper, StringMap} from 'angular2/src/core/facade/collection';
-import {bind, Binding, OpaqueToken} from 'angular2/di';
+import {bind, Binding, OpaqueToken} from 'angular2/src/core/di';
 
 import {Validator} from '../validator';
 import {MeasureValues} from '../measure_values';
diff --git a/modules/benchpress/src/web_driver_adapter.ts b/modules/benchpress/src/web_driver_adapter.ts
index 3e6801702e..3dee4aff22 100644
--- a/modules/benchpress/src/web_driver_adapter.ts
+++ b/modules/benchpress/src/web_driver_adapter.ts
@@ -1,4 +1,4 @@
-import {bind, Binding} from 'angular2/di';
+import {bind, Binding} from 'angular2/src/core/di';
 import {Promise} from 'angular2/src/core/facade/async';
 import {BaseException, ABSTRACT} from 'angular2/src/core/facade/lang';
 import {Map} from 'angular2/src/core/facade/collection';
diff --git a/modules/benchpress/src/web_driver_extension.ts b/modules/benchpress/src/web_driver_extension.ts
index 12914248a9..6ff3179cff 100644
--- a/modules/benchpress/src/web_driver_extension.ts
+++ b/modules/benchpress/src/web_driver_extension.ts
@@ -1,4 +1,4 @@
-import {bind, Binding, Injector, OpaqueToken} from 'angular2/di';
+import {bind, Binding, Injector, OpaqueToken} from 'angular2/src/core/di';
 
 import {BaseException, ABSTRACT, isBlank, isPresent} from 'angular2/src/core/facade/lang';
 import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async';
diff --git a/modules/benchpress/src/webdriver/chrome_driver_extension.ts b/modules/benchpress/src/webdriver/chrome_driver_extension.ts
index 0c355e579b..279c81afc6 100644
--- a/modules/benchpress/src/webdriver/chrome_driver_extension.ts
+++ b/modules/benchpress/src/webdriver/chrome_driver_extension.ts
@@ -1,4 +1,4 @@
-import {bind, Binding} from 'angular2/di';
+import {bind, Binding} from 'angular2/src/core/di';
 import {ListWrapper, StringMapWrapper, StringMap} from 'angular2/src/core/facade/collection';
 import {
   Json,
diff --git a/modules/benchpress/src/webdriver/firefox_driver_extension.ts b/modules/benchpress/src/webdriver/firefox_driver_extension.ts
index dead668af3..188bebb2fb 100644
--- a/modules/benchpress/src/webdriver/firefox_driver_extension.ts
+++ b/modules/benchpress/src/webdriver/firefox_driver_extension.ts
@@ -1,4 +1,4 @@
-import {bind, Binding} from 'angular2/di';
+import {bind, Binding} from 'angular2/src/core/di';
 import {isPresent, StringWrapper} from 'angular2/src/core/facade/lang';
 import {WebDriverExtension, PerfLogFeatures} from '../web_driver_extension';
 import {WebDriverAdapter} from '../web_driver_adapter';
diff --git a/modules/benchpress/src/webdriver/ios_driver_extension.ts b/modules/benchpress/src/webdriver/ios_driver_extension.ts
index 33f41424e8..2582cdd507 100644
--- a/modules/benchpress/src/webdriver/ios_driver_extension.ts
+++ b/modules/benchpress/src/webdriver/ios_driver_extension.ts
@@ -1,4 +1,4 @@
-import {bind, Binding} from 'angular2/di';
+import {bind, Binding} from 'angular2/src/core/di';
 import {ListWrapper, StringMap} from 'angular2/src/core/facade/collection';
 import {
   Json,
diff --git a/modules/benchpress/src/webdriver/selenium_webdriver_adapter.ts b/modules/benchpress/src/webdriver/selenium_webdriver_adapter.ts
index 12ebd163b2..bf4a639804 100644
--- a/modules/benchpress/src/webdriver/selenium_webdriver_adapter.ts
+++ b/modules/benchpress/src/webdriver/selenium_webdriver_adapter.ts
@@ -1,5 +1,5 @@
 import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async';
-import {bind, Binding} from 'angular2/di';
+import {bind, Binding} from 'angular2/src/core/di';
 import {WebDriverAdapter} from '../web_driver_adapter';
 
 import * as webdriver from 'selenium-webdriver';
diff --git a/modules/examples/e2e_test/routing/routing_spec.ts b/modules/examples/e2e_test/routing/routing_spec.ts
index f61406bfeb..f064860a64 100644
--- a/modules/examples/e2e_test/routing/routing_spec.ts
+++ b/modules/examples/e2e_test/routing/routing_spec.ts
@@ -4,7 +4,7 @@ import {Promise} from 'angular2/src/core/facade/async';
 function waitForElement(selector) {
   var EC = (<any>protractor).ExpectedConditions;
   // Waits for the element with id 'abc' to be present on the dom.
-  browser.wait(EC.presenceOf($(selector)), 10000);
+  browser.wait(EC.presenceOf($(selector)), 20000);
 }
 
 describe('routing inbox-app', function() {
diff --git a/modules/examples/e2e_test/web_workers/kitchen_sink/kitchen_sink_spec.ts b/modules/examples/e2e_test/web_workers/kitchen_sink/kitchen_sink_spec.ts
index ddf78c329c..f0b6ffba10 100644
--- a/modules/examples/e2e_test/web_workers/kitchen_sink/kitchen_sink_spec.ts
+++ b/modules/examples/e2e_test/web_workers/kitchen_sink/kitchen_sink_spec.ts
@@ -9,14 +9,14 @@ describe('WebWorkers Kitchen Sink', function() {
   it('should greet', () => {
     browser.get(URL);
 
-    browser.wait(protractor.until.elementLocated(by.css(selector)), 5000);
+    browser.wait(protractor.until.elementLocated(by.css(selector)), 15000);
     expect(element.all(by.css(selector)).first().getText()).toEqual("hello world!");
   });
 
   it('should change greeting', () => {
     browser.get(URL);
 
-    browser.wait(protractor.until.elementLocated(by.css(selector)), 5000);
+    browser.wait(protractor.until.elementLocated(by.css(selector)), 15000);
     element(by.css("hello-app .changeButton")).click();
     var elem = element(by.css(selector));
     browser.wait(protractor.until.elementTextIs(elem, "howdy world!"), 5000);
@@ -25,7 +25,7 @@ describe('WebWorkers Kitchen Sink', function() {
 
   it("should display correct key names", () => {
     browser.get(URL);
-    browser.wait(protractor.until.elementLocated(by.css(".sample-area")), 5000);
+    browser.wait(protractor.until.elementLocated(by.css(".sample-area")), 15000);
 
     var area = element.all(by.css(".sample-area")).first();
     expect(area.getText()).toEqual('(none)');
diff --git a/modules/examples/e2e_test/web_workers/message_broker/message_broker_spec.ts b/modules/examples/e2e_test/web_workers/message_broker/message_broker_spec.ts
index 643eeccba8..2928d29b0d 100644
--- a/modules/examples/e2e_test/web_workers/message_broker/message_broker_spec.ts
+++ b/modules/examples/e2e_test/web_workers/message_broker/message_broker_spec.ts
@@ -28,5 +28,5 @@ describe("MessageBroker", function() {
 });
 
 function waitForBootstrap(): void {
-  browser.wait(protractor.until.elementLocated(by.css("app h1")), 5000);
+  browser.wait(protractor.until.elementLocated(by.css("app h1")), 15000);
 }
diff --git a/modules/examples/e2e_test/web_workers/todo/todo_spec.ts b/modules/examples/e2e_test/web_workers/todo/todo_spec.ts
index 10f4c6a44b..d30696ed38 100644
--- a/modules/examples/e2e_test/web_workers/todo/todo_spec.ts
+++ b/modules/examples/e2e_test/web_workers/todo/todo_spec.ts
@@ -16,5 +16,5 @@ describe('WebWorkers Todo', function() {
 });
 
 function waitForBootstrap(): void {
-  browser.wait(protractor.until.elementLocated(by.css("todo-app #todoapp")), 5000);
+  browser.wait(protractor.until.elementLocated(by.css("todo-app #todoapp")), 15000);
 }
diff --git a/modules/examples/src/async/index.ts b/modules/examples/src/async/index.ts
index 3ae389f088..15cc6b2315 100644
--- a/modules/examples/src/async/index.ts
+++ b/modules/examples/src/async/index.ts
@@ -1,7 +1,7 @@
-import {NgIf, bootstrap, Component, View} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/bootstrap';
+import {NgIf, Component, View} from 'angular2/core';
 import {TimerWrapper} from 'angular2/src/core/facade/async';
 
-
 @Component({selector: 'async-app'})
 @View({
   template: `
@@ -12,12 +12,12 @@ import {TimerWrapper} from 'angular2/src/core/facade/async';
     <div id='delayedIncrement'>
       <span class='val'>{{val2}}</span>
       <button class='action' (click)="delayedIncrement()">Delayed Increment</button>
-      <button class='cancel' *ng-if="timeoutId != null" (click)="cancelDelayedIncrement()">Cancel</button>              
+      <button class='cancel' *ng-if="timeoutId != null" (click)="cancelDelayedIncrement()">Cancel</button>
     </div>
     <div id='multiDelayedIncrements'>
       <span class='val'>{{val3}}</span>
       <button class='action' (click)="multiDelayedIncrements(10)">10 Delayed Increments</button>
-      <button class='cancel' *ng-if="multiTimeoutId != null" (click)="cancelMultiDelayedIncrements()">Cancel</button>              
+      <button class='cancel' *ng-if="multiTimeoutId != null" (click)="cancelMultiDelayedIncrements()">Cancel</button>
     </div>
     <div id='periodicIncrement'>
       <span class='val'>{{val4}}</span>
diff --git a/modules/examples/src/gestures/index.ts b/modules/examples/src/gestures/index.ts
index 3ac14ccd3b..24d3535f68 100644
--- a/modules/examples/src/gestures/index.ts
+++ b/modules/examples/src/gestures/index.ts
@@ -1,4 +1,5 @@
-import {bootstrap, Component, View} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/bootstrap';
+import {Component, View} from 'angular2/core';
 
 @Component({selector: 'gestures-app'})
 @View({templateUrl: 'template.html'})
diff --git a/modules/examples/src/hello_world/index_common.ts b/modules/examples/src/hello_world/index_common.ts
index 9b1ff28dce..bdc6b3db32 100644
--- a/modules/examples/src/hello_world/index_common.ts
+++ b/modules/examples/src/hello_world/index_common.ts
@@ -1,4 +1,5 @@
-import {ElementRef, Component, Directive, View, Injectable, Renderer} from 'angular2/angular2';
+import {ElementRef, Component, Directive, View, Injectable} from 'angular2/core';
+import {Renderer} from 'angular2/render';
 
 // A service available to the Injector, used by the HelloCmp component.
 @Injectable()
diff --git a/modules/examples/src/key_events/index.ts b/modules/examples/src/key_events/index.ts
index f5a23aedaf..c750946140 100644
--- a/modules/examples/src/key_events/index.ts
+++ b/modules/examples/src/key_events/index.ts
@@ -1,4 +1,5 @@
-import {bootstrap, Component, View} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/bootstrap';
+import {Component, View} from 'angular2/core';
 import {KeyEventsPlugin} from 'angular2/src/core/render/dom/events/key_events';
 
 @Component({selector: 'key-events-app'})
diff --git a/modules/examples/src/material/button/index.ts b/modules/examples/src/material/button/index.ts
index b40359782a..b099d621e2 100644
--- a/modules/examples/src/material/button/index.ts
+++ b/modules/examples/src/material/button/index.ts
@@ -1,8 +1,7 @@
-import {bootstrap, Component, View, NgFor, ViewEncapsulation} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/bootstrap';
+import {bind, Component, NgFor, UrlResolver, View, ViewEncapsulation} from 'angular2/core';
 import {MdButton, MdAnchor} from 'angular2_material/src/components/button/button';
-import {UrlResolver} from 'angular2/src/core/services/url_resolver';
 import {commonDemoSetup, DemoUrlResolver} from '../demo_common';
-import {bind} from 'angular2/di';
 
 @Component({
   selector: 'demo-app',
diff --git a/modules/examples/src/material/checkbox/index.ts b/modules/examples/src/material/checkbox/index.ts
index 03c8e59e03..a55ff6f533 100644
--- a/modules/examples/src/material/checkbox/index.ts
+++ b/modules/examples/src/material/checkbox/index.ts
@@ -1,8 +1,8 @@
-import {bootstrap, Component, Directive, View, ViewEncapsulation} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/bootstrap';
+import {bind, Component, Directive, UrlResolver, View, ViewEncapsulation} from 'angular2/core';
 import {MdCheckbox} from 'angular2_material/src/components/checkbox/checkbox';
-import {UrlResolver} from 'angular2/src/core/services/url_resolver';
 import {commonDemoSetup, DemoUrlResolver} from '../demo_common';
-import {bind} from 'angular2/di';
+
 
 @Component({
   selector: 'demo-app',
diff --git a/modules/examples/src/material/demo_common.ts b/modules/examples/src/material/demo_common.ts
index 1a4a5a09a2..7ba36b0751 100644
--- a/modules/examples/src/material/demo_common.ts
+++ b/modules/examples/src/material/demo_common.ts
@@ -8,7 +8,7 @@ import {
   BaseException
 } from 'angular2/src/core/facade/lang';
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/core';
 import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter';
 
 
diff --git a/modules/examples/src/material/dialog/index.ts b/modules/examples/src/material/dialog/index.ts
index 17928a92a9..4ebbf1fec6 100644
--- a/modules/examples/src/material/dialog/index.ts
+++ b/modules/examples/src/material/dialog/index.ts
@@ -1,19 +1,19 @@
+import {bootstrap} from 'angular2/bootstrap';
 import {
-  bootstrap,
+  bind,
   ElementRef,
   ComponentRef,
   Component,
+  UrlResolver,
   View,
   ViewEncapsulation
-} from 'angular2/bootstrap';
+} from 'angular2/core';
 import {
   MdDialog,
   MdDialogRef,
   MdDialogConfig
 } from 'angular2_material/src/components/dialog/dialog';
-import {UrlResolver} from 'angular2/src/core/services/url_resolver';
 import {commonDemoSetup, DemoUrlResolver} from '../demo_common';
-import {bind} from 'angular2/di';
 import {isPresent} from 'angular2/src/core/facade/lang';
 
 
diff --git a/modules/examples/src/material/grid_list/index.ts b/modules/examples/src/material/grid_list/index.ts
index 46938877a5..f9a7db5c6d 100644
--- a/modules/examples/src/material/grid_list/index.ts
+++ b/modules/examples/src/material/grid_list/index.ts
@@ -1,8 +1,8 @@
-import {bootstrap, Component, View, ViewEncapsulation} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/bootstrap';
+import {bind, Component, UrlResolver, View, ViewEncapsulation} from 'angular2/core';
 import {MdGridList, MdGridTile} from 'angular2_material/src/components/grid_list/grid_list';
-import {UrlResolver} from 'angular2/src/core/services/url_resolver';
 import {commonDemoSetup, DemoUrlResolver} from '../demo_common';
-import {bind} from 'angular2/di';
+
 
 @Component({
   selector: 'demo-app',
diff --git a/modules/examples/src/material/input/index.ts b/modules/examples/src/material/input/index.ts
index 7cd5c134d2..57c05a885f 100644
--- a/modules/examples/src/material/input/index.ts
+++ b/modules/examples/src/material/input/index.ts
@@ -1,8 +1,7 @@
-import {bootstrap, Component, View, ViewEncapsulation} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/bootstrap';
+import {bind, Component, UrlResolver, View, ViewEncapsulation} from 'angular2/core';
 import {MdInputContainer, MdInput} from 'angular2_material/src/components/input/input';
-import {UrlResolver} from 'angular2/src/core/services/url_resolver';
 import {commonDemoSetup, DemoUrlResolver} from '../demo_common';
-import {bind} from 'angular2/di';
 
 @Component({selector: 'demo-app'})
 @View({
diff --git a/modules/examples/src/material/progress-linear/index.ts b/modules/examples/src/material/progress-linear/index.ts
index e1b108b563..37e7f23e8e 100644
--- a/modules/examples/src/material/progress-linear/index.ts
+++ b/modules/examples/src/material/progress-linear/index.ts
@@ -1,8 +1,8 @@
-import {bootstrap, Component, View, ViewEncapsulation} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/bootstrap';
+import {bind, Component, View, ViewEncapsulation} from 'angular2/core';
 import {MdProgressLinear} from 'angular2_material/src/components/progress-linear/progress_linear';
 import {UrlResolver} from 'angular2/src/core/services/url_resolver';
 import {commonDemoSetup, DemoUrlResolver} from '../demo_common';
-import {bind} from 'angular2/di';
 
 @Component({
   selector: 'demo-app',
diff --git a/modules/examples/src/material/radio/index.ts b/modules/examples/src/material/radio/index.ts
index f2fb374474..e21dba04de 100644
--- a/modules/examples/src/material/radio/index.ts
+++ b/modules/examples/src/material/radio/index.ts
@@ -1,9 +1,8 @@
-import {bootstrap, Component, View, ViewEncapsulation} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/bootstrap';
+import {bind, Component, UrlResolver, View, ViewEncapsulation} from 'angular2/core';
 import {MdRadioButton, MdRadioGroup} from 'angular2_material/src/components/radio/radio_button';
 import {MdRadioDispatcher} from 'angular2_material/src/components/radio/radio_dispatcher';
-import {UrlResolver} from 'angular2/src/core/services/url_resolver';
 import {commonDemoSetup, DemoUrlResolver} from '../demo_common';
-import {bind} from 'angular2/di';
 
 @Component({
   selector: 'demo-app',
diff --git a/modules/examples/src/material/switcher/index.ts b/modules/examples/src/material/switcher/index.ts
index c4efc76d15..bf342710ed 100644
--- a/modules/examples/src/material/switcher/index.ts
+++ b/modules/examples/src/material/switcher/index.ts
@@ -1,8 +1,8 @@
-import {bootstrap, Component, View, ViewEncapsulation} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/bootstrap';
+import {bind, Component, View, ViewEncapsulation} from 'angular2/core';
 import {MdSwitch} from 'angular2_material/src/components/switcher/switch';
 import {UrlResolver} from 'angular2/src/core/services/url_resolver';
 import {commonDemoSetup, DemoUrlResolver} from '../demo_common';
-import {bind} from 'angular2/di';
 
 @Component({
   selector: 'demo-app',
diff --git a/modules/examples/src/model_driven_forms/index.ts b/modules/examples/src/model_driven_forms/index.ts
index da3dba944f..1c67216f96 100644
--- a/modules/examples/src/model_driven_forms/index.ts
+++ b/modules/examples/src/model_driven_forms/index.ts
@@ -1,5 +1,17 @@
-import {bootstrap, NgIf, NgFor, Component, Directive, View, Host} from 'angular2/bootstrap';
-import {FORM_DIRECTIVES, NgControl, Validators, NgFormModel, FormBuilder} from 'angular2/forms';
+import {bootstrap} from 'angular2/bootstrap';
+import {
+  FORM_DIRECTIVES,
+  NgControl,
+  Validators,
+  NgFormModel,
+  FormBuilder,
+  NgIf,
+  NgFor,
+  Component,
+  Directive,
+  View,
+  Host
+} from 'angular2/core';
 
 import {RegExpWrapper, print, isPresent} from 'angular2/src/core/facade/lang';
 
diff --git a/modules/examples/src/observable_models/app.dart b/modules/examples/src/observable_models/app.dart
index d7236e0736..992ddf5a6d 100644
--- a/modules/examples/src/observable_models/app.dart
+++ b/modules/examples/src/observable_models/app.dart
@@ -1,10 +1,9 @@
 library benchmarks.src.naive_infinite_scroll.app;
 
 import "package:angular2/src/core/facade/collection.dart" show List, ListWrapper;
-import "package:angular2/directives.dart" show NgIf, NgFor;
 import "scroll_area.dart" show ScrollAreaComponent;
 import "package:angular2/angular2.dart" show Component, Directive, View, IterableDiffers, SkipSelf, Binding;
-import "package:angular2/src/core/directives/observable_list_diff.dart" show ObservableListDiffFactory;
+import "package:angular2/core.dart" show ObservableListDiffFactory, NgIf, NgFor;
 import 'package:observe/observe.dart' show ObservableList;
 
 createDiffers(IterableDiffers parent) {
diff --git a/modules/examples/src/observable_models/cells.dart b/modules/examples/src/observable_models/cells.dart
index ea05e95c02..73fb3b2191 100644
--- a/modules/examples/src/observable_models/cells.dart
+++ b/modules/examples/src/observable_models/cells.dart
@@ -4,7 +4,7 @@ import "package:angular2/src/core/facade/collection.dart"
     show List, ListWrapper, Map;
 import "common.dart"
     show Company, Opportunity, Offering, Account, CustomDate, STATUS_LIST;
-import "package:angular2/directives.dart" show NgFor;
+import "package:angular2/core.dart" show NgFor;
 import "package:angular2/angular2.dart" show Component, Directive, View, ChangeDetectionStrategy;
 
 class HasStyle {
diff --git a/modules/examples/src/observable_models/index.dart b/modules/examples/src/observable_models/index.dart
index 7585d7daf9..fb73a4dd96 100644
--- a/modules/examples/src/observable_models/index.dart
+++ b/modules/examples/src/observable_models/index.dart
@@ -4,7 +4,7 @@ import "package:angular2/bootstrap.dart" show bootstrap;
 import "app.dart" show App;
 import "package:angular2/src/core/compiler/view_pool.dart"
     show APP_VIEW_POOL_CAPACITY;
-import "package:angular2/di.dart" show bind;
+import "package:angular2/core.dart" show bind;
 
 main() {
   bootstrap(App, createBindings());
diff --git a/modules/examples/src/observable_models/scroll_area.dart b/modules/examples/src/observable_models/scroll_area.dart
index 8354cef0f4..58e0e7158e 100644
--- a/modules/examples/src/observable_models/scroll_area.dart
+++ b/modules/examples/src/observable_models/scroll_area.dart
@@ -14,7 +14,7 @@ import "common.dart"
         HEIGHT;
 import "random_data.dart" show generateOfferings;
 import "scroll_item.dart" show ScrollItemComponent;
-import "package:angular2/directives.dart" show NgFor;
+import "package:angular2/core.dart" show NgFor;
 
 @Component(selector: "scroll-area", changeDetection: ChangeDetectionStrategy.OnPushObserve)
 @View(directives: const [ScrollItemComponent, NgFor], template: '''
diff --git a/modules/examples/src/order_management/index.ts b/modules/examples/src/order_management/index.ts
index 8ea1c5463f..8a7c17957f 100644
--- a/modules/examples/src/order_management/index.ts
+++ b/modules/examples/src/order_management/index.ts
@@ -1,5 +1,5 @@
+import {bootstrap} from 'angular2/bootstrap';
 import {
-  bootstrap,
   NgIf,
   NgFor,
   Component,
@@ -8,12 +8,10 @@ import {
   Host,
   forwardRef,
   Binding,
-  EventEmitter
-} from 'angular2/bootstrap';
-
-import {Injectable} from 'angular2/di';
-
-import {FORM_DIRECTIVES} from 'angular2/forms';
+  EventEmitter,
+  FORM_DIRECTIVES,
+  Injectable
+} from 'angular2/core';
 
 import {ListWrapper} from 'angular2/src/core/facade/collection';
 
diff --git a/modules/examples/src/person_management/index.ts b/modules/examples/src/person_management/index.ts
index 6888abee76..4bf51f41f2 100644
--- a/modules/examples/src/person_management/index.ts
+++ b/modules/examples/src/person_management/index.ts
@@ -1,5 +1,5 @@
+import {bootstrap} from 'angular2/bootstrap';
 import {
-  bootstrap,
   NgIf,
   NgFor,
   Component,
@@ -7,12 +7,10 @@ import {
   View,
   Host,
   forwardRef,
-  Binding
-} from 'angular2/bootstrap';
-
-import {Injectable} from 'angular2/di';
-
-import {FORM_DIRECTIVES} from 'angular2/forms';
+  Binding,
+  FORM_DIRECTIVES,
+  Injectable
+} from 'angular2/core';
 
 import {CONST_EXPR} from 'angular2/src/core/facade/lang';
 
diff --git a/modules/examples/src/sourcemap/index.ts b/modules/examples/src/sourcemap/index.ts
index 5c5fb965b0..873dde8ecd 100644
--- a/modules/examples/src/sourcemap/index.ts
+++ b/modules/examples/src/sourcemap/index.ts
@@ -1,5 +1,6 @@
 import {BaseException} from 'angular2/src/core/facade/lang';
-import {bootstrap, Component, View} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/bootstrap';
+import {Component, View} from 'angular2/core';
 
 @Component({
   selector: 'error-app',
diff --git a/modules/examples/src/template_driven_forms/index.ts b/modules/examples/src/template_driven_forms/index.ts
index 13498a479a..6d219db926 100644
--- a/modules/examples/src/template_driven_forms/index.ts
+++ b/modules/examples/src/template_driven_forms/index.ts
@@ -1,5 +1,5 @@
+import {bootstrap} from 'angular2/bootstrap';
 import {
-  bootstrap,
   NgIf,
   NgFor,
   Component,
@@ -8,9 +8,12 @@ import {
   Host,
   NG_VALIDATORS,
   forwardRef,
-  Binding
-} from 'angular2/bootstrap';
-import {FORM_DIRECTIVES, NgControl, Validators, NgForm} from 'angular2/forms';
+  Binding,
+  FORM_DIRECTIVES,
+  NgControl,
+  Validators,
+  NgForm
+} from 'angular2/core';
 
 import {RegExpWrapper, print, isPresent, CONST_EXPR} from 'angular2/src/core/facade/lang';
 
diff --git a/modules/examples/src/todo/index.ts b/modules/examples/src/todo/index.ts
index f2347e3e7b..67cb0f53c0 100644
--- a/modules/examples/src/todo/index.ts
+++ b/modules/examples/src/todo/index.ts
@@ -1,4 +1,5 @@
-import {bootstrap, NgFor, Component, View} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/bootstrap';
+import {NgFor, Component, View} from 'angular2/core';
 import {Store, Todo, TodoFactory} from './services/TodoStore';
 
 @Component({selector: 'todo-app', viewBindings: [Store, TodoFactory]})
diff --git a/modules/examples/src/web_workers/kitchen_sink/index_common.ts b/modules/examples/src/web_workers/kitchen_sink/index_common.ts
index ac3ee18cf0..0de701fd5d 100644
--- a/modules/examples/src/web_workers/kitchen_sink/index_common.ts
+++ b/modules/examples/src/web_workers/kitchen_sink/index_common.ts
@@ -1,4 +1,5 @@
-import {ElementRef, Component, Directive, View, Injectable, Renderer} from 'angular2/angular2';
+import {ElementRef, Component, Directive, View, Injectable} from 'angular2/core';
+import {Renderer} from 'angular2/render';
 import {StringWrapper} from 'angular2/src/core/facade/lang';
 
 // A service available to the Injector, used by the HelloCmp component.
diff --git a/modules/examples/src/zippy_component/index.ts b/modules/examples/src/zippy_component/index.ts
index 0b588c1a17..4dca67909a 100644
--- a/modules/examples/src/zippy_component/index.ts
+++ b/modules/examples/src/zippy_component/index.ts
@@ -1,4 +1,5 @@
-import {bootstrap, Component, View, NgFor} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/bootstrap';
+import {Component, View, NgFor} from 'angular2/core';
 import {Zippy} from './zippy';
 
 @Component({selector: 'zippy-app'})
diff --git a/modules_dart/analyzer_plugin/test/tasks_test.server.spec.dart b/modules_dart/analyzer_plugin/test/tasks_test.server.spec.dart
index 507b3757bc..d5df8b5c59 100644
--- a/modules_dart/analyzer_plugin/test/tasks_test.server.spec.dart
+++ b/modules_dart/analyzer_plugin/test/tasks_test.server.spec.dart
@@ -31,7 +31,7 @@ class BuildUnitDirectivesTaskTest extends _AbstractDartTaskTest {
     _addAngularSources();
 
     Source source = _newSource('/test.dart', r'''
-  import '/angular2/metadata.dart';
+  import '/angular2/src/core/metadata.dart';
 
   @Component(selector: 'comp-a')
   class ComponentA {
@@ -56,7 +56,7 @@ class BuildUnitDirectivesTaskTest extends _AbstractDartTaskTest {
 
     Source source = _newSource('/test.dart', r'''
 
-import '/angular2/metadata.dart';
+import '/angular2/src/core/metadata.dart';
 
 @Directive(selector: 'deco-a')
 class ComponentA {
@@ -79,7 +79,7 @@ class ComponentB {
   void _addAngularSources() {
 
 
-    _newSource('/angular2/metadata.dart', r'''
+    _newSource('/angular2/src/core/metadata.dart', r'''
 
 library angular2.src.core.metadata;
 
diff --git a/modules_dart/transform/lib/src/transform/common/annotation_matcher.dart b/modules_dart/transform/lib/src/transform/common/annotation_matcher.dart
index f9c9c43a7a..3913c349d1 100644
--- a/modules_dart/transform/lib/src/transform/common/annotation_matcher.dart
+++ b/modules_dart/transform/lib/src/transform/common/annotation_matcher.dart
@@ -12,7 +12,8 @@ export 'class_matcher_base.dart' show ClassDescriptor;
 const INJECTABLES = const [
   const ClassDescriptor(
       'Injectable', 'package:angular2/src/core/di/decorators.dart'),
-  const ClassDescriptor('Injectable', 'package:angular2/di.dart'),
+  const ClassDescriptor('Injectable', 'package:angular2/core.dart'),
+  const ClassDescriptor('Injectable', 'package:angular2/src/core/di.dart'),
   const ClassDescriptor('Injectable', 'package:angular2/angular2.dart'),
   const ClassDescriptor('Injectable', 'package:angular2/bootstrap_static.dart'),
   const ClassDescriptor('Injectable', 'package:angular2/web_worker/worker.dart'),
@@ -23,14 +24,10 @@ const DIRECTIVES = const [
       superClass: 'Injectable'),
   const ClassDescriptor('Directive', 'package:angular2/src/core/metadata.dart',
       superClass: 'Injectable'),
-  const ClassDescriptor('Directive', 'package:angular2/metadata.dart',
-      superClass: 'Injectable'),
   const ClassDescriptor('Directive', 'package:angular2/angular2.dart',
       superClass: 'Injectable'),
   const ClassDescriptor('Directive', 'package:angular2/core.dart',
       superClass: 'Injectable'),
-  const ClassDescriptor('Directive', 'package:angular2/bootstrap_static.dart',
-      superClass: 'Injectable'),
   const ClassDescriptor('Directive', 'package:angular2/web_worker/worker.dart',
       superClass: 'Injectable'),
 ];
@@ -40,12 +37,8 @@ const COMPONENTS = const [
       superClass: 'Directive'),
   const ClassDescriptor('Component', 'package:angular2/src/core/metadata.dart',
       superClass: 'Directive'),
-  const ClassDescriptor('Component', 'package:angular2/metadata.dart',
-      superClass: 'Directive'),
   const ClassDescriptor('Component', 'package:angular2/angular2.dart',
       superClass: 'Directive'),
-  const ClassDescriptor('Component', 'package:angular2/bootstrap_static.dart',
-      superClass: 'Directive'),
   const ClassDescriptor('Component', 'package:angular2/core.dart',
       superClass: 'Directive'),
   const ClassDescriptor('Component', 'package:angular2/web_worker/worker.dart',
diff --git a/modules_dart/transform/lib/src/transform/common/interface_matcher.dart b/modules_dart/transform/lib/src/transform/common/interface_matcher.dart
index 64a9b56c3a..83b1bb572c 100644
--- a/modules_dart/transform/lib/src/transform/common/interface_matcher.dart
+++ b/modules_dart/transform/lib/src/transform/common/interface_matcher.dart
@@ -12,24 +12,28 @@ export 'class_matcher_base.dart' show ClassDescriptor;
 const _ON_CHANGE_INTERFACES = const [
   const ClassDescriptor('OnChanges', 'package:angular2/angular2.dart'),
   const ClassDescriptor('OnChanges', 'package:angular2/lifecycle_hooks.dart'),
+  const ClassDescriptor('OnChanges', 'package:angular2/src/core/compiler.dart'),
   const ClassDescriptor(
       'OnChanges', 'package:angular2/src/core/compiler/interfaces.dart'),
 ];
 const _ON_DESTROY_INTERFACES = const [
   const ClassDescriptor('OnDestroy', 'package:angular2/angular2.dart'),
   const ClassDescriptor('OnDestroy', 'package:angular2/lifecycle_hooks.dart'),
+  const ClassDescriptor('OnDestroy', 'package:angular2/src/core/compiler.dart'),
   const ClassDescriptor(
       'OnDestroy', 'package:angular2/src/core/compiler/interfaces.dart'),
 ];
 const _DO_CHECK_INTERFACES = const [
   const ClassDescriptor('DoCheck', 'package:angular2/angular2.dart'),
   const ClassDescriptor('DoCheck', 'package:angular2/lifecycle_hooks.dart'),
+  const ClassDescriptor('DoCheck', 'package:angular2/src/core/compiler.dart'),
   const ClassDescriptor(
       'DoCheck', 'package:angular2/src/core/compiler/interfaces.dart'),
 ];
 const _ON_INIT_INTERFACES = const [
   const ClassDescriptor('OnInit', 'package:angular2/angular2.dart'),
   const ClassDescriptor('OnInit', 'package:angular2/lifecycle_hooks.dart'),
+  const ClassDescriptor('OnInit', 'package:angular2/src/core/compiler.dart'),
   const ClassDescriptor(
       'OnInit', 'package:angular2/src/core/compiler/interfaces.dart'),
 ];
@@ -37,6 +41,8 @@ const _ON_AFTER_CONTENT_INIT_INTERFACES = const [
   const ClassDescriptor('AfterContentInit', 'package:angular2/angular2.dart'),
   const ClassDescriptor(
       'AfterContentInit', 'package:angular2/lifecycle_hooks.dart'),
+  const ClassDescriptor(
+      'AfterContentInit', 'package:angular2/src/core/compiler.dart'),
   const ClassDescriptor(
       'AfterContentInit', 'package:angular2/src/core/compiler/interfaces.dart')
 ];
@@ -44,6 +50,8 @@ const _ON_AFTER_CONTENT_CHECKED_INTERFACES = const [
   const ClassDescriptor('AfterContentChecked', 'package:angular2/angular2.dart'),
   const ClassDescriptor(
       'AfterContentChecked', 'package:angular2/lifecycle_hooks.dart'),
+  const ClassDescriptor(
+      'AfterContentChecked', 'package:angular2/src/core/compiler.dart'),
   const ClassDescriptor(
       'AfterContentChecked', 'package:angular2/src/core/compiler/interfaces.dart')
 ];
@@ -51,6 +59,8 @@ const _ON_AFTER_VIEW_INIT_INTERFACES = const [
   const ClassDescriptor('AfterViewInit', 'package:angular2/angular2.dart'),
   const ClassDescriptor(
       'AfterViewInit', 'package:angular2/lifecycle_hooks.dart'),
+  const ClassDescriptor(
+      'AfterViewInit', 'package:angular2/src/core/compiler.dart'),
   const ClassDescriptor(
       'AfterViewInit', 'package:angular2/src/core/compiler/interfaces.dart')
 ];
@@ -58,6 +68,8 @@ const _ON_AFTER_VIEW_CHECKED_INTERFACES = const [
   const ClassDescriptor('AfterViewChecked', 'package:angular2/angular2.dart'),
   const ClassDescriptor(
       'AfterViewChecked', 'package:angular2/lifecycle_hooks.dart'),
+  const ClassDescriptor(
+      'AfterViewChecked', 'package:angular2/src/core/compiler.dart'),
   const ClassDescriptor(
       'AfterViewChecked', 'package:angular2/src/core/compiler/interfaces.dart')
 ];
diff --git a/modules_dart/transform/test/transform/directive_processor/interfaces_files/expected/soup.ng_deps.dart b/modules_dart/transform/test/transform/directive_processor/interfaces_files/expected/soup.ng_deps.dart
index 7619cb6696..01996b2bc0 100644
--- a/modules_dart/transform/test/transform/directive_processor/interfaces_files/expected/soup.ng_deps.dart
+++ b/modules_dart/transform/test/transform/directive_processor/interfaces_files/expected/soup.ng_deps.dart
@@ -4,6 +4,7 @@ import 'soup.dart';
 export 'soup.dart';
 import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef;
 import 'package:angular2/src/core/metadata.dart';
+import 'package:angular2/src/core/compiler.dart';
 
 var _visited = false;
 void initReflector() {
@@ -13,7 +14,8 @@ void initReflector() {
     ..registerType(
         ChangingSoupComponent,
         new _ngRef.ReflectionInfo(
-            const [const Component(selector: '[soup]')],
+            const [
+              const Component(selector: '[soup]')],
             const [],
             () => new ChangingSoupComponent(),
             const [OnChanges, AnotherInterface]));
diff --git a/modules_dart/transform/test/transform/directive_processor/interfaces_files/soup.dart b/modules_dart/transform/test/transform/directive_processor/interfaces_files/soup.dart
index 7761c692cd..6478194a42 100644
--- a/modules_dart/transform/test/transform/directive_processor/interfaces_files/soup.dart
+++ b/modules_dart/transform/test/transform/directive_processor/interfaces_files/soup.dart
@@ -1,6 +1,7 @@
 library dinner.soup;
 
 import 'package:angular2/src/core/metadata.dart';
+import 'package:angular2/src/core/compiler.dart';
 
 @Component(selector: '[soup]')
 class ChangingSoupComponent implements OnChanges, AnotherInterface {}
diff --git a/modules_dart/transform/test/transform/directive_processor/multiple_interface_lifecycle_files/expected/soup.ng_deps.dart b/modules_dart/transform/test/transform/directive_processor/multiple_interface_lifecycle_files/expected/soup.ng_deps.dart
index 29506225c5..70d538f7ed 100644
--- a/modules_dart/transform/test/transform/directive_processor/multiple_interface_lifecycle_files/expected/soup.ng_deps.dart
+++ b/modules_dart/transform/test/transform/directive_processor/multiple_interface_lifecycle_files/expected/soup.ng_deps.dart
@@ -3,7 +3,8 @@ library dinner.soup.ng_deps.dart;
 import 'soup.dart';
 export 'soup.dart';
 import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef;
-import 'package:angular2/metadata.dart';
+import 'package:angular2/src/core/metadata.dart';
+import 'package:angular2/src/core/compiler.dart';
 
 var _visited = false;
 void initReflector() {
diff --git a/modules_dart/transform/test/transform/directive_processor/multiple_interface_lifecycle_files/soup.dart b/modules_dart/transform/test/transform/directive_processor/multiple_interface_lifecycle_files/soup.dart
index c100201354..e8002f7769 100644
--- a/modules_dart/transform/test/transform/directive_processor/multiple_interface_lifecycle_files/soup.dart
+++ b/modules_dart/transform/test/transform/directive_processor/multiple_interface_lifecycle_files/soup.dart
@@ -1,6 +1,7 @@
 library dinner.soup;
 
-import 'package:angular2/metadata.dart';
+import 'package:angular2/src/core/metadata.dart';
+import 'package:angular2/src/core/compiler.dart';
 
 @Component(selector: '[soup]')
 class MultiSoupComponent implements OnChanges, OnDestroy, OnInit {}
diff --git a/modules_dart/transform/test/transform/directive_processor/prefixed_interface_lifecycle_files/expected/soup.ng_deps.dart b/modules_dart/transform/test/transform/directive_processor/prefixed_interface_lifecycle_files/expected/soup.ng_deps.dart
index a85acf5a41..c9afa4529e 100644
--- a/modules_dart/transform/test/transform/directive_processor/prefixed_interface_lifecycle_files/expected/soup.ng_deps.dart
+++ b/modules_dart/transform/test/transform/directive_processor/prefixed_interface_lifecycle_files/expected/soup.ng_deps.dart
@@ -3,7 +3,8 @@ library dinner.soup.ng_deps.dart;
 import 'soup.dart';
 export 'soup.dart';
 import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef;
-import 'package:angular2/metadata.dart' as prefix;
+import 'package:angular2/src/core/compiler.dart' as prefix;
+import 'package:angular2/src/core/metadata.dart';
 
 var _visited = false;
 void initReflector() {
@@ -13,10 +14,7 @@ void initReflector() {
     ..registerType(
         OnChangeSoupComponent,
         new _ngRef.ReflectionInfo(
-            const [
-              const prefix.Component(
-                  selector: '[soup]')
-            ],
+            const [const Component(selector: '[soup]')],
             const [],
             () => new OnChangeSoupComponent(),
             const [prefix.OnChanges]));
diff --git a/modules_dart/transform/test/transform/directive_processor/prefixed_interface_lifecycle_files/soup.dart b/modules_dart/transform/test/transform/directive_processor/prefixed_interface_lifecycle_files/soup.dart
index 7dc20e5e8f..0293f9f7e9 100644
--- a/modules_dart/transform/test/transform/directive_processor/prefixed_interface_lifecycle_files/soup.dart
+++ b/modules_dart/transform/test/transform/directive_processor/prefixed_interface_lifecycle_files/soup.dart
@@ -1,6 +1,7 @@
 library dinner.soup;
 
-import 'package:angular2/metadata.dart' as prefix;
+import 'package:angular2/src/core/compiler.dart' as prefix;
+import 'package:angular2/src/core/metadata.dart';
 
-@prefix.Component(selector: '[soup]')
+@Component(selector: '[soup]')
 class OnChangeSoupComponent implements prefix.OnChanges {}
diff --git a/modules_dart/transform/test/transform/directive_processor/superclass_lifecycle_files/expected/soup.ng_deps.dart b/modules_dart/transform/test/transform/directive_processor/superclass_lifecycle_files/expected/soup.ng_deps.dart
index 6994bf36f4..b5e5dd2328 100644
--- a/modules_dart/transform/test/transform/directive_processor/superclass_lifecycle_files/expected/soup.ng_deps.dart
+++ b/modules_dart/transform/test/transform/directive_processor/superclass_lifecycle_files/expected/soup.ng_deps.dart
@@ -3,7 +3,8 @@ library dinner.soup.ng_deps.dart;
 import 'soup.dart';
 export 'soup.dart';
 import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef;
-import 'package:angular2/metadata.dart';
+import 'package:angular2/src/core/compiler.dart';
+import 'package:angular2/src/core/metadata.dart';
 
 var _visited = false;
 void initReflector() {
diff --git a/modules_dart/transform/test/transform/directive_processor/superclass_lifecycle_files/soup.dart b/modules_dart/transform/test/transform/directive_processor/superclass_lifecycle_files/soup.dart
index ee29a622fc..cc2da37008 100644
--- a/modules_dart/transform/test/transform/directive_processor/superclass_lifecycle_files/soup.dart
+++ b/modules_dart/transform/test/transform/directive_processor/superclass_lifecycle_files/soup.dart
@@ -1,6 +1,7 @@
 library dinner.soup;
 
-import 'package:angular2/metadata.dart';
+import 'package:angular2/src/core/compiler.dart';
+import 'package:angular2/src/core/metadata.dart';
 
 @Component(selector: '[soup]')
 class OnChangeSoupComponent extends OnChanges {}
diff --git a/modules_dart/transform/test/transform/integration/all_tests.dart b/modules_dart/transform/test/transform/integration/all_tests.dart
index c7130fa3d5..f4bea6378a 100644
--- a/modules_dart/transform/test/transform/integration/all_tests.dart
+++ b/modules_dart/transform/test/transform/integration/all_tests.dart
@@ -43,7 +43,7 @@ void allTests() {
     'angular2|lib/src/core/application.dart': '../common/application.dart',
     'angular2|lib/src/core/reflection/reflection_capabilities.dart':
         '../common/reflection_capabilities.dart',
-    'angular2|lib/di.dart': '../../../lib/di.dart',
+    'angular2|lib/core.dart': '../../../lib/core.dart',
     'angular2|lib/src/core/di/decorators.dart':
         '../../../lib/src/core/di/decorators.dart',
   };
diff --git a/tools/broccoli/broccoli-ts2dart.ts b/tools/broccoli/broccoli-ts2dart.ts
index 0b89f18b41..49f3ca58ba 100644
--- a/tools/broccoli/broccoli-ts2dart.ts
+++ b/tools/broccoli/broccoli-ts2dart.ts
@@ -24,7 +24,7 @@ class TSToDartTranspiler implements DiffingBroccoliPlugin {
     // These files are not compatible with Typescript's ES6 library
     // so they must be explicitly included when targetting ES5, as ts2dart does.
     // see https://github.com/angular/angular/issues/3770
-    let toEmit = [path.resolve(this.inputPath, 'angular2/traceur-runtime.d.ts')];
+    let toEmit = [path.resolve(this.inputPath, 'angular2/manual_typings/traceur-runtime.d.ts')];
     let getDartFilePath = (path: string) => path.replace(/((\.js)|(\.ts))$/i, '.dart');
     treeDiff.addedPaths.concat(treeDiff.changedPaths)
         .forEach((changedPath) => {
diff --git a/tools/broccoli/trees/browser_tree.ts b/tools/broccoli/trees/browser_tree.ts
index ad15eb3d65..817145477d 100644
--- a/tools/broccoli/trees/browser_tree.ts
+++ b/tools/broccoli/trees/browser_tree.ts
@@ -78,7 +78,7 @@ module.exports = function makeBrowserTree(options, destinationPath) {
       'benchmarks/e2e_test/**',
       'angular1_router/**',
       // Exclude ES6 polyfill typings when tsc target=ES6
-      'angular2/traceur-runtime.d.ts',
+      'angular2/manual_typings/traceur-runtime.d.ts',
       'angular2/typings/es6-promise/**'
     ],
     destDir: '/'
diff --git a/tools/broccoli/trees/node_tree.ts b/tools/broccoli/trees/node_tree.ts
index 7945357262..800164dc6d 100644
--- a/tools/broccoli/trees/node_tree.ts
+++ b/tools/broccoli/trees/node_tree.ts
@@ -23,7 +23,7 @@ module.exports = function makeNodeTree(destinationPath) {
       'angular2/test/core/zone/**',
       'angular2/test/test_lib/fake_async_spec.ts',
       'angular2/test/core/render/xhr_impl_spec.ts',
-      'angular2/test/forms/**',
+      'angular2/test/core/forms/**',
       'angular1_router/**'
     ]
   });
@@ -37,7 +37,8 @@ module.exports = function makeNodeTree(destinationPath) {
     module: 'CommonJS',
     noEmitOnError: true,
     rootDir: '.',
-    rootFilePaths: ['angular2/traceur-runtime.d.ts', 'angular2/globals.d.ts'],
+    rootFilePaths:
+        ['angular2/manual_typings/traceur-runtime.d.ts', 'angular2/manual_typings/globals.d.ts'],
     sourceMap: true,
     sourceRoot: '.',
     target: 'ES5'