diff --git a/modules/angular2/core.dart b/modules/angular2/core.dart
deleted file mode 100644
index b768f15e16..0000000000
--- a/modules/angular2/core.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-library angular2.core;
-
-// Public Core API
-export 'package:angular2/src/core/metadata.dart';
-export 'package:angular2/src/core/util.dart';
-export 'package:angular2/src/core/dev_mode.dart';
-export 'package:angular2/src/core/di.dart';
-export 'package:angular2/src/common/pipes.dart';
-export 'package:angular2/src/facade/facade.dart';
-export 'package:angular2/src/core/application_ref.dart'
-    hide ApplicationRef_, PlatformRef_;
-export 'package:angular2/src/core/application_tokens.dart' show APP_ID, APP_COMPONENT, APP_INITIALIZER, PLATFORM_INITIALIZER;
-export 'package:angular2/src/core/linker.dart';
-export 'package:angular2/src/core/zone.dart';
-export 'package:angular2/src/core/render.dart';
-export 'package:angular2/src/common/directives.dart';
-export 'package:angular2/src/common/forms.dart';
-export 'package:angular2/src/core/debug/debug_element.dart' show DebugElement, Scope, inspectElement, asNativeElements;
-export 'package:angular2/src/core/testability/testability.dart';
-export 'package:angular2/src/core/change_detection.dart';
-export 'package:angular2/src/core/platform_directives_and_pipes.dart';
-export 'package:angular2/src/core/platform_common_providers.dart';
-export 'package:angular2/src/core/application_common_providers.dart';
-export 'package:angular2/src/core/reflection/reflection.dart';
-export 'package:angular2/src/core/dom/dom_adapter.dart';
diff --git a/modules/angular2/core.ts b/modules/angular2/core.ts
index 1c53a08007..50c3e48f27 100644
--- a/modules/angular2/core.ts
+++ b/modules/angular2/core.ts
@@ -5,10 +5,9 @@
  */
 export * from './src/core/metadata';
 export * from './src/core/util';
+export * from './src/core/dev_mode';
 export * from './src/core/di';
-export * from './src/common/pipes';
 export * from './src/facade/facade';
-export * from './src/core/linker';
 export {platform, createNgZone, PlatformRef, ApplicationRef} from './src/core/application_ref';
 export {
   APP_ID,
@@ -18,8 +17,7 @@ export {
 } from './src/core/application_tokens';
 export * from './src/core/zone';
 export * from './src/core/render';
-export * from './src/common/directives';
-export * from './src/common/forms';
+export * from './src/core/linker';
 export {
   DebugElement,
   Scope,
@@ -29,8 +27,7 @@ export {
 export * from './src/core/testability/testability';
 export * from './src/core/change_detection';
 export * from './src/core/platform_directives_and_pipes';
-export * from './src/core/dev_mode';
-export * from './src/core/reflection/reflection';
-export * from './src/core/application_common_providers';
 export * from './src/core/platform_common_providers';
+export * from './src/core/application_common_providers';
+export * from './src/core/reflection/reflection';
 export * from './src/core/dom/dom_adapter';
diff --git a/modules/angular2/src/common/directives/ng_class.ts b/modules/angular2/src/common/directives/ng_class.ts
index 8354459567..373fad193d 100644
--- a/modules/angular2/src/common/directives/ng_class.ts
+++ b/modules/angular2/src/common/directives/ng_class.ts
@@ -1,14 +1,15 @@
 import {isPresent, isString, StringWrapper, isBlank, isArray} from 'angular2/src/facade/lang';
-import {DoCheck, OnDestroy} from 'angular2/lifecycle_hooks';
-import {Directive} from 'angular2/src/core/metadata';
-import {ElementRef} from 'angular2/src/core/linker';
 import {
+  DoCheck,
+  OnDestroy,
+  Directive,
+  ElementRef,
   IterableDiffer,
   IterableDiffers,
   KeyValueDiffer,
-  KeyValueDiffers
-} from 'angular2/src/core/change_detection';
-import {Renderer} from 'angular2/src/core/render';
+  KeyValueDiffers,
+  Renderer
+} from 'angular2/core';
 import {StringMapWrapper, isListLikeIterable} from 'angular2/src/facade/collection';
 
 /**
diff --git a/modules/angular2/src/common/directives/ng_for.ts b/modules/angular2/src/common/directives/ng_for.ts
index f2bb8616f6..068b8e25d0 100644
--- a/modules/angular2/src/common/directives/ng_for.ts
+++ b/modules/angular2/src/common/directives/ng_for.ts
@@ -1,11 +1,13 @@
-import {DoCheck} from 'angular2/lifecycle_hooks';
-import {Directive} from 'angular2/src/core/metadata';
 import {
+  DoCheck,
+  Directive,
   ChangeDetectorRef,
   IterableDiffer,
-  IterableDiffers
-} from 'angular2/src/core/change_detection';
-import {ViewContainerRef, TemplateRef, ViewRef} from 'angular2/src/core/linker';
+  IterableDiffers,
+  ViewContainerRef,
+  TemplateRef,
+  ViewRef
+} from 'angular2/core';
 import {isPresent, isBlank} from 'angular2/src/facade/lang';
 
 /**
diff --git a/modules/angular2/src/common/directives/ng_if.ts b/modules/angular2/src/common/directives/ng_if.ts
index ff1c9080a5..e2e3b9ffed 100644
--- a/modules/angular2/src/common/directives/ng_if.ts
+++ b/modules/angular2/src/common/directives/ng_if.ts
@@ -1,5 +1,4 @@
-import {Directive} from 'angular2/src/core/metadata';
-import {ViewContainerRef, TemplateRef} from 'angular2/src/core/linker';
+import {Directive, ViewContainerRef, TemplateRef} from 'angular2/core';
 import {isBlank} from 'angular2/src/facade/lang';
 
 /**
diff --git a/modules/angular2/src/common/directives/ng_style.ts b/modules/angular2/src/common/directives/ng_style.ts
index f0b29c7a61..bdc2e3f0ec 100644
--- a/modules/angular2/src/common/directives/ng_style.ts
+++ b/modules/angular2/src/common/directives/ng_style.ts
@@ -1,11 +1,11 @@
-import {DoCheck} from 'angular2/lifecycle_hooks';
 import {
+  DoCheck,
   KeyValueDiffer,
   KeyValueDiffers,
-} from 'angular2/src/core/change_detection';
-import {ElementRef} from 'angular2/src/core/linker';
-import {Directive} from 'angular2/src/core/metadata';
-import {Renderer} from 'angular2/src/core/render';
+  ElementRef,
+  Directive,
+  Renderer
+} from 'angular2/core';
 import {isPresent, isBlank, print} from 'angular2/src/facade/lang';
 
 /**
diff --git a/modules/angular2/src/common/directives/ng_switch.ts b/modules/angular2/src/common/directives/ng_switch.ts
index 6810a66cc9..e501e079c2 100644
--- a/modules/angular2/src/common/directives/ng_switch.ts
+++ b/modules/angular2/src/common/directives/ng_switch.ts
@@ -1,6 +1,4 @@
-import {Directive} from 'angular2/src/core/metadata';
-import {Host} from 'angular2/src/core/di';
-import {ViewContainerRef, TemplateRef} from 'angular2/src/core/linker';
+import {Directive, Host, ViewContainerRef, TemplateRef} from 'angular2/core';
 import {isPresent, isBlank, normalizeBlank, CONST_EXPR} from 'angular2/src/facade/lang';
 import {ListWrapper, Map} from 'angular2/src/facade/collection';
 
diff --git a/modules/angular2/src/common/forms/directives/checkbox_value_accessor.ts b/modules/angular2/src/common/forms/directives/checkbox_value_accessor.ts
index 2958d70b84..d6e4e47db2 100644
--- a/modules/angular2/src/common/forms/directives/checkbox_value_accessor.ts
+++ b/modules/angular2/src/common/forms/directives/checkbox_value_accessor.ts
@@ -1,7 +1,4 @@
-import {Directive} from 'angular2/src/core/metadata';
-import {Renderer} from 'angular2/src/core/render';
-import {ElementRef} from 'angular2/src/core/linker';
-import {Self, forwardRef, Provider} from 'angular2/src/core/di';
+import {Directive, Renderer, ElementRef, Self, forwardRef, Provider} from 'angular2/core';
 
 import {NG_VALUE_ACCESSOR, ControlValueAccessor} from './control_value_accessor';
 import {CONST_EXPR} from 'angular2/src/facade/lang';
diff --git a/modules/angular2/src/common/forms/directives/control_value_accessor.ts b/modules/angular2/src/common/forms/directives/control_value_accessor.ts
index aa1ffbbc54..33a907ba62 100644
--- a/modules/angular2/src/common/forms/directives/control_value_accessor.ts
+++ b/modules/angular2/src/common/forms/directives/control_value_accessor.ts
@@ -1,5 +1,5 @@
+import {OpaqueToken} from 'angular2/core';
 import {CONST_EXPR} from 'angular2/src/facade/lang';
-import {OpaqueToken} from 'angular2/src/core/di';
 
 /**
  * A bridge between a control and a native element.
diff --git a/modules/angular2/src/common/forms/directives/default_value_accessor.ts b/modules/angular2/src/common/forms/directives/default_value_accessor.ts
index 970270bbca..81ecc6c640 100644
--- a/modules/angular2/src/common/forms/directives/default_value_accessor.ts
+++ b/modules/angular2/src/common/forms/directives/default_value_accessor.ts
@@ -1,7 +1,4 @@
-import {Directive} from 'angular2/src/core/metadata';
-import {ElementRef} from 'angular2/src/core/linker';
-import {Renderer} from 'angular2/src/core/render';
-import {Self, forwardRef, Provider} from 'angular2/src/core/di';
+import {Directive, ElementRef, Renderer, Self, forwardRef, Provider} from 'angular2/core';
 import {NG_VALUE_ACCESSOR, ControlValueAccessor} from './control_value_accessor';
 import {isBlank, CONST_EXPR} from 'angular2/src/facade/lang';
 
diff --git a/modules/angular2/src/common/forms/directives/ng_control_group.ts b/modules/angular2/src/common/forms/directives/ng_control_group.ts
index ffcd573256..63e6eab718 100644
--- a/modules/angular2/src/common/forms/directives/ng_control_group.ts
+++ b/modules/angular2/src/common/forms/directives/ng_control_group.ts
@@ -1,7 +1,14 @@
-import {OnInit, OnDestroy} from 'angular2/lifecycle_hooks';
-import {Directive} from 'angular2/src/core/metadata';
-import {Optional, Inject, Host, SkipSelf, forwardRef, Provider} from 'angular2/src/core/di';
-import {ListWrapper} from 'angular2/src/facade/collection';
+import {
+  OnInit,
+  OnDestroy,
+  Directive,
+  Optional,
+  Inject,
+  Host,
+  SkipSelf,
+  forwardRef,
+  Provider
+} from 'angular2/core';
 import {CONST_EXPR} from 'angular2/src/facade/lang';
 
 import {ControlContainer} from './control_container';
diff --git a/modules/angular2/src/common/forms/directives/ng_control_name.ts b/modules/angular2/src/common/forms/directives/ng_control_name.ts
index ef287b8f5e..85ac9b8a74 100644
--- a/modules/angular2/src/common/forms/directives/ng_control_name.ts
+++ b/modules/angular2/src/common/forms/directives/ng_control_name.ts
@@ -1,9 +1,19 @@
 import {CONST_EXPR} from 'angular2/src/facade/lang';
 import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
-import {OnChanges, OnDestroy} from 'angular2/lifecycle_hooks';
-import {SimpleChange} from 'angular2/src/core/change_detection';
-import {Query, Directive} from 'angular2/src/core/metadata';
-import {forwardRef, Host, SkipSelf, Provider, Inject, Optional} from 'angular2/src/core/di';
+
+import {
+  OnChanges,
+  OnDestroy,
+  SimpleChange,
+  Query,
+  Directive,
+  forwardRef,
+  Host,
+  SkipSelf,
+  Provider,
+  Inject,
+  Optional
+} from 'angular2/core';
 
 import {ControlContainer} from './control_container';
 import {NgControl} from './ng_control';
diff --git a/modules/angular2/src/common/forms/directives/ng_control_status.ts b/modules/angular2/src/common/forms/directives/ng_control_status.ts
index fa3287a13d..f2579022c1 100644
--- a/modules/angular2/src/common/forms/directives/ng_control_status.ts
+++ b/modules/angular2/src/common/forms/directives/ng_control_status.ts
@@ -1,5 +1,4 @@
-import {Directive} from 'angular2/src/core/metadata';
-import {Self} from 'angular2/src/core/di';
+import {Directive, Self} from 'angular2/core';
 import {NgControl} from './ng_control';
 import {isBlank, isPresent} from 'angular2/src/facade/lang';
 
diff --git a/modules/angular2/src/common/forms/directives/ng_form.ts b/modules/angular2/src/common/forms/directives/ng_form.ts
index 21f9cf00ef..0dc8103f7d 100644
--- a/modules/angular2/src/common/forms/directives/ng_form.ts
+++ b/modules/angular2/src/common/forms/directives/ng_form.ts
@@ -6,8 +6,7 @@ import {
 } from 'angular2/src/facade/async';
 import {StringMapWrapper, ListWrapper} from 'angular2/src/facade/collection';
 import {isPresent, isBlank, CONST_EXPR} from 'angular2/src/facade/lang';
-import {Directive} from 'angular2/src/core/metadata';
-import {forwardRef, Provider, Optional, Inject} from 'angular2/src/core/di';
+import {Directive, forwardRef, Provider, Optional, Inject} from 'angular2/core';
 import {NgControl} from './ng_control';
 import {Form} from './form_interface';
 import {NgControlGroup} from './ng_control_group';
diff --git a/modules/angular2/src/common/forms/directives/ng_form_control.ts b/modules/angular2/src/common/forms/directives/ng_form_control.ts
index 8c37f916cf..73bc2000b9 100644
--- a/modules/angular2/src/common/forms/directives/ng_form_control.ts
+++ b/modules/angular2/src/common/forms/directives/ng_form_control.ts
@@ -1,10 +1,16 @@
 import {CONST_EXPR} from 'angular2/src/facade/lang';
 import {StringMapWrapper} from 'angular2/src/facade/collection';
 import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
-import {OnChanges} from 'angular2/lifecycle_hooks';
-import {SimpleChange} from 'angular2/src/core/change_detection';
-import {Query, Directive} from 'angular2/src/core/metadata';
-import {forwardRef, Provider, Inject, Optional} from 'angular2/src/core/di';
+import {
+  OnChanges,
+  SimpleChange,
+  Query,
+  Directive,
+  forwardRef,
+  Provider,
+  Inject,
+  Optional
+} from 'angular2/core';
 import {NgControl} from './ng_control';
 import {Control} from '../model';
 import {Validators, NG_VALIDATORS, NG_ASYNC_VALIDATORS} from '../validators';
diff --git a/modules/angular2/src/common/forms/directives/ng_form_model.ts b/modules/angular2/src/common/forms/directives/ng_form_model.ts
index 70ea1f8d20..cef2888eeb 100644
--- a/modules/angular2/src/common/forms/directives/ng_form_model.ts
+++ b/modules/angular2/src/common/forms/directives/ng_form_model.ts
@@ -1,11 +1,15 @@
 import {CONST_EXPR} from 'angular2/src/facade/lang';
 import {ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
 import {ObservableWrapper, EventEmitter} from 'angular2/src/facade/async';
-import {SimpleChange} from 'angular2/src/core/change_detection';
-
-import {OnChanges} from 'angular2/lifecycle_hooks';
-import {Directive} from 'angular2/src/core/metadata';
-import {forwardRef, Provider, Inject, Optional} from 'angular2/src/core/di';
+import {
+  SimpleChange,
+  OnChanges,
+  Directive,
+  forwardRef,
+  Provider,
+  Inject,
+  Optional
+} from 'angular2/core';
 import {NgControl} from './ng_control';
 import {NgControlGroup} from './ng_control_group';
 import {ControlContainer} from './control_container';
diff --git a/modules/angular2/src/common/forms/directives/ng_model.ts b/modules/angular2/src/common/forms/directives/ng_model.ts
index e5e32f49b5..123f159832 100644
--- a/modules/angular2/src/common/forms/directives/ng_model.ts
+++ b/modules/angular2/src/common/forms/directives/ng_model.ts
@@ -1,9 +1,15 @@
 import {CONST_EXPR} from 'angular2/src/facade/lang';
 import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
-import {OnChanges} from 'angular2/lifecycle_hooks';
-import {SimpleChange} from 'angular2/src/core/change_detection';
-import {Query, Directive} from 'angular2/src/core/metadata';
-import {forwardRef, Provider, Inject, Optional} from 'angular2/src/core/di';
+import {
+  OnChanges,
+  SimpleChange,
+  Query,
+  Directive,
+  forwardRef,
+  Provider,
+  Inject,
+  Optional
+} from 'angular2/core';
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from './control_value_accessor';
 import {NgControl} from './ng_control';
 import {Control} from '../model';
diff --git a/modules/angular2/src/common/forms/directives/number_value_accessor.ts b/modules/angular2/src/common/forms/directives/number_value_accessor.ts
index d3dd233ff3..7fbabece45 100644
--- a/modules/angular2/src/common/forms/directives/number_value_accessor.ts
+++ b/modules/angular2/src/common/forms/directives/number_value_accessor.ts
@@ -1,7 +1,4 @@
-import {Directive} from 'angular2/src/core/metadata';
-import {ElementRef} from 'angular2/src/core/linker';
-import {Renderer} from 'angular2/src/core/render';
-import {Self, forwardRef, Provider} from 'angular2/src/core/di';
+import {Directive, ElementRef, Renderer, Self, forwardRef, Provider} from 'angular2/core';
 import {NG_VALUE_ACCESSOR, ControlValueAccessor} from './control_value_accessor';
 import {isBlank, CONST_EXPR, NumberWrapper} from 'angular2/src/facade/lang';
 
diff --git a/modules/angular2/src/common/forms/directives/select_control_value_accessor.ts b/modules/angular2/src/common/forms/directives/select_control_value_accessor.ts
index 2fe478a309..c91213937e 100644
--- a/modules/angular2/src/common/forms/directives/select_control_value_accessor.ts
+++ b/modules/angular2/src/common/forms/directives/select_control_value_accessor.ts
@@ -1,7 +1,13 @@
-import {Self, forwardRef, Provider} from 'angular2/src/core/di';
-import {Renderer} from 'angular2/src/core/render';
-import {ElementRef, QueryList} from 'angular2/src/core/linker';
-import {Query, Directive} from 'angular2/src/core/metadata';
+import {
+  Query,
+  Directive,
+  Renderer,
+  Self,
+  forwardRef,
+  Provider,
+  ElementRef,
+  QueryList
+} from 'angular2/core';
 
 import {ObservableWrapper} from 'angular2/src/facade/async';
 import {NG_VALUE_ACCESSOR, ControlValueAccessor} from './control_value_accessor';
diff --git a/modules/angular2/src/common/forms/directives/validators.ts b/modules/angular2/src/common/forms/directives/validators.ts
index 540d880466..a1a56bb5d4 100644
--- a/modules/angular2/src/common/forms/directives/validators.ts
+++ b/modules/angular2/src/common/forms/directives/validators.ts
@@ -1,6 +1,5 @@
-import {forwardRef, Provider, OpaqueToken} from 'angular2/src/core/di';
+import {forwardRef, Provider, OpaqueToken, Attribute, Directive} from 'angular2/core';
 import {CONST_EXPR} from 'angular2/src/facade/lang';
-import {Attribute, Directive} from 'angular2/src/core/metadata';
 import {Validators, NG_VALIDATORS} from '../validators';
 import {Control} from '../model';
 import * as modelModule from '../model';
diff --git a/modules/angular2/src/common/forms/form_builder.ts b/modules/angular2/src/common/forms/form_builder.ts
index 15a66ed5c9..460dd08957 100644
--- a/modules/angular2/src/common/forms/form_builder.ts
+++ b/modules/angular2/src/common/forms/form_builder.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/src/core/di';
+import {Injectable} from 'angular2/core';
 import {StringMapWrapper} from 'angular2/src/facade/collection';
 import {isPresent, isArray, CONST_EXPR, Type} from 'angular2/src/facade/lang';
 import * as modelModule from './model';
diff --git a/modules/angular2/src/common/forms/validators.ts b/modules/angular2/src/common/forms/validators.ts
index 9f3dc50ef0..38210c1276 100644
--- a/modules/angular2/src/common/forms/validators.ts
+++ b/modules/angular2/src/common/forms/validators.ts
@@ -2,7 +2,7 @@ import {isBlank, isPresent, CONST_EXPR} from 'angular2/src/facade/lang';
 import {PromiseWrapper} from 'angular2/src/facade/promise';
 import {ObservableWrapper} from 'angular2/src/facade/async';
 import {ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
-import {OpaqueToken} from 'angular2/src/core/di';
+import {OpaqueToken} from 'angular2/core';
 
 import * as modelModule from './model';
 
diff --git a/modules/angular2/src/common/pipes/async_pipe.ts b/modules/angular2/src/common/pipes/async_pipe.ts
index 99e7982df0..5842caa34b 100644
--- a/modules/angular2/src/common/pipes/async_pipe.ts
+++ b/modules/angular2/src/common/pipes/async_pipe.ts
@@ -1,13 +1,13 @@
 import {isBlank, isPresent, isPromise, CONST} from 'angular2/src/facade/lang';
 import {Promise, ObservableWrapper, Observable, EventEmitter} from 'angular2/src/facade/async';
-import {Pipe} from 'angular2/src/core/metadata';
-import {Injectable} from 'angular2/src/core/di';
 import {
+  Pipe,
+  Injectable,
   ChangeDetectorRef,
   PipeOnDestroy,
   PipeTransform,
   WrappedValue
-} from 'angular2/src/core/change_detection';
+} from 'angular2/core';
 
 import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
 
diff --git a/modules/angular2/src/common/pipes/date_pipe.ts b/modules/angular2/src/common/pipes/date_pipe.ts
index 72f4210026..27f38308a6 100644
--- a/modules/angular2/src/common/pipes/date_pipe.ts
+++ b/modules/angular2/src/common/pipes/date_pipe.ts
@@ -9,9 +9,7 @@ import {
   FunctionWrapper
 } from 'angular2/src/facade/lang';
 import {DateFormatter} from 'angular2/src/facade/intl';
-import {Injectable} from 'angular2/src/core/di';
-import {Pipe} from 'angular2/src/core/metadata';
-import {PipeTransform, WrappedValue} from 'angular2/src/core/change_detection';
+import {PipeTransform, WrappedValue, Pipe, Injectable} from 'angular2/core';
 import {StringMapWrapper, ListWrapper} from 'angular2/src/facade/collection';
 
 import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
diff --git a/modules/angular2/src/common/pipes/json_pipe.ts b/modules/angular2/src/common/pipes/json_pipe.ts
index 2e75641c62..99bcf97b7f 100644
--- a/modules/angular2/src/common/pipes/json_pipe.ts
+++ b/modules/angular2/src/common/pipes/json_pipe.ts
@@ -1,7 +1,5 @@
 import {isBlank, isPresent, Json, CONST} from 'angular2/src/facade/lang';
-import {Injectable} from 'angular2/src/core/di';
-import {PipeTransform, WrappedValue} from 'angular2/src/core/change_detection';
-import {Pipe} from 'angular2/src/core/metadata';
+import {Injectable, PipeTransform, WrappedValue, Pipe} from 'angular2/core';
 
 /**
  * Transforms any input value using `JSON.stringify`. Useful for debugging.
diff --git a/modules/angular2/src/common/pipes/lowercase_pipe.ts b/modules/angular2/src/common/pipes/lowercase_pipe.ts
index 2ac96d162a..3fe1069054 100644
--- a/modules/angular2/src/common/pipes/lowercase_pipe.ts
+++ b/modules/angular2/src/common/pipes/lowercase_pipe.ts
@@ -1,7 +1,5 @@
 import {isString, CONST, isBlank} from 'angular2/src/facade/lang';
-import {Injectable} from 'angular2/src/core/di';
-import {PipeTransform, WrappedValue} from 'angular2/src/core/change_detection';
-import {Pipe} from 'angular2/src/core/metadata';
+import {Injectable, PipeTransform, WrappedValue, Pipe} from 'angular2/core';
 import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
 
 /**
diff --git a/modules/angular2/src/common/pipes/number_pipe.ts b/modules/angular2/src/common/pipes/number_pipe.ts
index e4be050015..d26bd53128 100644
--- a/modules/angular2/src/common/pipes/number_pipe.ts
+++ b/modules/angular2/src/common/pipes/number_pipe.ts
@@ -10,9 +10,7 @@ import {
 } from 'angular2/src/facade/lang';
 import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
 import {NumberFormatter, NumberFormatStyle} from 'angular2/src/facade/intl';
-import {Injectable} from 'angular2/src/core/di';
-import {PipeTransform, WrappedValue} from 'angular2/src/core/change_detection';
-import {Pipe} from 'angular2/src/core/metadata';
+import {Injectable, PipeTransform, WrappedValue, Pipe} from 'angular2/core';
 import {ListWrapper} from 'angular2/src/facade/collection';
 
 import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
diff --git a/modules/angular2/src/common/pipes/slice_pipe.ts b/modules/angular2/src/common/pipes/slice_pipe.ts
index 0a87dd9eaa..200ac0ae8f 100644
--- a/modules/angular2/src/common/pipes/slice_pipe.ts
+++ b/modules/angular2/src/common/pipes/slice_pipe.ts
@@ -1,13 +1,9 @@
 import {isBlank, isString, isArray, StringWrapper, CONST} from 'angular2/src/facade/lang';
 import {BaseException} from 'angular2/src/facade/exceptions';
 import {ListWrapper} from 'angular2/src/facade/collection';
-import {Injectable} from 'angular2/src/core/di';
-
-import {PipeTransform, WrappedValue} from 'angular2/src/core/change_detection';
+import {Injectable, PipeTransform, WrappedValue, Pipe} from 'angular2/core';
 import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
 
-import {Pipe} from 'angular2/src/core/metadata';
-
 /**
  * Creates a new List or String containing only a subset (slice) of the
  * elements.
diff --git a/modules/angular2/src/common/pipes/uppercase_pipe.ts b/modules/angular2/src/common/pipes/uppercase_pipe.ts
index ae62c07c62..f91d2ce460 100644
--- a/modules/angular2/src/common/pipes/uppercase_pipe.ts
+++ b/modules/angular2/src/common/pipes/uppercase_pipe.ts
@@ -1,7 +1,5 @@
 import {isString, CONST, isBlank} from 'angular2/src/facade/lang';
-import {Pipe} from 'angular2/src/core/metadata';
-import {Injectable} from 'angular2/src/core/di';
-import {PipeTransform, WrappedValue} from 'angular2/src/core/change_detection';
+import {PipeTransform, WrappedValue, Injectable, Pipe} from 'angular2/core';
 import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
 
 /**
diff --git a/modules/angular2/test/common/directives/ng_if_spec.ts b/modules/angular2/test/common/directives/ng_if_spec.ts
index 0b8080b098..1b4939557f 100644
--- a/modules/angular2/test/common/directives/ng_if_spec.ts
+++ b/modules/angular2/test/common/directives/ng_if_spec.ts
@@ -14,7 +14,8 @@ import {
 
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 
-import {Component, View, NgIf} from 'angular2/core';
+import {Component, View} from 'angular2/core';
+import {NgIf} from 'angular2/common';
 
 import {IS_DART} from 'angular2/src/facade/lang';
 
diff --git a/modules/angular2/test/common/directives/observable_list_diff_spec.dart b/modules/angular2/test/common/directives/observable_list_diff_spec.dart
index 28f13e08ae..630f4aee68 100644
--- a/modules/angular2/test/common/directives/observable_list_diff_spec.dart
+++ b/modules/angular2/test/common/directives/observable_list_diff_spec.dart
@@ -2,8 +2,8 @@ library angular2.test.directives.observable_list_iterable_diff_spec;
 
 import 'package:angular2/testing_internal.dart';
 import 'package:observe/observe.dart' show ObservableList;
-import 'package:angular2/core.dart'
-    show ObservableListDiffFactory, ChangeDetectorRef;
+import 'package:angular2/core.dart' show ChangeDetectorRef;
+import 'package:angular2/common.dart' show ObservableListDiffFactory;
 
 @proxy
 class SpyChangeDetectorRef extends SpyObject implements ChangeDetectorRef {
diff --git a/modules/angular2/test/common/forms/directives_spec.ts b/modules/angular2/test/common/forms/directives_spec.ts
index 5af2cbca5e..b8c532fbe3 100644
--- a/modules/angular2/test/common/forms/directives_spec.ts
+++ b/modules/angular2/test/common/forms/directives_spec.ts
@@ -17,6 +17,8 @@ import {
 
 import {SpyNgControl, SpyValueAccessor} from '../spies';
 
+import {QueryList} from 'angular2/core';
+
 import {
   ControlGroup,
   Control,
@@ -32,9 +34,8 @@ import {
   DefaultValueAccessor,
   CheckboxControlValueAccessor,
   SelectControlValueAccessor,
-  QueryList,
   Validator
-} from 'angular2/core';
+} from 'angular2/common';
 
 
 import {selectValueAccessor, composeValidators} from 'angular2/src/common/forms/directives/shared';
diff --git a/modules/angular2/test/common/forms/form_builder_spec.ts b/modules/angular2/test/common/forms/form_builder_spec.ts
index d84bda4639..7a863b83b8 100644
--- a/modules/angular2/test/common/forms/form_builder_spec.ts
+++ b/modules/angular2/test/common/forms/form_builder_spec.ts
@@ -9,7 +9,7 @@ import {
   afterEach,
   el
 } from 'angular2/testing_internal';
-import {Control, FormBuilder} from 'angular2/core';
+import {Control, FormBuilder} from 'angular2/common';
 import {PromiseWrapper} from 'angular2/src/facade/promise';
 
 export function main() {
diff --git a/modules/angular2/test/common/forms/integration_spec.ts b/modules/angular2/test/common/forms/integration_spec.ts
index bd565cc521..d0751eec43 100644
--- a/modules/angular2/test/common/forms/integration_spec.ts
+++ b/modules/angular2/test/common/forms/integration_spec.ts
@@ -19,23 +19,21 @@ import {
 } from 'angular2/testing_internal';
 
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
+import {Input, Provider, forwardRef} from 'angular2/core';
 import {
-  Input,
   Control,
   ControlGroup,
   ControlValueAccessor,
   FORM_DIRECTIVES,
   NG_VALIDATORS,
   NG_ASYNC_VALIDATORS,
-  Provider,
   NgControl,
   NgIf,
   NgFor,
   NgForm,
   Validators,
-  forwardRef,
   Validator
-} from 'angular2/core';
+} from 'angular2/common';
 import {By} from 'angular2/platform/browser';
 import {ListWrapper} from 'angular2/src/facade/collection';
 import {ObservableWrapper} from 'angular2/src/facade/async';
diff --git a/modules/angular2/test/common/forms/model_spec.ts b/modules/angular2/test/common/forms/model_spec.ts
index 8f66c8f69f..b5eeb4f374 100644
--- a/modules/angular2/test/common/forms/model_spec.ts
+++ b/modules/angular2/test/common/forms/model_spec.ts
@@ -13,7 +13,7 @@ import {
   tick,
   inject
 } from 'angular2/testing_internal';
-import {ControlGroup, Control, ControlArray, Validators} from 'angular2/core';
+import {ControlGroup, Control, ControlArray, Validators} from 'angular2/common';
 import {IS_DART, isPresent, CONST_EXPR} from 'angular2/src/facade/lang';
 import {PromiseWrapper} from 'angular2/src/facade/promise';
 import {TimerWrapper, ObservableWrapper, EventEmitter} from 'angular2/src/facade/async';
diff --git a/modules/angular2/test/common/forms/validators_spec.ts b/modules/angular2/test/common/forms/validators_spec.ts
index 8d22e578a9..5a1e13698c 100644
--- a/modules/angular2/test/common/forms/validators_spec.ts
+++ b/modules/angular2/test/common/forms/validators_spec.ts
@@ -11,7 +11,7 @@ import {
   tick,
   el
 } from 'angular2/testing_internal';
-import {ControlGroup, Control, Validators, AbstractControl, ControlArray} from 'angular2/core';
+import {ControlGroup, Control, Validators, AbstractControl, ControlArray} from 'angular2/common';
 import {PromiseWrapper} from 'angular2/src/facade/promise';
 import {EventEmitter, ObservableWrapper, TimerWrapper} from 'angular2/src/facade/async';
 import {CONST_EXPR} from 'angular2/src/facade/lang';
diff --git a/modules/angular2/test/common/pipes/async_pipe_spec.ts b/modules/angular2/test/common/pipes/async_pipe_spec.ts
index 1eef278d23..f59e1c81b8 100644
--- a/modules/angular2/test/common/pipes/async_pipe_spec.ts
+++ b/modules/angular2/test/common/pipes/async_pipe_spec.ts
@@ -14,7 +14,8 @@ import {
 import {SpyChangeDetectorRef} from '../spies';
 
 import {isBlank} from 'angular2/src/facade/lang';
-import {AsyncPipe, WrappedValue} from 'angular2/core';
+import {AsyncPipe} from 'angular2/common';
+import {WrappedValue} from 'angular2/core';
 import {
   EventEmitter,
   ObservableWrapper,
diff --git a/modules/angular2/test/common/pipes/date_pipe_spec.ts b/modules/angular2/test/common/pipes/date_pipe_spec.ts
index c901077250..7978f3aa2b 100644
--- a/modules/angular2/test/common/pipes/date_pipe_spec.ts
+++ b/modules/angular2/test/common/pipes/date_pipe_spec.ts
@@ -10,7 +10,7 @@ import {
   browserDetection
 } from 'angular2/testing_internal';
 
-import {DatePipe} from 'angular2/core';
+import {DatePipe} from 'angular2/common';
 import {DateWrapper} from 'angular2/src/facade/lang';
 import {PipeResolver} from 'angular2/src/core/linker/pipe_resolver';
 
diff --git a/modules/angular2/test/common/pipes/json_pipe_spec.ts b/modules/angular2/test/common/pipes/json_pipe_spec.ts
index bb81a00251..af1492ba17 100644
--- a/modules/angular2/test/common/pipes/json_pipe_spec.ts
+++ b/modules/angular2/test/common/pipes/json_pipe_spec.ts
@@ -14,7 +14,8 @@ import {
 } from 'angular2/testing_internal';
 import {Json, RegExp, NumberWrapper, StringWrapper} from 'angular2/src/facade/lang';
 
-import {JsonPipe, Component} from 'angular2/core';
+import {Component} from 'angular2/core';
+import {JsonPipe} from 'angular2/common';
 
 export function main() {
   describe("JsonPipe", () => {
diff --git a/modules/angular2/test/common/pipes/lowercase_pipe_spec.ts b/modules/angular2/test/common/pipes/lowercase_pipe_spec.ts
index 447412d9b4..3dd6bebe39 100644
--- a/modules/angular2/test/common/pipes/lowercase_pipe_spec.ts
+++ b/modules/angular2/test/common/pipes/lowercase_pipe_spec.ts
@@ -9,7 +9,7 @@ import {
   afterEach
 } from 'angular2/testing_internal';
 
-import {LowerCasePipe} from 'angular2/core';
+import {LowerCasePipe} from 'angular2/common';
 
 export function main() {
   describe("LowerCasePipe", () => {
diff --git a/modules/angular2/test/common/pipes/number_pipe_spec.ts b/modules/angular2/test/common/pipes/number_pipe_spec.ts
index f692d5d302..20f16fc1ff 100644
--- a/modules/angular2/test/common/pipes/number_pipe_spec.ts
+++ b/modules/angular2/test/common/pipes/number_pipe_spec.ts
@@ -10,7 +10,7 @@ import {
   browserDetection
 } from 'angular2/testing_internal';
 
-import {DecimalPipe, PercentPipe, CurrencyPipe} from 'angular2/core';
+import {DecimalPipe, PercentPipe, CurrencyPipe} from 'angular2/common';
 
 export function main() {
   // TODO(mlaval): enable tests when Intl API is no longer used, see
diff --git a/modules/angular2/test/common/pipes/slice_pipe_spec.ts b/modules/angular2/test/common/pipes/slice_pipe_spec.ts
index 9a6d2886b8..dab2236c3f 100644
--- a/modules/angular2/test/common/pipes/slice_pipe_spec.ts
+++ b/modules/angular2/test/common/pipes/slice_pipe_spec.ts
@@ -13,7 +13,8 @@ import {
   AsyncTestCompleter
 } from 'angular2/testing_internal';
 
-import {SlicePipe, Component} from 'angular2/core';
+import {Component} from 'angular2/core';
+import {SlicePipe} from 'angular2/common';
 
 export function main() {
   describe("SlicePipe", () => {
diff --git a/modules/angular2/test/common/pipes/uppercase_pipe_spec.ts b/modules/angular2/test/common/pipes/uppercase_pipe_spec.ts
index a3a8b5a649..7241c468c3 100644
--- a/modules/angular2/test/common/pipes/uppercase_pipe_spec.ts
+++ b/modules/angular2/test/common/pipes/uppercase_pipe_spec.ts
@@ -9,7 +9,7 @@ import {
   afterEach
 } from 'angular2/testing_internal';
 
-import {UpperCasePipe} from 'angular2/core';
+import {UpperCasePipe} from 'angular2/common';
 
 export function main() {
   describe("UpperCasePipe", () => {
diff --git a/modules/angular2/test/core/debug/debug_element_spec.ts b/modules/angular2/test/core/debug/debug_element_spec.ts
index 5f3806a7ea..9c793c254b 100644
--- a/modules/angular2/test/core/debug/debug_element_spec.ts
+++ b/modules/angular2/test/core/debug/debug_element_spec.ts
@@ -18,7 +18,8 @@ import {DOM} from 'angular2/src/core/dom/dom_adapter';
 
 import {PromiseWrapper, EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
 
-import {Injectable, NgFor, NgIf} from 'angular2/core';
+import {Injectable} from 'angular2/core';
+import {NgFor, NgIf} from 'angular2/common';
 import {Scope} from 'angular2/core';
 import {By} from 'angular2/platform/browser';
 
diff --git a/modules/angular2/test/core/forward_ref_integration_spec.ts b/modules/angular2/test/core/forward_ref_integration_spec.ts
index fe80304bd5..02ba07cde8 100644
--- a/modules/angular2/test/core/forward_ref_integration_spec.ts
+++ b/modules/angular2/test/core/forward_ref_integration_spec.ts
@@ -18,11 +18,11 @@ import {
   Component,
   Directive,
   Inject,
-  NgFor,
   Query,
   QueryList,
   View
 } from 'angular2/core';
+import {NgFor} from 'angular2/common';
 import {Type} from 'angular2/src/facade/lang';
 import {asNativeElements} from 'angular2/core';
 
diff --git a/modules/angular2/test/core/linker/dynamic_component_loader_spec.ts b/modules/angular2/test/core/linker/dynamic_component_loader_spec.ts
index fdf3b88736..3c1416ec0a 100644
--- a/modules/angular2/test/core/linker/dynamic_component_loader_spec.ts
+++ b/modules/angular2/test/core/linker/dynamic_component_loader_spec.ts
@@ -17,7 +17,8 @@ import {
 } from 'angular2/testing_internal';
 
 import {OnDestroy} from 'angular2/lifecycle_hooks';
-import {Injector, NgIf, inspectElement} from 'angular2/core';
+import {Injector, inspectElement} from 'angular2/core';
+import {NgIf} from 'angular2/common';
 import {By} from 'angular2/platform/browser';
 import {Component, View, ViewMetadata} from 'angular2/src/core/metadata';
 import {DynamicComponentLoader} from 'angular2/src/core/linker/dynamic_component_loader';
diff --git a/modules/angular2/test/core/linker/integration_spec.ts b/modules/angular2/test/core/linker/integration_spec.ts
index da647f2a43..7592a9a7ab 100644
--- a/modules/angular2/test/core/linker/integration_spec.ts
+++ b/modules/angular2/test/core/linker/integration_spec.ts
@@ -54,11 +54,11 @@ import {
   Inject,
   Host,
   SkipSelf,
-  SkipSelfMetadata,
-  NgIf,
-  NgFor
+  SkipSelfMetadata
 } from 'angular2/core';
 
+import {NgIf, NgFor} from 'angular2/common';
+
 import {AsyncPipe} from 'angular2/common';
 
 import {
diff --git a/modules/angular2/test/core/linker/query_integration_spec.ts b/modules/angular2/test/core/linker/query_integration_spec.ts
index 5636b719bd..e04f48c356 100644
--- a/modules/angular2/test/core/linker/query_integration_spec.ts
+++ b/modules/angular2/test/core/linker/query_integration_spec.ts
@@ -19,8 +19,6 @@ import {
   Component,
   Directive,
   Injectable,
-  NgIf,
-  NgFor,
   Optional,
   TemplateRef,
   Query,
@@ -36,7 +34,7 @@ import {
   AfterContentChecked,
   AfterViewChecked
 } from 'angular2/core';
-
+import {NgIf, NgFor} from 'angular2/common';
 import {asNativeElements} from 'angular2/core';
 import {BrowserDomAdapter} from 'angular2/src/platform/browser/browser_adapter';
 
diff --git a/modules/angular2/test/testing/test_component_builder_spec.ts b/modules/angular2/test/testing/test_component_builder_spec.ts
index 5276983b97..7134f8a4ee 100644
--- a/modules/angular2/test/testing/test_component_builder_spec.ts
+++ b/modules/angular2/test/testing/test_component_builder_spec.ts
@@ -14,7 +14,8 @@ import {
   TestComponentBuilder
 } from 'angular2/testing_internal';
 
-import {Injectable, NgIf, provide} from 'angular2/core';
+import {Injectable, provide} from 'angular2/core';
+import {NgIf} from 'angular2/common';
 import {Directive, Component, View, ViewMetadata} from 'angular2/src/core/metadata';
 
 @Component({selector: 'child-comp'})
diff --git a/modules/angular2/test/testing/testing_public_spec.ts b/modules/angular2/test/testing/testing_public_spec.ts
index c517187faa..d037aacb53 100644
--- a/modules/angular2/test/testing/testing_public_spec.ts
+++ b/modules/angular2/test/testing/testing_public_spec.ts
@@ -14,7 +14,8 @@ import {
   TestComponentBuilder
 } from 'angular2/testing';
 
-import {Injectable, NgIf, bind} from 'angular2/core';
+import {Injectable, bind} from 'angular2/core';
+import {NgIf} from 'angular2/common';
 import {Directive, Component, View, ViewMetadata} from 'angular2/angular2';
 import {XHR} from 'angular2/src/compiler/xhr';
 import {XHRImpl} from 'angular2/src/platform/browser/xhr_impl';
diff --git a/modules/angular2/test/web_workers/worker/renderer_integration_spec.ts b/modules/angular2/test/web_workers/worker/renderer_integration_spec.ts
index a7286027b7..f9ecaa6b53 100644
--- a/modules/angular2/test/web_workers/worker/renderer_integration_spec.ts
+++ b/modules/angular2/test/web_workers/worker/renderer_integration_spec.ts
@@ -21,9 +21,9 @@ import {
   Component,
   View,
   Injectable,
-  ElementRef,
-  NgIf
+  ElementRef
 } from 'angular2/core';
+import {NgIf} from 'angular2/common';
 import {WebWorkerRenderer} from "angular2/src/web_workers/worker/renderer";
 import {
   ClientMessageBrokerFactory,
diff --git a/modules/benchmarks/src/compiler/compiler_benchmark.ts b/modules/benchmarks/src/compiler/compiler_benchmark.ts
index 4050be058b..82b81e4b62 100644
--- a/modules/benchmarks/src/compiler/compiler_benchmark.ts
+++ b/modules/benchmarks/src/compiler/compiler_benchmark.ts
@@ -14,7 +14,6 @@ import {
   bind,
   provide,
   Provider,
-  NgIf,
   ViewMetadata
 } from 'angular2/core';
 
diff --git a/modules/benchmarks/src/costs/index.ts b/modules/benchmarks/src/costs/index.ts
index 2f6d440915..42d34e8ae1 100644
--- a/modules/benchmarks/src/costs/index.ts
+++ b/modules/benchmarks/src/costs/index.ts
@@ -1,13 +1,6 @@
 import {bootstrap} from 'angular2/bootstrap';
-import {
-  Component,
-  Directive,
-  DynamicComponentLoader,
-  ElementRef,
-  View,
-  NgIf,
-  NgFor
-} from 'angular2/core';
+import {Component, Directive, DynamicComponentLoader, ElementRef, View} from 'angular2/core';
+import {NgIf, NgFor} from 'angular2/common';
 import {ApplicationRef} from 'angular2/src/core/application_ref';
 import {ListWrapper} from 'angular2/src/facade/collection';
 import {getIntParameter, bindAction} from 'angular2/src/testing/benchmark_util';
diff --git a/modules/benchmarks/src/largetable/largetable_benchmark.ts b/modules/benchmarks/src/largetable/largetable_benchmark.ts
index 0832aa9e5a..f68f5a754f 100644
--- a/modules/benchmarks/src/largetable/largetable_benchmark.ts
+++ b/modules/benchmarks/src/largetable/largetable_benchmark.ts
@@ -8,17 +8,8 @@ import {
   windowProfileEnd
 } from 'angular2/src/testing/benchmark_util';
 import {bootstrap} from 'angular2/bootstrap';
-import {
-  Component,
-  Directive,
-  View,
-  bind,
-  provide,
-  NgFor,
-  NgSwitch,
-  NgSwitchWhen,
-  NgSwitchDefault
-} from 'angular2/core';
+import {Component, Directive, View, bind, provide} from 'angular2/core';
+import {NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault} from 'angular2/common';
 import {ApplicationRef} from 'angular2/src/core/application_ref';
 import {BrowserDomAdapter} from 'angular2/src/platform/browser/browser_adapter';
 import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/linker/view_pool';
diff --git a/modules/benchmarks/src/naive_infinite_scroll/app.ts b/modules/benchmarks/src/naive_infinite_scroll/app.ts
index d3079de971..94f391d358 100644
--- a/modules/benchmarks/src/naive_infinite_scroll/app.ts
+++ b/modules/benchmarks/src/naive_infinite_scroll/app.ts
@@ -2,7 +2,7 @@ import {isPresent} from 'angular2/src/facade/lang';
 import {getIntParameter, bindAction} from 'angular2/src/testing/benchmark_util';
 import {TimerWrapper} from 'angular2/src/facade/async';
 import {ScrollAreaComponent} from './scroll_area';
-import {NgIf, NgFor} from 'angular2/core';
+import {NgIf, NgFor} from 'angular2/common';
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 import {document} from 'angular2/src/facade/browser';
 
diff --git a/modules/benchmarks/src/naive_infinite_scroll/cells.ts b/modules/benchmarks/src/naive_infinite_scroll/cells.ts
index 3fa8f72ee8..ed50714bba 100644
--- a/modules/benchmarks/src/naive_infinite_scroll/cells.ts
+++ b/modules/benchmarks/src/naive_infinite_scroll/cells.ts
@@ -1,6 +1,6 @@
 import {ListWrapper, Map} from 'angular2/src/facade/collection';
 import {Company, Opportunity, Offering, Account, CustomDate, STATUS_LIST} from './common';
-import {NgFor} from 'angular2/core';
+import {NgFor} from 'angular2/common';
 
 import {Component, Directive, View} from 'angular2/angular2';
 
diff --git a/modules/benchmarks/src/naive_infinite_scroll/scroll_area.ts b/modules/benchmarks/src/naive_infinite_scroll/scroll_area.ts
index a8f50d0d15..4947116069 100644
--- a/modules/benchmarks/src/naive_infinite_scroll/scroll_area.ts
+++ b/modules/benchmarks/src/naive_infinite_scroll/scroll_area.ts
@@ -14,7 +14,7 @@ import {
 } from './common';
 import {generateOfferings} from './random_data';
 import {ScrollItemComponent} from './scroll_item';
-import {NgFor} from 'angular2/core';
+import {NgFor} from 'angular2/common';
 
 @Component({
   selector: 'scroll-area',
diff --git a/modules/benchmarks/src/static_tree/tree_benchmark.ts b/modules/benchmarks/src/static_tree/tree_benchmark.ts
index c3ac1f9023..8a0dc74339 100644
--- a/modules/benchmarks/src/static_tree/tree_benchmark.ts
+++ b/modules/benchmarks/src/static_tree/tree_benchmark.ts
@@ -1,4 +1,5 @@
 import {bootstrap} from 'angular2/bootstrap';
+import {NgIf} from 'angular2/common';
 import {
   Compiler,
   Component,
@@ -7,8 +8,7 @@ import {
   ViewContainerRef,
   bind,
   provide,
-  Provider,
-  NgIf
+  Provider
 } from 'angular2/core';
 import {ComponentRef_} from 'angular2/src/core/linker/dynamic_component_loader';
 import {ApplicationRef} from 'angular2/src/core/application_ref';
diff --git a/modules/benchmarks/src/tree/tree_benchmark.ts b/modules/benchmarks/src/tree/tree_benchmark.ts
index 12d0a008bf..2573eb2d9e 100644
--- a/modules/benchmarks/src/tree/tree_benchmark.ts
+++ b/modules/benchmarks/src/tree/tree_benchmark.ts
@@ -7,9 +7,9 @@ import {
   ViewContainerRef,
   bind,
   provide,
-  Provider,
-  NgIf
+  Provider
 } from 'angular2/core';
+import {NgIf} from 'angular2/common';
 
 import {ApplicationRef} from 'angular2/src/core/application_ref';
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
diff --git a/modules/playground/src/async/index.ts b/modules/playground/src/async/index.ts
index 6f673dd2bc..7261fdc0e2 100644
--- a/modules/playground/src/async/index.ts
+++ b/modules/playground/src/async/index.ts
@@ -1,5 +1,6 @@
 import {bootstrap} from 'angular2/bootstrap';
-import {NgIf, Component, View} from 'angular2/core';
+import {Component, View} from 'angular2/core';
+import {NgIf} from 'angular2/common';
 import {TimerWrapper} from 'angular2/src/facade/async';
 
 @Component({selector: 'async-app'})
diff --git a/modules/playground/src/material/button/index.ts b/modules/playground/src/material/button/index.ts
index 7d0fe545d4..272c4e9100 100644
--- a/modules/playground/src/material/button/index.ts
+++ b/modules/playground/src/material/button/index.ts
@@ -1,5 +1,6 @@
 import {bootstrap} from 'angular2/bootstrap';
-import {bind, provide, Component, NgFor, View, ViewEncapsulation} from 'angular2/core';
+import {bind, provide, Component, View, ViewEncapsulation} from 'angular2/core';
+import {NgFor} from 'angular2/common';
 import {UrlResolver} from 'angular2/compiler';
 import {MdButton, MdAnchor} from 'angular2_material/src/components/button/button';
 import {commonDemoSetup, DemoUrlResolver} from '../demo_common';
diff --git a/modules/playground/src/model_driven_forms/index.ts b/modules/playground/src/model_driven_forms/index.ts
index 7d946c82c3..2fe4f8ab94 100644
--- a/modules/playground/src/model_driven_forms/index.ts
+++ b/modules/playground/src/model_driven_forms/index.ts
@@ -7,12 +7,9 @@ import {
   NgFormModel,
   FormBuilder,
   NgIf,
-  NgFor,
-  Component,
-  Directive,
-  View,
-  Host
-} from 'angular2/core';
+  NgFor
+} from 'angular2/common';
+import {Component, Directive, View, Host} from 'angular2/core';
 
 import {RegExpWrapper, print, isPresent} from 'angular2/src/facade/lang';
 
diff --git a/modules/playground/src/observable_models/app.dart b/modules/playground/src/observable_models/app.dart
index f0e2eee078..390eab2c3b 100644
--- a/modules/playground/src/observable_models/app.dart
+++ b/modules/playground/src/observable_models/app.dart
@@ -3,7 +3,7 @@ library benchmarks.src.naive_infinite_scroll.app;
 import "package:angular2/src/facade/collection.dart" show List, ListWrapper;
 import "scroll_area.dart" show ScrollAreaComponent;
 import "package:angular2/angular2.dart" show Component, Directive, View, IterableDiffers, SkipSelf, Binding;
-import "package:angular2/core.dart" show ObservableListDiffFactory, NgIf, NgFor;
+import "package:angular2/common.dart" show ObservableListDiffFactory, NgIf, NgFor;
 import 'package:observe/observe.dart' show ObservableList;
 
 createDiffers(IterableDiffers parent) {
diff --git a/modules/playground/src/observable_models/cells.dart b/modules/playground/src/observable_models/cells.dart
index 54fdbe752b..b06a0eec93 100644
--- a/modules/playground/src/observable_models/cells.dart
+++ b/modules/playground/src/observable_models/cells.dart
@@ -4,7 +4,7 @@ import "package:angular2/src/facade/collection.dart"
     show List, ListWrapper, Map;
 import "common.dart"
     show Company, Opportunity, Offering, Account, CustomDate, STATUS_LIST;
-import "package:angular2/core.dart" show NgFor;
+import "package:angular2/common.dart" show NgFor;
 import "package:angular2/angular2.dart" show Component, Directive, View, ChangeDetectionStrategy;
 
 class HasStyle {
diff --git a/modules/playground/src/observable_models/scroll_area.dart b/modules/playground/src/observable_models/scroll_area.dart
index 7ad9eb7209..530e5a2912 100644
--- a/modules/playground/src/observable_models/scroll_area.dart
+++ b/modules/playground/src/observable_models/scroll_area.dart
@@ -14,7 +14,7 @@ import "common.dart"
         HEIGHT;
 import "random_data.dart" show generateOfferings;
 import "scroll_item.dart" show ScrollItemComponent;
-import "package:angular2/core.dart" show NgFor;
+import "package:angular2/common.dart" show NgFor;
 
 @Component(selector: "scroll-area", changeDetection: ChangeDetectionStrategy.OnPushObserve)
 @View(directives: const [ScrollItemComponent, NgFor], template: '''
diff --git a/modules/playground/src/order_management/index.ts b/modules/playground/src/order_management/index.ts
index 9d8dd3a70a..43e5b37587 100644
--- a/modules/playground/src/order_management/index.ts
+++ b/modules/playground/src/order_management/index.ts
@@ -1,18 +1,16 @@
 import {bootstrap} from 'angular2/bootstrap';
 import {
-  NgIf,
-  NgFor,
   Component,
   Directive,
   Host,
   forwardRef,
   Provider,
   EventEmitter,
-  FORM_DIRECTIVES,
   Injectable,
   Input,
   Output
 } from 'angular2/core';
+import {NgIf, NgFor, FORM_DIRECTIVES} from 'angular2/common';
 
 import {ListWrapper} from 'angular2/src/facade/collection';
 
diff --git a/modules/playground/src/person_management/index.ts b/modules/playground/src/person_management/index.ts
index ac1fb4fc09..1fe5cd326e 100644
--- a/modules/playground/src/person_management/index.ts
+++ b/modules/playground/src/person_management/index.ts
@@ -1,16 +1,6 @@
 import {bootstrap} from 'angular2/bootstrap';
-import {
-  NgIf,
-  NgFor,
-  Component,
-  Directive,
-  View,
-  Host,
-  forwardRef,
-  Provider,
-  FORM_DIRECTIVES,
-  Injectable
-} from 'angular2/core';
+import {Component, Directive, View, Host, forwardRef, Provider, Injectable} from 'angular2/core';
+import {NgIf, NgFor, FORM_DIRECTIVES} from 'angular2/common';
 
 import {CONST_EXPR} from 'angular2/src/facade/lang';
 
diff --git a/modules/playground/src/template_driven_forms/index.ts b/modules/playground/src/template_driven_forms/index.ts
index ab1004c4ba..f1d03f2007 100644
--- a/modules/playground/src/template_driven_forms/index.ts
+++ b/modules/playground/src/template_driven_forms/index.ts
@@ -1,20 +1,15 @@
 import {bootstrap} from 'angular2/bootstrap';
+import {Component, Directive, View, Host, forwardRef, Provider} from 'angular2/core';
 import {
   ControlGroup,
   NgIf,
   NgFor,
-  Component,
-  Directive,
-  View,
-  Host,
   NG_VALIDATORS,
-  forwardRef,
-  Provider,
   FORM_DIRECTIVES,
   NgControl,
   Validators,
   NgForm
-} from 'angular2/core';
+} from 'angular2/common';
 
 import {RegExpWrapper, print, isPresent, CONST_EXPR} from 'angular2/src/facade/lang';
 
diff --git a/modules/playground/src/todo/index.ts b/modules/playground/src/todo/index.ts
index c7e6806fa1..ae1eb14c4a 100644
--- a/modules/playground/src/todo/index.ts
+++ b/modules/playground/src/todo/index.ts
@@ -1,5 +1,6 @@
 import {bootstrap} from 'angular2/bootstrap';
-import {NgFor, Component, View} from 'angular2/core';
+import {Component, View} from 'angular2/core';
+import {NgFor} from 'angular2/common';
 import {Store, Todo, TodoFactory} from './services/TodoStore';
 
 @Component({selector: 'todo-app', viewProviders: [Store, TodoFactory]})
diff --git a/modules_dart/transform/lib/src/transform/common/interface_matcher.dart b/modules_dart/transform/lib/src/transform/common/interface_matcher.dart
index 747632d4b2..ac9916e61c 100644
--- a/modules_dart/transform/lib/src/transform/common/interface_matcher.dart
+++ b/modules_dart/transform/lib/src/transform/common/interface_matcher.dart
@@ -13,6 +13,7 @@ const _ON_CHANGE_INTERFACES = const [
   const ClassDescriptor('OnChanges', 'package:angular2/angular2.dart'),
   const ClassDescriptor('OnChanges', 'package:angular2/lifecycle_hooks.dart'),
   const ClassDescriptor('OnChanges', 'package:angular2/src/core/linker.dart'),
+  const ClassDescriptor('OnChanges', 'package:angular2/core.dart'),
   const ClassDescriptor(
       'OnChanges', 'package:angular2/src/core/linker/interfaces.dart'),
 ];
@@ -20,6 +21,7 @@ const _ON_DESTROY_INTERFACES = const [
   const ClassDescriptor('OnDestroy', 'package:angular2/angular2.dart'),
   const ClassDescriptor('OnDestroy', 'package:angular2/lifecycle_hooks.dart'),
   const ClassDescriptor('OnDestroy', 'package:angular2/src/core/linker.dart'),
+  const ClassDescriptor('OnDestroy', 'package:angular2/core.dart'),
   const ClassDescriptor(
       'OnDestroy', 'package:angular2/src/core/linker/interfaces.dart'),
 ];
@@ -27,6 +29,7 @@ const _DO_CHECK_INTERFACES = const [
   const ClassDescriptor('DoCheck', 'package:angular2/angular2.dart'),
   const ClassDescriptor('DoCheck', 'package:angular2/lifecycle_hooks.dart'),
   const ClassDescriptor('DoCheck', 'package:angular2/src/core/linker.dart'),
+  const ClassDescriptor('DoCheck', 'package:angular2/core.dart'),
   const ClassDescriptor(
       'DoCheck', 'package:angular2/src/core/linker/interfaces.dart'),
 ];
@@ -34,6 +37,7 @@ const _ON_INIT_INTERFACES = const [
   const ClassDescriptor('OnInit', 'package:angular2/angular2.dart'),
   const ClassDescriptor('OnInit', 'package:angular2/lifecycle_hooks.dart'),
   const ClassDescriptor('OnInit', 'package:angular2/src/core/linker.dart'),
+  const ClassDescriptor('OnInit', 'package:angular2/core.dart'),
   const ClassDescriptor(
       'OnInit', 'package:angular2/src/core/linker/interfaces.dart'),
 ];
@@ -43,6 +47,8 @@ const _ON_AFTER_CONTENT_INIT_INTERFACES = const [
       'AfterContentInit', 'package:angular2/lifecycle_hooks.dart'),
   const ClassDescriptor(
       'AfterContentInit', 'package:angular2/src/core/linker.dart'),
+  const ClassDescriptor(
+      'AfterContentInit', 'package:angular2/core.dart'),
   const ClassDescriptor(
       'AfterContentInit', 'package:angular2/src/core/linker/interfaces.dart')
 ];
@@ -53,6 +59,8 @@ const _ON_AFTER_CONTENT_CHECKED_INTERFACES = const [
       'AfterContentChecked', 'package:angular2/lifecycle_hooks.dart'),
   const ClassDescriptor(
       'AfterContentChecked', 'package:angular2/src/core/linker.dart'),
+  const ClassDescriptor(
+      'AfterContentChecked', 'package:angular2/core.dart'),
   const ClassDescriptor(
       'AfterContentChecked', 'package:angular2/src/core/linker/interfaces.dart')
 ];
@@ -62,6 +70,8 @@ const _ON_AFTER_VIEW_INIT_INTERFACES = const [
       'AfterViewInit', 'package:angular2/lifecycle_hooks.dart'),
   const ClassDescriptor(
       'AfterViewInit', 'package:angular2/src/core/linker.dart'),
+  const ClassDescriptor(
+      'AfterViewInit', 'package:angular2/core.dart'),
   const ClassDescriptor(
       'AfterViewInit', 'package:angular2/src/core/linker/interfaces.dart')
 ];
@@ -71,6 +81,8 @@ const _ON_AFTER_VIEW_CHECKED_INTERFACES = const [
       'AfterViewChecked', 'package:angular2/lifecycle_hooks.dart'),
   const ClassDescriptor(
       'AfterViewChecked', 'package:angular2/src/core/linker.dart'),
+  const ClassDescriptor(
+      'AfterViewChecked', 'package:angular2/core.dart'),
   const ClassDescriptor(
       'AfterViewChecked', 'package:angular2/src/core/linker/interfaces.dart')
 ];
diff --git a/tools/broccoli/broccoli-check-imports.ts b/tools/broccoli/broccoli-check-imports.ts
index 0844607ba3..7659a4049b 100644
--- a/tools/broccoli/broccoli-check-imports.ts
+++ b/tools/broccoli/broccoli-check-imports.ts
@@ -18,12 +18,7 @@ class CheckImports implements DiffingBroccoliPlugin {
       "angular2/src/facade",
     ],
     "angular2/src/facade": ["angular2/src/facade", "@reactivex/rxjs"],
-    // enable these
-    //"angular2/src/common": [
-    //  "angular2/core",
-    //  "angular2/src/facade",
-    //  "angular2/src/common"
-    //],
+    "angular2/src/common": ["angular2/core", "angular2/src/facade", "angular2/src/common"]
     //"angular2/src/render": [
     //  "angular2/animate",
     //  "angular2/core",