refactor: export core APIs from angular2/core

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

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

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

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

modules/angular2/test/core/application_spec.ts

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

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

@@ -1,7 +1,7 @@
 import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach} from 'angular2/test_lib';
 import {SpyIterableDifferFactory} from '../../spies';
 import {IterableDiffers} from 'angular2/src/core/change_detection/differs/iterable_differs';
-import {Injector, bind} from 'angular2/di';
+import {Injector, bind} from 'angular2/core';
 
 export function main() {
   describe('IterableDiffers', function() {

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

@@ -20,7 +20,7 @@ import {AppProtoView} from 'angular2/src/core/compiler/view';
 import {ElementBinder} from 'angular2/src/core/compiler/element_binder';
 import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver';
 import {PipeResolver} from 'angular2/src/core/compiler/pipe_resolver';
-import {Attribute, ViewMetadata, Component, Directive, Pipe} from 'angular2/metadata';
+import {Attribute, ViewMetadata, Component, Directive, Pipe} from 'angular2/src/core/metadata';
 import {internalProtoView} from 'angular2/src/core/compiler/view_ref';
 import {DirectiveBinding} from 'angular2/src/core/compiler/element_injector';
 import {ViewResolver} from 'angular2/src/core/compiler/view_resolver';

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

@@ -7,7 +7,7 @@ import {
   Event,
   HostBinding,
   HostListener
-} from 'angular2/metadata';
+} from 'angular2/src/core/metadata';
 
 @Directive({selector: 'someDirective'})
 class SomeDirective {

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

@@ -13,15 +13,13 @@ import {
   it,
   xit,
   TestComponentBuilder,
-  RootTestComponent,
-  inspectElement,
-  By
+  RootTestComponent
 } from 'angular2/test_lib';
 
-import {Injector} from 'angular2/di';
-import {NgIf} from 'angular2/directives';
-import {Component, View, ViewMetadata} from 'angular2/metadata';
 import {OnDestroy} from 'angular2/lifecycle_hooks';
+import {Injector, NgIf} from 'angular2/core';
+import {inspectElement, By} from 'angular2/src/core/debug';
+import {Component, View, ViewMetadata} from 'angular2/src/core/metadata';
 import {DynamicComponentLoader} from 'angular2/src/core/compiler/dynamic_component_loader';
 import {ElementRef} from 'angular2/src/core/compiler/element_ref';
 import {DOCUMENT} from 'angular2/src/core/render/render';

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

@@ -36,9 +36,9 @@ import {
   ViewQuery,
   ComponentMetadata,
   DirectiveMetadata
-} from 'angular2/metadata';
+} from 'angular2/src/core/metadata';
 import {OnDestroy} from 'angular2/lifecycle_hooks';
-import {bind, Injector, Binding, Optional, Inject, Injectable, Self, SkipSelf, InjectMetadata, Host, HostMetadata, SkipSelfMetadata} from 'angular2/di';
+import {bind, Injector, Binding, Optional, Inject, Injectable, Self, SkipSelf, InjectMetadata, Host, HostMetadata, SkipSelfMetadata} from 'angular2/core';
 import {ViewContainerRef} from 'angular2/src/core/compiler/view_container_ref';
 import {TemplateRef} from 'angular2/src/core/compiler/template_ref';
 import {ElementRef} from 'angular2/src/core/compiler/element_ref';

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

@@ -2,10 +2,10 @@
 library angular2.test.di.integration_dart_spec;
 
 import 'package:angular2/angular2.dart';
-import 'package:angular2/di.dart';
+import 'package:angular2/core.dart';
+import 'package:angular2/src/core/debug.dart';
 import 'package:angular2/test_lib.dart';
 import 'package:observe/observe.dart';
-import 'package:angular2/src/core/directives/observable_list_diff.dart';
 import 'package:angular2/src/core/change_detection/differs/default_iterable_differ.dart';
 import 'package:angular2/src/core/change_detection/change_detection.dart';
 

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

@@ -52,8 +52,10 @@ import {
   Inject,
   Host,
   SkipSelf,
-  SkipSelfMetadata
-} from 'angular2/di';
+  SkipSelfMetadata,
+  NgIf,
+  NgFor
+} from 'angular2/core';
 
 import {
   PipeTransform,
@@ -76,13 +78,10 @@ import {
   Event,
   HostBinding,
   HostListener
-} from 'angular2/metadata';
+} from 'angular2/src/core/metadata';
 
 import {QueryList} from 'angular2/src/core/compiler/query_list';
 
-import {NgIf} from 'angular2/src/core/directives/ng_if';
-import {NgFor} from 'angular2/src/core/directives/ng_for';
-
 import {ViewContainerRef} from 'angular2/src/core/compiler/view_container_ref';
 import {ViewRef} from 'angular2/src/core/compiler/view_ref';
 

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

@@ -17,23 +17,25 @@ import {
   TestComponentBuilder,
   RootTestComponent,
   fakeAsync,
-  tick,
-  By
+  tick
 } from 'angular2/test_lib';
 
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 
 import {
+  bind,
   forwardRef,
-  ViewContainerRef,
+  Component,
+  Directive,
   ElementRef,
   TemplateRef,
-  bind,
-  ViewEncapsulation
-} from 'angular2/angular2';
-import {Component, Directive, View, ViewMetadata} from 'angular2/metadata';
-
-import {MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE} from 'angular2/src/core/render/render';
+  View,
+  ViewContainerRef,
+  ViewEncapsulation,
+  ViewMetadata
+} from 'angular2/core';
+import {By} from 'angular2/src/core/debug';
+import {MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE} from 'angular2/src/core/render';
 
 export function main() {
   describe('projection', () => {

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

@@ -29,8 +29,8 @@ import {
   createDirectiveVariableBindings,
   createVariableLocations
 } from 'angular2/src/core/compiler/proto_view_factory';
-import {Component, Directive} from 'angular2/metadata';
-import {Key, Binding} from 'angular2/di';
+import {Component, Directive} from 'angular2/src/core/metadata';
+import {Key, Binding} from 'angular2/core';
 import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver';
 import {DirectiveBinding} from 'angular2/src/core/compiler/element_injector';
 import {

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

@@ -10,16 +10,24 @@ import {
   it,
   xit,
   TestComponentBuilder,
-  asNativeElements,
-  By
 } from 'angular2/test_lib';
 
 
-import {Injectable, Optional} from 'angular2/di';
-import {QueryList, TemplateRef} from 'angular2/core';
-import {Query, ViewQuery, Component, Directive, View} from 'angular2/metadata';
+import {
+  Component,
+  Directive,
+  Injectable,
+  NgIf,
+  NgFor,
+  Optional,
+  TemplateRef,
+  Query,
+  QueryList,
+  View,
+  ViewQuery
+} from 'angular2/core';
 
-import {NgIf, NgFor} from 'angular2/angular2';
+import {asNativeElements} from 'angular2/src/core/debug';
 
 import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter';
 

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

@@ -13,9 +13,8 @@ import {
   it,
   xit
 } from 'angular2/test_lib';
-
 import {SpyRenderer, SpyAppViewPool, SpyAppViewListener} from '../spies';
-import {Injector, bind} from 'angular2/di';
+import {Injector, bind} from 'angular2/core';
 
 import {
   AppProtoView,

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

@@ -24,7 +24,7 @@ import {
   SpyPreBuiltObjects
 } from '../spies';
 
-import {Injector, bind} from 'angular2/di';
+import {Injector, bind} from 'angular2/core';
 import {isBlank, isPresent} from 'angular2/src/core/facade/lang';
 import {MapWrapper, ListWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
 
@@ -37,7 +37,7 @@ import {
   ProtoElementInjector
 } from 'angular2/src/core/compiler/element_injector';
 import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver';
-import {Component} from 'angular2/metadata';
+import {Component} from 'angular2/src/core/metadata';
 import {AppViewManagerUtils} from 'angular2/src/core/compiler/view_manager_utils';
 import {
   RenderProtoViewMergeMapping,

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

@@ -11,25 +11,21 @@ import {
   beforeEachBindings,
   it,
   xit,
-  TestComponentBuilder,
-  By,
-  Scope
+  TestComponentBuilder
 } from 'angular2/test_lib';
 
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 
-import {ListWrapper} from 'angular2/src/core/facade/collection';
 import {PromiseWrapper, EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async';
 
-import {Injectable} from 'angular2/di';
+import {Injectable, NgFor} from 'angular2/core';
+import {By, Scope} from 'angular2/src/core/debug';
 
 import {
   Directive,
   Component,
   View,
-} from 'angular2/metadata';
-
-import {NgFor} from 'angular2/src/core/directives/ng_for';
+} from 'angular2/src/core/metadata';
 
 @Injectable()
 class Logger {

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

@@ -12,18 +12,11 @@ import {
   it,
   xit,
   TestComponentBuilder,
-  By,
-  Scope,
-  inspectNativeElement
 } from 'angular2/test_lib';
 import {global} from 'angular2/src/core/facade/lang';
 import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/compiler/view_pool';
-import {Injectable, bind} from 'angular2/di';
-import {
-  Directive,
-  Component,
-  View,
-} from 'angular2/metadata';
+import {bind, Component, Directive, Injectable, View} from 'angular2/core';
+import {inspectNativeElement} from 'angular2/src/core/debug';
 import {IS_DART} from '../../platform';
 
 @Component({selector: 'my-comp'})

modules/angular2/test/core/di/binding_dart_spec.dart

@@ -4,7 +4,7 @@ library angular2.test.di.binding_dart_spec;
 
 import 'dart:mirrors';
 import 'package:angular2/test_lib.dart';
-import 'package:angular2/di.dart';
+import 'package:angular2/core.dart';
 
 main() {
   describe('Binding', () {

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

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

modules/angular2/test/core/di/injector_dart_spec.dart

@@ -2,7 +2,7 @@
 library angular2.test.di.injector_dart_spec;
 
 import 'package:angular2/test_lib.dart';
-import 'package:angular2/di.dart';
+import 'package:angular2/core.dart';
 
 main() {
   describe('Injector', () {

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

@@ -19,7 +19,7 @@ import {
   BindingWithVisibility,
   Visibility,
   Binding
-} from 'angular2/di';
+} from 'angular2/core';
 
 import {InjectorInlineStrategy, InjectorDynamicStrategy} from 'angular2/src/core/di/injector';
 

modules/angular2/test/core/di/key_dart_spec.dart

@@ -2,7 +2,7 @@
 library angular2.test.di.key_dart_spec;
 
 import 'package:angular2/test_lib.dart';
-import 'package:angular2/di.dart';
+import 'package:angular2/core.dart';
 
 main() {
   describe('TypeLiteral', () {

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

@@ -1,5 +1,5 @@
 import {describe, iit, it, expect, beforeEach} from 'angular2/test_lib';
-import {Key, KeyRegistry} from 'angular2/di';
+import {Key, KeyRegistry} from 'angular2/core';
 
 export function main() {
   describe("key", function() {

modules/angular2/test/core/directive_lifecycle_integration_spec.ts

@@ -13,7 +13,6 @@ import {
   TestComponentBuilder
 } from 'angular2/test_lib';
 
-import {Directive, Component, View, ViewMetadata} from 'angular2/metadata';
 import {
   OnChanges,
   OnInit,
@@ -23,6 +22,7 @@ import {
   AfterViewInit,
   AfterViewChecked
 } from 'angular2/lifecycle_hooks';
+import {Directive, Component, View, ViewMetadata} from 'angular2/src/core/metadata';
 
 export function main() {
   describe('directive lifecycle integration spec', () => {

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

@@ -1,7 +1,6 @@
 import {
   AsyncTestCompleter,
   TestComponentBuilder,
-  By,
   beforeEach,
   ddescribe,
   describe,
@@ -15,9 +14,8 @@ import {
 
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 
-import {Component, View} from 'angular2/angular2';
+import {Component, View, NgIf} from 'angular2/core';
 
-import {NgIf} from 'angular2/src/core/directives/ng_if';
 import {IS_DART} from '../../platform';
 
 export function main() {

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

@@ -1,7 +1,6 @@
 import {
   AsyncTestCompleter,
   TestComponentBuilder,
-  By,
   beforeEach,
   ddescribe,
   describe,
@@ -13,13 +12,9 @@ import {
   xit,
 } from 'angular2/test_lib';
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
-
-import {Component, Directive, View} from 'angular2/angular2';
-
+import {Component, Directive, NgNonBindable, View} from 'angular2/core';
 import {ElementRef} from 'angular2/src/core/compiler/element_ref';
 
-import {NgNonBindable} from 'angular2/src/core/directives/ng_non_bindable';
-
 export function main() {
   describe('non-bindable', () => {
     it('should not interpolate children',

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

@@ -1,9 +1,8 @@
 library angular2.test.directives.observable_list_iterable_diff_spec;
 
 import 'package:angular2/test_lib.dart';
-import 'package:angular2/change_detection.dart';
 import 'package:observe/observe.dart' show ObservableList;
-import 'package:angular2/src/core/directives/observable_list_diff.dart';
+import 'package:angular2/core.dart' show ObservableListDiffFactory, ChangeDetectorRef;
 
 @proxy
 class SpyChangeDetectorRef extends SpyObject implements ChangeDetectorRef {

modules/angular2/test/core/forms/directives_spec.ts

@@ -26,7 +26,7 @@ import {
   NgModel,
   NgFormControl,
   DefaultValidators
-} from 'angular2/forms';
+} from 'angular2/core';
 
 class DummyControlValueAccessor implements ControlValueAccessor {
   writtenValue;

modules/angular2/test/core/forms/form_builder_spec.ts

@@ -9,7 +9,7 @@ import {
   afterEach,
   el
 } from 'angular2/test_lib';
-import {Control, FormBuilder, Validators} from 'angular2/forms';
+import {Control, FormBuilder, Validators} from 'angular2/core';
 
 export function main() {
   describe("Form Builder", () => {

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

@@ -3,7 +3,6 @@ import {
   afterEach,
   AsyncTestCompleter,
   TestComponentBuilder,
-  By,
   beforeEach,
   ddescribe,
   describe,
@@ -19,17 +18,18 @@ import {
 } from 'angular2/test_lib';
 
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
-import {NgIf, NgFor} from 'angular2/directives';
-
 import {
   Control,
   ControlGroup,
-  NgForm,
+  ControlValueAccessor,
   FORM_DIRECTIVES,
-  Validators,
   NgControl,
-  ControlValueAccessor
-} from 'angular2/forms';
+  NgIf,
+  NgFor,
+  NgForm,
+  Validators,
+} from 'angular2/core';
+import {By} from 'angular2/src/core/debug';
 
 export function main() {
   describe("integration tests", () => {

modules/angular2/test/core/forms/model_spec.ts

@@ -13,7 +13,7 @@ import {
   tick,
   inject
 } from 'angular2/test_lib';
-import {ControlGroup, Control, ControlArray, Validators} from 'angular2/forms';
+import {ControlGroup, Control, ControlArray, Validators} from 'angular2/core';
 import {ObservableWrapper} from 'angular2/src/core/facade/async';
 
 export function main() {

modules/angular2/test/core/forms/validators_spec.ts

@@ -9,7 +9,7 @@ import {
   afterEach,
   el
 } from 'angular2/test_lib';
-import {ControlGroup, Control, Validators} from 'angular2/forms';
+import {ControlGroup, Control, Validators} from 'angular2/core';
 
 export function main() {
   function validator(key: string, error: any) {

modules/angular2/test/core/forward_ref_integration_spec.ts

@@ -1,7 +1,6 @@
 import {
   AsyncTestCompleter,
   TestComponentBuilder,
-  asNativeElements,
   beforeEach,
   ddescribe,
   describe,
@@ -11,10 +10,20 @@ import {
   it,
   xit
 } from 'angular2/test_lib';
-import {Directive, Component, Query, View} from 'angular2/metadata';
-import {QueryList, NgFor} from 'angular2/angular2';
-import {forwardRef, resolveForwardRef, bind, Inject} from 'angular2/di';
+import {
+  bind,
+  forwardRef,
+  resolveForwardRef,
+  Component,
+  Directive,
+  Inject,
+  NgFor,
+  Query,
+  QueryList,
+  View
+} from 'angular2/core';
 import {Type} from 'angular2/src/core/facade/lang';
+import {asNativeElements} from 'angular2/src/core/debug';
 
 export function main() {
   describe("forwardRef integration", function() {

modules/angular2/test/core/pipes/async_pipe_spec.ts

@@ -15,8 +15,7 @@ import {
 import {SpyChangeDetectorRef} from './spies';
 
 import {isBlank} from 'angular2/src/core/facade/lang';
-import {WrappedValue} from 'angular2/change_detection';
-import {AsyncPipe} from 'angular2/pipes';
+import {AsyncPipe, WrappedValue} from 'angular2/core';
 import {
   EventEmitter,
   ObservableWrapper,

modules/angular2/test/core/pipes/date_pipe_spec.ts

@@ -10,7 +10,7 @@ import {
   browserDetection
 } from 'angular2/test_lib';
 
-import {DatePipe} from 'angular2/pipes';
+import {DatePipe} from 'angular2/core';
 import {DateWrapper} from 'angular2/src/core/facade/lang';
 
 export function main() {

modules/angular2/test/core/pipes/json_pipe_spec.ts

@@ -14,7 +14,7 @@ import {
 } from 'angular2/test_lib';
 import {Json, RegExp, NumberWrapper, StringWrapper} from 'angular2/src/core/facade/lang';
 
-import {JsonPipe} from 'angular2/pipes';
+import {JsonPipe} from 'angular2/core';
 
 export function main() {
   describe("JsonPipe", () => {

modules/angular2/test/core/pipes/limit_to_pipe_spec.ts

@@ -1,6 +1,6 @@
 import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach} from 'angular2/test_lib';
 
-import {LimitToPipe} from 'angular2/pipes';
+import {LimitToPipe} from 'angular2/core';
 
 export function main() {
   describe("LimitToPipe", () => {

modules/angular2/test/core/pipes/lowercase_pipe_spec.ts

@@ -1,6 +1,6 @@
 import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach} from 'angular2/test_lib';
 
-import {LowerCasePipe} from 'angular2/pipes';
+import {LowerCasePipe} from 'angular2/core';
 
 export function main() {
   describe("LowerCasePipe", () => {

modules/angular2/test/core/pipes/number_pipe_spec.ts

@@ -10,7 +10,7 @@ import {
   browserDetection
 } from 'angular2/test_lib';
 
-import {DecimalPipe, PercentPipe, CurrencyPipe} from 'angular2/pipes';
+import {DecimalPipe, PercentPipe, CurrencyPipe} from 'angular2/core';
 
 export function main() {
   // TODO(mlaval): enable tests when Intl API is no longer used, see

modules/angular2/test/core/pipes/pipe_binding_spec.ts

@@ -11,7 +11,7 @@ import {
 } from 'angular2/test_lib';
 
 import {PipeBinding} from 'angular2/src/core/pipes/pipe_binding';
-import {Pipe} from 'angular2/metadata';
+import {Pipe} from 'angular2/src/core/metadata';
 
 class MyPipe {}
 

modules/angular2/test/core/pipes/pipes_spec.ts

@@ -10,11 +10,9 @@ import {
   afterEach
 } from 'angular2/test_lib';
 
-import {PipeTransform} from 'angular2/change_detection';
-import {Injector, Inject, bind} from 'angular2/di';
+import {Injector, Inject, bind, Pipe, PipeTransform} from 'angular2/core';
 import {ProtoPipes, Pipes} from 'angular2/src/core/pipes/pipes';
 import {PipeBinding} from 'angular2/src/core/pipes/pipe_binding';
-import {Pipe} from 'angular2/metadata';
 
 class PipeA implements PipeTransform {
   transform(a, b) {}

modules/angular2/test/core/pipes/uppercase_pipe_spec.ts

@@ -1,6 +1,6 @@
 import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach} from 'angular2/test_lib';
 
-import {UpperCasePipe} from 'angular2/pipes';
+import {UpperCasePipe} from 'angular2/core';
 
 export function main() {
   describe("UpperCasePipe", () => {

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

@@ -19,7 +19,7 @@ import {Map, MapWrapper} from 'angular2/src/core/facade/collection';
 
 import {XHR} from 'angular2/src/core/render/xhr';
 
-import {bind} from 'angular2/di';
+import {bind} from 'angular2/core';
 
 export function main() {
   describe('StyleInliner', () => {

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

@@ -1,4 +1,4 @@
-import {Inject, Injectable} from 'angular2/di';
+import {Inject, Injectable} from 'angular2/core';
 import {isPresent} from 'angular2/src/core/facade/lang';
 import {MapWrapper, ListWrapper, Map} from 'angular2/src/core/facade/collection';
 import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async';

modules/angular2/test/core/spies.dart

@@ -1,6 +1,6 @@
 library core.spies;
 
-import 'package:angular2/di.dart';
+import 'package:angular2/core.dart';
 import 'package:angular2/src/core/change_detection/change_detection.dart';
 import 'package:angular2/src/core/render/api.dart';
 import 'package:angular2/src/core/compiler/directive_resolver.dart';