diff --git a/ionic/components/action-sheet/action-sheet.ts b/ionic/components/action-sheet/action-sheet.ts
index a59d9280d8..de365a83a6 100644
--- a/ionic/components/action-sheet/action-sheet.ts
+++ b/ionic/components/action-sheet/action-sheet.ts
@@ -5,7 +5,8 @@
 * @description
 * The ActionSheet is a modal menu with options to select based on an action.
 */
-import {Component, Injectable, Renderer, NgFor, NgIf} from 'angular2/angular2';
+import {Component, Injectable, Renderer} from 'angular2/core';
+import {NgFor, NgIf} from 'angular2/common';
 
 import {OverlayController} from '../overlay/overlay-controller';
 import {Config} from '../../config/config';
diff --git a/ionic/components/app/app.ts b/ionic/components/app/app.ts
index 2c2fdbab73..45b3e9597c 100644
--- a/ionic/components/app/app.ts
+++ b/ionic/components/app/app.ts
@@ -1,4 +1,5 @@
-import {Injectable, NgZone, Title} from 'angular2/angular2';
+import {Injectable, NgZone} from 'angular2/core';
+import {Title} from 'angular2/platform/browser';
 
 import {Config} from '../../config/config';
 import {ClickBlock} from '../../util/click-block';
diff --git a/ionic/components/app/id.ts b/ionic/components/app/id.ts
index c89f3f1f5e..3996f55228 100644
--- a/ionic/components/app/id.ts
+++ b/ionic/components/app/id.ts
@@ -1,4 +1,4 @@
-import {AppViewManager, ElementRef, Directive, Renderer} from 'angular2/angular2';
+import {AppViewManager, ElementRef, Directive, Renderer} from 'angular2/core';
 
 import {IonicApp} from './app';
 
diff --git a/ionic/components/app/test/storage/index.ts b/ionic/components/app/test/storage/index.ts
index 1f34536d9c..a53f87c2bf 100644
--- a/ionic/components/app/test/storage/index.ts
+++ b/ionic/components/app/test/storage/index.ts
@@ -1,4 +1,5 @@
-import {Component, Control, ControlGroup} from 'angular2/angular2';
+import {Component} from 'angular2/core';
+import {Control, ControlGroup} 'angular2/common';
 
 import {App, Storage, LocalStorage, SqlStorage} from 'ionic/ionic';
 
diff --git a/ionic/components/blur/blur.ts b/ionic/components/blur/blur.ts
index 928a62142f..a8e312d88a 100644
--- a/ionic/components/blur/blur.ts
+++ b/ionic/components/blur/blur.ts
@@ -1,4 +1,4 @@
-import {Directive, Renderer, ElementRef} from 'angular2/angular2';
+import {Directive, Renderer, ElementRef} from 'angular2/core';
 
 
 /**
diff --git a/ionic/components/button/button.ts b/ionic/components/button/button.ts
index 37adca5541..8b96cb7b21 100644
--- a/ionic/components/button/button.ts
+++ b/ionic/components/button/button.ts
@@ -1,4 +1,4 @@
-import {Directive, ElementRef, Renderer, Attribute, Optional} from 'angular2/angular2';
+import {Directive, ElementRef, Renderer, Attribute, Optional} from 'angular2/core';
 
 import {Config} from '../../config/config';
 import {Toolbar} from '../toolbar/toolbar';
diff --git a/ionic/components/checkbox/checkbox.ts b/ionic/components/checkbox/checkbox.ts
index b752798aed..4b8307d4e1 100644
--- a/ionic/components/checkbox/checkbox.ts
+++ b/ionic/components/checkbox/checkbox.ts
@@ -1,4 +1,5 @@
-import {Component, Directive, Optional, NgControl, ElementRef} from 'angular2/angular2';
+import {Component, Directive, Optional, ElementRef} from 'angular2/core';
+import {NgControl} from 'angular2/common';
 
 import {Ion} from '../ion';
 import {Form} from '../../util/form';
diff --git a/ionic/components/checkbox/test/basic/index.ts b/ionic/components/checkbox/test/basic/index.ts
index 49e605090c..751eba08ea 100644
--- a/ionic/components/checkbox/test/basic/index.ts
+++ b/ionic/components/checkbox/test/basic/index.ts
@@ -9,7 +9,8 @@ import {
   NgControlName,
   NgFormModel,
   FormBuilder
-} from 'angular2/angular2';
+} from 'angular2/common';
+
 
 @App({
   templateUrl: 'main.html'
diff --git a/ionic/components/content/content.ts b/ionic/components/content/content.ts
index 4f3cc7c4bb..7fe59b2853 100644
--- a/ionic/components/content/content.ts
+++ b/ionic/components/content/content.ts
@@ -1,4 +1,4 @@
-import {Component, ElementRef, Optional, NgZone} from 'angular2/angular2';
+import {Component, ElementRef, Optional, NgZone} from 'angular2/core';
 
 import {Ion} from '../ion';
 import {Config} from '../../config/config';
diff --git a/ionic/components/icon/icon.ts b/ionic/components/icon/icon.ts
index 44543c5c3b..28a1abb5c4 100644
--- a/ionic/components/icon/icon.ts
+++ b/ionic/components/icon/icon.ts
@@ -1,4 +1,4 @@
-import {Directive, ElementRef, Attribute, Renderer} from 'angular2/angular2';
+import {Directive, ElementRef, Attribute, Renderer} from 'angular2/core';
 
 import {Config} from '../../config/config';
 
diff --git a/ionic/components/ion.ts b/ionic/components/ion.ts
index 6dfb852a89..a92669b75b 100644
--- a/ionic/components/ion.ts
+++ b/ionic/components/ion.ts
@@ -1,4 +1,4 @@
-import {ElementRef} from 'angular2/angular2';
+import {ElementRef} from 'angular2/core';
 import {Config} from '../config/config';
 import {isArray} from '../util';
 import * as dom from '../util/dom';
diff --git a/ionic/components/item/item-sliding.ts b/ionic/components/item/item-sliding.ts
index 66d294d1df..d6688f6630 100644
--- a/ionic/components/item/item-sliding.ts
+++ b/ionic/components/item/item-sliding.ts
@@ -1,4 +1,4 @@
-import {Component, ElementRef, Optional} from 'angular2/angular2';
+import {Component, ElementRef, Optional} from 'angular2/core';
 
 import {List} from '../list/list';
 
diff --git a/ionic/components/item/item.ts b/ionic/components/item/item.ts
index d89d9e181d..c24ad6f3e7 100644
--- a/ionic/components/item/item.ts
+++ b/ionic/components/item/item.ts
@@ -1,4 +1,4 @@
-import {Component} from 'angular2/angular2';
+import {Component} from 'angular2/core';
 
 
 /**
diff --git a/ionic/components/list/list.ts b/ionic/components/list/list.ts
index f6707fc6d3..b57e0d2e41 100644
--- a/ionic/components/list/list.ts
+++ b/ionic/components/list/list.ts
@@ -1,4 +1,4 @@
-import {Directive, ElementRef, NgZone} from 'angular2/angular2';
+import {Directive, ElementRef, NgZone} from 'angular2/core';
 
 import {Ion} from '../ion';
 import {Config} from '../../config/config';
diff --git a/ionic/components/list/test/infinite/index.ts b/ionic/components/list/test/infinite/index.ts
index ffd2f0623c..9164945f91 100644
--- a/ionic/components/list/test/infinite/index.ts
+++ b/ionic/components/list/test/infinite/index.ts
@@ -1,5 +1,5 @@
-import {ProtoViewRef, ViewContainerRef} from 'angular2/angular2'
-import {Directive, Host, forwardRef} from 'angular2/angular2';
+import {ProtoViewRef, ViewContainerRef} from 'angular2/core'
+import {Directive, Host, forwardRef} from 'angular2/core';
 
 import {App, List} from 'ionic/ionic';
 
diff --git a/ionic/components/menu/menu-close.ts b/ionic/components/menu/menu-close.ts
index 71ff611a66..ace10bf7f5 100644
--- a/ionic/components/menu/menu-close.ts
+++ b/ionic/components/menu/menu-close.ts
@@ -1,4 +1,4 @@
-import {Directive} from 'angular2/angular2';
+import {Directive} from 'angular2/core';
 
 import {IonicApp} from '../app/app';
 import {Menu} from './menu';
diff --git a/ionic/components/menu/menu-toggle.ts b/ionic/components/menu/menu-toggle.ts
index fb212f3f47..676717b719 100644
--- a/ionic/components/menu/menu-toggle.ts
+++ b/ionic/components/menu/menu-toggle.ts
@@ -1,4 +1,4 @@
-import {Directive, ElementRef, Optional} from 'angular2/angular2';
+import {Directive, ElementRef, Optional} from 'angular2/core';
 
 import {IonicApp} from '../app/app';
 import {ViewController} from '../nav/view-controller';
diff --git a/ionic/components/menu/menu.ts b/ionic/components/menu/menu.ts
index 49e32d47b1..927767ee8b 100644
--- a/ionic/components/menu/menu.ts
+++ b/ionic/components/menu/menu.ts
@@ -1,4 +1,4 @@
-import {Component, forwardRef, Directive, Host, EventEmitter, ElementRef} from 'angular2/angular2';
+import {Component, forwardRef, Directive, Host, EventEmitter, ElementRef} from 'angular2/core';
 
 import {Ion} from '../ion';
 import {IonicApp} from '../app/app';
diff --git a/ionic/components/modal/modal.ts b/ionic/components/modal/modal.ts
index a2a4cfb6ad..dc527d3902 100644
--- a/ionic/components/modal/modal.ts
+++ b/ionic/components/modal/modal.ts
@@ -1,4 +1,4 @@
-import {Injectable, Type} from 'angular2/angular2';
+import {Injectable, Type} from 'angular2/core';
 
 import {OverlayController} from '../overlay/overlay-controller';
 import {Config} from '../../config/config';
diff --git a/ionic/components/nav/nav-controller.ts b/ionic/components/nav/nav-controller.ts
index 0ef0f998e5..7042c9008e 100644
--- a/ionic/components/nav/nav-controller.ts
+++ b/ionic/components/nav/nav-controller.ts
@@ -1,5 +1,5 @@
-import {ChangeDetectorRef, Compiler, ElementRef, Injector, provide, NgZone, AppViewManager, Renderer} from 'angular2/angular2';
-import {wtfLeave, wtfCreateScope, WtfScopeFn, wtfStartTimeRange, wtfEndTimeRange} from 'angular2/angular2';
+import {ChangeDetectorRef, Compiler, ElementRef, Injector, provide, NgZone, AppViewManager, Renderer} from 'angular2/core';
+import {wtfLeave, wtfCreateScope, WtfScopeFn, wtfStartTimeRange, wtfEndTimeRange} from 'angular2/instrumentation';
 
 import {Ion} from '../ion';
 import {IonicApp} from '../app/app';
diff --git a/ionic/components/nav/nav-push.ts b/ionic/components/nav/nav-push.ts
index 0a1cbaeef9..b0e697d33c 100644
--- a/ionic/components/nav/nav-push.ts
+++ b/ionic/components/nav/nav-push.ts
@@ -1,4 +1,4 @@
-import {Directive, Optional} from 'angular2/angular2';
+import {Directive, Optional} from 'angular2/core';
 import {NavController} from './nav-controller';
 import {NavRegistry} from './nav-registry';
 
diff --git a/ionic/components/nav/nav-router.ts b/ionic/components/nav/nav-router.ts
index a7c17beac1..72f1382792 100644
--- a/ionic/components/nav/nav-router.ts
+++ b/ionic/components/nav/nav-router.ts
@@ -1,4 +1,4 @@
-import {Directive, ElementRef, DynamicComponentLoader, Attribute} from 'angular2/angular2';
+import {Directive, ElementRef, DynamicComponentLoader, Attribute} from 'angular2/core';
 import {
   RouterOutlet,
   Router,
diff --git a/ionic/components/nav/nav.ts b/ionic/components/nav/nav.ts
index 94ae9a877d..510e697a08 100644
--- a/ionic/components/nav/nav.ts
+++ b/ionic/components/nav/nav.ts
@@ -1,4 +1,4 @@
-import {ChangeDetectorRef, Component, Directive, ElementRef, Host, Optional, forwardRef, Inject, NgZone, Compiler, AppViewManager, Renderer, ViewContainerRef} from 'angular2/angular2';
+import {ChangeDetectorRef, Component, Directive, ElementRef, Host, Optional, forwardRef, Inject, NgZone, Compiler, AppViewManager, Renderer, ViewContainerRef} from 'angular2/core';
 
 import {IonicApp} from '../app/app';
 import {Config} from '../../config/config';
diff --git a/ionic/components/nav/test/basic/index.ts b/ionic/components/nav/test/basic/index.ts
index 4352bc6bc0..ad60028ea3 100644
--- a/ionic/components/nav/test/basic/index.ts
+++ b/ionic/components/nav/test/basic/index.ts
@@ -1,4 +1,4 @@
-import {Component} from 'angular2/angular2';
+import {Component} from 'angular2/core';
 import {App, NavController} from 'ionic/ionic';
 import {Page, Config, IonicApp} from 'ionic/ionic';
 import {NavParams, NavController, ViewController, IONIC_DIRECTIVES} from 'ionic/ionic';
diff --git a/ionic/components/navbar/navbar.ts b/ionic/components/navbar/navbar.ts
index 517ff91d72..e1db15b35b 100644
--- a/ionic/components/navbar/navbar.ts
+++ b/ionic/components/navbar/navbar.ts
@@ -1,4 +1,4 @@
-import {Component, Directive, Optional, ElementRef, Renderer, TemplateRef, forwardRef, Inject, ViewContainerRef} from 'angular2/angular2';
+import {Component, Directive, Optional, ElementRef, Renderer, TemplateRef, forwardRef, Inject, ViewContainerRef} from 'angular2/core';
 
 import {Ion} from '../ion';
 import {Icon} from '../icon/icon';
diff --git a/ionic/components/overlay/overlay.ts b/ionic/components/overlay/overlay.ts
index bb708d182f..f21f461fd4 100644
--- a/ionic/components/overlay/overlay.ts
+++ b/ionic/components/overlay/overlay.ts
@@ -1,4 +1,4 @@
-import {ChangeDetectorRef, Component, ElementRef, Compiler, AppViewManager, NgZone, Renderer} from 'angular2/angular2';
+import {ChangeDetectorRef, Component, ElementRef, Compiler, AppViewManager, NgZone, Renderer} from 'angular2/core';
 
 import {IonicApp} from '../app/app';
 import {Config} from '../../config/config';
diff --git a/ionic/components/popup/popup.ts b/ionic/components/popup/popup.ts
index f2cd107d60..c5b37547fe 100644
--- a/ionic/components/popup/popup.ts
+++ b/ionic/components/popup/popup.ts
@@ -1,5 +1,5 @@
-import {FORM_DIRECTIVES, NgControl, NgControlGroup,
-  Component, ElementRef, Injectable, NgClass, NgIf, NgFor, Renderer} from 'angular2/angular2';
+import {Component, ElementRef, Injectable, Renderer} from 'angular2/core';
+import {NgClass, NgIf, NgFor, FORM_DIRECTIVES} from 'angular2/common';
 
 import {OverlayController} from '../overlay/overlay-controller';
 import {Config} from '../../config/config';
diff --git a/ionic/components/radio/radio.ts b/ionic/components/radio/radio.ts
index e890b6a624..777b500056 100644
--- a/ionic/components/radio/radio.ts
+++ b/ionic/components/radio/radio.ts
@@ -1,4 +1,5 @@
-import {Component, Directive, ElementRef, Host, Optional, NgControl, Query, QueryList} from 'angular2/angular2';
+import {Component, Directive, ElementRef, Host, Optional, Query, QueryList} from 'angular2/core';
+import {NgControl} from 'angular2/common';
 
 import {Config} from '../../config/config';
 import {Ion} from '../ion';
diff --git a/ionic/components/radio/test/basic/index.ts b/ionic/components/radio/test/basic/index.ts
index a14701f71b..566d380a24 100644
--- a/ionic/components/radio/test/basic/index.ts
+++ b/ionic/components/radio/test/basic/index.ts
@@ -9,7 +9,7 @@ import {
   NgControlName,
   NgFormModel,
   FormBuilder
-} from 'angular2/angular2';
+} from 'angular2/common';
 
 
 @App({
diff --git a/ionic/components/scroll/pull-to-refresh.ts b/ionic/components/scroll/pull-to-refresh.ts
index eaefd66354..bb5816234b 100644
--- a/ionic/components/scroll/pull-to-refresh.ts
+++ b/ionic/components/scroll/pull-to-refresh.ts
@@ -1,4 +1,5 @@
-import {Component, NgIf, NgClass, ElementRef, EventEmitter, Host} from 'angular2/angular2'
+import {Component, ElementRef, EventEmitter, Host} from 'angular2/core'
+import {NgIf, NgClass} from 'angular2/common';
 
 import {Content} from '../content/content';
 import * as util from '../../util';
diff --git a/ionic/components/scroll/scroll.ts b/ionic/components/scroll/scroll.ts
index 3735d5a37b..ec0bf9dc54 100644
--- a/ionic/components/scroll/scroll.ts
+++ b/ionic/components/scroll/scroll.ts
@@ -1,4 +1,4 @@
-import {Component, ElementRef, onInit} from 'angular2/angular2';
+import {Component, ElementRef, onInit} from 'angular2/core';
 
 import {Ion} from '../ion';
 import {Config} from '../../config/config';
diff --git a/ionic/components/searchbar/searchbar.ts b/ionic/components/searchbar/searchbar.ts
index 29f63d85fc..b73c28985a 100644
--- a/ionic/components/searchbar/searchbar.ts
+++ b/ionic/components/searchbar/searchbar.ts
@@ -1,4 +1,5 @@
-import {ElementRef, Pipe, NgControl, Renderer, FORM_DIRECTIVES, NgIf, NgClass} from 'angular2/angular2';
+import {ElementRef, Renderer} from 'angular2/core';
+import {NgIf, NgClass, NgControl, FORM_DIRECTIVES} from 'angular2/common';
 
 import {Ion} from '../ion';
 import {Config} from '../../config/config';
diff --git a/ionic/components/searchbar/test/basic/index.ts b/ionic/components/searchbar/test/basic/index.ts
index fe6524bd8f..90974c444e 100644
--- a/ionic/components/searchbar/test/basic/index.ts
+++ b/ionic/components/searchbar/test/basic/index.ts
@@ -1,4 +1,4 @@
-import {NgControl, FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/angular2';
+import {NgControl, FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/common';
 
 import {App} from 'ionic/ionic';
 import {SearchPipe} from 'ionic/components/searchbar/searchbar';
diff --git a/ionic/components/searchbar/test/floating/index.ts b/ionic/components/searchbar/test/floating/index.ts
index e375587be2..b0acc22e0d 100644
--- a/ionic/components/searchbar/test/floating/index.ts
+++ b/ionic/components/searchbar/test/floating/index.ts
@@ -1,4 +1,4 @@
-import {FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/angular2';
+import {FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/common';
 
 import {App} from 'ionic/ionic';
 import {SearchPipe} from 'ionic/components/searchbar/searchbar';
diff --git a/ionic/components/searchbar/test/model/index.ts b/ionic/components/searchbar/test/model/index.ts
index a240add794..9aeda952f4 100644
--- a/ionic/components/searchbar/test/model/index.ts
+++ b/ionic/components/searchbar/test/model/index.ts
@@ -1,4 +1,4 @@
-import {NgControl, FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/angular2';
+import {NgControl, FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/common';
 
 import {App} from 'ionic/ionic';
 import {SearchPipe} from 'ionic/components/searchbar/searchbar';
diff --git a/ionic/components/segment/segment.ts b/ionic/components/segment/segment.ts
index d5793f67ff..122b045198 100644
--- a/ionic/components/segment/segment.ts
+++ b/ionic/components/segment/segment.ts
@@ -1,4 +1,5 @@
-import {Directive, Renderer, ElementRef, Host, Optional, NgControl} from 'angular2/angular2';
+import {Directive, Renderer, ElementRef, Host, Optional} from 'angular2/core';
+import {NgControl} from 'angular2/common';
 
 import {Ion} from '../ion';
 import {Config} from '../../config/config';
diff --git a/ionic/components/segment/test/basic/index.ts b/ionic/components/segment/test/basic/index.ts
index 635578c552..ae4873cca8 100644
--- a/ionic/components/segment/test/basic/index.ts
+++ b/ionic/components/segment/test/basic/index.ts
@@ -1,4 +1,4 @@
-import {FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/angular2';
+import {FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/common';
 
 import {App} from 'ionic/ionic';
 
diff --git a/ionic/components/segment/test/nav/index.ts b/ionic/components/segment/test/nav/index.ts
index e5474d8a48..6722218006 100644
--- a/ionic/components/segment/test/nav/index.ts
+++ b/ionic/components/segment/test/nav/index.ts
@@ -1,4 +1,4 @@
-import {FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/angular2';
+import {FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/common';
 
 import {App, Page} from 'ionic/ionic';
 
diff --git a/ionic/components/show-hide-when/show-hide-when.ts b/ionic/components/show-hide-when/show-hide-when.ts
index 5920838001..f8c633d3ab 100644
--- a/ionic/components/show-hide-when/show-hide-when.ts
+++ b/ionic/components/show-hide-when/show-hide-when.ts
@@ -1,4 +1,4 @@
-import {Directive, Attribute, NgZone} from 'angular2/angular2'
+import {Directive, Attribute, NgZone} from 'angular2/core'
 
 import {Platform} from '../../platform/platform';
 
diff --git a/ionic/components/show-hide-when/test/basic/index.ts b/ionic/components/show-hide-when/test/basic/index.ts
index 49e605090c..611ee2dc2a 100644
--- a/ionic/components/show-hide-when/test/basic/index.ts
+++ b/ionic/components/show-hide-when/test/basic/index.ts
@@ -9,7 +9,7 @@ import {
   NgControlName,
   NgFormModel,
   FormBuilder
-} from 'angular2/angular2';
+} from 'angular2/common';
 
 @App({
   templateUrl: 'main.html'
diff --git a/ionic/components/slides/slides.ts b/ionic/components/slides/slides.ts
index c56c5b8aec..2fa2d72d70 100644
--- a/ionic/components/slides/slides.ts
+++ b/ionic/components/slides/slides.ts
@@ -1,4 +1,5 @@
-import {Directive, Component, ElementRef, Host, NgClass, EventEmitter} from 'angular2/angular2';
+import {Directive, Component, ElementRef, Host, EventEmitter} from 'angular2/core';
+import {NgClass} from 'angular2/common';
 
 import {Ion} from '../ion';
 import {Animation} from '../../animations/animation';
diff --git a/ionic/components/slides/test/scroll/index.ts b/ionic/components/slides/test/scroll/index.ts
index d35afbe1b4..edfdcec9b6 100644
--- a/ionic/components/slides/test/scroll/index.ts
+++ b/ionic/components/slides/test/scroll/index.ts
@@ -1,5 +1,4 @@
 import {App} from 'ionic/ionic';
-import {NgIf} from 'angular/angular';
 
 @App({
   templateUrl: 'main.html',
diff --git a/ionic/components/tabs/tab.ts b/ionic/components/tabs/tab.ts
index 131f6e7005..2ae8f7b364 100644
--- a/ionic/components/tabs/tab.ts
+++ b/ionic/components/tabs/tab.ts
@@ -1,4 +1,4 @@
-import {ChangeDetectorRef, Component, Directive, Host, ElementRef, Compiler, AppViewManager, NgZone, Renderer} from 'angular2/angular2';
+import {ChangeDetectorRef, Component, Directive, Host, ElementRef, Compiler, AppViewManager, NgZone, Renderer} from 'angular2/core';
 
 import {IonicApp} from '../app/app';
 import {Config} from '../../config/config';
diff --git a/ionic/components/tabs/tabs.ts b/ionic/components/tabs/tabs.ts
index fa160401ff..8ef6c6716f 100644
--- a/ionic/components/tabs/tabs.ts
+++ b/ionic/components/tabs/tabs.ts
@@ -1,4 +1,5 @@
-import {Directive, ElementRef, Optional, Host, NgFor, NgIf, forwardRef, ViewContainerRef} from 'angular2/angular2';
+import {Directive, ElementRef, Optional, Host, forwardRef, ViewContainerRef} from 'angular2/core';
+import {NgFor, NgIf} from 'angular2/common';
 
 import {Ion} from '../ion';
 import {Attr} from '../app/id';
diff --git a/ionic/components/tabs/test/ghost/index.ts b/ionic/components/tabs/test/ghost/index.ts
index cb31731976..a4816bb487 100644
--- a/ionic/components/tabs/test/ghost/index.ts
+++ b/ionic/components/tabs/test/ghost/index.ts
@@ -1,6 +1,6 @@
   import {App, Page, NavController, Tab} from 'ionic/ionic';
 
-import {ContentChild, QueryList, ViewChildren} from 'angular2/angular2';
+import {ContentChild, QueryList, ViewChildren} from 'angular2/core';
 
 //
 // Tab 1
diff --git a/ionic/components/tap-click/tap-click.ts b/ionic/components/tap-click/tap-click.ts
index 6b85bc268e..03155645fd 100644
--- a/ionic/components/tap-click/tap-click.ts
+++ b/ionic/components/tap-click/tap-click.ts
@@ -1,4 +1,4 @@
-import {Injectable, NgZone} from 'angular2/angular2';
+import {Injectable, NgZone} from 'angular2/core';
 
 import {IonicApp} from '../app/app';
 import {Config} from '../../config/config';
diff --git a/ionic/components/text-input/label.ts b/ionic/components/text-input/label.ts
index 507f69e3d7..01146d5052 100644
--- a/ionic/components/text-input/label.ts
+++ b/ionic/components/text-input/label.ts
@@ -1,4 +1,4 @@
-import {Directive, Optional, ElementRef, Renderer} from 'angular2/angular2';
+import {Directive, Optional, ElementRef, Renderer} from 'angular2/core';
 
 import {Config} from '../../config/config';
 import {TextInput} from './text-input';
diff --git a/ionic/components/text-input/test/form-inputs/index.ts b/ionic/components/text-input/test/form-inputs/index.ts
index 1eb3f9b37f..9d55a29d72 100644
--- a/ionic/components/text-input/test/form-inputs/index.ts
+++ b/ionic/components/text-input/test/form-inputs/index.ts
@@ -1,5 +1,5 @@
 import {App} from 'ionic/ionic';
-import {FormBuilder, Validators} from 'angular2/angular2';
+import {FormBuilder, Validators} from 'angular2/common';
 
 
 @App({
diff --git a/ionic/components/text-input/test/inline-labels/index.ts b/ionic/components/text-input/test/inline-labels/index.ts
index 261c4ab4ca..a9bdbc8a78 100644
--- a/ionic/components/text-input/test/inline-labels/index.ts
+++ b/ionic/components/text-input/test/inline-labels/index.ts
@@ -7,7 +7,6 @@ import {App} from 'ionic/ionic';
 class E2EApp {
 
   submit(ev) {
-    debugger
   }
 
 }
diff --git a/ionic/components/text-input/text-input.ts b/ionic/components/text-input/text-input.ts
index 48543eea0c..c2500f0608 100644
--- a/ionic/components/text-input/text-input.ts
+++ b/ionic/components/text-input/text-input.ts
@@ -1,4 +1,5 @@
-import {Component, Directive, Attribute, NgIf, forwardRef, Host, Optional, ElementRef, Renderer, Attribute, NgControl} from 'angular2/angular2';
+import {Component, Directive, Attribute, forwardRef, Host, Optional, ElementRef, Renderer} from 'angular2/core';
+import {NgIf, NgControl} from 'angular2/common';
 
 import {NavController} from '../nav/nav-controller';
 import {Config} from '../../config/config';
diff --git a/ionic/components/toggle/test/basic/index.ts b/ionic/components/toggle/test/basic/index.ts
index dde96c875f..1d8c6a59c3 100644
--- a/ionic/components/toggle/test/basic/index.ts
+++ b/ionic/components/toggle/test/basic/index.ts
@@ -9,7 +9,7 @@ import {
   NgControlName,
   NgFormModel,
   FormBuilder
-} from 'angular2/angular2';
+} from 'angular2/common';
 
 @App({
   templateUrl: 'main.html'
diff --git a/ionic/components/toggle/toggle.ts b/ionic/components/toggle/toggle.ts
index e5de92d6c8..b278bdccb6 100644
--- a/ionic/components/toggle/toggle.ts
+++ b/ionic/components/toggle/toggle.ts
@@ -1,4 +1,5 @@
-import {Component, Directive, ElementRef, Host, Optional, NgControl, Inject, forwardRef} from 'angular2/angular2';
+import {Component, Directive, ElementRef, Host, Optional, Inject, forwardRef} from 'angular2/core';
+import {NgControl} from 'angular2/common';
 
 import {Form} from '../../util/form';
 import {Config} from '../../config/config';
diff --git a/ionic/components/toolbar/toolbar.ts b/ionic/components/toolbar/toolbar.ts
index f6cd4f608b..4f59f7d9f8 100644
--- a/ionic/components/toolbar/toolbar.ts
+++ b/ionic/components/toolbar/toolbar.ts
@@ -1,4 +1,4 @@
-import {Component, Directive, Host, ElementRef, Optional, forwardRef, Inject, ContentChildren, ContentChild, QueryList} from 'angular2/angular2';
+import {Component, Directive, Host, ElementRef, Optional, forwardRef, Inject, ContentChildren, ContentChild, QueryList} from 'angular2/core';
 
 import {Ion} from '../ion';
 import {Config} from '../../config/config';
diff --git a/ionic/config/bootstrap.ts b/ionic/config/bootstrap.ts
index b70329f416..e4d284bf6a 100644
--- a/ionic/config/bootstrap.ts
+++ b/ionic/config/bootstrap.ts
@@ -1,4 +1,4 @@
-import {bootstrap, provide, Provider} from 'angular2/angular2';
+import {provide, Provider} from 'angular2/core';
 import {ROUTER_PROVIDERS, LocationStrategy, HashLocationStrategy} from 'angular2/router';
 import {HTTP_PROVIDERS} from 'angular2/http';
 
diff --git a/ionic/config/decorators/app.ts b/ionic/config/decorators/app.ts
index 02e8cbedd6..e30ab8776b 100644
--- a/ionic/config/decorators/app.ts
+++ b/ionic/config/decorators/app.ts
@@ -1,4 +1,5 @@
-import {Component, bootstrap} from 'angular2/angular2'
+import {Component} from 'angular2/core';
+import {bootstrap} from 'angular2/platform/browser';
 import {TapClick} from '../../components/tap-click/tap-click';
 import {ionicProviders} from '../bootstrap';
 import {IONIC_DIRECTIVES} from '../directives';
diff --git a/ionic/config/decorators/config-component.ts b/ionic/config/decorators/config-component.ts
index f54f0c49cf..f24a13f656 100644
--- a/ionic/config/decorators/config-component.ts
+++ b/ionic/config/decorators/config-component.ts
@@ -1,4 +1,4 @@
-import {Component} from 'angular2/angular2'
+import {Component} from 'angular2/core'
 import {pascalCaseToDashCase} from '../../util/util';
 
 
diff --git a/ionic/config/decorators/page.ts b/ionic/config/decorators/page.ts
index 0d47c30a7c..0ac5448876 100644
--- a/ionic/config/decorators/page.ts
+++ b/ionic/config/decorators/page.ts
@@ -1,4 +1,4 @@
-import {Component} from 'angular2/angular2'
+import {Component} from 'angular2/core'
 import {IONIC_DIRECTIVES} from '../directives';
 
 
diff --git a/ionic/config/directives.ts b/ionic/config/directives.ts
index 22e38db52e..cf7a6feaea 100644
--- a/ionic/config/directives.ts
+++ b/ionic/config/directives.ts
@@ -1,4 +1,5 @@
-import {CORE_DIRECTIVES, FORM_DIRECTIVES, forwardRef, Type} from 'angular2/angular2'
+import {forwardRef, Type} from 'angular2/core';
+import {CORE_DIRECTIVES, FORM_DIRECTIVES} from 'angular2/common';
 
 import {OverlayNav} from '../components/overlay/overlay';
 import {Menu} from '../components/menu/menu';
diff --git a/ionic/translation/translate.ts b/ionic/translation/translate.ts
index 83c64ea780..eb65e4ac91 100644
--- a/ionic/translation/translate.ts
+++ b/ionic/translation/translate.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/angular2';
+import {Injectable} from 'angular2/core';
 
 /**
  * @private
diff --git a/ionic/translation/translate_pipe.ts b/ionic/translation/translate_pipe.ts
index 5a56529a02..a9c4be777f 100644
--- a/ionic/translation/translate_pipe.ts
+++ b/ionic/translation/translate_pipe.ts
@@ -1,4 +1,4 @@
-import {Injectable, Pipe, PipeTransform} from 'angular2/angular2';
+import {Injectable, Pipe, PipeTransform} from 'angular2/core';
 
 import {Translate} from './translate';
 
diff --git a/ionic/util/events.ts b/ionic/util/events.ts
index 7a38ef22d6..7e00d1d117 100644
--- a/ionic/util/events.ts
+++ b/ionic/util/events.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/angular2';
+import {Injectable} from 'angular2/core';
 
 /**
  * Events is a pub/sub style event system for sending and responding to application-level
diff --git a/ionic/util/form.ts b/ionic/util/form.ts
index 7c87a8c727..69cf65e1d3 100644
--- a/ionic/util/form.ts
+++ b/ionic/util/form.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/angular2';
+import {Injectable} from 'angular2/core';
 
 
 /**
diff --git a/ionic/util/keyboard.ts b/ionic/util/keyboard.ts
index 7eebcf5154..8c3509ce02 100644
--- a/ionic/util/keyboard.ts
+++ b/ionic/util/keyboard.ts
@@ -1,4 +1,4 @@
-import {Injectable, NgZone} from 'angular2/angular2';
+import {Injectable, NgZone} from 'angular2/core';
 
 import {Config} from '../config/config';
 import {Form} from './form';