diff --git a/modules/angular2/examples/core/pipes/ts/async_pipe/async_pipe_example.ts b/modules/angular2/examples/core/pipes/ts/async_pipe/async_pipe_example.ts
index 3cb7e93d5e..bb8efcdabb 100644
--- a/modules/angular2/examples/core/pipes/ts/async_pipe/async_pipe_example.ts
+++ b/modules/angular2/examples/core/pipes/ts/async_pipe/async_pipe_example.ts
@@ -1,4 +1,4 @@
-import {Component, provide, Observable} from 'angular2/angular2';
+import {Component, provide, Observable} from 'angular2/core';
 import {bootstrap} from 'angular2/bootstrap';
 
 // #docregion AsyncPipe
@@ -6,7 +6,7 @@ import {bootstrap} from 'angular2/bootstrap';
   selector: 'async-example',
   template: `<div>
     <p>Wait for it... {{ greeting | async }}</p>
-    <button (click)="clicked()">{{ arrived ? 'Reset' : 'Resolve' }}</button> 
+    <button (click)="clicked()">{{ arrived ? 'Reset' : 'Resolve' }}</button>
   </div>`
 })
 export class AsyncPipeExample {
@@ -44,7 +44,7 @@ class Task {
 @Component({
   selector: 'example-app',
   directives: [AsyncPipeExample],
-  template: ` 
+  template: `
     <h1>AsyncPipe Example</h1>
     <async-example></async-example>
   `
diff --git a/modules/angular2/examples/core/pipes/ts/date_pipe/date_pipe_example.ts b/modules/angular2/examples/core/pipes/ts/date_pipe/date_pipe_example.ts
index f3985ed04a..5523dfdcc8 100644
--- a/modules/angular2/examples/core/pipes/ts/date_pipe/date_pipe_example.ts
+++ b/modules/angular2/examples/core/pipes/ts/date_pipe/date_pipe_example.ts
@@ -1,4 +1,4 @@
-import {Component, provide} from 'angular2/angular2';
+import {Component, provide} from 'angular2/core';
 import {bootstrap} from 'angular2/bootstrap';
 
 // #docregion DatePipe
diff --git a/modules/angular2/examples/core/pipes/ts/json_pipe/json_pipe_example.ts b/modules/angular2/examples/core/pipes/ts/json_pipe/json_pipe_example.ts
index 4bb4414383..8d9a626143 100644
--- a/modules/angular2/examples/core/pipes/ts/json_pipe/json_pipe_example.ts
+++ b/modules/angular2/examples/core/pipes/ts/json_pipe/json_pipe_example.ts
@@ -1,4 +1,4 @@
-import {Component, provide} from 'angular2/angular2';
+import {Component, provide} from 'angular2/core';
 import {bootstrap} from 'angular2/bootstrap';
 
 // #docregion JsonPipe
@@ -19,7 +19,7 @@ export class JsonPipeExample {
 @Component({
   selector: 'example-app',
   directives: [JsonPipeExample],
-  template: ` 
+  template: `
     <h1>JsonPipe Example</h1>
     <json-example></json-example>
   `
diff --git a/modules/angular2/examples/core/pipes/ts/lowerupper_pipe/lowerupper_pipe_example.ts b/modules/angular2/examples/core/pipes/ts/lowerupper_pipe/lowerupper_pipe_example.ts
index a67b754e63..78c99366f9 100644
--- a/modules/angular2/examples/core/pipes/ts/lowerupper_pipe/lowerupper_pipe_example.ts
+++ b/modules/angular2/examples/core/pipes/ts/lowerupper_pipe/lowerupper_pipe_example.ts
@@ -1,4 +1,4 @@
-import {Component, provide} from 'angular2/angular2';
+import {Component, provide} from 'angular2/core';
 import {bootstrap} from 'angular2/bootstrap';
 
 // #docregion LowerUpperPipe
@@ -19,7 +19,7 @@ export class LowerUpperPipeExample {
 @Component({
   selector: 'example-app',
   directives: [LowerUpperPipeExample],
-  template: ` 
+  template: `
     <h1>LowercasePipe &amp; UppercasePipe Example</h1>
     <lowerupper-example></lowerupper-example>
   `
diff --git a/modules/angular2/examples/core/pipes/ts/number_pipe/number_pipe_example.ts b/modules/angular2/examples/core/pipes/ts/number_pipe/number_pipe_example.ts
index 3b000d8b5f..08f1b4efb0 100644
--- a/modules/angular2/examples/core/pipes/ts/number_pipe/number_pipe_example.ts
+++ b/modules/angular2/examples/core/pipes/ts/number_pipe/number_pipe_example.ts
@@ -1,4 +1,4 @@
-import {Component, provide} from 'angular2/angular2';
+import {Component, provide} from 'angular2/core';
 import {bootstrap} from 'angular2/bootstrap';
 
 // #docregion NumberPipe
@@ -48,7 +48,7 @@ export class CurrencyPipeExample {
 @Component({
   selector: 'example-app',
   directives: [NumberPipeExample, PercentPipeExample, CurrencyPipeExample],
-  template: ` 
+  template: `
     <h1>Numeric Pipe Examples</h1>
     <h2>NumberPipe Example</h2>
     <number-example></number-example>
diff --git a/modules/angular2/examples/core/pipes/ts/slice_pipe/slice_pipe_example.ts b/modules/angular2/examples/core/pipes/ts/slice_pipe/slice_pipe_example.ts
index 302c3ff22e..2504b9da2f 100644
--- a/modules/angular2/examples/core/pipes/ts/slice_pipe/slice_pipe_example.ts
+++ b/modules/angular2/examples/core/pipes/ts/slice_pipe/slice_pipe_example.ts
@@ -1,4 +1,4 @@
-import {Component, provide} from 'angular2/angular2';
+import {Component, provide} from 'angular2/core';
 import {bootstrap} from 'angular2/bootstrap';
 
 // #docregion SlicePipe_string
diff --git a/modules/angular2/examples/core/ts/dev_mode/dev_mode_example.ts b/modules/angular2/examples/core/ts/dev_mode/dev_mode_example.ts
index 95dbf56cd2..0e973b98fd 100644
--- a/modules/angular2/examples/core/ts/dev_mode/dev_mode_example.ts
+++ b/modules/angular2/examples/core/ts/dev_mode/dev_mode_example.ts
@@ -1,5 +1,6 @@
 // #docregion enableDevMode
-import {bootstrap, enableDevMode} from 'angular2/angular2';
+import {enableDevMode} from 'angular2/core';
+import {bootstrap} from 'angular2/bootstrap';
 import {MyComponent} from 'my_component';
 
 enableDevMode();
diff --git a/modules/angular2/examples/router/ts/can_activate/can_activate_example.ts b/modules/angular2/examples/router/ts/can_activate/can_activate_example.ts
index b2972da45c..cd0ccc66e2 100644
--- a/modules/angular2/examples/router/ts/can_activate/can_activate_example.ts
+++ b/modules/angular2/examples/router/ts/can_activate/can_activate_example.ts
@@ -1,4 +1,5 @@
-import {bootstrap, provide, Component} from 'angular2/angular2';
+import {provide, Component} from 'angular2/core';
+import {bootstrap} from 'angular2/bootstrap';
 import {
   CanActivate,
   RouteConfig,
diff --git a/modules/angular2/examples/router/ts/can_deactivate/can_deactivate_example.ts b/modules/angular2/examples/router/ts/can_deactivate/can_deactivate_example.ts
index 36492cbb57..41de37b4b9 100644
--- a/modules/angular2/examples/router/ts/can_deactivate/can_deactivate_example.ts
+++ b/modules/angular2/examples/router/ts/can_deactivate/can_deactivate_example.ts
@@ -1,4 +1,5 @@
-import {provide, bootstrap, Component} from 'angular2/angular2';
+import {provide, Component} from 'angular2/core';
+import {bootstrap} from 'angular2/bootstrap';
 import {
   CanDeactivate,
   RouteConfig,
diff --git a/modules/angular2/examples/router/ts/on_activate/on_activate_example.ts b/modules/angular2/examples/router/ts/on_activate/on_activate_example.ts
index d179a25671..2a04513912 100644
--- a/modules/angular2/examples/router/ts/on_activate/on_activate_example.ts
+++ b/modules/angular2/examples/router/ts/on_activate/on_activate_example.ts
@@ -1,4 +1,5 @@
-import {Component, provide, bootstrap} from 'angular2/angular2';
+import {Component, provide} from 'angular2/core';
+import {bootstrap} from 'angular2/bootstrap';
 import {
   OnActivate,
   ComponentInstruction,
diff --git a/modules/angular2/examples/router/ts/on_deactivate/on_deactivate_example.ts b/modules/angular2/examples/router/ts/on_deactivate/on_deactivate_example.ts
index 07940a815d..036a0a47a2 100644
--- a/modules/angular2/examples/router/ts/on_deactivate/on_deactivate_example.ts
+++ b/modules/angular2/examples/router/ts/on_deactivate/on_deactivate_example.ts
@@ -1,4 +1,5 @@
-import {Component, Injectable, NgFor, provide, bootstrap} from 'angular2/angular2';
+import {Component, Injectable, provide} from 'angular2/core';
+import {bootstrap} from 'angular2/bootstrap';
 import {
   OnDeactivate,
   ComponentInstruction,
@@ -43,7 +44,7 @@ class MyCmp implements OnDeactivate {
       <p *ngFor="#logItem of logService.logs">{{ logItem }}</p>
     </div>
   `,
-  directives: [ROUTER_DIRECTIVES, NgFor]
+  directives: [ROUTER_DIRECTIVES]
 })
 @RouteConfig([
   {path: '/', component: MyCmp, name: 'HomeCmp'},
diff --git a/modules/angular2/examples/router/ts/reuse/reuse_example.ts b/modules/angular2/examples/router/ts/reuse/reuse_example.ts
index c709fe9ed4..4e34e31d79 100644
--- a/modules/angular2/examples/router/ts/reuse/reuse_example.ts
+++ b/modules/angular2/examples/router/ts/reuse/reuse_example.ts
@@ -1,4 +1,5 @@
-import {bootstrap, Component, provide} from 'angular2/angular2';
+import {Component, provide} from 'angular2/core';
+import {bootstrap} from 'angular2/bootstrap';
 import {
   CanActivate,
   RouteConfig,