chore: update all import paths

docs/public-docs-package/index.js

@@ -10,7 +10,7 @@ module.exports = new Package('angular-v2-public-docs', [basePackage])
     'angular2/core.ts',
     'angular2/di.ts',
     'angular2/directives.ts',
-    'http/http.ts',
+    'angular2/http.ts',
     'angular2/forms.ts',
     'angular2/router.ts',
     'angular2/test.ts',

docs/typescript-definition-package/index.js

@@ -40,7 +40,7 @@ module.exports = new Package('angular-v2-docs', [jsdocPackage, nunjucksPackage,
   readTypeScriptModules.sourceFiles = [
     'angular2/angular2.ts',
     'angular2/router.ts',
-    'http/http.ts'
+    'angular2/http.ts'
   ];
   readTypeScriptModules.basePath = path.resolve(path.resolve(__dirname, '../../modules'));
 
@@ -62,10 +62,10 @@ module.exports = new Package('angular-v2-docs', [jsdocPackage, nunjucksPackage,
         }
       },
       {
-        id: 'http/http',
+        id: 'angular2/http',
         namespace: 'ngHttp',
         modules: {
-          'http/http':'http/http'
+          'angular2/http':'angular2/http'
         }
       }
   ];

gulpfile.js

@@ -699,7 +699,7 @@ gulp.task('test.unit.dart/ci', function (done) {
 
 
 gulp.task('test.unit.cjs/ci', function(done) {
-  runJasmineTests(['dist/js/cjs/{angular2,benchpress,http}/test/**/*_spec.js'], done);
+  runJasmineTests(['dist/js/cjs/{angular2,benchpress}/test/**/*_spec.js'], done);
 });
 
 
@@ -1020,7 +1020,7 @@ gulp.task('!bundle.js.prod', ['build.js.prod'], function() {
       then(function(){
         return bundler.bundle(
           bundleConfig,
-          'http/http',
+          'angular2/http',
           './dist/build/http.js',
           {
             sourceMaps: true
@@ -1042,7 +1042,7 @@ gulp.task('!bundle.js.min', ['build.js.prod'], function() {
       then(function(){
         return bundler.bundle(
           bundleConfig,
-          'http/http',
+          'angular2/http',
           './dist/build/http.min.js',
           {
             sourceMaps: true,
@@ -1067,7 +1067,7 @@ gulp.task('!bundle.js.dev', ['build.js.dev'], function() {
       then(function() {
         return bundler.bundle(
           devBundleConfig,
-          'http/http',
+          'angular2/http',
           './dist/build/http.dev.js',
           { sourceMaps: true });
       });
@@ -1115,15 +1115,7 @@ gulp.task('!bundle.js.sfx.dev', ['build.js.dev'], function() {
       'angular2/angular2_sfx',
       './dist/build/angular2.sfx.dev.js',
       { sourceMaps: true },
-      /* self-executing */ true).
+      /* self-executing */ true);
-      then(function() {
-        return bundler.bundle(
-          devBundleConfig,
-          'http/http_sfx',
-          './dist/build/http.sfx.dev.js',
-          { sourceMaps: true },
-          true)
-      });
 });
 
 gulp.task('!bundle.js.prod.deps', ['!bundle.js.prod'], function() {
@@ -1221,7 +1213,7 @@ gulp.task('build.change_detect.dart', function(done) {
 
 gulp.task('!build/change_detect.dart', function(done) {
   var fs = require('fs');
-  var changeDetectDir = path.join(CONFIG.dest.dart, 'angular2/test/change_detection/');
+  var changeDetectDir = path.join(CONFIG.dest.dart, 'angular2/test/core/change_detection/');
   var srcDir = path.join(changeDetectDir, 'generator');
   var destDir = path.join(changeDetectDir, 'generated');
 

karma-dart.conf.js

@@ -45,6 +45,7 @@ module.exports = function(config) {
       '/packages/path': '/base/packages/path',
 
       // Local dependencies, transpiled from the source.
+      '/packages/angular2/test/': '/base/dist/dart/angular2/test/',
       '/packages/angular2': '/base/dist/dart/angular2/lib',
       '/packages/http': '/base/dist/dart/http/lib',
       '/packages/angular2_material': '/base/dist/dart/angular2_material/lib',

modules/angular1_router/build.js

@@ -121,7 +121,7 @@ function angularFactory(name, deps, body) {
 
 function isFacadeModule(modulePath) {
   return modulePath.indexOf('facade') > -1 ||
-    modulePath === 'angular2/src/reflection/reflection';
+    modulePath === 'angular2/src/core/reflection/reflection';
 }
 
 module.exports = function () {

modules/angular2/change_detection.ts

@@ -29,4 +29,4 @@ export {
   KeyValueDiffer,
   KeyValueDifferFactory
 
-} from 'angular2/src/change_detection/change_detection';
+} from 'angular2/src/core/change_detection/change_detection';

modules/angular2/core.dart

@@ -4,8 +4,8 @@ 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/services/app_root_url.dart' show AppRootUrl;
+export 'package:angular2/src/core/services/app_root_url.dart' show AppRootUrl;
-export 'package:angular2/src/services/url_resolver.dart' show UrlResolver;
+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'
@@ -28,4 +28,4 @@ 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/facade/async.dart' show Stream, EventEmitter;
+export 'package:angular2/src/core/facade/async.dart' show Stream, EventEmitter;

modules/angular2/core.ts

@@ -5,13 +5,13 @@
  */
 export {APP_COMPONENT} from 'angular2/src/core/application_tokens';
 export {commonBootstrap as bootstrap} from 'angular2/src/core/application_common';
-export {Type} from 'angular2/src/facade/lang';
+export {Type} from 'angular2/src/core/facade/lang';
 export {ApplicationRef} from 'angular2/src/core/application_ref';
 
 
 // Compiler Related Dependencies.
-export {AppRootUrl} from 'angular2/src/services/app_root_url';
+export {AppRootUrl} from 'angular2/src/core/services/app_root_url';
-export {UrlResolver} from 'angular2/src/services/url_resolver';
+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';
@@ -28,4 +28,9 @@ 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/facade/async';
+export {Observable, EventEmitter} from 'angular2/src/core/facade/async';
+
+// DI
+export {Injector} from 'angular2/src/core/di/injector';
+export {bind} from 'angular2/src/core/di/binding';
+export {Inject} from 'angular2/src/core/di/decorators';

modules/angular2/debug.ts

@@ -1,5 +1,5 @@
-export * from './src/debug/debug_element';
+export * from './src/core/debug/debug_element';
 export {
   inspectNativeElement,
   ELEMENT_PROBE_BINDINGS
-} from './src/debug/debug_element_view_listener';
+} from './src/core/debug/debug_element_view_listener';

modules/angular2/di.ts

@@ -12,12 +12,12 @@ export {
   HostMetadata,
   SkipSelfMetadata,
   DependencyMetadata
-} from './src/di/metadata';
+} from './src/core/di/metadata';
 
 // we have to reexport * because Dart and TS export two different sets of types
-export * from './src/di/decorators';
+export * from './src/core/di/decorators';
 
-export {forwardRef, resolveForwardRef, ForwardRefFn} from './src/di/forward_ref';
+export {forwardRef, resolveForwardRef, ForwardRefFn} from './src/core/di/forward_ref';
 export {
   Injector,
   ProtoInjector,
@@ -25,9 +25,9 @@ export {
   DependencyProvider,
   Visibility,
   UNDEFINED
-} from './src/di/injector';
+} from './src/core/di/injector';
-export {Binding, BindingBuilder, ResolvedBinding, Dependency, bind} from './src/di/binding';
+export {Binding, BindingBuilder, ResolvedBinding, Dependency, bind} from './src/core/di/binding';
-export {Key, KeyRegistry, TypeLiteral} from './src/di/key';
+export {Key, KeyRegistry, TypeLiteral} from './src/core/di/key';
 export {
   NoBindingError,
   AbstractBindingError,
@@ -36,5 +36,5 @@ export {
   InvalidBindingError,
   NoAnnotationError,
   OutOfBoundsError
-} from './src/di/exceptions';
+} from './src/core/di/exceptions';
-export {OpaqueToken} from './src/di/opaque_token';
+export {OpaqueToken} from './src/core/di/opaque_token';

modules/angular2/directives.ts

@@ -4,19 +4,19 @@
  * Common directives shipped with Angular.
  */
 
-import {CONST_EXPR, Type} from './src/facade/lang';
+import {CONST_EXPR, Type} from './src/core/facade/lang';
-import {NgClass} from './src/directives/ng_class';
+import {NgClass} from './src/core/directives/ng_class';
-import {NgFor} from './src/directives/ng_for';
+import {NgFor} from './src/core/directives/ng_for';
-import {NgIf} from './src/directives/ng_if';
+import {NgIf} from './src/core/directives/ng_if';
-import {NgNonBindable} from './src/directives/ng_non_bindable';
+import {NgNonBindable} from './src/core/directives/ng_non_bindable';
-import {NgSwitch, NgSwitchWhen, NgSwitchDefault} from './src/directives/ng_switch';
+import {NgSwitch, NgSwitchWhen, NgSwitchDefault} from './src/core/directives/ng_switch';
 
-export * from './src/directives/ng_class';
+export * from './src/core/directives/ng_class';
-export * from './src/directives/ng_for';
+export * from './src/core/directives/ng_for';
-export * from './src/directives/ng_if';
+export * from './src/core/directives/ng_if';
-export * from './src/directives/ng_non_bindable';
+export * from './src/core/directives/ng_non_bindable';
-export * from './src/directives/ng_style';
+export * from './src/core/directives/ng_style';
-export * from './src/directives/ng_switch';
+export * from './src/core/directives/ng_switch';
 
 /**
  * A collection of the Angular core directives that are likely to be used in each and every Angular

modules/angular2/forms.ts

@@ -37,6 +37,6 @@ export {NgValidator, NgRequiredValidator} from './src/forms/directives/validator
 export {FormBuilder} from './src/forms/form_builder';
 
 import {FormBuilder} from './src/forms/form_builder';
-import {CONST_EXPR, Type} from './src/facade/lang';
+import {CONST_EXPR, Type} from './src/core/facade/lang';
 
 export const FORM_BINDINGS: List<Type> = CONST_EXPR([FormBuilder]);

modules/angular2/http.ts

@@ -5,34 +5,34 @@
  * class.
  */
 import {bind, Binding} from 'angular2/di';
-import {Http, Jsonp} from './src/http';
+import {Http, Jsonp} from './src/http/http';
-import {XHRBackend, XHRConnection} from './src/backends/xhr_backend';
+import {XHRBackend, XHRConnection} from './src/http/backends/xhr_backend';
-import {JSONPBackend, JSONPConnection} from './src/backends/jsonp_backend';
+import {JSONPBackend, JSONPConnection} from './src/http/backends/jsonp_backend';
-import {BrowserXhr} from './src/backends/browser_xhr';
+import {BrowserXhr} from './src/http/backends/browser_xhr';
-import {BrowserJsonp} from './src/backends/browser_jsonp';
+import {BrowserJsonp} from './src/http/backends/browser_jsonp';
-import {BaseRequestOptions, RequestOptions} from './src/base_request_options';
+import {BaseRequestOptions, RequestOptions} from './src/http/base_request_options';
-import {ConnectionBackend} from './src/interfaces';
+import {ConnectionBackend} from './src/http/interfaces';
-import {BaseResponseOptions, ResponseOptions} from './src/base_response_options';
+import {BaseResponseOptions, ResponseOptions} from './src/http/base_response_options';
 
-export {MockConnection, MockBackend} from './src/backends/mock_backend';
+export {MockConnection, MockBackend} from './src/http/backends/mock_backend';
-export {Request} from './src/static_request';
+export {Request} from './src/http/static_request';
-export {Response} from './src/static_response';
+export {Response} from './src/http/static_response';
 
 export {
   RequestOptionsArgs,
   ResponseOptionsArgs,
   Connection,
   ConnectionBackend
-} from './src/interfaces';
+} from './src/http/interfaces';
 
-export {BrowserXhr} from './src/backends/browser_xhr';
+export {BrowserXhr} from './src/http/backends/browser_xhr';
-export {BaseRequestOptions, RequestOptions} from './src/base_request_options';
+export {BaseRequestOptions, RequestOptions} from './src/http/base_request_options';
-export {BaseResponseOptions, ResponseOptions} from './src/base_response_options';
+export {BaseResponseOptions, ResponseOptions} from './src/http/base_response_options';
-export {XHRBackend, XHRConnection} from './src/backends/xhr_backend';
+export {XHRBackend, XHRConnection} from './src/http/backends/xhr_backend';
-export {JSONPBackend, JSONPConnection} from './src/backends/jsonp_backend';
+export {JSONPBackend, JSONPConnection} from './src/http/backends/jsonp_backend';
-export {Http, Jsonp} from './src/http';
+export {Http, Jsonp} from './src/http/http';
 
-export {Headers} from './src/headers';
+export {Headers} from './src/http/headers';
 
 export {
   ResponseTypes,

modules/angular2/metadata.ts

@@ -45,4 +45,4 @@ export {
   OnCheck
 } from './src/core/compiler/interfaces';
 
-export {Class, ClassDefinition, TypeDecorator} from './src/util/decorators';
+export {Class, ClassDefinition, TypeDecorator} from './src/core/util/decorators';

modules/angular2/mock.ts

@@ -2,4 +2,4 @@ export * from './src/mock/mock_location_strategy';
 export {LocationStrategy} from './src/router/location_strategy';
 
 export {MockViewResolver} from 'angular2/src/mock/view_resolver_mock';
-export {MockXHR} from 'angular2/src/render/xhr_mock';
+export {MockXHR} from 'angular2/src/core/render/xhr_mock';

modules/angular2/pipes.ts

@@ -4,11 +4,11 @@
  * This module provides advanced support for extending change detection.
  */
 
-export {UpperCasePipe} from './src/pipes/uppercase_pipe';
+export {UpperCasePipe} from './src/core/pipes/uppercase_pipe';
-export {LowerCasePipe} from './src/pipes/lowercase_pipe';
+export {LowerCasePipe} from './src/core/pipes/lowercase_pipe';
-export {AsyncPipe} from './src/pipes/async_pipe';
+export {AsyncPipe} from './src/core/pipes/async_pipe';
-export {JsonPipe} from './src/pipes/json_pipe';
+export {JsonPipe} from './src/core/pipes/json_pipe';
-export {DatePipe} from './src/pipes/date_pipe';
+export {DatePipe} from './src/core/pipes/date_pipe';
-export {DecimalPipe, PercentPipe, CurrencyPipe} from './src/pipes/number_pipe';
+export {DecimalPipe, PercentPipe, CurrencyPipe} from './src/core/pipes/number_pipe';
-export {LimitToPipe} from './src/pipes/limit_to_pipe';
+export {LimitToPipe} from './src/core/pipes/limit_to_pipe';
-export {DEFAULT_PIPES_TOKEN, DEFAULT_PIPES} from './src/pipes/default_pipes';
+export {DEFAULT_PIPES_TOKEN, DEFAULT_PIPES} from './src/core/pipes/default_pipes';

modules/angular2/profile.ts

@@ -4,4 +4,4 @@ export {
   wtfStartTimeRange,
   wtfEndTimeRange,
   WtfScopeFn
-} from './src/profile/profile';
+} from './src/core/profile/profile';

modules/angular2/render.ts

@@ -18,4 +18,4 @@ export {
   DOCUMENT,
   APP_ID,
   MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE
-} from './src/render/render';
+} from './src/core/render/render';

modules/angular2/router.ts

@@ -34,8 +34,8 @@ 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 {CONST_EXPR} from './src/facade/lang';
+import {CONST_EXPR} from './src/core/facade/lang';
-import {List} from './src/facade/collection';
+import {List} from './src/core/facade/collection';
 
 export const ROUTER_DIRECTIVES: List<any> = CONST_EXPR([RouterOutlet, RouterLink]);
 

modules/angular2/src/core/application.dart

@@ -2,8 +2,8 @@ library angular2.application;
 
 import 'dart:async';
 
-import 'package:angular2/src/reflection/reflection.dart' show reflector;
+import 'package:angular2/src/core/reflection/reflection.dart' show reflector;
-import 'package:angular2/src/reflection/reflection_capabilities.dart'
+import 'package:angular2/src/core/reflection/reflection_capabilities.dart'
     show ReflectionCapabilities;
 import 'application_common.dart';
 import 'application_ref.dart';

modules/angular2/src/core/application_common.ts

@@ -8,11 +8,11 @@ import {
   assertionsEnabled,
   print,
   stringify
-} from 'angular2/src/facade/lang';
+} from 'angular2/src/core/facade/lang';
-import {BrowserDomAdapter} from 'angular2/src/dom/browser_adapter';
+import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter';
-import {DOM} from 'angular2/src/dom/dom_adapter';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
 import {Compiler, CompilerCache} from './compiler/compiler';
-import {Reflector, reflector} from 'angular2/src/reflection/reflection';
+import {Reflector, reflector} from 'angular2/src/core/reflection/reflection';
 import {
   Parser,
   Lexer,
@@ -24,28 +24,28 @@ import {
   defaultIterableDiffers,
   KeyValueDiffers,
   defaultKeyValueDiffers
-} from 'angular2/src/change_detection/change_detection';
+} from 'angular2/src/core/change_detection/change_detection';
 import {DEFAULT_PIPES} from 'angular2/pipes';
 import {ExceptionHandler} from './exception_handler';
-import {ViewLoader} from 'angular2/src/render/dom/compiler/view_loader';
+import {ViewLoader} from 'angular2/src/core/render/dom/compiler/view_loader';
-import {StyleUrlResolver} from 'angular2/src/render/dom/compiler/style_url_resolver';
+import {StyleUrlResolver} from 'angular2/src/core/render/dom/compiler/style_url_resolver';
-import {StyleInliner} from 'angular2/src/render/dom/compiler/style_inliner';
+import {StyleInliner} from 'angular2/src/core/render/dom/compiler/style_inliner';
 import {ViewResolver} from './compiler/view_resolver';
 import {DirectiveResolver} from './compiler/directive_resolver';
 import {PipeResolver} from './compiler/pipe_resolver';
-import {List, ListWrapper} from 'angular2/src/facade/collection';
+import {List, ListWrapper} from 'angular2/src/core/facade/collection';
-import {Promise, PromiseWrapper, PromiseCompleter} from 'angular2/src/facade/async';
+import {Promise, PromiseWrapper, PromiseCompleter} from 'angular2/src/core/facade/async';
 import {NgZone} from 'angular2/src/core/zone/ng_zone';
 import {LifeCycle} from 'angular2/src/core/life_cycle/life_cycle';
-import {XHR} from 'angular2/src/render/xhr';
+import {XHR} from 'angular2/src/core/render/xhr';
-import {XHRImpl} from 'angular2/src/render/xhr_impl';
+import {XHRImpl} from 'angular2/src/core/render/xhr_impl';
-import {EventManager, DomEventsPlugin} from 'angular2/src/render/dom/events/event_manager';
+import {EventManager, DomEventsPlugin} from 'angular2/src/core/render/dom/events/event_manager';
-import {KeyEventsPlugin} from 'angular2/src/render/dom/events/key_events';
+import {KeyEventsPlugin} from 'angular2/src/core/render/dom/events/key_events';
-import {HammerGesturesPlugin} from 'angular2/src/render/dom/events/hammer_gestures';
+import {HammerGesturesPlugin} from 'angular2/src/core/render/dom/events/hammer_gestures';
 import {ComponentUrlMapper} from 'angular2/src/core/compiler/component_url_mapper';
-import {UrlResolver} from 'angular2/src/services/url_resolver';
+import {UrlResolver} from 'angular2/src/core/services/url_resolver';
-import {AppRootUrl} from 'angular2/src/services/app_root_url';
+import {AppRootUrl} from 'angular2/src/core/services/app_root_url';
-import {AnchorBasedAppRootUrl} from 'angular2/src/services/anchor_based_app_root_url';
+import {AnchorBasedAppRootUrl} from 'angular2/src/core/services/anchor_based_app_root_url';
 import {
   ComponentRef,
   DynamicComponentLoader
@@ -56,7 +56,7 @@ import {AppViewManager} from 'angular2/src/core/compiler/view_manager';
 import {AppViewManagerUtils} from 'angular2/src/core/compiler/view_manager_utils';
 import {AppViewListener} from 'angular2/src/core/compiler/view_listener';
 import {ProtoViewFactory} from 'angular2/src/core/compiler/proto_view_factory';
-import {Renderer, RenderCompiler} from 'angular2/src/render/api';
+import {Renderer, RenderCompiler} from 'angular2/src/core/render/api';
 import {
   DomRenderer,
   DOCUMENT,
@@ -64,16 +64,18 @@ import {
   APP_ID_RANDOM_BINDING,
   MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE,
   TemplateCloner
-} from 'angular2/src/render/render';
+} from 'angular2/src/core/render/render';
-import {ElementSchemaRegistry} from 'angular2/src/render/dom/schema/element_schema_registry';
+import {ElementSchemaRegistry} from 'angular2/src/core/render/dom/schema/element_schema_registry';
-import {DomElementSchemaRegistry} from 'angular2/src/render/dom/schema/dom_element_schema_registry';
+import {
+  DomElementSchemaRegistry
+} from 'angular2/src/core/render/dom/schema/dom_element_schema_registry';
 import {
   SharedStylesHost,
   DomSharedStylesHost
-} from 'angular2/src/render/dom/view/shared_styles_host';
+} from 'angular2/src/core/render/dom/view/shared_styles_host';
 import {internalView} from 'angular2/src/core/compiler/view_ref';
 import {APP_COMPONENT_REF_PROMISE, APP_COMPONENT} from './application_tokens';
-import {wtfInit} from '../profile/wtf_init';
+import {wtfInit} from './profile/wtf_init';
 import {EXCEPTION_BINDING} from './platform_bindings';
 import {ApplicationRef} from './application_ref';
 

modules/angular2/src/core/application_ref.ts

@@ -1,6 +1,6 @@
 import {ComponentRef} from 'angular2/src/core/compiler/dynamic_component_loader';
 import {Injector} from 'angular2/di';
-import {Type} from 'angular2/src/facade/lang';
+import {Type} from 'angular2/src/core/facade/lang';
 /**
  * Represents a Angular's representation of an Application.
  *

modules/angular2/src/core/application_tokens.ts

@@ -1,5 +1,5 @@
 import {OpaqueToken} from 'angular2/di';
-import {CONST_EXPR} from 'angular2/src/facade/lang';
+import {CONST_EXPR} from 'angular2/src/core/facade/lang';
 
 /**
  *  @private

modules/angular2/src/core/change_detection/abstract_change_detector.ts

@@ -1,5 +1,5 @@
-import {isPresent, isBlank, BaseException, StringWrapper} from 'angular2/src/facade/lang';
+import {isPresent, isBlank, BaseException, StringWrapper} from 'angular2/src/core/facade/lang';
-import {List, ListWrapper} from 'angular2/src/facade/collection';
+import {List, ListWrapper} from 'angular2/src/core/facade/collection';
 import {ChangeDetectionUtil} from './change_detection_util';
 import {ChangeDetectorRef} from './change_detector_ref';
 import {DirectiveIndex} from './directive_record';

modules/angular2/src/core/change_detection/binding_record.ts

@@ -1,5 +1,5 @@
-import {isPresent, isBlank} from 'angular2/src/facade/lang';
+import {isPresent, isBlank} from 'angular2/src/core/facade/lang';
-import {SetterFn} from 'angular2/src/reflection/types';
+import {SetterFn} from 'angular2/src/core/reflection/types';
 import {AST} from './parser/ast';
 import {DirectiveIndex, DirectiveRecord} from './directive_record';
 

modules/angular2/src/core/change_detection/change_detection.ts

@@ -12,14 +12,14 @@ import {
   ChangeDetectorGenConfig
 } from './interfaces';
 import {Injector, Inject, Injectable, OpaqueToken, Optional, Binding} from 'angular2/di';
-import {List, StringMap, StringMapWrapper} from 'angular2/src/facade/collection';
+import {List, StringMap, StringMapWrapper} from 'angular2/src/core/facade/collection';
 import {
   CONST,
   CONST_EXPR,
   isPresent,
   BaseException,
   assertionsEnabled
-} from 'angular2/src/facade/lang';
+} from 'angular2/src/core/facade/lang';
 
 export {
   ASTWithSource,

modules/angular2/src/core/change_detection/change_detection_jit_generator.ts

@@ -1,5 +1,5 @@
-import {BaseException, Type, isBlank, isPresent} from 'angular2/src/facade/lang';
+import {BaseException, Type, isBlank, isPresent} from 'angular2/src/core/facade/lang';
-import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
+import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
 
 import {AbstractChangeDetector} from './abstract_change_detector';
 import {ChangeDetectionUtil} from './change_detection_util';

modules/angular2/src/core/change_detection/change_detection_util.ts

@@ -5,8 +5,8 @@ import {
   BaseException,
   Type,
   StringWrapper
-} from 'angular2/src/facade/lang';
+} from 'angular2/src/core/facade/lang';
-import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
+import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
 import {ProtoRecord} from './proto_record';
 import {
   CHECK_ALWAYS,

modules/angular2/src/core/change_detection/coalesce.ts

@@ -1,5 +1,5 @@
-import {isPresent, isBlank, looseIdentical} from 'angular2/src/facade/lang';
+import {isPresent, isBlank, looseIdentical} from 'angular2/src/core/facade/lang';
-import {List, ListWrapper, Map} from 'angular2/src/facade/collection';
+import {List, ListWrapper, Map} from 'angular2/src/core/facade/collection';
 import {RecordType, ProtoRecord} from './proto_record';
 
 /**

modules/angular2/src/core/change_detection/codegen_facade.ts

@@ -1,4 +1,4 @@
-import {List} from 'angular2/src/facade/collection';
+import {List} from 'angular2/src/core/facade/collection';
 
 /**
  * Converts `funcOrValue` to a string which can be used in generated code.

modules/angular2/src/core/change_detection/codegen_logic_util.ts

@@ -1,5 +1,11 @@
-import {ListWrapper} from 'angular2/src/facade/collection';
+import {ListWrapper} from 'angular2/src/core/facade/collection';
-import {BaseException, Json, StringWrapper, isPresent, isBlank} from 'angular2/src/facade/lang';
+import {
+  BaseException,
+  Json,
+  StringWrapper,
+  isPresent,
+  isBlank
+} from 'angular2/src/core/facade/lang';
 import {CodegenNameUtil} from './codegen_name_util';
 import {codify, combineGeneratedStrings, rawString} from './codegen_facade';
 import {ProtoRecord, RecordType} from './proto_record';

modules/angular2/src/core/change_detection/codegen_name_util.ts

@@ -1,5 +1,5 @@
-import {RegExpWrapper, StringWrapper} from 'angular2/src/facade/lang';
+import {RegExpWrapper, StringWrapper} from 'angular2/src/core/facade/lang';
-import {List, ListWrapper, MapWrapper, Map} from 'angular2/src/facade/collection';
+import {List, ListWrapper, MapWrapper, Map} from 'angular2/src/core/facade/collection';
 
 import {DirectiveIndex} from './directive_record';
 

modules/angular2/src/core/change_detection/constants.ts

@@ -1,5 +1,5 @@
 // TODO:vsavkin Use enums after switching to TypeScript
-import {StringWrapper, normalizeBool, isBlank} from 'angular2/src/facade/lang';
+import {StringWrapper, normalizeBool, isBlank} from 'angular2/src/core/facade/lang';
 
 /**
  * CHECK_ONCE means that after calling detectChanges the mode of the change detector

modules/angular2/src/core/change_detection/differs/default_iterable_differ.ts

@@ -1,10 +1,10 @@
-import {CONST, BaseException} from 'angular2/src/facade/lang';
+import {CONST, BaseException} from 'angular2/src/core/facade/lang';
 import {
   isListLikeIterable,
   iterateListLike,
   ListWrapper,
   MapWrapper
-} from 'angular2/src/facade/collection';
+} from 'angular2/src/core/facade/collection';
 
 import {
   isBlank,
@@ -13,7 +13,7 @@ import {
   getMapKey,
   looseIdentical,
   isArray
-} from 'angular2/src/facade/lang';
+} from 'angular2/src/core/facade/lang';
 
 import {ChangeDetectorRef} from '../change_detector_ref';
 import {IterableDiffer, IterableDifferFactory} from '../differs/iterable_differs';

modules/angular2/src/core/change_detection/differs/default_keyvalue_differ.ts

@@ -1,4 +1,4 @@
-import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
+import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
 import {
   stringify,
   looseIdentical,
@@ -6,7 +6,7 @@ import {
   CONST,
   isBlank,
   BaseException
-} from 'angular2/src/facade/lang';
+} from 'angular2/src/core/facade/lang';
 import {ChangeDetectorRef} from '../change_detector_ref';
 import {KeyValueDiffer, KeyValueDifferFactory} from '../differs/keyvalue_differs';
 

modules/angular2/src/core/change_detection/differs/iterable_differs.ts

@@ -1,5 +1,5 @@
-import {isBlank, isPresent, BaseException, CONST} from 'angular2/src/facade/lang';
+import {isBlank, isPresent, BaseException, CONST} from 'angular2/src/core/facade/lang';
-import {ListWrapper} from 'angular2/src/facade/collection';
+import {ListWrapper} from 'angular2/src/core/facade/collection';
 import {ChangeDetectorRef} from '../change_detector_ref';
 import {Binding, SkipSelfMetadata, OptionalMetadata, Injectable} from 'angular2/di';
 

modules/angular2/src/core/change_detection/differs/keyvalue_differs.ts

@@ -1,5 +1,5 @@
-import {isBlank, isPresent, BaseException, CONST} from 'angular2/src/facade/lang';
+import {isBlank, isPresent, BaseException, CONST} from 'angular2/src/core/facade/lang';
-import {ListWrapper} from 'angular2/src/facade/collection';
+import {ListWrapper} from 'angular2/src/core/facade/collection';
 import {ChangeDetectorRef} from '../change_detector_ref';
 import {Binding, SkipSelfMetadata, OptionalMetadata, Injectable} from 'angular2/di';
 

modules/angular2/src/core/change_detection/directive_record.ts

@@ -1,4 +1,4 @@
-import {StringWrapper, normalizeBool, isBlank} from 'angular2/src/facade/lang';
+import {StringWrapper, normalizeBool, isBlank} from 'angular2/src/core/facade/lang';
 import {isDefaultChangeDetectionStrategy} from './constants';
 
 export class DirectiveIndex {

modules/angular2/src/core/change_detection/dynamic_change_detector.ts

@@ -4,8 +4,8 @@ import {
   BaseException,
   FunctionWrapper,
   StringWrapper
-} from 'angular2/src/facade/lang';
+} from 'angular2/src/core/facade/lang';
-import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
+import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
 
 import {AbstractChangeDetector} from './abstract_change_detector';
 import {EventBinding} from './event_binding';

modules/angular2/src/core/change_detection/exceptions.ts

@@ -1,4 +1,4 @@
-import {BaseException} from "angular2/src/facade/lang";
+import {BaseException} from "angular2/src/core/facade/lang";
 
 /**
  * An error thrown if application changes model breaking the top-down data flow.

modules/angular2/src/core/change_detection/interfaces.ts

@@ -1,5 +1,5 @@
-import {List} from 'angular2/src/facade/collection';
+import {List} from 'angular2/src/core/facade/collection';
-import {CONST} from 'angular2/src/facade/lang';
+import {CONST} from 'angular2/src/core/facade/lang';
 import {Locals} from './parser/locals';
 import {BindingTarget, BindingRecord} from './binding_record';
 import {DirectiveIndex, DirectiveRecord} from './directive_record';

modules/angular2/src/core/change_detection/jit_proto_change_detector.ts

@@ -1,5 +1,5 @@
-import {ListWrapper} from 'angular2/src/facade/collection';
+import {ListWrapper} from 'angular2/src/core/facade/collection';
-import {isPresent} from 'angular2/src/facade/lang';
+import {isPresent} from 'angular2/src/core/facade/lang';
 
 import {ProtoChangeDetector, ChangeDetector, ChangeDetectorDefinition} from './interfaces';
 import {ChangeDetectorJITGenerator} from './change_detection_jit_generator';

modules/angular2/src/core/change_detection/parser/ast.ts

@@ -1,5 +1,5 @@
-import {isBlank, isPresent, FunctionWrapper, BaseException} from "angular2/src/facade/lang";
+import {isBlank, isPresent, FunctionWrapper, BaseException} from "angular2/src/core/facade/lang";
-import {List, Map, ListWrapper, StringMapWrapper} from "angular2/src/facade/collection";
+import {List, Map, ListWrapper, StringMapWrapper} from "angular2/src/core/facade/collection";
 
 export class AST {
   visit(visitor: AstVisitor): any { return null; }

modules/angular2/src/core/change_detection/parser/lexer.ts

@@ -1,12 +1,12 @@
-import {Injectable} from 'angular2/src/di/decorators';
+import {Injectable} from 'angular2/src/core/di/decorators';
-import {List, ListWrapper, SetWrapper} from "angular2/src/facade/collection";
+import {List, ListWrapper, SetWrapper} from "angular2/src/core/facade/collection";
 import {
   NumberWrapper,
   StringJoiner,
   StringWrapper,
   BaseException,
   isPresent
-} from "angular2/src/facade/lang";
+} from "angular2/src/core/facade/lang";
 
 export enum TokenType {
   CHARACTER,

modules/angular2/src/core/change_detection/parser/locals.ts

@@ -1,5 +1,5 @@
-import {isPresent, BaseException} from 'angular2/src/facade/lang';
+import {isPresent, BaseException} from 'angular2/src/core/facade/lang';
-import {ListWrapper, MapWrapper} from 'angular2/src/facade/collection';
+import {ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection';
 
 export class Locals {
   constructor(public parent: Locals, public current: Map<any, any>) {}

modules/angular2/src/core/change_detection/parser/parser.ts

@@ -1,6 +1,6 @@
-import {Injectable} from 'angular2/src/di/decorators';
+import {Injectable} from 'angular2/src/core/di/decorators';
-import {isBlank, isPresent, BaseException, StringWrapper} from 'angular2/src/facade/lang';
+import {isBlank, isPresent, BaseException, StringWrapper} from 'angular2/src/core/facade/lang';
-import {ListWrapper, List} from 'angular2/src/facade/collection';
+import {ListWrapper, List} from 'angular2/src/core/facade/collection';
 import {
   Lexer,
   EOF,
@@ -16,7 +16,7 @@ import {
   $LPAREN,
   $RPAREN
 } from './lexer';
-import {reflector, Reflector} from 'angular2/src/reflection/reflection';
+import {reflector, Reflector} from 'angular2/src/core/reflection/reflection';
 import {
   AST,
   EmptyExpr,

modules/angular2/src/core/change_detection/pipe_lifecycle_reflector.dart

@@ -1,5 +1,5 @@
 library angular2.core.compiler.pipe_lifecycle_reflector;
 
-import 'package:angular2/src/change_detection/pipe_transform.dart';
+import 'package:angular2/src/core/change_detection/pipe_transform.dart';
 
 bool implementsOnDestroy(Object pipe) => pipe is PipeOnDestroy;

modules/angular2/src/core/change_detection/pipe_transform.ts

@@ -1,4 +1,4 @@
-import {ABSTRACT, BaseException, CONST, Type} from 'angular2/src/facade/lang';
+import {ABSTRACT, BaseException, CONST, Type} from 'angular2/src/core/facade/lang';
 
 /**
  * An interface which all pipes must implement.

modules/angular2/src/core/change_detection/pregen_proto_change_detector.dart

@@ -1,23 +1,23 @@
 library angular2.src.change_detection.pregen_proto_change_detector;
 
-import 'package:angular2/src/change_detection/interfaces.dart';
+import 'package:angular2/src/core/change_detection/interfaces.dart';
-import 'package:angular2/src/facade/lang.dart' show looseIdentical;
+import 'package:angular2/src/core/facade/lang.dart' show looseIdentical;
 
 export 'dart:core' show List;
-export 'package:angular2/src/change_detection/abstract_change_detector.dart'
+export 'package:angular2/src/core/change_detection/abstract_change_detector.dart'
     show AbstractChangeDetector;
-export 'package:angular2/src/change_detection/change_detection.dart'
+export 'package:angular2/src/core/change_detection/change_detection.dart'
     show preGeneratedProtoDetectors;
-export 'package:angular2/src/change_detection/directive_record.dart'
+export 'package:angular2/src/core/change_detection/directive_record.dart'
     show DirectiveIndex, DirectiveRecord;
-export 'package:angular2/src/change_detection/interfaces.dart'
+export 'package:angular2/src/core/change_detection/interfaces.dart'
     show ChangeDetector, ChangeDetectorDefinition, ProtoChangeDetector;
-export 'package:angular2/src/change_detection/pipes.dart' show Pipes;
+export 'package:angular2/src/core/change_detection/pipes.dart' show Pipes;
-export 'package:angular2/src/change_detection/proto_record.dart'
+export 'package:angular2/src/core/change_detection/proto_record.dart'
     show ProtoRecord;
-export 'package:angular2/src/change_detection/change_detection_util.dart'
+export 'package:angular2/src/core/change_detection/change_detection_util.dart'
     show ChangeDetectionUtil;
-export 'package:angular2/src/facade/lang.dart' show looseIdentical;
+export 'package:angular2/src/core/facade/lang.dart' show looseIdentical;
 
 typedef ProtoChangeDetector PregenProtoChangeDetectorFactory(
     ChangeDetectorDefinition definition);

modules/angular2/src/core/change_detection/pregen_proto_change_detector.ts

@@ -1,4 +1,4 @@
-import {BaseException} from 'angular2/src/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/lang';
 
 import {ProtoChangeDetector, ChangeDetector} from './interfaces';
 import {coalesce} from './coalesce';

modules/angular2/src/core/change_detection/proto_change_detector.ts

@@ -1,5 +1,5 @@
-import {BaseException, Type, isBlank, isPresent, isString} from 'angular2/src/facade/lang';
+import {BaseException, Type, isBlank, isPresent, isString} from 'angular2/src/core/facade/lang';
-import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
+import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
 
 import {
   PropertyRead,

modules/angular2/src/core/change_detection/proto_record.ts

@@ -1,4 +1,4 @@
-import {List} from 'angular2/src/facade/collection';
+import {List} from 'angular2/src/core/facade/collection';
 import {BindingRecord} from './binding_record';
 import {DirectiveIndex} from './directive_record';
 

modules/angular2/src/core/compiler/compiler.ts

@@ -9,9 +9,9 @@ import {
   stringify,
   isArray,
   isPromise
-} from 'angular2/src/facade/lang';
+} from 'angular2/src/core/facade/lang';
-import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
+import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async';
-import {List, ListWrapper, Map, MapWrapper} from 'angular2/src/facade/collection';
+import {List, ListWrapper, Map, MapWrapper} from 'angular2/src/core/facade/collection';
 
 import {DirectiveResolver} from './directive_resolver';
 
@@ -23,10 +23,10 @@ import {PipeResolver} from './pipe_resolver';
 import {ViewMetadata} from 'angular2/metadata';
 import {ComponentUrlMapper} from './component_url_mapper';
 import {ProtoViewFactory} from './proto_view_factory';
-import {UrlResolver} from 'angular2/src/services/url_resolver';
+import {UrlResolver} from 'angular2/src/core/services/url_resolver';
-import {AppRootUrl} from 'angular2/src/services/app_root_url';
+import {AppRootUrl} from 'angular2/src/core/services/app_root_url';
 import {ElementBinder} from './element_binder';
-import {wtfStartTimeRange, wtfEndTimeRange} from '../../profile/profile';
+import {wtfStartTimeRange, wtfEndTimeRange} from '../profile/profile';
 import {PipeBinding} from '../pipes/pipe_binding';
 import {DEFAULT_PIPES_TOKEN} from 'angular2/pipes';
 
@@ -37,7 +37,7 @@ import {
   ViewType,
   RenderProtoViewMergeMapping,
   RenderProtoViewRef
-} from 'angular2/src/render/api';
+} from 'angular2/src/core/render/api';
 
 /**
  * Cache that stores the AppProtoView of the template of a component.

modules/angular2/src/core/compiler/component_url_mapper.ts

@@ -1,6 +1,6 @@
 import {Injectable} from 'angular2/di';
-import {Type, isPresent} from 'angular2/src/facade/lang';
+import {Type, isPresent} from 'angular2/src/core/facade/lang';
-import {Map, MapWrapper} from 'angular2/src/facade/collection';
+import {Map, MapWrapper} from 'angular2/src/core/facade/collection';
 
 /**
  * Resolve a `Type` from a {@link ComponentMetadata} into a URL.

modules/angular2/src/core/compiler/directive_lifecycle_reflector.dart

@@ -2,7 +2,7 @@ library angular2.src.core.compiler.directive_lifecycle_reflector;
 
 import 'package:angular2/src/core/metadata.dart';
 import 'package:angular2/src/core/compiler/interfaces.dart';
-import 'package:angular2/src/reflection/reflection.dart';
+import 'package:angular2/src/core/reflection/reflection.dart';
 
 bool hasLifecycleHook(LifecycleEvent e, type, DirectiveMetadata annotation) {
   if (annotation.lifecycle != null) {

modules/angular2/src/core/compiler/directive_lifecycle_reflector.ts

@@ -1,4 +1,4 @@
-import {Type, isPresent} from 'angular2/src/facade/lang';
+import {Type, isPresent} from 'angular2/src/core/facade/lang';
 import {LifecycleEvent, DirectiveMetadata} from 'angular2/metadata';
 
 export function hasLifecycleHook(e: LifecycleEvent, type, annotation: DirectiveMetadata): boolean {

modules/angular2/src/core/compiler/directive_resolver.ts

@@ -1,7 +1,7 @@
 import {resolveForwardRef, Injectable} from 'angular2/di';
-import {Type, isPresent, BaseException, stringify} from 'angular2/src/facade/lang';
+import {Type, isPresent, BaseException, stringify} from 'angular2/src/core/facade/lang';
 import {DirectiveMetadata} from 'angular2/metadata';
-import {reflector} from 'angular2/src/reflection/reflection';
+import {reflector} from 'angular2/src/core/reflection/reflection';
 
 /**
  * Resolve a `Type` for {@link DirectiveMetadata}.

modules/angular2/src/core/compiler/dynamic_component_loader.ts

@@ -1,7 +1,7 @@
 import {Key, Injector, ResolvedBinding, Binding, bind, Injectable} from 'angular2/di';
 import {Compiler} from './compiler';
-import {Type, BaseException, stringify, isPresent} from 'angular2/src/facade/lang';
+import {Type, BaseException, stringify, isPresent} from 'angular2/src/core/facade/lang';
-import {Promise} from 'angular2/src/facade/async';
+import {Promise} from 'angular2/src/core/facade/async';
 import {AppViewManager} from 'angular2/src/core/compiler/view_manager';
 import {ElementRef} from './element_ref';
 import {ViewRef, HostViewRef} from './view_ref';

modules/angular2/src/core/compiler/element_binder.ts

@@ -1,4 +1,4 @@
-import {isBlank, isPresent, BaseException} from 'angular2/src/facade/lang';
+import {isBlank, isPresent, BaseException} from 'angular2/src/core/facade/lang';
 import * as eiModule from './element_injector';
 import {DirectiveBinding} from './element_injector';
 import * as viewModule from './view';

modules/angular2/src/core/compiler/element_injector.ts

@@ -6,9 +6,9 @@ import {
   stringify,
   CONST_EXPR,
   StringWrapper
-} from 'angular2/src/facade/lang';
+} from 'angular2/src/core/facade/lang';
-import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
+import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async';
-import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
+import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
 import {
   Injector,
   ProtoInjector,
@@ -29,7 +29,7 @@ import {
   InjectorInlineStrategy,
   InjectorDynamicStrategy,
   BindingWithVisibility
-} from 'angular2/src/di/injector';
+} from 'angular2/src/core/di/injector';
 
 import {AttributeMetadata, QueryMetadata} from '../metadata/di';
 
@@ -40,11 +40,14 @@ import {ElementRef} from './element_ref';
 import {TemplateRef} from './template_ref';
 import {DirectiveMetadata, ComponentMetadata, LifecycleEvent} from '../metadata/directives';
 import {hasLifecycleHook} from './directive_lifecycle_reflector';
-import {ChangeDetector, ChangeDetectorRef} from 'angular2/src/change_detection/change_detection';
+import {
+  ChangeDetector,
+  ChangeDetectorRef
+} from 'angular2/src/core/change_detection/change_detection';
 import {QueryList} from './query_list';
-import {reflector} from 'angular2/src/reflection/reflection';
+import {reflector} from 'angular2/src/core/reflection/reflection';
-import {RenderDirectiveMetadata} from 'angular2/src/render/api';
+import {RenderDirectiveMetadata} from 'angular2/src/core/render/api';
-import {EventConfig} from 'angular2/src/render/dom/util';
+import {EventConfig} from 'angular2/src/core/render/dom/util';
 import {PipeBinding} from '../pipes/pipe_binding';
 
 var _staticKeys;

modules/angular2/src/core/compiler/element_ref.ts

@@ -1,6 +1,6 @@
-import {BaseException, isPresent} from 'angular2/src/facade/lang';
+import {BaseException, isPresent} from 'angular2/src/core/facade/lang';
 import {ViewRef} from './view_ref';
-import {RenderViewRef, RenderElementRef, Renderer} from 'angular2/src/render/api';
+import {RenderViewRef, RenderElementRef, Renderer} from 'angular2/src/core/render/api';
 
 /**
  * Reference to the element.

modules/angular2/src/core/compiler/interfaces.ts

@@ -1,5 +1,5 @@
-import {StringMap} from 'angular2/src/facade/collection';
+import {StringMap} from 'angular2/src/core/facade/collection';
-import {global} from 'angular2/src/facade/lang';
+import {global} from 'angular2/src/core/facade/lang';
 
 // This is here only so that after TS transpilation the file is not empty.
 // TODO(rado): find a better way to fix this, or remove if likely culprit

modules/angular2/src/core/compiler/pipe_resolver.ts

@@ -1,7 +1,7 @@
 import {resolveForwardRef, Injectable} from 'angular2/di';
-import {Type, isPresent, BaseException, stringify} from 'angular2/src/facade/lang';
+import {Type, isPresent, BaseException, stringify} from 'angular2/src/core/facade/lang';
 import {PipeMetadata} from '../metadata/directives';
-import {reflector} from 'angular2/src/reflection/reflection';
+import {reflector} from 'angular2/src/core/reflection/reflection';
 
 /**
  * Resolve a `Type` for {@link PipeMetadata}.

modules/angular2/src/core/compiler/proto_view_factory.ts

@@ -1,8 +1,8 @@
 import {Injectable} from 'angular2/di';
 
-import {List, ListWrapper, MapWrapper} from 'angular2/src/facade/collection';
+import {List, ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection';
-import {isPresent, isBlank, BaseException, assertionsEnabled} from 'angular2/src/facade/lang';
+import {isPresent, isBlank, BaseException, assertionsEnabled} from 'angular2/src/core/facade/lang';
-import {reflector} from 'angular2/src/reflection/reflection';
+import {reflector} from 'angular2/src/core/reflection/reflection';
 
 import {
   ChangeDetection,
@@ -14,7 +14,7 @@ import {
   ChangeDetectorDefinition,
   ChangeDetectorGenConfig,
   ASTWithSource
-} from 'angular2/src/change_detection/change_detection';
+} from 'angular2/src/core/change_detection/change_detection';
 
 import {PipeBinding} from 'angular2/src/core/pipes/pipe_binding';
 import {ProtoPipes} from 'angular2/src/core/pipes/pipes';
@@ -26,7 +26,7 @@ import {
   DirectiveBinder,
   ProtoViewDto,
   ViewType
-} from 'angular2/src/render/api';
+} from 'angular2/src/core/render/api';
 import {AppProtoView} from './view';
 import {ElementBinder} from './element_binder';
 import {ProtoElementInjector, DirectiveBinding} from './element_injector';

modules/angular2/src/core/compiler/query_list.ts

@@ -1,4 +1,4 @@
-import {List, ListWrapper, MapWrapper} from 'angular2/src/facade/collection';
+import {List, ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection';
 
 /**
  * An iterable and observable live list of components in the DOM.

modules/angular2/src/core/compiler/view.ts

@@ -5,7 +5,7 @@ import {
   StringMapWrapper,
   List,
   StringMap
-} from 'angular2/src/facade/collection';
+} from 'angular2/src/core/facade/collection';
 import {
   AST,
   ChangeDetector,
@@ -16,8 +16,8 @@ import {
   BindingTarget,
   Locals,
   ProtoChangeDetector
-} from 'angular2/src/change_detection/change_detection';
+} from 'angular2/src/core/change_detection/change_detection';
-import {DebugContext} from 'angular2/src/change_detection/interfaces';
+import {DebugContext} from 'angular2/src/core/change_detection/interfaces';
 
 import {
   ProtoElementInjector,
@@ -26,15 +26,15 @@ import {
   DirectiveBinding
 } from './element_injector';
 import {ElementBinder} from './element_binder';
-import {isPresent, isBlank, BaseException} from 'angular2/src/facade/lang';
+import {isPresent, isBlank, BaseException} from 'angular2/src/core/facade/lang';
-import * as renderApi from 'angular2/src/render/api';
+import * as renderApi from 'angular2/src/core/render/api';
-import {RenderEventDispatcher} from 'angular2/src/render/api';
+import {RenderEventDispatcher} from 'angular2/src/core/render/api';
 import {ViewRef, ProtoViewRef, internalView} from './view_ref';
 import {ElementRef} from './element_ref';
 import {ProtoPipes} from 'angular2/src/core/pipes/pipes';
-import {camelCaseToDashCase} from 'angular2/src/render/dom/util';
+import {camelCaseToDashCase} from 'angular2/src/core/render/dom/util';
 
-export {DebugContext} from 'angular2/src/change_detection/interfaces';
+export {DebugContext} from 'angular2/src/core/change_detection/interfaces';
 
 const REFLECT_PREFIX: string = 'ng-reflect-';
 

modules/angular2/src/core/compiler/view_container_ref.ts

@@ -1,6 +1,6 @@
-import {ListWrapper, List} from 'angular2/src/facade/collection';
+import {ListWrapper, List} from 'angular2/src/core/facade/collection';
 import {ResolvedBinding} from 'angular2/di';
-import {isPresent, isBlank} from 'angular2/src/facade/lang';
+import {isPresent, isBlank} from 'angular2/src/core/facade/lang';
 
 import * as avmModule from './view_manager';
 import * as viewModule from './view';

modules/angular2/src/core/compiler/view_manager.ts

@@ -1,5 +1,5 @@
 import {Injector, Binding, Injectable, ResolvedBinding} from 'angular2/di';
-import {isPresent, isBlank, BaseException} from 'angular2/src/facade/lang';
+import {isPresent, isBlank, BaseException} from 'angular2/src/core/facade/lang';
 import * as viewModule from './view';
 import {ElementRef} from './element_ref';
 import {ProtoViewRef, ViewRef, HostViewRef, internalView, internalProtoView} from './view_ref';
@@ -11,11 +11,11 @@ import {
   RenderFragmentRef,
   RenderViewWithFragments,
   ViewType
-} from 'angular2/src/render/api';
+} from 'angular2/src/core/render/api';
 import {AppViewManagerUtils} from './view_manager_utils';
 import {AppViewPool} from './view_pool';
 import {AppViewListener} from './view_listener';
-import {wtfCreateScope, wtfLeave, WtfScopeFn} from '../../profile/profile';
+import {wtfCreateScope, wtfLeave, WtfScopeFn} from '../profile/profile';
 
 /**
  * Entry point for creating, moving views in the view hierarchy and destroying views.

modules/angular2/src/core/compiler/view_manager_utils.ts

@@ -1,16 +1,22 @@
 import {Injector, Binding, Injectable, ResolvedBinding} from 'angular2/di';
-import {ListWrapper, MapWrapper, Map, StringMapWrapper, List} from 'angular2/src/facade/collection';
+import {
+  ListWrapper,
+  MapWrapper,
+  Map,
+  StringMapWrapper,
+  List
+} from 'angular2/src/core/facade/collection';
 import * as eli from './element_injector';
-import {isPresent, isBlank, BaseException} from 'angular2/src/facade/lang';
+import {isPresent, isBlank, BaseException} from 'angular2/src/core/facade/lang';
 import * as viewModule from './view';
 import {internalView} from './view_ref';
 import * as avmModule from './view_manager';
 import {ElementRef} from './element_ref';
 import {TemplateRef} from './template_ref';
-import {Renderer, RenderViewWithFragments} from 'angular2/src/render/api';
+import {Renderer, RenderViewWithFragments} from 'angular2/src/core/render/api';
-import {Locals} from 'angular2/src/change_detection/change_detection';
+import {Locals} from 'angular2/src/core/change_detection/change_detection';
 import {Pipes} from 'angular2/src/core/pipes/pipes';
-import {RenderViewRef, RenderFragmentRef, ViewType} from 'angular2/src/render/api';
+import {RenderViewRef, RenderFragmentRef, ViewType} from 'angular2/src/core/render/api';
 
 @Injectable()
 export class AppViewManagerUtils {

modules/angular2/src/core/compiler/view_pool.ts

@@ -1,7 +1,7 @@
 import {Inject, Injectable, OpaqueToken} from 'angular2/di';
 
-import {ListWrapper, MapWrapper, Map, List} from 'angular2/src/facade/collection';
+import {ListWrapper, MapWrapper, Map, List} from 'angular2/src/core/facade/collection';
-import {isPresent, isBlank, CONST_EXPR} from 'angular2/src/facade/lang';
+import {isPresent, isBlank, CONST_EXPR} from 'angular2/src/core/facade/lang';
 
 import * as viewModule from './view';
 

modules/angular2/src/core/compiler/view_ref.ts

@@ -1,6 +1,6 @@
-import {isPresent} from 'angular2/src/facade/lang';
+import {isPresent} from 'angular2/src/core/facade/lang';
 import * as viewModule from './view';
-import {RenderViewRef, RenderFragmentRef} from 'angular2/src/render/api';
+import {RenderViewRef, RenderFragmentRef} from 'angular2/src/core/render/api';
 
 // This is a workaround for privacy in Dart as we don't have library parts
 export function internalView(viewRef: ViewRef): viewModule.AppView {

modules/angular2/src/core/compiler/view_resolver.ts

@@ -1,10 +1,10 @@
 import {Injectable} from 'angular2/di';
 import {ViewMetadata} from '../metadata/view';
 
-import {Type, stringify, isBlank, BaseException} from 'angular2/src/facade/lang';
+import {Type, stringify, isBlank, BaseException} from 'angular2/src/core/facade/lang';
-import {Map, MapWrapper, List, ListWrapper} from 'angular2/src/facade/collection';
+import {Map, MapWrapper, List, ListWrapper} from 'angular2/src/core/facade/collection';
 
-import {reflector} from 'angular2/src/reflection/reflection';
+import {reflector} from 'angular2/src/core/reflection/reflection';
 
 
 @Injectable()

modules/angular2/src/core/debug/debug_element.ts

@@ -1,7 +1,7 @@
-import {Type, isPresent, BaseException, isBlank} from 'angular2/src/facade/lang';
+import {Type, isPresent, BaseException, isBlank} from 'angular2/src/core/facade/lang';
-import {List, ListWrapper, MapWrapper, Predicate} from 'angular2/src/facade/collection';
+import {List, ListWrapper, MapWrapper, Predicate} from 'angular2/src/core/facade/collection';
 
-import {DOM} from 'angular2/src/dom/dom_adapter';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
 
 import {ElementInjector} from 'angular2/src/core/compiler/element_injector';
 import {AppView} from 'angular2/src/core/compiler/view';

modules/angular2/src/core/debug/debug_element_view_listener.ts

@@ -1,10 +1,10 @@
-import {CONST_EXPR, isPresent, NumberWrapper, StringWrapper} from 'angular2/src/facade/lang';
+import {CONST_EXPR, isPresent, NumberWrapper, StringWrapper} from 'angular2/src/core/facade/lang';
-import {MapWrapper, Map, ListWrapper, List} from 'angular2/src/facade/collection';
+import {MapWrapper, Map, ListWrapper, List} from 'angular2/src/core/facade/collection';
 import {Injectable, bind, Binding} from 'angular2/di';
 import {AppViewListener} from 'angular2/src/core/compiler/view_listener';
 import {AppView} from 'angular2/src/core/compiler/view';
-import {DOM} from 'angular2/src/dom/dom_adapter';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
-import {Renderer} from 'angular2/src/render/api';
+import {Renderer} from 'angular2/src/core/render/api';
 import {DebugElement} from './debug_element';
 
 const NG_ID_PROPERTY = 'ngid';

modules/angular2/src/core/di/binding.ts

@@ -7,9 +7,9 @@ import {
   BaseException,
   stringify,
   isArray
-} from 'angular2/src/facade/lang';
+} from 'angular2/src/core/facade/lang';
-import {List, MapWrapper, ListWrapper} from 'angular2/src/facade/collection';
+import {List, MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection';
-import {reflector} from 'angular2/src/reflection/reflection';
+import {reflector} from 'angular2/src/core/reflection/reflection';
 import {Key} from './key';
 import {
   InjectMetadata,

modules/angular2/src/core/di/exceptions.ts

@@ -1,5 +1,5 @@
-import {ListWrapper, List} from 'angular2/src/facade/collection';
+import {ListWrapper, List} from 'angular2/src/core/facade/collection';
-import {stringify, BaseException, isBlank} from 'angular2/src/facade/lang';
+import {stringify, BaseException, isBlank} from 'angular2/src/core/facade/lang';
 import {Key} from './key';
 import {Injector} from './injector';
 

modules/angular2/src/core/di/forward_ref.ts

@@ -1,4 +1,4 @@
-import {Type, stringify, isFunction} from 'angular2/src/facade/lang';
+import {Type, stringify, isFunction} from 'angular2/src/core/facade/lang';
 
 export interface ForwardRefFn { (): any; }
 

modules/angular2/src/core/di/injector.ts

@@ -1,4 +1,4 @@
-import {Map, List, MapWrapper, ListWrapper} from 'angular2/src/facade/collection';
+import {Map, List, MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection';
 import {ResolvedBinding, Binding, Dependency, BindingBuilder, bind} from './binding';
 import {
   AbstractBindingError,
@@ -8,7 +8,7 @@ import {
   InvalidBindingError,
   OutOfBoundsError
 } from './exceptions';
-import {FunctionWrapper, Type, isPresent, isBlank, CONST_EXPR} from 'angular2/src/facade/lang';
+import {FunctionWrapper, Type, isPresent, isBlank, CONST_EXPR} from 'angular2/src/core/facade/lang';
 import {Key} from './key';
 import {resolveForwardRef} from './forward_ref';
 import {SelfMetadata, HostMetadata, SkipSelfMetadata} from './metadata';

modules/angular2/src/core/di/key.ts

@@ -1,5 +1,5 @@
-import {MapWrapper} from 'angular2/src/facade/collection';
+import {MapWrapper} from 'angular2/src/core/facade/collection';
-import {stringify, CONST, Type, isBlank, BaseException} from 'angular2/src/facade/lang';
+import {stringify, CONST, Type, isBlank, BaseException} from 'angular2/src/core/facade/lang';
 import {TypeLiteral} from './type_literal';
 import {resolveForwardRef} from './forward_ref';
 

modules/angular2/src/core/di/metadata.ts

@@ -1,4 +1,4 @@
-import {CONST, CONST_EXPR, stringify, isBlank, isPresent} from "angular2/src/facade/lang";
+import {CONST, CONST_EXPR, stringify, isBlank, isPresent} from "angular2/src/core/facade/lang";
 
 /**
  * A parameter metadata that specifies a dependency.

modules/angular2/src/core/di/opaque_token.ts

@@ -1,4 +1,4 @@
-import {CONST} from 'angular2/src/facade/lang';
+import {CONST} from 'angular2/src/core/facade/lang';
 
 @CONST()
 export class OpaqueToken {

modules/angular2/src/core/directives/ng_class.ts

@@ -1,14 +1,18 @@
-import {isPresent, isString, StringWrapper, isBlank} from 'angular2/src/facade/lang';
+import {isPresent, isString, StringWrapper, isBlank} from 'angular2/src/core/facade/lang';
 import {Directive, LifecycleEvent} from 'angular2/metadata';
 import {ElementRef} from 'angular2/core';
-import {Renderer} from 'angular2/src/render/api';
+import {Renderer} from 'angular2/src/core/render/api';
 import {
   KeyValueDiffer,
   IterableDiffer,
   IterableDiffers,
   KeyValueDiffers
 } from 'angular2/change_detection';
-import {ListWrapper, StringMapWrapper, isListLikeIterable} from 'angular2/src/facade/collection';
+import {
+  ListWrapper,
+  StringMapWrapper,
+  isListLikeIterable
+} from 'angular2/src/core/facade/collection';
 
 /**
  * Adds and removes CSS classes based on an {expression} value.

modules/angular2/src/core/directives/ng_for.ts

@@ -1,7 +1,7 @@
 import {Directive, LifecycleEvent} from 'angular2/metadata';
 import {ViewContainerRef, ViewRef, TemplateRef} from 'angular2/core';
 import {ChangeDetectorRef, IterableDiffer, IterableDiffers} from 'angular2/change_detection';
-import {isPresent, isBlank} from 'angular2/src/facade/lang';
+import {isPresent, isBlank} from 'angular2/src/core/facade/lang';
 
 /**
  * The `NgFor` directive instantiates a template once per item from an iterable. The context for

modules/angular2/src/core/directives/ng_if.ts

@@ -1,6 +1,6 @@
 import {Directive} from 'angular2/metadata';
 import {ViewContainerRef, TemplateRef} from 'angular2/core';
-import {isBlank} from 'angular2/src/facade/lang';
+import {isBlank} from 'angular2/src/core/facade/lang';
 
 /**
  * Removes or recreates a portion of the DOM tree based on an {expression}.

modules/angular2/src/core/directives/ng_style.ts

@@ -1,8 +1,8 @@
 import {Directive, LifecycleEvent} from 'angular2/metadata';
 import {ElementRef} from 'angular2/core';
 import {KeyValueDiffer, KeyValueDiffers} from 'angular2/change_detection';
-import {isPresent, isBlank, print} from 'angular2/src/facade/lang';
+import {isPresent, isBlank, print} from 'angular2/src/core/facade/lang';
-import {Renderer} from 'angular2/src/render/api';
+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,8 +1,8 @@
 import {Directive} from 'angular2/metadata';
 import {Host} from 'angular2/di';
 import {ViewContainerRef, TemplateRef} from 'angular2/core';
-import {isPresent, isBlank, normalizeBlank, CONST_EXPR} from 'angular2/src/facade/lang';
+import {isPresent, isBlank, normalizeBlank, CONST_EXPR} from 'angular2/src/core/facade/lang';
-import {ListWrapper, List, Map} from 'angular2/src/facade/collection';
+import {ListWrapper, List, Map} from 'angular2/src/core/facade/collection';
 
 const _WHEN_DEFAULT = CONST_EXPR(new Object());
 

modules/angular2/src/core/directives/observable_list_diff.dart

@@ -2,7 +2,7 @@ library angular2.directives.observable_list_iterable_diff;
 
 import 'package:observe/observe.dart' show ObservableList;
 import 'package:angular2/change_detection.dart';
-import 'package:angular2/src/change_detection/differs/default_iterable_differ.dart';
+import 'package:angular2/src/core/change_detection/differs/default_iterable_differ.dart';
 import 'dart:async';
 
 class ObservableListDiff extends DefaultIterableDiffer {

modules/angular2/src/core/dom/browser_adapter.ts

@@ -1,5 +1,5 @@
-import {List, MapWrapper, ListWrapper} from 'angular2/src/facade/collection';
+import {List, MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection';
-import {isBlank, isPresent, global} from 'angular2/src/facade/lang';
+import {isBlank, isPresent, global} from 'angular2/src/core/facade/lang';
 import {setRootDomAdapter} from './dom_adapter';
 import {GenericBrowserDomAdapter} from './generic_browser_adapter';
 

modules/angular2/src/core/dom/dom_adapter.ts

@@ -1,4 +1,4 @@
-import {BaseException, isBlank} from 'angular2/src/facade/lang';
+import {BaseException, isBlank} from 'angular2/src/core/facade/lang';
 
 export var DOM: DomAdapter;
 
@@ -8,6 +8,8 @@ export function setRootDomAdapter(adapter: DomAdapter) {
   }
 }
 
+
+
 function _abstract() {
   return new BaseException('This method is abstract');
 }

modules/angular2/src/core/dom/generic_browser_adapter.ts

@@ -1,5 +1,5 @@
-import {List, ListWrapper} from 'angular2/src/facade/collection';
+import {List, ListWrapper} from 'angular2/src/core/facade/collection';
-import {isPresent, isFunction} from 'angular2/src/facade/lang';
+import {isPresent, isFunction} from 'angular2/src/core/facade/lang';
 import {DomAdapter} from './dom_adapter';
 
 /**

modules/angular2/src/core/dom/parse5_adapter.ts

@@ -7,10 +7,10 @@ var cssParse = require('css').parse;
 
 var url = require('url');
 
-import {List, MapWrapper, ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
+import {List, MapWrapper, ListWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
 import {DomAdapter, setRootDomAdapter} from './dom_adapter';
-import {BaseException, isPresent, isBlank, global} from 'angular2/src/facade/lang';
+import {BaseException, isPresent, isBlank, global} from 'angular2/src/core/facade/lang';
-import {SelectorMatcher, CssSelector} from 'angular2/src/render/dom/compiler/selector';
+import {SelectorMatcher, CssSelector} from 'angular2/src/core/render/dom/compiler/selector';
 
 var _attrToPropMap = {
   'class': 'className',

modules/angular2/src/core/exception_handler.ts

@@ -1,6 +1,6 @@
 import {Injectable} from 'angular2/di';
-import {isPresent, isBlank, print, BaseException} from 'angular2/src/facade/lang';
+import {isPresent, isBlank, print, BaseException} from 'angular2/src/core/facade/lang';
-import {ListWrapper, isListLikeIterable} from 'angular2/src/facade/collection';
+import {ListWrapper, isListLikeIterable} from 'angular2/src/core/facade/collection';
 
 class _ArrayLogger {
   res: any[] = [];

modules/angular2/src/core/facade/async.ts

@@ -1,7 +1,7 @@
-/// <reference path="../../typings/rx/rx.d.ts" />
+/// <reference path="../../../typings/rx/rx.d.ts" />
 
-import {global, isPresent} from 'angular2/src/facade/lang';
+import {global, isPresent} from 'angular2/src/core/facade/lang';
-import {List} from 'angular2/src/facade/collection';
+import {List} from 'angular2/src/core/facade/collection';
 import * as Rx from 'rx';
 
 export {Promise};

modules/angular2/src/core/facade/collection.ts

@@ -1,4 +1,4 @@
-import {isJsObject, global, isPresent, isBlank, isArray} from 'angular2/src/facade/lang';
+import {isJsObject, global, isPresent, isBlank, isArray} from 'angular2/src/core/facade/lang';
 
 export var List = global.Array;
 export var Map = global.Map;

modules/angular2/src/core/facade/lang.ts

@@ -1,4 +1,4 @@
-/// <reference path="../../globals.d.ts" />
+/// <reference path="../../../globals.d.ts" />
 var _global: BrowserNodeGlobal = <any>(typeof window === 'undefined' ? global : window);
 export {_global as global};
 

modules/angular2/src/core/facade/math.ts

@@ -1,4 +1,4 @@
-import {global} from 'angular2/src/facade/lang';
+import {global} from 'angular2/src/core/facade/lang';
 
 export var Math = global.Math;
 export var NaN = typeof NaN;

modules/angular2/src/core/life_cycle/life_cycle.ts

@@ -1,8 +1,8 @@
 import {Injectable} from 'angular2/di';
-import {ChangeDetector} from 'angular2/src/change_detection/change_detection';
+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/facade/lang';
+import {isPresent, BaseException} from 'angular2/src/core/facade/lang';
-import {wtfLeave, wtfCreateScope, WtfScopeFn} from '../../profile/profile';
+import {wtfLeave, wtfCreateScope, WtfScopeFn} from '../profile/profile';
 
 /**
  * Provides access to explicitly trigger change detection in an application.

modules/angular2/src/core/metadata.dart

@@ -1,6 +1,6 @@
 library angular2.src.core.metadata;
 
-import "package:angular2/src/facade/collection.dart" show List;
+import "package:angular2/src/core/facade/collection.dart" show List;
 import "./metadata/di.dart";
 import "./metadata/directives.dart";
 import "./metadata/view.dart";

modules/angular2/src/core/metadata.ts

@@ -34,8 +34,8 @@ import {
 
 import {ViewMetadata, ViewEncapsulation} from './metadata/view';
 
-import {makeDecorator, makeParamDecorator, TypeDecorator, Class} from '../util/decorators';
+import {makeDecorator, makeParamDecorator, TypeDecorator, Class} from './util/decorators';
-import {Type} from 'angular2/src/facade/lang';
+import {Type} from 'angular2/src/core/facade/lang';
 
 /**
  * Interface for the {@link DirectiveMetadata} decorator function.

modules/angular2/src/core/metadata/di.ts

@@ -1,5 +1,12 @@
-import {CONST, Type, stringify, isPresent, StringWrapper, isString} from 'angular2/src/facade/lang';
+import {
-import {DependencyMetadata} from 'angular2/src/di/metadata';
+  CONST,
+  Type,
+  stringify,
+  isPresent,
+  StringWrapper,
+  isString
+} from 'angular2/src/core/facade/lang';
+import {DependencyMetadata} from 'angular2/src/core/di/metadata';
 import {resolveForwardRef} from 'angular2/di';
 
 /**