refactor: export core APIs from angular2/core

This change moves many APIs to the angular2/core export.

This change also automatically adds FORM_BINDINGS in
the application root injector.

BREAKING CHANGE:
    Many dependencies that were previously exported from specific
    APIs are now exported from angular2/core. Affected exports, which
    should now be included from angular2/core include:

    angular2/forms
    angular2/di
    angular2/directives
    angular2/change_detection
    angular2/bootstrap (except for dart users)
    angular2/render
    angular2/metadata
    angular2/debug
    angular2/pipes
Closes #3977

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;
 })

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'}}
     }

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';

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';

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';

modules/angular2/bootstrap_static.dart

@@ -1,4 +1,3 @@
 library angular2.bootstrap_static;
 
-export 'angular2_exports.dart';
 export 'src/core/application_static.dart';

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';

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';

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';

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';

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]);

modules/angular2/src/core/application.dart

@@ -1,4 +1,4 @@
-library angular2.application;
+library angular2.src.core.application;
 
 import 'dart:async';
 

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';

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
   ];
 }
 

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.

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';

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';
 
 /**

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);
+}

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';

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';

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,

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;

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);

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;

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';

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,

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';

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';
 
 /**

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';

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,

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';
 
 /**

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 {

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';

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';
 
 /**

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';

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';

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';

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';

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';

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';

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';

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';

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';

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

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,

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';
 
 /**

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';
 
 /**

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

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}.

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';
 

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';
 

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';
 

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';

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';
 

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;

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]);

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';

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';

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';
 

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';

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';

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';

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';

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';

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';

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[] {

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 =

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',

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';
 

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';

modules/angular2/src/core/lifecycle.ts

@@ -0,0 +1,2 @@
+// Public API for LifeCycle
+export {LifeCycle} from './life_cycle/life_cycle';

modules/angular2/src/core/metadata.ts

@@ -21,7 +21,6 @@ export {
 
 export {ViewMetadata, ViewEncapsulation} from './metadata/view';
 
-
 import {
   QueryMetadata,
   ViewQueryMetadata,

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.

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.

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';

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 {

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';

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}));

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.

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.

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.
  *

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+))?)?$');
 

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 {

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';
 

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.
  *

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';
 

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';
 

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';

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';

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';
 

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';
 

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,

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,

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'));

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"));

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;
 

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 {

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> = {

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';
 

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';