chore: update all import paths

modules/angular2/test/benchmark/transform/directive_linker/simple.dart

@@ -28,7 +28,7 @@ const aContents = '''
 library a.ng_deps.dart;
 
 import 'package:angular2/src/core/application.dart';
-import 'package:angular2/src/reflection/reflection_capabilities.dart';
+import 'package:angular2/src/core/reflection/reflection_capabilities.dart';
 import 'b.dart';
 
 bool _visited = false;

modules/angular2/test/benchmark/transform/integration/hello_world.dart

@@ -27,8 +27,8 @@ const indexContents = '''
 library examples.src.hello_world.index;
 
 import "index_common.dart" as app;
-import "package:angular2/src/reflection/reflection.dart" show reflector;
-import "package:angular2/src/reflection/reflection_capabilities.dart"
+import "package:angular2/src/core/reflection/reflection.dart" show reflector;
+import "package:angular2/src/core/reflection/reflection_capabilities.dart"
     show ReflectionCapabilities;
 
 main() {

modules/angular2/test/benchmark/transform/reflection_remover/simple.dart

@@ -25,8 +25,8 @@ const indexContents = '''
 library web_foo;
 
 import 'package:angular2/bootstrap.dart';
-import 'package:angular2/src/reflection/reflection.dart';
-import 'package:angular2/src/reflection/reflection_capabilities.dart';
+import 'package:angular2/src/core/reflection/reflection.dart';
+import 'package:angular2/src/core/reflection/reflection_capabilities.dart';
 
 void main() {
   reflector.reflectionCapabilities = new ReflectionCapabilities();

modules/angular2/test/core/application_spec.ts

@@ -10,16 +10,16 @@ import {
   xdescribe,
   xit
 } from 'angular2/test_lib';
-import {isPresent, stringify} from 'angular2/src/facade/lang';
+import {isPresent, stringify} from 'angular2/src/core/facade/lang';
 import {bootstrap, ApplicationRef} from 'angular2/src/core/application';
 import {Component, Directive, View} from 'angular2/metadata';
-import {DOM} from 'angular2/src/dom/dom_adapter';
-import {PromiseWrapper} from 'angular2/src/facade/async';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
+import {PromiseWrapper} from 'angular2/src/core/facade/async';
 import {bind, Inject, Injector} from 'angular2/di';
 import {LifeCycle} from 'angular2/core';
 import {ExceptionHandler} from 'angular2/src/core/exception_handler';
 import {Testability, TestabilityRegistry} from 'angular2/src/core/testability/testability';
-import {DOCUMENT} from 'angular2/src/render/render';
+import {DOCUMENT} from 'angular2/src/core/render/render';
 import {IS_DART} from '../platform';
 
 @Component({selector: 'hello-app'})

modules/angular2/test/core/change_detection/change_detection_spec.ts

@@ -14,7 +14,7 @@ import {
   PreGeneratedChangeDetection,
   ChangeDetectorDefinition,
   DynamicProtoChangeDetector
-} from 'angular2/src/change_detection/change_detection';
+} from 'angular2/src/core/change_detection/change_detection';
 
 export function main() {
   describe("PreGeneratedChangeDetection", () => {

modules/angular2/test/core/change_detection/change_detector_config.ts

@@ -1,5 +1,5 @@
-import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
-import {isBlank, isPresent} from 'angular2/src/facade/lang';
+import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
+import {isBlank, isPresent} from 'angular2/src/core/facade/lang';
 import {
   DEFAULT,
   ON_PUSH,
@@ -11,10 +11,10 @@ import {
   Locals,
   Parser,
   ChangeDetectorGenConfig
-} from 'angular2/src/change_detection/change_detection';
-import {ON_PUSH_OBSERVE} from 'angular2/src/change_detection/constants';
-import {reflector} from 'angular2/src/reflection/reflection';
-import {ReflectionCapabilities} from 'angular2/src/reflection/reflection_capabilities';
+} from 'angular2/src/core/change_detection/change_detection';
+import {ON_PUSH_OBSERVE} from 'angular2/src/core/change_detection/constants';
+import {reflector} from 'angular2/src/core/reflection/reflection';
+import {ReflectionCapabilities} from 'angular2/src/core/reflection/reflection_capabilities';
 
 /*
  * This file defines `ChangeDetectorDefinition` objects which are used in the tests defined in

modules/angular2/test/core/change_detection/change_detector_spec.ts

@@ -1,4 +1,4 @@
-///<reference path="../../src/change_detection/pipe_transform.ts"/>
+///<reference path="../../../src/core/change_detection/pipe_transform.ts"/>
 import {
   ddescribe,
   describe,
@@ -19,8 +19,8 @@ import {
   isJsObject,
   BaseException,
   FunctionWrapper
-} from 'angular2/src/facade/lang';
-import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
+} from 'angular2/src/core/facade/lang';
+import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
 
 import {
   ChangeDispatcher,
@@ -45,15 +45,15 @@ import {
   Parser,
   Locals,
   ProtoChangeDetector
-} from 'angular2/src/change_detection/change_detection';
+} from 'angular2/src/core/change_detection/change_detection';
 
-import {Pipes} from 'angular2/src/change_detection/pipes';
-import {JitProtoChangeDetector} from 'angular2/src/change_detection/jit_proto_change_detector';
+import {Pipes} from 'angular2/src/core/change_detection/pipes';
+import {JitProtoChangeDetector} from 'angular2/src/core/change_detection/jit_proto_change_detector';
 
 import {getDefinition} from './change_detector_config';
 import {createObservableModel} from './change_detector_spec_util';
 import {getFactoryById} from './generated/change_detector_classes';
-import {IS_DART} from '../platform';
+import {IS_DART} from '../../platform';
 
 const _DEFAULT_CONTEXT = CONST_EXPR(new Object());
 

modules/angular2/test/core/change_detection/coalesce_spec.ts

@@ -1,9 +1,9 @@
 import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach} from 'angular2/test_lib';
-import {isBlank} from 'angular2/src/facade/lang';
+import {isBlank} from 'angular2/src/core/facade/lang';
 
-import {coalesce} from 'angular2/src/change_detection/coalesce';
-import {RecordType, ProtoRecord} from 'angular2/src/change_detection/proto_record';
-import {DirectiveIndex} from 'angular2/src/change_detection/directive_record';
+import {coalesce} from 'angular2/src/core/change_detection/coalesce';
+import {RecordType, ProtoRecord} from 'angular2/src/core/change_detection/proto_record';
+import {DirectiveIndex} from 'angular2/src/core/change_detection/directive_record';
 
 export function main() {
   function r(funcOrValue, args, contextIndex, selfIndex,

modules/angular2/test/core/change_detection/differs/default_iterable_differ_spec.ts

@@ -2,13 +2,13 @@ import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach} from '
 import {
   DefaultIterableDiffer,
   DefaultIterableDifferFactory
-} from 'angular2/src/change_detection/differs/default_iterable_differ';
+} from 'angular2/src/core/change_detection/differs/default_iterable_differ';
 
-import {NumberWrapper} from 'angular2/src/facade/lang';
-import {ListWrapper, MapWrapper} from 'angular2/src/facade/collection';
+import {NumberWrapper} from 'angular2/src/core/facade/lang';
+import {ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection';
 
-import {TestIterable} from '../iterable';
-import {iterableChangesAsString} from '../util';
+import {TestIterable} from '../../../core/change_detection/iterable';
+import {iterableChangesAsString} from '../../../core/change_detection/util';
 
 // todo(vicb): UnmodifiableListView / frozen object when implemented
 export function main() {

modules/angular2/test/core/change_detection/differs/default_keyvalue_differ_spec.ts

@@ -2,10 +2,10 @@ import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach} from '
 import {
   DefaultKeyValueDiffer,
   DefaultKeyValueDifferFactory
-} from 'angular2/src/change_detection/differs/default_keyvalue_differ';
-import {NumberWrapper, isJsObject} from 'angular2/src/facade/lang';
-import {MapWrapper} from 'angular2/src/facade/collection';
-import {kvChangesAsString} from '../util';
+} from 'angular2/src/core/change_detection/differs/default_keyvalue_differ';
+import {NumberWrapper, isJsObject} from 'angular2/src/core/facade/lang';
+import {MapWrapper} from 'angular2/src/core/facade/collection';
+import {kvChangesAsString} from '../../../core/change_detection/util';
 
 // todo(vicb): Update the code & tests for object equality
 export function main() {

modules/angular2/test/core/change_detection/differs/iterable_differs_spec.ts

@@ -9,7 +9,7 @@ import {
   afterEach,
   SpyIterableDifferFactory
 } from 'angular2/test_lib';
-import {IterableDiffers} from 'angular2/src/change_detection/differs/iterable_differs';
+import {IterableDiffers} from 'angular2/src/core/change_detection/differs/iterable_differs';
 import {Injector, bind} from 'angular2/di';
 
 export function main() {

modules/angular2/test/core/change_detection/iterable.ts

@@ -1,4 +1,4 @@
-import {List} from 'angular2/src/facade/collection';
+import {List} from 'angular2/src/core/facade/collection';
 
 export class TestIterable {
   list: List<number>;

modules/angular2/test/core/change_detection/parser/lexer_spec.ts

@@ -1,9 +1,9 @@
 import {ddescribe, describe, it, expect} from 'angular2/test_lib';
 
-import {Lexer, Token} from 'angular2/src/change_detection/parser/lexer';
+import {Lexer, Token} from 'angular2/src/core/change_detection/parser/lexer';
 
-import {List, ListWrapper} from "angular2/src/facade/collection";
-import {StringWrapper} from "angular2/src/facade/lang";
+import {List, ListWrapper} from "angular2/src/core/facade/collection";
+import {StringWrapper} from "angular2/src/core/facade/lang";
 
 function lex(text: string): List<any> {
   return new Lexer().tokenize(text);

modules/angular2/test/core/change_detection/parser/locals_spec.ts

@@ -1,8 +1,8 @@
 import {ddescribe, describe, it, xit, iit, expect, beforeEach} from 'angular2/test_lib';
 
-import {Locals} from 'angular2/src/change_detection/parser/locals';
+import {Locals} from 'angular2/src/core/change_detection/parser/locals';
 
-import {MapWrapper} from 'angular2/src/facade/collection';
+import {MapWrapper} from 'angular2/src/core/facade/collection';
 
 export function main() {
   describe('Locals', () => {

modules/angular2/test/core/change_detection/parser/parser_spec.ts

@@ -1,11 +1,11 @@
 import {ddescribe, describe, it, xit, iit, expect, beforeEach} from 'angular2/test_lib';
-import {BaseException, isBlank, isPresent} from 'angular2/src/facade/lang';
-import {reflector} from 'angular2/src/reflection/reflection';
-import {MapWrapper, ListWrapper} from 'angular2/src/facade/collection';
-import {Parser} from 'angular2/src/change_detection/parser/parser';
+import {BaseException, isBlank, isPresent} from 'angular2/src/core/facade/lang';
+import {reflector} from 'angular2/src/core/reflection/reflection';
+import {MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection';
+import {Parser} from 'angular2/src/core/change_detection/parser/parser';
 import {Unparser} from './unparser';
-import {Lexer} from 'angular2/src/change_detection/parser/lexer';
-import {BindingPipe, LiteralPrimitive, AST} from 'angular2/src/change_detection/parser/ast';
+import {Lexer} from 'angular2/src/core/change_detection/parser/lexer';
+import {BindingPipe, LiteralPrimitive, AST} from 'angular2/src/core/change_detection/parser/ast';
 
 class TestData {
   constructor(public a?: any, public b?: any, public fnReturnValue?: any) {}

modules/angular2/test/core/change_detection/parser/unparser.ts

@@ -21,10 +21,10 @@ import {
   PrefixNot,
   SafePropertyRead,
   SafeMethodCall
-} from 'angular2/src/change_detection/parser/ast';
+} from 'angular2/src/core/change_detection/parser/ast';
 
 
-import {StringWrapper, isPresent, isString} from 'angular2/src/facade/lang';
+import {StringWrapper, isPresent, isString} from 'angular2/src/core/facade/lang';
 
 export class Unparser implements AstVisitor {
   private static _quoteRegExp = /"/g;

modules/angular2/test/core/change_detection/proto_record_builder_spec.ts

@@ -10,9 +10,9 @@ import {
   inject
 } from 'angular2/test_lib';
 
-import {ProtoRecordBuilder} from 'angular2/src/change_detection/proto_change_detector';
-import {BindingRecord} from 'angular2/src/change_detection/binding_record';
-import {Parser} from 'angular2/src/change_detection/parser/parser';
+import {ProtoRecordBuilder} from 'angular2/src/core/change_detection/proto_change_detector';
+import {BindingRecord} from 'angular2/src/core/change_detection/binding_record';
+import {Parser} from 'angular2/src/core/change_detection/parser/parser';
 
 export function main() {
   describe("ProtoRecordBuilder", () => {

modules/angular2/test/core/change_detection/proto_record_spec.ts

@@ -1,7 +1,7 @@
 import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach} from 'angular2/test_lib';
-import {isBlank} from 'angular2/src/facade/lang';
+import {isBlank} from 'angular2/src/core/facade/lang';
 
-import {RecordType, ProtoRecord} from 'angular2/src/change_detection/proto_record';
+import {RecordType, ProtoRecord} from 'angular2/src/core/change_detection/proto_record';
 
 export function main() {
   function r({lastInBinding, mode, name, directiveIndex, argumentToPureFunction, referencedBySelf}:

modules/angular2/test/core/change_detection/util.ts

@@ -1,4 +1,4 @@
-import {isBlank, CONST_EXPR} from 'angular2/src/facade/lang';
+import {isBlank, CONST_EXPR} from 'angular2/src/core/facade/lang';
 
 export function iterableChangesAsString({collection = CONST_EXPR([]), previous = CONST_EXPR([]),
                                          additions = CONST_EXPR([]), moves = CONST_EXPR([]),

modules/angular2/test/core/compiler/compiler_spec.ts

@@ -13,9 +13,22 @@ import {
   proxy
 } from 'angular2/test_lib';
 
-import {List, ListWrapper, Map, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
-import {IMPLEMENTS, Type, isBlank, stringify, isPresent, isArray} from 'angular2/src/facade/lang';
-import {PromiseCompleter, PromiseWrapper, Promise} from 'angular2/src/facade/async';
+import {
+  List,
+  ListWrapper,
+  Map,
+  MapWrapper,
+  StringMapWrapper
+} from 'angular2/src/core/facade/collection';
+import {
+  IMPLEMENTS,
+  Type,
+  isBlank,
+  stringify,
+  isPresent,
+  isArray
+} from 'angular2/src/core/facade/lang';
+import {PromiseCompleter, PromiseWrapper, Promise} from 'angular2/src/core/facade/async';
 
 import {Compiler, CompilerCache} from 'angular2/src/core/compiler/compiler';
 import {AppProtoView} from 'angular2/src/core/compiler/view';
@@ -32,8 +45,8 @@ import {
 } from 'angular2/src/core/compiler/component_url_mapper';
 import {ProtoViewFactory} from 'angular2/src/core/compiler/proto_view_factory';
 
-import {UrlResolver} from 'angular2/src/services/url_resolver';
-import {AppRootUrl} from 'angular2/src/services/app_root_url';
+import {UrlResolver} from 'angular2/src/core/services/url_resolver';
+import {AppRootUrl} from 'angular2/src/core/services/app_root_url';
 import {
   ProtoViewDto,
   ViewType,
@@ -43,9 +56,9 @@ import {
   RenderDirectiveMetadata,
   DirectiveBinder,
   RenderElementBinder
-} from 'angular2/src/render/api';
+} from 'angular2/src/core/render/api';
 // TODO(tbosch): Spys don't support named modules...
-import {RenderCompiler} from 'angular2/src/render/api';
+import {RenderCompiler} from 'angular2/src/core/render/api';
 import {PipeBinding} from 'angular2/src/core/pipes/pipe_binding';
 
 

modules/angular2/test/core/compiler/directive_lifecycle_spec.ts

@@ -13,7 +13,7 @@ import {
   proxy
 } from 'angular2/test_lib';
 
-import {DirectiveMetadata, LifecycleEvent} from '../../../src/core/metadata';
+import {DirectiveMetadata, LifecycleEvent} from 'angular2/src/core/metadata';
 import {DirectiveBinding} from 'angular2/src/core/compiler/element_injector';
 
 export function main() {

modules/angular2/test/core/compiler/dynamic_component_loader_spec.ts

@@ -23,8 +23,8 @@ import {NgIf} from 'angular2/directives';
 import {Component, View, ViewMetadata, LifecycleEvent} from 'angular2/metadata';
 import {DynamicComponentLoader} from 'angular2/src/core/compiler/dynamic_component_loader';
 import {ElementRef} from 'angular2/src/core/compiler/element_ref';
-import {DOCUMENT} from 'angular2/src/render/render';
-import {DOM} from 'angular2/src/dom/dom_adapter';
+import {DOCUMENT} from 'angular2/src/core/render/render';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
 
 export function main() {
   describe('DynamicComponentLoader', function() {

modules/angular2/test/core/compiler/element_injector_spec.ts

@@ -17,14 +17,14 @@ import {
   el,
   containsRegexp
 } from 'angular2/test_lib';
-import {isBlank, isPresent, IMPLEMENTS, stringify} from 'angular2/src/facade/lang';
+import {isBlank, isPresent, IMPLEMENTS, stringify} from 'angular2/src/core/facade/lang';
 import {
   ListWrapper,
   MapWrapper,
   List,
   StringMapWrapper,
   iterateListLike
-} from 'angular2/src/facade/collection';
+} from 'angular2/src/core/facade/collection';
 import {
   ProtoElementInjector,
   ElementInjector,
@@ -45,7 +45,7 @@ import {AppProtoView, AppView} from 'angular2/src/core/compiler/view';
 import {ViewContainerRef} from 'angular2/src/core/compiler/view_container_ref';
 import {TemplateRef} from 'angular2/src/core/compiler/template_ref';
 import {ElementRef} from 'angular2/src/core/compiler/element_ref';
-import {DynamicChangeDetector, ChangeDetectorRef, Parser, Lexer} from 'angular2/src/change_detection/change_detection';
+import {DynamicChangeDetector, ChangeDetectorRef, Parser, Lexer} from 'angular2/src/core/change_detection/change_detection';
 import {QueryList} from 'angular2/src/core/compiler/query_list';
 
 @proxy

modules/angular2/test/core/compiler/integration_dart_spec.dart

@@ -5,8 +5,8 @@ import 'package:angular2/angular2.dart';
 import 'package:angular2/di.dart';
 import 'package:angular2/test_lib.dart';
 import 'package:observe/observe.dart';
-import 'package:angular2/src/directives/observable_list_diff.dart';
-import 'package:angular2/src/change_detection/differs/default_iterable_differ.dart';
+import 'package:angular2/src/core/directives/observable_list_diff.dart';
+import 'package:angular2/src/core/change_detection/differs/default_iterable_differ.dart';
 
 class MockException implements Error {
   var message;

modules/angular2/test/core/compiler/integration_spec.ts

@@ -21,7 +21,7 @@ import {
 } from 'angular2/test_lib';
 
 
-import {DOM} from 'angular2/src/dom/dom_adapter';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
 import {
   Type,
   isPresent,
@@ -33,14 +33,14 @@ import {
   isBlank,
   CONST,
   CONST_EXPR
-} from 'angular2/src/facade/lang';
+} from 'angular2/src/core/facade/lang';
 import {
   PromiseWrapper,
   EventEmitter,
   ObservableWrapper,
   PromiseCompleter,
   Promise
-} from 'angular2/src/facade/async';
+} from 'angular2/src/core/facade/async';
 
 import {
   Injector,
@@ -62,14 +62,14 @@ import {
   ChangeDetection,
   DynamicChangeDetection,
   ChangeDetectorGenConfig
-} from 'angular2/src/change_detection/change_detection';
+} from 'angular2/src/core/change_detection/change_detection';
 
 import {Directive, Component, View, ViewMetadata, Attribute, Query, Pipe} from 'angular2/metadata';
 
 import {QueryList} from 'angular2/src/core/compiler/query_list';
 
-import {NgIf} from 'angular2/src/directives/ng_if';
-import {NgFor} from 'angular2/src/directives/ng_for';
+import {NgIf} from 'angular2/src/core/directives/ng_if';
+import {NgFor} from 'angular2/src/core/directives/ng_for';
 
 import {ViewContainerRef} from 'angular2/src/core/compiler/view_container_ref';
 import {ViewRef} from 'angular2/src/core/compiler/view_ref';
@@ -78,7 +78,7 @@ import {Compiler} from 'angular2/src/core/compiler/compiler';
 import {ElementRef} from 'angular2/src/core/compiler/element_ref';
 import {TemplateRef} from 'angular2/src/core/compiler/template_ref';
 
-import {DomRenderer} from 'angular2/src/render/dom/dom_renderer';
+import {DomRenderer} from 'angular2/src/core/render/dom/dom_renderer';
 import {IS_DART} from '../../platform';
 
 const ANCHOR_ELEMENT = CONST_EXPR(new OpaqueToken('AnchorElement'));

modules/angular2/test/core/compiler/projection_integration_spec.ts

@@ -21,7 +21,7 @@ import {
   By
 } from 'angular2/test_lib';
 
-import {DOM} from 'angular2/src/dom/dom_adapter';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
 
 import {
   forwardRef,
@@ -33,7 +33,7 @@ import {
 } from 'angular2/angular2';
 import {Component, Directive, View, ViewMetadata} from 'angular2/metadata';
 
-import {MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE} from 'angular2/src/render/render';
+import {MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE} from 'angular2/src/core/render/render';
 
 export function main() {
   describe('projection', () => {

modules/angular2/test/core/compiler/proto_view_factory_spec.ts

@@ -13,8 +13,8 @@ import {
   proxy
 } from 'angular2/test_lib';
 
-import {isBlank, IMPLEMENTS, stringify} from 'angular2/src/facade/lang';
-import {MapWrapper} from 'angular2/src/facade/collection';
+import {isBlank, IMPLEMENTS, stringify} from 'angular2/src/core/facade/lang';
+import {MapWrapper} from 'angular2/src/core/facade/collection';
 
 import {
   ChangeDetection,
@@ -22,7 +22,7 @@ import {
   BindingRecord,
   DirectiveIndex,
   Parser
-} from 'angular2/src/change_detection/change_detection';
+} from 'angular2/src/core/change_detection/change_detection';
 import {
   BindingRecordsCreator,
   ProtoViewFactory,
@@ -41,7 +41,7 @@ import {
   ViewType,
   ProtoViewDto,
   DirectiveBinder
-} from 'angular2/src/render/api';
+} from 'angular2/src/core/render/api';
 
 export function main() {
   // TODO(tbosch): add missing tests

modules/angular2/test/core/compiler/query_integration_spec.ts

@@ -21,7 +21,7 @@ import {Query, ViewQuery, Component, Directive, View} from 'angular2/metadata';
 
 import {NgIf, NgFor} from 'angular2/angular2';
 
-import {BrowserDomAdapter} from 'angular2/src/dom/browser_adapter';
+import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter';
 
 export function main() {
   BrowserDomAdapter.makeCurrent();

modules/angular2/test/core/compiler/query_list_spec.ts

@@ -1,7 +1,7 @@
 import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'angular2/test_lib';
 
-import {List, MapWrapper, ListWrapper, iterateListLike} from 'angular2/src/facade/collection';
-import {StringWrapper} from 'angular2/src/facade/lang';
+import {List, MapWrapper, ListWrapper, iterateListLike} from 'angular2/src/core/facade/collection';
+import {StringWrapper} from 'angular2/src/core/facade/lang';
 import {QueryList} from 'angular2/src/core/compiler/query_list';
 
 

modules/angular2/test/core/compiler/view_container_ref_spec.ts

@@ -16,7 +16,7 @@ import {
   proxy
 } from 'angular2/test_lib';
 
-import {IMPLEMENTS} from 'angular2/src/facade/lang';
+import {IMPLEMENTS} from 'angular2/src/core/facade/lang';
 
 import {AppView, AppViewContainer} from 'angular2/src/core/compiler/view';
 import {ViewContainerRef} from 'angular2/src/core/compiler/view_container_ref';

modules/angular2/test/core/compiler/view_manager_spec.ts

@@ -16,7 +16,7 @@ import {
   proxy
 } from 'angular2/test_lib';
 import {Injector, bind} from 'angular2/di';
-import {IMPLEMENTS} from 'angular2/src/facade/lang';
+import {IMPLEMENTS} from 'angular2/src/core/facade/lang';
 
 import {
   AppProtoView,
@@ -35,7 +35,7 @@ import {
   ViewType,
   RenderProtoViewMergeMapping,
   RenderViewWithFragments
-} from 'angular2/src/render/api';
+} from 'angular2/src/core/render/api';
 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';

modules/angular2/test/core/compiler/view_manager_utils_spec.ts

@@ -20,8 +20,8 @@ import {
 } from 'angular2/test_lib';
 
 import {Injector, bind} from 'angular2/di';
-import {IMPLEMENTS, isBlank, isPresent} from 'angular2/src/facade/lang';
-import {MapWrapper, ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
+import {IMPLEMENTS, isBlank, isPresent} from 'angular2/src/core/facade/lang';
+import {MapWrapper, ListWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
 
 import {AppProtoView, AppView, AppProtoViewMergeMapping} from 'angular2/src/core/compiler/view';
 import {ElementBinder} from 'angular2/src/core/compiler/element_binder';
@@ -38,7 +38,7 @@ import {
   RenderProtoViewMergeMapping,
   ViewType,
   RenderViewWithFragments
-} from 'angular2/src/render/render';
+} from 'angular2/src/core/render/render';
 
 export function main() {
   // TODO(tbosch): add more tests here!

modules/angular2/test/core/compiler/view_pool_spec.ts

@@ -17,7 +17,7 @@ import {
 } from 'angular2/test_lib';
 import {AppViewPool} from 'angular2/src/core/compiler/view_pool';
 import {AppProtoView, AppView} from 'angular2/src/core/compiler/view';
-import {MapWrapper, Map} from 'angular2/src/facade/collection';
+import {MapWrapper, Map} from 'angular2/src/core/facade/collection';
 
 export function main() {
   describe('AppViewPool', () => {

modules/angular2/test/core/debug/debug_element_spec.ts

@@ -16,10 +16,10 @@ import {
   Scope
 } from 'angular2/test_lib';
 
-import {DOM} from 'angular2/src/dom/dom_adapter';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
 
-import {List, ListWrapper} from 'angular2/src/facade/collection';
-import {PromiseWrapper, EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
+import {List, ListWrapper} from 'angular2/src/core/facade/collection';
+import {PromiseWrapper, EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async';
 
 import {Injectable} from 'angular2/di';
 
@@ -29,7 +29,7 @@ import {
   View,
 } from 'angular2/metadata';
 
-import {NgFor} from 'angular2/src/directives/ng_for';
+import {NgFor} from 'angular2/src/core/directives/ng_for';
 
 @Injectable()
 class Logger {

modules/angular2/test/core/debug/debug_element_view_listener_spec.ts

@@ -16,7 +16,7 @@ import {
   Scope,
   inspectNativeElement
 } from 'angular2/test_lib';
-import {global} from 'angular2/src/facade/lang';
+import {global} from 'angular2/src/core/facade/lang';
 import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/compiler/view_pool';
 import {Injectable, bind} from 'angular2/di';
 import {
@@ -24,7 +24,7 @@ import {
   Component,
   View,
 } from 'angular2/metadata';
-import {IS_DART} from '../platform';
+import {IS_DART} from '../../platform';
 
 @Component({selector: 'my-comp'})
 @View({directives: []})

modules/angular2/test/core/di/forward_ref_spec.ts

@@ -10,7 +10,7 @@ import {
   xit,
 } from 'angular2/test_lib';
 import {forwardRef, resolveForwardRef} from 'angular2/di';
-import {Type} from 'angular2/src/facade/lang';
+import {Type} from 'angular2/src/core/facade/lang';
 
 export function main() {
   describe("forwardRef", function() {

modules/angular2/test/core/di/injector_spec.ts

@@ -1,4 +1,4 @@
-import {isBlank, BaseException, stringify} from 'angular2/src/facade/lang';
+import {isBlank, BaseException, stringify} from 'angular2/src/core/facade/lang';
 import {
   describe,
   ddescribe,
@@ -27,7 +27,7 @@ import {
   Visibility
 } from 'angular2/di';
 
-import {InjectorInlineStrategy, InjectorDynamicStrategy} from 'angular2/src/di/injector';
+import {InjectorInlineStrategy, InjectorDynamicStrategy} from 'angular2/src/core/di/injector';
 
 class CustomDependencyMetadata extends DependencyMetadata {}
 

modules/angular2/test/core/directives/ng_class_spec.ts

@@ -13,9 +13,9 @@ import {
   it,
   xit,
 } from 'angular2/test_lib';
-import {List, ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
+import {List, ListWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
 import {Component, View, NgFor, bind} from 'angular2/angular2';
-import {NgClass} from 'angular2/src/directives/ng_class';
+import {NgClass} from 'angular2/src/core/directives/ng_class';
 import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/compiler/view_pool';
 
 function detectChangesAndCheck(rootTC, classes: string, elIndex: number = 0) {

modules/angular2/test/core/directives/ng_for_spec.ts

@@ -13,11 +13,11 @@ import {
   xit,
 } from 'angular2/test_lib';
 
-import {ListWrapper} from 'angular2/src/facade/collection';
+import {ListWrapper} from 'angular2/src/core/facade/collection';
 
 import {Component, View} from 'angular2/angular2';
 
-import {NgFor} from 'angular2/src/directives/ng_for';
+import {NgFor} from 'angular2/src/core/directives/ng_for';
 
 
 export function main() {

modules/angular2/test/core/directives/ng_if_spec.ts

@@ -13,12 +13,12 @@ import {
   xit,
 } from 'angular2/test_lib';
 
-import {DOM} from 'angular2/src/dom/dom_adapter';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
 
 import {Component, View} from 'angular2/angular2';
 
-import {NgIf} from 'angular2/src/directives/ng_if';
-import {IS_DART} from '../platform';
+import {NgIf} from 'angular2/src/core/directives/ng_if';
+import {IS_DART} from '../../platform';
 
 export function main() {
   describe('ng-if directive', () => {

modules/angular2/test/core/directives/ng_style_spec.ts

@@ -14,12 +14,12 @@ import {
   xit,
 } from 'angular2/test_lib';
 
-import {StringMapWrapper} from 'angular2/src/facade/collection';
+import {StringMapWrapper} from 'angular2/src/core/facade/collection';
 
 import {Component, View} from 'angular2/angular2';
 
-import {DOM} from 'angular2/src/dom/dom_adapter';
-import {NgStyle} from 'angular2/src/directives/ng_style';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
+import {NgStyle} from 'angular2/src/core/directives/ng_style';
 
 export function main() {
   describe('binding to CSS styles', () => {

modules/angular2/test/core/directives/ng_switch_spec.ts

@@ -14,7 +14,7 @@ import {
 
 import {Component, View} from 'angular2/angular2';
 
-import {NgSwitch, NgSwitchWhen, NgSwitchDefault} from 'angular2/src/directives/ng_switch';
+import {NgSwitch, NgSwitchWhen, NgSwitchDefault} from 'angular2/src/core/directives/ng_switch';
 
 export function main() {
   describe('switch', () => {

modules/angular2/test/core/directives/non_bindable_spec.ts

@@ -12,13 +12,13 @@ import {
   it,
   xit,
 } from 'angular2/test_lib';
-import {DOM} from 'angular2/src/dom/dom_adapter';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
 
 import {Component, Directive, View} from 'angular2/angular2';
 
 import {ElementRef} from 'angular2/src/core/compiler/element_ref';
 
-import {NgNonBindable} from 'angular2/src/directives/ng_non_bindable';
+import {NgNonBindable} from 'angular2/src/core/directives/ng_non_bindable';
 
 export function main() {
   describe('non-bindable', () => {

modules/angular2/test/core/directives/observable_list_diff_spec.dart

@@ -2,7 +2,7 @@ library angular2.test.directives.observable_list_iterable_diff_spec;
 
 import 'package:angular2/test_lib.dart';
 import 'package:observe/observe.dart' show ObservableList;
-import 'package:angular2/src/directives/observable_list_diff.dart';
+import 'package:angular2/src/core/directives/observable_list_diff.dart';
 
 main() {
   describe('ObservableListDiff', () {

modules/angular2/test/core/dom/dom_adapter_spec.ts

@@ -14,7 +14,7 @@ import {
   stringifyElement
 } from 'angular2/test_lib';
 
-import {DOM} from 'angular2/src/dom/dom_adapter';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
 
 export function main() {
   describe('dom adapter', () => {

modules/angular2/test/core/dom/html5lib_adapter.server.spec.dart

@@ -2,7 +2,7 @@ library angular2.dom.html5lib_adapter.test;
 
 import 'package:guinness/guinness.dart';
 import 'package:unittest/unittest.dart' hide expect;
-import 'package:angular2/src/dom/html_adapter.dart';
+import 'package:angular2/src/core/dom/html_adapter.dart';
 
 // A smoke-test of the adapter. It is primarily tested by the compiler.
 main() {

modules/angular2/test/core/exception_handler_spec.ts

@@ -11,7 +11,7 @@ import {
   xit,
   Log
 } from 'angular2/test_lib';
-import {BaseException} from 'angular2/src/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/lang';
 import {ExceptionHandler} from 'angular2/src/core/exception_handler';
 
 class _CustomException {

modules/angular2/test/core/facade/async_dart_spec.dart

@@ -2,7 +2,7 @@
 library angular2.test.facade.async_dart_spec;
 
 import 'package:angular2/test_lib.dart';
-import 'package:angular2/src/facade/async.dart';
+import 'package:angular2/src/core/facade/async.dart';
 
 class MockException implements Error {
   var message;

modules/angular2/test/core/facade/async_spec.ts

@@ -12,8 +12,8 @@ import {
   inject
 } from 'angular2/test_lib';
 
-import {ObservableWrapper, EventEmitter, PromiseWrapper} from 'angular2/src/facade/async';
-import {ListWrapper} from 'angular2/src/facade/collection';
+import {ObservableWrapper, EventEmitter, PromiseWrapper} from 'angular2/src/core/facade/async';
+import {ListWrapper} from 'angular2/src/core/facade/collection';
 
 export function main() {
   describe('EventEmitter', () => {

modules/angular2/test/core/facade/collection_spec.ts

@@ -6,7 +6,7 @@ import {
   StringMap,
   StringMapWrapper,
   MapWrapper
-} from 'angular2/src/facade/collection';
+} from 'angular2/src/core/facade/collection';
 
 export function main() {
   describe('ListWrapper', () => {

modules/angular2/test/core/facade/lang_spec.ts

@@ -5,7 +5,7 @@ import {
   RegExpMatcherWrapper,
   StringWrapper,
   CONST_EXPR
-} from 'angular2/src/facade/lang';
+} from 'angular2/src/core/facade/lang';
 
 export function main() {
   describe('RegExp', () => {

modules/angular2/test/core/forward_ref_integration_spec.ts

@@ -14,7 +14,7 @@ import {
 import {Directive, Component, Query, View} from 'angular2/metadata';
 import {QueryList, NgFor} from 'angular2/angular2';
 import {forwardRef, resolveForwardRef, bind, Inject} from 'angular2/di';
-import {Type} from 'angular2/src/facade/lang';
+import {Type} from 'angular2/src/core/facade/lang';
 
 export function main() {
   describe("forwardRef integration", function() {

modules/angular2/test/core/life_cycle/life_cycle_spec.ts

@@ -15,7 +15,7 @@ import {
   SpyChangeDetector,
 } from 'angular2/test_lib';
 import {LifeCycle} from 'angular2/core';
-import {IMPLEMENTS} from 'angular2/src/facade/lang';
+import {IMPLEMENTS} from 'angular2/src/core/facade/lang';
 
 export function main() {
   describe("LifeCycle", () => {

modules/angular2/test/core/metadata/decorators_spec.ts

@@ -11,7 +11,7 @@ import {
 } from 'angular2/test_lib';
 
 import {Component, View, Directive} from 'angular2/angular2';
-import {reflector} from 'angular2/src/reflection/reflection';
+import {reflector} from 'angular2/src/core/reflection/reflection';
 
 export function main() {
   describe('es5 decorators', () => {

modules/angular2/test/core/profile/wtf_impl_spec.dart

@@ -2,7 +2,7 @@
 library angular2.test.core.wtf_impl;
 
 import 'package:angular2/test_lib.dart';
-import 'package:angular2/src/profile/wtf_impl.dart' as impl;
+import 'package:angular2/src/core/profile/wtf_impl.dart' as impl;
 
 main() {
   describe('WTF', () {

modules/angular2/test/core/reflection/reflector_common.ts

@@ -1,4 +1,4 @@
-import {makeDecorator, makeParamDecorator} from 'angular2/src/util/decorators';
+import {makeDecorator, makeParamDecorator} from 'angular2/src/core/util/decorators';
 
 export class ClassDecoratorImpl {
   value;

modules/angular2/test/core/reflection/reflector_spec.ts

@@ -1,9 +1,9 @@
 import {describe, it, iit, ddescribe, expect, beforeEach} from 'angular2/test_lib';
-import {Reflector, ReflectionInfo} from 'angular2/src/reflection/reflection';
-import {ReflectionCapabilities} from 'angular2/src/reflection/reflection_capabilities';
+import {Reflector, ReflectionInfo} from 'angular2/src/core/reflection/reflection';
+import {ReflectionCapabilities} from 'angular2/src/core/reflection/reflection_capabilities';
 import {ClassDecorator, ParamDecorator, classDecorator, paramDecorator} from './reflector_common';
-import {List} from 'angular2/src/facade/collection';
-import {IS_DART} from '../platform';
+import {List} from 'angular2/src/core/facade/collection';
+import {IS_DART} from '../../platform';
 
 class AType {
   value;

modules/angular2/test/core/render/api_spec.ts

@@ -1,6 +1,6 @@
-import {RenderDirectiveMetadata} from 'angular2/src/render/api';
+import {RenderDirectiveMetadata} from 'angular2/src/core/render/api';
 
-import {MapWrapper} from 'angular2/src/facade/collection';
+import {MapWrapper} from 'angular2/src/core/facade/collection';
 import {ddescribe, describe, expect, it} from 'angular2/test_lib';
 
 export function main() {

modules/angular2/test/core/render/dom/compiler/compiler_common_tests.ts

@@ -10,27 +10,33 @@ import {
   it,
 } from 'angular2/test_lib';
 
-import {DOM} from 'angular2/src/dom/dom_adapter';
-import {List, ListWrapper, Map, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
-import {Type, isBlank, stringify, isPresent, BaseException} from 'angular2/src/facade/lang';
-import {PromiseWrapper, Promise} from 'angular2/src/facade/async';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
+import {
+  List,
+  ListWrapper,
+  Map,
+  MapWrapper,
+  StringMapWrapper
+} from 'angular2/src/core/facade/collection';
+import {Type, isBlank, stringify, isPresent, BaseException} from 'angular2/src/core/facade/lang';
+import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async';
 
-import {DomCompiler} from 'angular2/src/render/dom/compiler/compiler';
+import {DomCompiler} from 'angular2/src/core/render/dom/compiler/compiler';
 import {
   ProtoViewDto,
   ViewDefinition,
   RenderDirectiveMetadata,
   ViewType,
   ViewEncapsulation
-} from 'angular2/src/render/api';
-import {CompileStep} from 'angular2/src/render/dom/compiler/compile_step';
-import {CompileStepFactory} from 'angular2/src/render/dom/compiler/compile_step_factory';
-import {ElementSchemaRegistry} from 'angular2/src/render/dom/schema/element_schema_registry';
-import {ViewLoader, TemplateAndStyles} from 'angular2/src/render/dom/compiler/view_loader';
+} from 'angular2/src/core/render/api';
+import {CompileStep} from 'angular2/src/core/render/dom/compiler/compile_step';
+import {CompileStepFactory} from 'angular2/src/core/render/dom/compiler/compile_step_factory';
+import {ElementSchemaRegistry} from 'angular2/src/core/render/dom/schema/element_schema_registry';
+import {ViewLoader, TemplateAndStyles} from 'angular2/src/core/render/dom/compiler/view_loader';
 
-import {resolveInternalDomProtoView} from 'angular2/src/render/dom/view/proto_view';
-import {SharedStylesHost} from 'angular2/src/render/dom/view/shared_styles_host';
-import {TemplateCloner} from 'angular2/src/render/dom/template_cloner';
+import {resolveInternalDomProtoView} from 'angular2/src/core/render/dom/view/proto_view';
+import {SharedStylesHost} from 'angular2/src/core/render/dom/view/shared_styles_host';
+import {TemplateCloner} from 'angular2/src/core/render/dom/template_cloner';
 
 import {MockStep} from './pipeline_spec';
 

modules/angular2/test/core/render/dom/compiler/compiler_html5lib.server.spec.dart

@@ -1,6 +1,6 @@
 library angular2.compiler.html5lib_dom_adapter.test;
 
-import 'package:angular2/src/dom/html_adapter.dart';
+import 'package:angular2/src/core/dom/html_adapter.dart';
 import 'package:angular2/src/test_lib/test_lib.dart' show testSetup;
 import 'compiler_common_tests.dart';
 

modules/angular2/test/core/render/dom/compiler/directive_parser_spec.ts

@@ -1,12 +1,12 @@
 import {describe, beforeEach, it, xit, expect, iit, ddescribe, el} from 'angular2/test_lib';
-import {isPresent, isBlank, assertionsEnabled, IMPLEMENTS} from 'angular2/src/facade/lang';
-import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
-import {DOM} from 'angular2/src/dom/dom_adapter';
-import {DirectiveParser} from 'angular2/src/render/dom/compiler/directive_parser';
-import {CompilePipeline} from 'angular2/src/render/dom/compiler/compile_pipeline';
-import {ViewDefinition, RenderDirectiveMetadata, ViewType} from 'angular2/src/render/api';
-import {Lexer, Parser} from 'angular2/src/change_detection/change_detection';
-import {ElementBinderBuilder} from 'angular2/src/render/dom/view/proto_view_builder';
+import {isPresent, isBlank, assertionsEnabled, IMPLEMENTS} from 'angular2/src/core/facade/lang';
+import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
+import {DirectiveParser} from 'angular2/src/core/render/dom/compiler/directive_parser';
+import {CompilePipeline} from 'angular2/src/core/render/dom/compiler/compile_pipeline';
+import {ViewDefinition, RenderDirectiveMetadata, ViewType} from 'angular2/src/core/render/api';
+import {Lexer, Parser} from 'angular2/src/core/change_detection/change_detection';
+import {ElementBinderBuilder} from 'angular2/src/core/render/dom/view/proto_view_builder';
 import {MockStep} from './pipeline_spec';
 
 export function main() {

modules/angular2/test/core/render/dom/compiler/pipeline_spec.ts

@@ -1,15 +1,20 @@
 import {describe, beforeEach, it, expect, iit, ddescribe, el} from 'angular2/test_lib';
-import {ListWrapper, List, MapWrapper} from 'angular2/src/facade/collection';
-import {DOM} from 'angular2/src/dom/dom_adapter';
-import {isPresent, NumberWrapper, StringWrapper, IMPLEMENTS} from 'angular2/src/facade/lang';
+import {ListWrapper, List, MapWrapper} from 'angular2/src/core/facade/collection';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
+import {isPresent, NumberWrapper, StringWrapper, IMPLEMENTS} from 'angular2/src/core/facade/lang';
 
-import {CompilePipeline} from 'angular2/src/render/dom/compiler/compile_pipeline';
-import {CompileElement} from 'angular2/src/render/dom/compiler/compile_element';
-import {CompileStep} from 'angular2/src/render/dom/compiler/compile_step';
-import {CompileControl} from 'angular2/src/render/dom/compiler/compile_control';
+import {CompilePipeline} from 'angular2/src/core/render/dom/compiler/compile_pipeline';
+import {CompileElement} from 'angular2/src/core/render/dom/compiler/compile_element';
+import {CompileStep} from 'angular2/src/core/render/dom/compiler/compile_step';
+import {CompileControl} from 'angular2/src/core/render/dom/compiler/compile_control';
 
-import {ProtoViewBuilder} from 'angular2/src/render/dom/view/proto_view_builder';
-import {ProtoViewDto, ViewType, ViewEncapsulation, ViewDefinition} from 'angular2/src/render/api';
+import {ProtoViewBuilder} from 'angular2/src/core/render/dom/view/proto_view_builder';
+import {
+  ProtoViewDto,
+  ViewType,
+  ViewEncapsulation,
+  ViewDefinition
+} from 'angular2/src/core/render/api';
 
 export function main() {
   describe('compile_pipeline', () => {

modules/angular2/test/core/render/dom/compiler/property_binding_parser_spec.ts

@@ -1,11 +1,11 @@
 import {describe, beforeEach, it, expect, iit, ddescribe, el} from 'angular2/test_lib';
-import {IMPLEMENTS} from 'angular2/src/facade/lang';
-import {PropertyBindingParser} from 'angular2/src/render/dom/compiler/property_binding_parser';
-import {CompilePipeline} from 'angular2/src/render/dom/compiler/compile_pipeline';
-import {MapWrapper, ListWrapper} from 'angular2/src/facade/collection';
-import {Lexer, Parser} from 'angular2/src/change_detection/change_detection';
-import {ElementBinderBuilder} from 'angular2/src/render/dom/view/proto_view_builder';
-import {ViewDefinition, ViewType} from 'angular2/src/render/api';
+import {IMPLEMENTS} from 'angular2/src/core/facade/lang';
+import {PropertyBindingParser} from 'angular2/src/core/render/dom/compiler/property_binding_parser';
+import {CompilePipeline} from 'angular2/src/core/render/dom/compiler/compile_pipeline';
+import {MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection';
+import {Lexer, Parser} from 'angular2/src/core/change_detection/change_detection';
+import {ElementBinderBuilder} from 'angular2/src/core/render/dom/view/proto_view_builder';
+import {ViewDefinition, ViewType} from 'angular2/src/core/render/api';
 import {MockStep} from './pipeline_spec';
 
 var EMPTY_MAP = new Map();

modules/angular2/test/core/render/dom/compiler/selector_spec.ts

@@ -1,8 +1,8 @@
 import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'angular2/test_lib';
-import {DOM} from 'angular2/src/dom/dom_adapter';
-import {SelectorMatcher} from 'angular2/src/render/dom/compiler/selector';
-import {CssSelector} from 'angular2/src/render/dom/compiler/selector';
-import {List, ListWrapper, MapWrapper} from 'angular2/src/facade/collection';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
+import {SelectorMatcher} from 'angular2/src/core/render/dom/compiler/selector';
+import {CssSelector} from 'angular2/src/core/render/dom/compiler/selector';
+import {List, ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection';
 
 export function main() {
   describe('SelectorMatcher', () => {

modules/angular2/test/core/render/dom/compiler/shadow_css_spec.ts

@@ -9,10 +9,10 @@ import {
   el,
   normalizeCSS
 } from 'angular2/test_lib';
-import {ShadowCss} from 'angular2/src/render/dom/compiler/shadow_css';
+import {ShadowCss} from 'angular2/src/core/render/dom/compiler/shadow_css';
 
-import {RegExpWrapper, StringWrapper, isPresent} from 'angular2/src/facade/lang';
-import {DOM} from 'angular2/src/dom/dom_adapter';
+import {RegExpWrapper, StringWrapper, isPresent} from 'angular2/src/core/facade/lang';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
 
 export function main() {
   describe('ShadowCss', function() {

modules/angular2/test/core/render/dom/compiler/style_encapsulator_spec.ts

@@ -12,17 +12,17 @@ import {
   SpyObject,
 } from 'angular2/test_lib';
 
-import {DOM} from 'angular2/src/dom/dom_adapter';
-import {CompilePipeline} from 'angular2/src/render/dom/compiler/compile_pipeline';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
+import {CompilePipeline} from 'angular2/src/core/render/dom/compiler/compile_pipeline';
 
-import {MapWrapper, ListWrapper} from 'angular2/src/facade/collection';
+import {MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection';
 import {
   ProtoViewBuilder,
   ElementBinderBuilder
-} from 'angular2/src/render/dom/view/proto_view_builder';
-import {ViewDefinition, ViewType, ViewEncapsulation} from 'angular2/src/render/api';
+} from 'angular2/src/core/render/dom/view/proto_view_builder';
+import {ViewDefinition, ViewType, ViewEncapsulation} from 'angular2/src/core/render/api';
 
-import {StyleEncapsulator} from 'angular2/src/render/dom/compiler/style_encapsulator';
+import {StyleEncapsulator} from 'angular2/src/core/render/dom/compiler/style_encapsulator';
 import {MockStep} from './pipeline_spec';
 
 export function main() {

modules/angular2/test/core/render/dom/compiler/style_inliner_spec.ts

@@ -11,13 +11,13 @@ import {
   it,
   xit,
 } from 'angular2/test_lib';
-import {StyleInliner} from 'angular2/src/render/dom/compiler/style_inliner';
+import {StyleInliner} from 'angular2/src/core/render/dom/compiler/style_inliner';
 
-import {isBlank} from 'angular2/src/facade/lang';
-import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
-import {Map, MapWrapper} from 'angular2/src/facade/collection';
+import {isBlank} from 'angular2/src/core/facade/lang';
+import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async';
+import {Map, MapWrapper} from 'angular2/src/core/facade/collection';
 
-import {XHR} from 'angular2/src/render/xhr';
+import {XHR} from 'angular2/src/core/render/xhr';
 
 import {bind} from 'angular2/di';
 

modules/angular2/test/core/render/dom/compiler/style_url_resolver_spec.ts

@@ -1,7 +1,7 @@
 import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'angular2/test_lib';
-import {StyleUrlResolver} from 'angular2/src/render/dom/compiler/style_url_resolver';
+import {StyleUrlResolver} from 'angular2/src/core/render/dom/compiler/style_url_resolver';
 
-import {UrlResolver} from 'angular2/src/services/url_resolver';
+import {UrlResolver} from 'angular2/src/core/services/url_resolver';
 
 export function main() {
   describe('StyleUrlResolver', () => {

modules/angular2/test/core/render/dom/compiler/text_interpolation_parser_spec.ts

@@ -1,15 +1,17 @@
 import {describe, beforeEach, expect, it, iit, ddescribe, el} from 'angular2/test_lib';
-import {TextInterpolationParser} from 'angular2/src/render/dom/compiler/text_interpolation_parser';
-import {CompilePipeline} from 'angular2/src/render/dom/compiler/compile_pipeline';
-import {MapWrapper, ListWrapper} from 'angular2/src/facade/collection';
-import {Lexer, Parser, ASTWithSource} from 'angular2/src/change_detection/change_detection';
+import {
+  TextInterpolationParser
+} from 'angular2/src/core/render/dom/compiler/text_interpolation_parser';
+import {CompilePipeline} from 'angular2/src/core/render/dom/compiler/compile_pipeline';
+import {MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection';
+import {Lexer, Parser, ASTWithSource} from 'angular2/src/core/change_detection/change_detection';
 import {IgnoreChildrenStep} from './pipeline_spec';
 import {
   ProtoViewBuilder,
   ElementBinderBuilder
-} from 'angular2/src/render/dom/view/proto_view_builder';
-import {DOM} from 'angular2/src/dom/dom_adapter';
-import {ViewDefinition, ViewType} from 'angular2/src/render/api';
+} from 'angular2/src/core/render/dom/view/proto_view_builder';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
+import {ViewDefinition, ViewType} from 'angular2/src/core/render/api';
 
 export function main() {
   describe('TextInterpolationParser', () => {

modules/angular2/test/core/render/dom/compiler/view_loader_spec.ts

@@ -10,16 +10,16 @@ import {
   it,
   xit,
 } from 'angular2/test_lib';
-import {ViewLoader, TemplateAndStyles} from 'angular2/src/render/dom/compiler/view_loader';
-import {StyleInliner} from 'angular2/src/render/dom/compiler/style_inliner';
-import {StyleUrlResolver} from 'angular2/src/render/dom/compiler/style_url_resolver';
-import {UrlResolver} from 'angular2/src/services/url_resolver';
+import {ViewLoader, TemplateAndStyles} from 'angular2/src/core/render/dom/compiler/view_loader';
+import {StyleInliner} from 'angular2/src/core/render/dom/compiler/style_inliner';
+import {StyleUrlResolver} from 'angular2/src/core/render/dom/compiler/style_url_resolver';
+import {UrlResolver} from 'angular2/src/core/services/url_resolver';
 
-import {PromiseWrapper, Promise} from 'angular2/src/facade/async';
-import {MapWrapper, ListWrapper} from 'angular2/src/facade/collection';
-import {XHR} from 'angular2/src/render/xhr';
-import {MockXHR} from 'angular2/src/render/xhr_mock';
-import {ViewDefinition} from 'angular2/src/render/api';
+import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async';
+import {MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection';
+import {XHR} from 'angular2/src/core/render/xhr';
+import {MockXHR} from 'angular2/src/core/render/xhr_mock';
+import {ViewDefinition} from 'angular2/src/core/render/api';
 
 export function main() {
   describe('ViewLoader', () => {

modules/angular2/test/core/render/dom/compiler/view_splitter_spec.ts

@@ -8,15 +8,15 @@ import {
   el,
   stringifyElement
 } from 'angular2/test_lib';
-import {MapWrapper} from 'angular2/src/facade/collection';
+import {MapWrapper} from 'angular2/src/core/facade/collection';
 
-import {ViewSplitter} from 'angular2/src/render/dom/compiler/view_splitter';
-import {CompilePipeline} from 'angular2/src/render/dom/compiler/compile_pipeline';
-import {CompileElement} from 'angular2/src/render/dom/compiler/compile_element';
-import {ProtoViewDto, ViewType, ViewDefinition} from 'angular2/src/render/api';
-import {DOM} from 'angular2/src/dom/dom_adapter';
+import {ViewSplitter} from 'angular2/src/core/render/dom/compiler/view_splitter';
+import {CompilePipeline} from 'angular2/src/core/render/dom/compiler/compile_pipeline';
+import {CompileElement} from 'angular2/src/core/render/dom/compiler/compile_element';
+import {ProtoViewDto, ViewType, ViewDefinition} from 'angular2/src/core/render/api';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
 
-import {Lexer, Parser} from 'angular2/src/change_detection/change_detection';
+import {Lexer, Parser} from 'angular2/src/core/change_detection/change_detection';
 
 export function main() {
   describe('ViewSplitter', () => {

modules/angular2/test/core/render/dom/convert_spec.ts

@@ -1,6 +1,9 @@
-import {MapWrapper} from 'angular2/src/facade/collection';
-import {RenderDirectiveMetadata} from 'angular2/src/render/api';
-import {directiveMetadataFromMap, directiveMetadataToMap} from 'angular2/src/render/dom/convert';
+import {MapWrapper} from 'angular2/src/core/facade/collection';
+import {RenderDirectiveMetadata} from 'angular2/src/core/render/api';
+import {
+  directiveMetadataFromMap,
+  directiveMetadataToMap
+} from 'angular2/src/core/render/dom/convert';
 import {ddescribe, describe, expect, it} from 'angular2/test_lib';
 
 export function main() {

modules/angular2/test/core/render/dom/dom_renderer_integration_spec.ts

@@ -13,8 +13,8 @@ import {
   SpyObject,
 } from 'angular2/test_lib';
 
-import {MapWrapper} from 'angular2/src/facade/collection';
-import {DOM} from 'angular2/src/dom/dom_adapter';
+import {MapWrapper} from 'angular2/src/core/facade/collection';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
 
 import {DomTestbed, TestRootView, elRef} from './dom_testbed';
 
@@ -23,7 +23,7 @@ import {
   RenderDirectiveMetadata,
   RenderViewRef,
   ViewEncapsulation
-} from 'angular2/src/render/api';
+} from 'angular2/src/core/render/api';
 
 export function main() {
   describe('DomRenderer integration', () => {

modules/angular2/test/core/render/dom/dom_testbed.ts

@@ -1,12 +1,12 @@
 import {Inject, Injectable} from 'angular2/di';
-import {isPresent} from 'angular2/src/facade/lang';
-import {MapWrapper, ListWrapper, List, Map} from 'angular2/src/facade/collection';
-import {PromiseWrapper, Promise} from 'angular2/src/facade/async';
-import {DOM} from 'angular2/src/dom/dom_adapter';
+import {isPresent} from 'angular2/src/core/facade/lang';
+import {MapWrapper, ListWrapper, List, Map} from 'angular2/src/core/facade/collection';
+import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
 
-import {DomRenderer} from 'angular2/src/render/dom/dom_renderer';
-import {DOCUMENT} from 'angular2/src/render/dom/dom_tokens';
-import {DefaultDomCompiler} from 'angular2/src/render/dom/compiler/compiler';
+import {DomRenderer} from 'angular2/src/core/render/dom/dom_renderer';
+import {DOCUMENT} from 'angular2/src/core/render/dom/dom_tokens';
+import {DefaultDomCompiler} from 'angular2/src/core/render/dom/compiler/compiler';
 import {
   RenderViewWithFragments,
   RenderFragmentRef,
@@ -18,9 +18,9 @@ import {
   RenderElementRef,
   RenderProtoViewMergeMapping,
   RenderProtoViewRef
-} from 'angular2/src/render/api';
-import {resolveInternalDomView} from 'angular2/src/render/dom/view/view';
-import {resolveInternalDomFragment} from 'angular2/src/render/dom/view/fragment';
+} from 'angular2/src/core/render/api';
+import {resolveInternalDomView} from 'angular2/src/core/render/dom/view/view';
+import {resolveInternalDomFragment} from 'angular2/src/core/render/dom/view/fragment';
 import {el, dispatchEvent} from 'angular2/test_lib';
 
 export class TestRootView {

modules/angular2/test/core/render/dom/events/event_manager_spec.ts

@@ -13,10 +13,10 @@ import {
   EventManager,
   EventManagerPlugin,
   DomEventsPlugin
-} from 'angular2/src/render/dom/events/event_manager';
+} from 'angular2/src/core/render/dom/events/event_manager';
 import {NgZone} from 'angular2/src/core/zone/ng_zone';
-import {List, ListWrapper, Map, MapWrapper} from 'angular2/src/facade/collection';
-import {DOM} from 'angular2/src/dom/dom_adapter';
+import {List, ListWrapper, Map, MapWrapper} from 'angular2/src/core/facade/collection';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
 
 export function main() {
   var domEventPlugin;

modules/angular2/test/core/render/dom/events/key_events_spec.ts

@@ -9,7 +9,7 @@ import {
   beforeEach,
   el
 } from 'angular2/test_lib';
-import {KeyEventsPlugin} from 'angular2/src/render/dom/events/key_events';
+import {KeyEventsPlugin} from 'angular2/src/core/render/dom/events/key_events';
 
 export function main() {
   describe('KeyEvents', () => {

modules/angular2/test/core/render/dom/schema/dom_element_schema_registry_spec.ts

@@ -9,10 +9,12 @@ import {
   it,
   xit
 } from 'angular2/test_lib';
-import {IS_DART} from '../../../platform';
+import {IS_DART} from '../../../../platform';
 
-import {DomElementSchemaRegistry} from 'angular2/src/render/dom/schema/dom_element_schema_registry';
-import {DOM} from 'angular2/src/dom/dom_adapter';
+import {
+  DomElementSchemaRegistry
+} from 'angular2/src/core/render/dom/schema/dom_element_schema_registry';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
 
 export function main() {
   // DOMElementSchema can only be used on the JS side where we can safely

modules/angular2/test/core/render/dom/template_cloner_spec.ts

@@ -13,8 +13,8 @@ import {
   SpyObject,
 } from 'angular2/test_lib';
 
-import {DOM} from 'angular2/src/dom/dom_adapter';
-import {TemplateCloner} from 'angular2/src/render/dom/template_cloner';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
+import {TemplateCloner} from 'angular2/src/core/render/dom/template_cloner';
 
 export function main() {
   describe('TemplateCloner', () => {

modules/angular2/test/core/render/dom/util_spec.ts

@@ -1,4 +1,4 @@
-import {EventConfig} from 'angular2/src/render/dom/util';
+import {EventConfig} from 'angular2/src/core/render/dom/util';
 import {ddescribe, describe, expect, it} from 'angular2/test_lib';
 
 export function main() {

modules/angular2/test/core/render/dom/view/proto_view_builder_spec.ts

@@ -10,13 +10,15 @@ import {
   el
 } from 'angular2/test_lib';
 
-import {DomElementSchemaRegistry} from 'angular2/src/render/dom/schema/dom_element_schema_registry';
-import {TemplateCloner} from 'angular2/src/render/dom/template_cloner';
-import {ProtoViewBuilder} from 'angular2/src/render/dom/view/proto_view_builder';
-import {ASTWithSource, AST} from 'angular2/src/change_detection/change_detection';
-import {PropertyBindingType, ViewType, ViewEncapsulation} from 'angular2/src/render/api';
-import {DOM} from 'angular2/src/dom/dom_adapter';
-import {IS_DART} from '../../../platform';
+import {
+  DomElementSchemaRegistry
+} from 'angular2/src/core/render/dom/schema/dom_element_schema_registry';
+import {TemplateCloner} from 'angular2/src/core/render/dom/template_cloner';
+import {ProtoViewBuilder} from 'angular2/src/core/render/dom/view/proto_view_builder';
+import {ASTWithSource, AST} from 'angular2/src/core/change_detection/change_detection';
+import {PropertyBindingType, ViewType, ViewEncapsulation} from 'angular2/src/core/render/api';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
+import {IS_DART} from '../../../../platform';
 
 export function main() {
   function emptyExpr() { return new ASTWithSource(new AST(), 'empty', 'empty'); }

modules/angular2/test/core/render/dom/view/proto_view_merger_integration_spec.ts

@@ -15,9 +15,9 @@ import {
   stringifyElement
 } from 'angular2/test_lib';
 
-import {isPresent} from 'angular2/src/facade/lang';
+import {isPresent} from 'angular2/src/core/facade/lang';
 
-import {DomTestbed} from '../dom_testbed';
+import {DomTestbed} from '../../../../core/render/dom/dom_testbed';
 
 import {
   ViewDefinition,
@@ -25,14 +25,17 @@ import {
   RenderProtoViewMergeMapping,
   ViewEncapsulation,
   ViewType
-} from 'angular2/src/render/api';
+} from 'angular2/src/core/render/api';
 
-import {DOM} from 'angular2/src/dom/dom_adapter';
-import {cloneAndQueryProtoView} from 'angular2/src/render/dom/util';
-import {TemplateCloner} from 'angular2/src/render/dom/template_cloner';
-import {resolveInternalDomProtoView, DomProtoView} from 'angular2/src/render/dom/view/proto_view';
-import {ProtoViewBuilder} from 'angular2/src/render/dom/view/proto_view_builder';
-import {ElementSchemaRegistry} from 'angular2/src/render/dom/schema/element_schema_registry';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
+import {cloneAndQueryProtoView} from 'angular2/src/core/render/dom/util';
+import {TemplateCloner} from 'angular2/src/core/render/dom/template_cloner';
+import {
+  resolveInternalDomProtoView,
+  DomProtoView
+} from 'angular2/src/core/render/dom/view/proto_view';
+import {ProtoViewBuilder} from 'angular2/src/core/render/dom/view/proto_view_builder';
+import {ElementSchemaRegistry} from 'angular2/src/core/render/dom/schema/element_schema_registry';
 
 export function main() {
   describe('ProtoViewMerger integration test', () => {

modules/angular2/test/core/render/dom/view/shared_styles_host_spec.ts

@@ -16,8 +16,8 @@ import {
   proxy
 } from 'angular2/test_lib';
 
-import {DOM} from 'angular2/src/dom/dom_adapter';
-import {DomSharedStylesHost} from 'angular2/src/render/dom/view/shared_styles_host';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
+import {DomSharedStylesHost} from 'angular2/src/core/render/dom/view/shared_styles_host';
 
 export function main() {
   describe('DomSharedStylesHost', () => {

modules/angular2/test/core/render/dom/view/view_spec.ts

@@ -15,14 +15,14 @@ import {
   SpyObject,
   proxy
 } from 'angular2/test_lib';
-import {isBlank} from 'angular2/src/facade/lang';
-import {ListWrapper} from 'angular2/src/facade/collection';
+import {isBlank} from 'angular2/src/core/facade/lang';
+import {ListWrapper} from 'angular2/src/core/facade/collection';
 
-import {DomProtoView} from 'angular2/src/render/dom/view/proto_view';
-import {DomElementBinder} from 'angular2/src/render/dom/view/element_binder';
-import {DomView} from 'angular2/src/render/dom/view/view';
-import {DOM} from 'angular2/src/dom/dom_adapter';
-import {TemplateCloner} from 'angular2/src/render/dom/template_cloner';
+import {DomProtoView} from 'angular2/src/core/render/dom/view/proto_view';
+import {DomElementBinder} from 'angular2/src/core/render/dom/view/element_binder';
+import {DomView} from 'angular2/src/core/render/dom/view/view';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
+import {TemplateCloner} from 'angular2/src/core/render/dom/template_cloner';
 
 export function main() {
   describe('DomView', () => {

modules/angular2/test/core/render/xhr_impl_spec.ts

@@ -10,14 +10,14 @@ import {
   xit
 } from 'angular2/test_lib';
 
-import {XHRImpl} from 'angular2/src/render/xhr_impl';
-import {PromiseWrapper} from 'angular2/src/facade/async';
+import {XHRImpl} from 'angular2/src/core/render/xhr_impl';
+import {PromiseWrapper} from 'angular2/src/core/facade/async';
 
 export function main() {
   describe('XHRImpl', () => {
     var xhr: XHRImpl;
-    var url200 = '/base/modules/angular2/test/services/static_assets/200.html';
-    var url404 = '/base/modules/angular2/test/services/static_assets/404.html';
+    var url200 = '/base/modules/angular2/test/core/services/static_assets/200.html';
+    var url404 = '/base/modules/angular2/test/core/services/static_assets/404.html';
 
     beforeEach(() => { xhr = new XHRImpl(); });
 

modules/angular2/test/core/render/xhr_mock_spec.ts

@@ -9,9 +9,9 @@ import {
   inject,
   it,
 } from 'angular2/test_lib';
-import {MockXHR} from 'angular2/src/render/xhr_mock';
-import {PromiseWrapper, Promise} from 'angular2/src/facade/async';
-import {isPresent} from 'angular2/src/facade/lang';
+import {MockXHR} from 'angular2/src/core/render/xhr_mock';
+import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async';
+import {isPresent} from 'angular2/src/core/facade/lang';
 
 export function main() {
   describe('MockXHR', () => {

modules/angular2/test/core/services/ruler_spec.ts

@@ -11,12 +11,12 @@ import {
   proxy
 } from 'angular2/test_lib';
 
-import {DOM, DomAdapter} from 'angular2/src/dom/dom_adapter';
+import {DOM, DomAdapter} from 'angular2/src/core/dom/dom_adapter';
 import {ElementRef} from 'angular2/src/core/compiler/element_ref';
 
-import {Ruler, Rectangle} from 'angular2/src/services/ruler';
+import {Ruler, Rectangle} from 'angular2/src/core/services/ruler';
 import {createRectangle} from './rectangle_mock';
-import {IMPLEMENTS} from 'angular2/src/facade/lang';
+import {IMPLEMENTS} from 'angular2/src/core/facade/lang';
 
 function assertDimensions(rect: Rectangle, left, right, top, bottom, width, height) {
   expect(rect.left).toEqual(left);

modules/angular2/test/core/services/title_spec.ts

@@ -1,7 +1,7 @@
 import {ddescribe, describe, it, iit, xit, expect, afterEach} from 'angular2/test_lib';
-import {DOM} from 'angular2/src/dom/dom_adapter';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
 
-import {Title} from 'angular2/src/services/title';
+import {Title} from 'angular2/src/core/services/title';
 
 export function main() {
   describe('title service', () => {

modules/angular2/test/core/services/url_resolver_spec.ts

@@ -1,5 +1,5 @@
 import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'angular2/test_lib';
-import {UrlResolver} from 'angular2/src/services/url_resolver';
+import {UrlResolver} from 'angular2/src/core/services/url_resolver';
 
 export function main() {
   describe('UrlResolver', () => {

modules/angular2/test/core/testability/testability_spec.ts

@@ -13,8 +13,8 @@ import {
 } from 'angular2/test_lib';
 import {Testability} from 'angular2/src/core/testability/testability';
 import {NgZone} from 'angular2/src/core/zone/ng_zone';
-import {normalizeBlank} from 'angular2/src/facade/lang';
-import {PromiseWrapper} from 'angular2/src/facade/async';
+import {normalizeBlank} from 'angular2/src/core/facade/lang';
+import {PromiseWrapper} from 'angular2/src/core/facade/async';
 
 // Schedules a microtasks (using a resolved promise .then())
 function microTask(fn: Function): void {

modules/angular2/test/core/util/decorators_spec.ts

@@ -10,10 +10,10 @@ import {
   xit,
 } from 'angular2/test_lib';
 
-import {makeDecorator, makeParamDecorator, Class} from 'angular2/src/util/decorators';
-import {global} from 'angular2/src/facade/lang';
+import {makeDecorator, makeParamDecorator, Class} from 'angular2/src/core/util/decorators';
+import {global} from 'angular2/src/core/facade/lang';
 import {Inject} from 'angular2/angular2';
-import {reflector} from 'angular2/src/reflection/reflection';
+import {reflector} from 'angular2/src/core/reflection/reflection';
 
 class TestAnnotation {
   constructor(public arg: any) {}

modules/angular2/test/core/zone/ng_zone_spec.ts

@@ -16,8 +16,8 @@ import {
   isIE
 } from 'angular2/test_lib';
 
-import {PromiseCompleter, PromiseWrapper, TimerWrapper} from 'angular2/src/facade/async';
-import {BaseException} from 'angular2/src/facade/lang';
+import {PromiseCompleter, PromiseWrapper, TimerWrapper} from 'angular2/src/core/facade/async';
+import {BaseException} from 'angular2/src/core/facade/lang';
 
 import {NgZone} from 'angular2/src/core/zone/ng_zone';
 

modules/angular2/test/forms/integration_spec.ts

@@ -18,7 +18,7 @@ import {
   isFirefox
 } from 'angular2/test_lib';
 
-import {DOM} from 'angular2/src/dom/dom_adapter';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
 import {NgIf, NgFor} from 'angular2/directives';
 
 import {

modules/angular2/test/forms/model_spec.ts

@@ -14,7 +14,7 @@ import {
   inject
 } from 'angular2/test_lib';
 import {ControlGroup, Control, ControlArray, Validators} from 'angular2/forms';
-import {ObservableWrapper} from 'angular2/src/facade/async';
+import {ObservableWrapper} from 'angular2/src/core/facade/async';
 
 export function main() {
   describe("Form Model", () => {

modules/angular2/test/http/backends/jsonp_backend_spec.ts

@@ -11,18 +11,18 @@ import {
   xit,
   SpyObject
 } from 'angular2/test_lib';
-import {ObservableWrapper} from 'angular2/src/facade/async';
-import {BrowserJsonp} from 'http/src/backends/browser_jsonp';
-import {JSONPConnection, JSONPBackend} from 'http/src/backends/jsonp_backend';
+import {ObservableWrapper} from 'angular2/src/core/facade/async';
+import {BrowserJsonp} from 'angular2/src/http/backends/browser_jsonp';
+import {JSONPConnection, JSONPBackend} from 'angular2/src/http/backends/jsonp_backend';
 import {bind, Injector} from 'angular2/di';
-import {isPresent, StringWrapper} from 'angular2/src/facade/lang';
-import {TimerWrapper} from 'angular2/src/facade/async';
-import {Request} from 'http/src/static_request';
-import {Response} from 'http/src/static_response';
-import {Map} from 'angular2/src/facade/collection';
-import {RequestOptions, BaseRequestOptions} from 'http/src/base_request_options';
-import {BaseResponseOptions, ResponseOptions} from 'http/src/base_response_options';
-import {ResponseTypes, ReadyStates, RequestMethods} from 'http/src/enums';
+import {isPresent, StringWrapper} from 'angular2/src/core/facade/lang';
+import {TimerWrapper} from 'angular2/src/core/facade/async';
+import {Request} from 'angular2/src/http/static_request';
+import {Response} from 'angular2/src/http/static_response';
+import {Map} from 'angular2/src/core/facade/collection';
+import {RequestOptions, BaseRequestOptions} from 'angular2/src/http/base_request_options';
+import {BaseResponseOptions, ResponseOptions} from 'angular2/src/http/base_response_options';
+import {ResponseTypes, ReadyStates, RequestMethods} from 'angular2/src/http/enums';
 
 var addEventListenerSpy;
 var existingScripts = [];

modules/angular2/test/http/backends/xhr_backend_spec.ts

@@ -11,17 +11,17 @@ import {
   xit,
   SpyObject
 } from 'angular2/test_lib';
-import {ObservableWrapper} from 'angular2/src/facade/async';
-import {BrowserXhr} from 'http/src/backends/browser_xhr';
-import {XHRConnection, XHRBackend} from 'http/src/backends/xhr_backend';
+import {ObservableWrapper} from 'angular2/src/core/facade/async';
+import {BrowserXhr} from 'angular2/src/http/backends/browser_xhr';
+import {XHRConnection, XHRBackend} from 'angular2/src/http/backends/xhr_backend';
 import {bind, Injector} from 'angular2/di';
-import {Request} from 'http/src/static_request';
-import {Response} from 'http/src/static_response';
-import {Headers} from 'http/src/headers';
-import {Map} from 'angular2/src/facade/collection';
-import {RequestOptions, BaseRequestOptions} from 'http/src/base_request_options';
-import {BaseResponseOptions, ResponseOptions} from 'http/src/base_response_options';
-import {ResponseTypes} from 'http/src/enums';
+import {Request} from 'angular2/src/http/static_request';
+import {Response} from 'angular2/src/http/static_response';
+import {Headers} from 'angular2/src/http/headers';
+import {Map} from 'angular2/src/core/facade/collection';
+import {RequestOptions, BaseRequestOptions} from 'angular2/src/http/base_request_options';
+import {BaseResponseOptions, ResponseOptions} from 'angular2/src/http/base_response_options';
+import {ResponseTypes} from 'angular2/src/http/enums';
 
 var abortSpy;
 var sendSpy;

modules/angular2/test/http/base_request_options_spec.ts

@@ -9,8 +9,8 @@ import {
   it,
   xit
 } from 'angular2/test_lib';
-import {BaseRequestOptions, RequestOptions} from 'http/src/base_request_options';
-import {RequestMethods, RequestModesOpts} from 'http/src/enums';
+import {BaseRequestOptions, RequestOptions} from 'angular2/src/http/base_request_options';
+import {RequestMethods, RequestModesOpts} from 'angular2/src/http/enums';
 
 export function main() {
   describe('BaseRequestOptions', () => {

modules/angular2/test/http/headers_spec.ts

@@ -1,5 +1,5 @@
-import {Headers} from 'http/src/headers';
-import {Map, StringMapWrapper} from 'angular2/src/facade/collection';
+import {Headers} from 'angular2/src/http/headers';
+import {Map, StringMapWrapper} from 'angular2/src/core/facade/collection';
 import {
   AsyncTestCompleter,
   beforeEach,

modules/angular2/test/http/http_spec.ts

@@ -12,8 +12,8 @@ import {
   SpyObject
 } from 'angular2/test_lib';
 import {Injector, bind} from 'angular2/di';
-import {MockBackend, MockConnection} from 'http/src/backends/mock_backend';
-import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
+import {MockBackend, MockConnection} from 'angular2/src/http/backends/mock_backend';
+import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async';
 import {
   BaseRequestOptions,
   ConnectionBackend,
@@ -29,7 +29,7 @@ import {
   JSONPBackend,
   Http,
   Jsonp
-} from 'http/http';
+} from 'angular2/http';
 
 class SpyObserver extends SpyObject {
   onNext: Function;

modules/angular2/test/http/url_search_params_spec.ts

@@ -9,7 +9,7 @@ import {
   it,
   xit
 } from 'angular2/test_lib';
-import {URLSearchParams} from 'http/src/url_search_params';
+import {URLSearchParams} from 'angular2/src/http/url_search_params';
 
 export function main() {
   describe('URLSearchParams', () => {

modules/angular2/test/mock/view_resolver_mock_spec.ts

@@ -8,13 +8,13 @@ import {
   it,
 } from 'angular2/test_lib';
 
-import {stringify} from 'angular2/src/facade/lang';
+import {stringify} from 'angular2/src/core/facade/lang';
 
 import {MockViewResolver} from 'angular2/src/mock/view_resolver_mock';
 
 import {Component, View, ViewMetadata} from 'angular2/metadata';
 
-import {isBlank} from 'angular2/src/facade/lang';
+import {isBlank} from 'angular2/src/core/facade/lang';
 
 export function main() {
   describe('MockViewResolver', () => {