remove angular2/angular2 imports

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';

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';

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';
 

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';
 

ionic/components/blur/blur.ts

@@ -1,4 +1,4 @@
-import {Directive, Renderer, ElementRef} from 'angular2/angular2';
+import {Directive, Renderer, ElementRef} from 'angular2/core';
 
 
 /**

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';

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';

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'

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';

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';
 

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';

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';
 

ionic/components/item/item.ts

@@ -1,4 +1,4 @@
-import {Component} from 'angular2/angular2';
+import {Component} from 'angular2/core';
 
 
 /**

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';

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';
 

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';

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';

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';

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';

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';

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';
 

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,

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';

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';

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';

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';

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';

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';

ionic/components/radio/test/basic/index.ts

@@ -9,7 +9,7 @@ import {
   NgControlName,
   NgFormModel,
   FormBuilder
-} from 'angular2/angular2';
+} from 'angular2/common';
 
 
 @App({

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';

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';

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';

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';

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';

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';

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';

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';
 

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';
 

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';
 

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'

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';

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',

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';

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';

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

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';

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';

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({

ionic/components/text-input/test/inline-labels/index.ts

@@ -7,7 +7,6 @@ import {App} from 'ionic/ionic';
 class E2EApp {
 
   submit(ev) {
-    debugger
   }
 
 }

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';

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'

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';

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';

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';
 

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';

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';
 
 

ionic/config/decorators/page.ts

@@ -1,4 +1,4 @@
-import {Component} from 'angular2/angular2'
+import {Component} from 'angular2/core'
 import {IONIC_DIRECTIVES} from '../directives';
 
 

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';

ionic/translation/translate.ts

@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/angular2';
+import {Injectable} from 'angular2/core';
 
 /**
  * @private

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';
 

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

ionic/util/form.ts

@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/angular2';
+import {Injectable} from 'angular2/core';
 
 
 /**

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';