diff --git a/src/components/card/test/advanced/app/app.module.ts b/src/components/card/test/advanced/app/app.module.ts
index a97cc075e4..7fb2e9ecf9 100644
--- a/src/components/card/test/advanced/app/app.module.ts
+++ b/src/components/card/test/advanced/app/app.module.ts
@@ -3,20 +3,17 @@ import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
 import { AppComponent } from './app.component';
-import { RootPage } from '../pages/root-page/root-page';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    RootPage
-  ]
 })
 export class AppModule {}
diff --git a/src/components/card/test/advanced/pages/root-page/root-page.module.ts b/src/components/card/test/advanced/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/card/test/advanced/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/card/test/basic/app/app.module.ts b/src/components/card/test/basic/app/app.module.ts
index a97cc075e4..7fb2e9ecf9 100644
--- a/src/components/card/test/basic/app/app.module.ts
+++ b/src/components/card/test/basic/app/app.module.ts
@@ -3,20 +3,17 @@ import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
 import { AppComponent } from './app.component';
-import { RootPage } from '../pages/root-page/root-page';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    RootPage
-  ]
 })
 export class AppModule {}
diff --git a/src/components/card/test/basic/pages/root-page/root-page.module.ts b/src/components/card/test/basic/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/card/test/basic/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/card/test/colors/app/app.module.ts b/src/components/card/test/colors/app/app.module.ts
index a97cc075e4..7fb2e9ecf9 100644
--- a/src/components/card/test/colors/app/app.module.ts
+++ b/src/components/card/test/colors/app/app.module.ts
@@ -3,20 +3,17 @@ import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
 import { AppComponent } from './app.component';
-import { RootPage } from '../pages/root-page/root-page';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    RootPage
-  ]
 })
 export class AppModule {}
diff --git a/src/components/card/test/colors/pages/root-page/root-page.module.ts b/src/components/card/test/colors/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/card/test/colors/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/card/test/images/app/app.module.ts b/src/components/card/test/images/app/app.module.ts
index a97cc075e4..7fb2e9ecf9 100644
--- a/src/components/card/test/images/app/app.module.ts
+++ b/src/components/card/test/images/app/app.module.ts
@@ -3,20 +3,17 @@ import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
 import { AppComponent } from './app.component';
-import { RootPage } from '../pages/root-page/root-page';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    RootPage
-  ]
 })
 export class AppModule {}
diff --git a/src/components/card/test/images/pages/root-page/root-page.module.ts b/src/components/card/test/images/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/card/test/images/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/card/test/list/app/app.module.ts b/src/components/card/test/list/app/app.module.ts
index a97cc075e4..7fb2e9ecf9 100644
--- a/src/components/card/test/list/app/app.module.ts
+++ b/src/components/card/test/list/app/app.module.ts
@@ -3,20 +3,17 @@ import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
 import { AppComponent } from './app.component';
-import { RootPage } from '../pages/root-page/root-page';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    RootPage
-  ]
 })
 export class AppModule {}
diff --git a/src/components/card/test/list/pages/root-page/root-page.module.ts b/src/components/card/test/list/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/card/test/list/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/checkbox/test/basic/app/app.module.ts b/src/components/checkbox/test/basic/app/app.module.ts
index a97cc075e4..7fb2e9ecf9 100644
--- a/src/components/checkbox/test/basic/app/app.module.ts
+++ b/src/components/checkbox/test/basic/app/app.module.ts
@@ -3,20 +3,17 @@ import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
 import { AppComponent } from './app.component';
-import { RootPage } from '../pages/root-page/root-page';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    RootPage
-  ]
 })
 export class AppModule {}
diff --git a/src/components/checkbox/test/basic/pages/root-page/root-page.module.ts b/src/components/checkbox/test/basic/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/checkbox/test/basic/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/chip/test/basic/app/app.module.ts b/src/components/chip/test/basic/app/app.module.ts
index a97cc075e4..7fb2e9ecf9 100644
--- a/src/components/chip/test/basic/app/app.module.ts
+++ b/src/components/chip/test/basic/app/app.module.ts
@@ -3,20 +3,17 @@ import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
 import { AppComponent } from './app.component';
-import { RootPage } from '../pages/root-page/root-page';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    RootPage
-  ]
 })
 export class AppModule {}
diff --git a/src/components/chip/test/basic/pages/root-page/root-page.module.ts b/src/components/chip/test/basic/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/chip/test/basic/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/content/test/basic/app/app.component.ts b/src/components/content/test/basic/app/app.component.ts
index dcf2f9e7e7..fdf06bf0c1 100644
--- a/src/components/content/test/basic/app/app.component.ts
+++ b/src/components/content/test/basic/app/app.component.ts
@@ -1,10 +1,10 @@
 import { Component } from '@angular/core';
 
-import { RootPage } from '../pages/root-page/root-page';
+import { PageOne } from '../pages/page-one/page-one';
 
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
 export class AppComponent {
-  root = RootPage;
+  root = PageOne;
 }
diff --git a/src/components/content/test/basic/app/app.module.ts b/src/components/content/test/basic/app/app.module.ts
index 012e962583..472cd840ec 100644
--- a/src/components/content/test/basic/app/app.module.ts
+++ b/src/components/content/test/basic/app/app.module.ts
@@ -3,40 +3,17 @@ import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
 import { AppComponent } from './app.component';
-import { Page1 } from '../pages/page1/page1';
-import { Page2 } from '../pages/page2/page2';
-import { Page3 } from '../pages/page3/page3';
-import { Page4 } from '../pages/page4/page4';
-import { RootPage } from '../pages/root-page/root-page';
-import { TabsPage } from '../pages/tabs/tabs';
-
+import { PageOneModule } from '../pages/page-one/page-one.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    Page1,
-    Page2,
-    Page3,
-    Page4,
-    RootPage,
-    TabsPage,
-    RootPage,
-    TabsPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    PageOneModule
   ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    Page1,
-    Page2,
-    Page3,
-    Page4,
-    RootPage,
-    TabsPage,
-    RootPage,
-    TabsPage
-  ]
+  bootstrap: [IonicApp]
 })
 export class AppModule {}
diff --git a/src/components/content/test/basic/pages/page4/page4.html b/src/components/content/test/basic/pages/page-five/page-five.html
similarity index 100%
rename from src/components/content/test/basic/pages/page4/page4.html
rename to src/components/content/test/basic/pages/page-five/page-five.html
diff --git a/src/components/content/test/basic/pages/page-five/page-five.module.ts b/src/components/content/test/basic/pages/page-five/page-five.module.ts
new file mode 100644
index 0000000000..d2fbf883b2
--- /dev/null
+++ b/src/components/content/test/basic/pages/page-five/page-five.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { PageFive } from './page-five';
+
+@NgModule({
+  declarations: [
+    PageFive,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageFive)
+  ]
+})
+export class PageFiveModule {}
diff --git a/src/components/content/test/basic/pages/page-five/page-five.ts b/src/components/content/test/basic/pages/page-five/page-five.ts
new file mode 100644
index 0000000000..274cf46f0e
--- /dev/null
+++ b/src/components/content/test/basic/pages/page-five/page-five.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+import { IonicPage } from '../../../../../..';
+
+@IonicPage()
+@Component({
+  templateUrl: 'page-five.html'
+})
+export class PageFive {
+  tabsPage = 'TabsPage';
+}
diff --git a/src/components/content/test/basic/pages/page3/page3.html b/src/components/content/test/basic/pages/page-four/page-four.html
similarity index 100%
rename from src/components/content/test/basic/pages/page3/page3.html
rename to src/components/content/test/basic/pages/page-four/page-four.html
diff --git a/src/components/content/test/basic/pages/page-four/page-four.module.ts b/src/components/content/test/basic/pages/page-four/page-four.module.ts
new file mode 100644
index 0000000000..c2c73b3bd8
--- /dev/null
+++ b/src/components/content/test/basic/pages/page-four/page-four.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { PageFour } from './page-four';
+
+@NgModule({
+  declarations: [
+    PageFour,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageFour)
+  ]
+})
+export class PageFourModule {}
diff --git a/src/components/content/test/basic/pages/page-four/page-four.ts b/src/components/content/test/basic/pages/page-four/page-four.ts
new file mode 100644
index 0000000000..814323d5eb
--- /dev/null
+++ b/src/components/content/test/basic/pages/page-four/page-four.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+import { IonicPage } from '../../../../../..';
+
+@IonicPage()
+@Component({
+  templateUrl: 'page-four.html'
+})
+export class PageFour {
+  page4 = 'PageFive';
+}
diff --git a/src/components/content/test/basic/pages/root-page/root-page.html b/src/components/content/test/basic/pages/page-one/page-one.html
similarity index 100%
rename from src/components/content/test/basic/pages/root-page/root-page.html
rename to src/components/content/test/basic/pages/page-one/page-one.html
diff --git a/src/components/content/test/basic/pages/page-one/page-one.module.ts b/src/components/content/test/basic/pages/page-one/page-one.module.ts
new file mode 100644
index 0000000000..b9640b7046
--- /dev/null
+++ b/src/components/content/test/basic/pages/page-one/page-one.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { PageOne } from './page-one';
+
+@NgModule({
+  declarations: [
+    PageOne,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageOne)
+  ]
+})
+export class PageOneModule {}
diff --git a/src/components/content/test/basic/pages/root-page/root-page.ts b/src/components/content/test/basic/pages/page-one/page-one.ts
similarity index 69%
rename from src/components/content/test/basic/pages/root-page/root-page.ts
rename to src/components/content/test/basic/pages/page-one/page-one.ts
index ef3df29da0..9090be79bd 100644
--- a/src/components/content/test/basic/pages/root-page/root-page.ts
+++ b/src/components/content/test/basic/pages/page-one/page-one.ts
@@ -1,16 +1,13 @@
 import { Component, ViewChild } from '@angular/core';
+import { Content, IonicPage, ScrollEvent } from '../../../../../../';
 
-import { Content, ScrollEvent } from '../../../../../../';
-
-import { Page1 } from '../page1/page1';
-
-
+@IonicPage()
 @Component({
-  templateUrl: 'root-page.html'
+  templateUrl: 'page-one.html'
 })
-export class RootPage {
+export class PageOne {
   @ViewChild(Content) content: Content;
-  page1 = Page1;
+  page1 = 'PageTwo';
   showToolbar: boolean = false;
 
   onScroll(ev: ScrollEvent) {
diff --git a/src/components/content/test/basic/pages/page2/page2.html b/src/components/content/test/basic/pages/page-three/page-three.html
similarity index 100%
rename from src/components/content/test/basic/pages/page2/page2.html
rename to src/components/content/test/basic/pages/page-three/page-three.html
diff --git a/src/components/content/test/basic/pages/page-three/page-three.module.ts b/src/components/content/test/basic/pages/page-three/page-three.module.ts
new file mode 100644
index 0000000000..b3c5a8088e
--- /dev/null
+++ b/src/components/content/test/basic/pages/page-three/page-three.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { PageThree } from './page-three';
+
+@NgModule({
+  declarations: [
+    PageThree,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageThree)
+  ]
+})
+export class PageThreeModule {}
diff --git a/src/components/content/test/basic/pages/page-three/page-three.ts b/src/components/content/test/basic/pages/page-three/page-three.ts
new file mode 100644
index 0000000000..fb2c9da13d
--- /dev/null
+++ b/src/components/content/test/basic/pages/page-three/page-three.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+import { IonicPage } from '../../../../../..';
+
+@IonicPage()
+@Component({
+  templateUrl: 'page-three.html'
+})
+export class PageThree {
+  page3 = 'PageFour';
+}
diff --git a/src/components/content/test/basic/pages/page1/page1.html b/src/components/content/test/basic/pages/page-two/page-two.html
similarity index 100%
rename from src/components/content/test/basic/pages/page1/page1.html
rename to src/components/content/test/basic/pages/page-two/page-two.html
diff --git a/src/components/content/test/basic/pages/page-two/page-two.module.ts b/src/components/content/test/basic/pages/page-two/page-two.module.ts
new file mode 100644
index 0000000000..8774af30fd
--- /dev/null
+++ b/src/components/content/test/basic/pages/page-two/page-two.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { PageTwo } from './page-two';
+
+@NgModule({
+  declarations: [
+    PageTwo,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageTwo)
+  ]
+})
+export class PageTwoModule {}
diff --git a/src/components/content/test/basic/pages/page-two/page-two.ts b/src/components/content/test/basic/pages/page-two/page-two.ts
new file mode 100644
index 0000000000..f2501bebf9
--- /dev/null
+++ b/src/components/content/test/basic/pages/page-two/page-two.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+import { IonicPage } from '../../../../../..';
+
+@IonicPage()
+@Component({
+  templateUrl: 'page-two.html'
+})
+export class PageTwo {
+  page2 = 'PageThree';
+}
diff --git a/src/components/content/test/basic/pages/page2/page2.ts b/src/components/content/test/basic/pages/page2/page2.ts
deleted file mode 100644
index 043ea25bd5..0000000000
--- a/src/components/content/test/basic/pages/page2/page2.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Component } from '@angular/core';
-
-import { Page3 } from '../page3/page3';
-
-
-@Component({
-  templateUrl: 'page2.html'
-})
-export class Page2 {
-  page3 = Page3;
-}
diff --git a/src/components/content/test/basic/pages/page3/page3.ts b/src/components/content/test/basic/pages/page3/page3.ts
deleted file mode 100644
index 1be9147b96..0000000000
--- a/src/components/content/test/basic/pages/page3/page3.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Component } from '@angular/core';
-
-import { Page4 } from '../page4/page4';
-
-
-@Component({
-  templateUrl: 'page3.html'
-})
-export class Page3 {
-  page4 = Page4;
-}
diff --git a/src/components/content/test/basic/pages/page4/page4.ts b/src/components/content/test/basic/pages/page4/page4.ts
deleted file mode 100644
index 1516a84e40..0000000000
--- a/src/components/content/test/basic/pages/page4/page4.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Component } from '@angular/core';
-
-import { TabsPage } from '../tabs/tabs';
-
-
-@Component({
-  templateUrl: 'page4.html'
-})
-export class Page4 {
-  tabsPage = TabsPage;
-}
diff --git a/src/components/content/test/basic/pages/tabs/tabs.html b/src/components/content/test/basic/pages/tabs-page/tabs-page.html
similarity index 100%
rename from src/components/content/test/basic/pages/tabs/tabs.html
rename to src/components/content/test/basic/pages/tabs-page/tabs-page.html
diff --git a/src/components/content/test/basic/pages/tabs-page/tabs-page.module.ts b/src/components/content/test/basic/pages/tabs-page/tabs-page.module.ts
new file mode 100644
index 0000000000..b708dd044a
--- /dev/null
+++ b/src/components/content/test/basic/pages/tabs-page/tabs-page.module.ts
@@ -0,0 +1,16 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { TabsPage } from './tabs-page';
+import { PageOneModule } from '../page-one/page-one.module';
+
+@NgModule({
+  declarations: [
+    TabsPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(TabsPage),
+    PageOneModule
+  ]
+})
+export class TabsPageModule {}
diff --git a/src/components/content/test/basic/pages/tabs-page/tabs-page.ts b/src/components/content/test/basic/pages/tabs-page/tabs-page.ts
new file mode 100644
index 0000000000..f312a8c20b
--- /dev/null
+++ b/src/components/content/test/basic/pages/tabs-page/tabs-page.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import { IonicPage } from '../../../../../..';
+import { PageOne } from '../page-one/page-one';
+
+@IonicPage()
+@Component({
+  templateUrl: 'tabs-page.html'
+})
+export class TabsPage {
+  rootPage = PageOne;
+  page1 = 'PageTwo';
+  page2 = 'PageThree';
+  page3 = 'PageFour';
+  page4 = 'PageFive';
+}
diff --git a/src/components/content/test/basic/pages/tabs/tabs.ts b/src/components/content/test/basic/pages/tabs/tabs.ts
deleted file mode 100644
index 54c95977fd..0000000000
--- a/src/components/content/test/basic/pages/tabs/tabs.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Component } from '@angular/core';
-
-import { RootPage } from '../root-page/root-page';
-import { Page1 } from '../page1/page1';
-import { Page2 } from '../page2/page2';
-import { Page3 } from '../page3/page3';
-import { Page4 } from '../page4/page4';
-
-
-@Component({
-  templateUrl: 'tabs.html'
-})
-export class TabsPage {
-  rootPage = RootPage;
-  page1 = Page1;
-  page2 = Page2;
-  page3 = Page3;
-  page4 = Page4;
-}
diff --git a/src/components/content/test/fullscreen/app/app.component.ts b/src/components/content/test/fullscreen/app/app.component.ts
index dcf2f9e7e7..fdf06bf0c1 100644
--- a/src/components/content/test/fullscreen/app/app.component.ts
+++ b/src/components/content/test/fullscreen/app/app.component.ts
@@ -1,10 +1,10 @@
 import { Component } from '@angular/core';
 
-import { RootPage } from '../pages/root-page/root-page';
+import { PageOne } from '../pages/page-one/page-one';
 
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
 export class AppComponent {
-  root = RootPage;
+  root = PageOne;
 }
diff --git a/src/components/content/test/fullscreen/app/app.module.ts b/src/components/content/test/fullscreen/app/app.module.ts
index 012e962583..472cd840ec 100644
--- a/src/components/content/test/fullscreen/app/app.module.ts
+++ b/src/components/content/test/fullscreen/app/app.module.ts
@@ -3,40 +3,17 @@ import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
 import { AppComponent } from './app.component';
-import { Page1 } from '../pages/page1/page1';
-import { Page2 } from '../pages/page2/page2';
-import { Page3 } from '../pages/page3/page3';
-import { Page4 } from '../pages/page4/page4';
-import { RootPage } from '../pages/root-page/root-page';
-import { TabsPage } from '../pages/tabs/tabs';
-
+import { PageOneModule } from '../pages/page-one/page-one.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    Page1,
-    Page2,
-    Page3,
-    Page4,
-    RootPage,
-    TabsPage,
-    RootPage,
-    TabsPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    PageOneModule
   ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    Page1,
-    Page2,
-    Page3,
-    Page4,
-    RootPage,
-    TabsPage,
-    RootPage,
-    TabsPage
-  ]
+  bootstrap: [IonicApp]
 })
 export class AppModule {}
diff --git a/src/components/content/test/fullscreen/pages/page4/page4.html b/src/components/content/test/fullscreen/pages/page-five/page-five.html
similarity index 100%
rename from src/components/content/test/fullscreen/pages/page4/page4.html
rename to src/components/content/test/fullscreen/pages/page-five/page-five.html
diff --git a/src/components/content/test/fullscreen/pages/page-five/page-five.module.ts b/src/components/content/test/fullscreen/pages/page-five/page-five.module.ts
new file mode 100644
index 0000000000..d2fbf883b2
--- /dev/null
+++ b/src/components/content/test/fullscreen/pages/page-five/page-five.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { PageFive } from './page-five';
+
+@NgModule({
+  declarations: [
+    PageFive,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageFive)
+  ]
+})
+export class PageFiveModule {}
diff --git a/src/components/content/test/fullscreen/pages/page-five/page-five.ts b/src/components/content/test/fullscreen/pages/page-five/page-five.ts
new file mode 100644
index 0000000000..274cf46f0e
--- /dev/null
+++ b/src/components/content/test/fullscreen/pages/page-five/page-five.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+import { IonicPage } from '../../../../../..';
+
+@IonicPage()
+@Component({
+  templateUrl: 'page-five.html'
+})
+export class PageFive {
+  tabsPage = 'TabsPage';
+}
diff --git a/src/components/content/test/fullscreen/pages/page3/page3.html b/src/components/content/test/fullscreen/pages/page-four/page-four.html
similarity index 100%
rename from src/components/content/test/fullscreen/pages/page3/page3.html
rename to src/components/content/test/fullscreen/pages/page-four/page-four.html
diff --git a/src/components/content/test/fullscreen/pages/page-four/page-four.module.ts b/src/components/content/test/fullscreen/pages/page-four/page-four.module.ts
new file mode 100644
index 0000000000..c2c73b3bd8
--- /dev/null
+++ b/src/components/content/test/fullscreen/pages/page-four/page-four.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { PageFour } from './page-four';
+
+@NgModule({
+  declarations: [
+    PageFour,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageFour)
+  ]
+})
+export class PageFourModule {}
diff --git a/src/components/content/test/fullscreen/pages/page-four/page-four.ts b/src/components/content/test/fullscreen/pages/page-four/page-four.ts
new file mode 100644
index 0000000000..814323d5eb
--- /dev/null
+++ b/src/components/content/test/fullscreen/pages/page-four/page-four.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+import { IonicPage } from '../../../../../..';
+
+@IonicPage()
+@Component({
+  templateUrl: 'page-four.html'
+})
+export class PageFour {
+  page4 = 'PageFive';
+}
diff --git a/src/components/content/test/fullscreen/pages/root-page/root-page.html b/src/components/content/test/fullscreen/pages/page-one/page-one.html
similarity index 100%
rename from src/components/content/test/fullscreen/pages/root-page/root-page.html
rename to src/components/content/test/fullscreen/pages/page-one/page-one.html
diff --git a/src/components/content/test/fullscreen/pages/page-one/page-one.module.ts b/src/components/content/test/fullscreen/pages/page-one/page-one.module.ts
new file mode 100644
index 0000000000..b9640b7046
--- /dev/null
+++ b/src/components/content/test/fullscreen/pages/page-one/page-one.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { PageOne } from './page-one';
+
+@NgModule({
+  declarations: [
+    PageOne,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageOne)
+  ]
+})
+export class PageOneModule {}
diff --git a/src/components/content/test/fullscreen/pages/root-page/root-page.ts b/src/components/content/test/fullscreen/pages/page-one/page-one.ts
similarity index 69%
rename from src/components/content/test/fullscreen/pages/root-page/root-page.ts
rename to src/components/content/test/fullscreen/pages/page-one/page-one.ts
index ef3df29da0..9090be79bd 100644
--- a/src/components/content/test/fullscreen/pages/root-page/root-page.ts
+++ b/src/components/content/test/fullscreen/pages/page-one/page-one.ts
@@ -1,16 +1,13 @@
 import { Component, ViewChild } from '@angular/core';
+import { Content, IonicPage, ScrollEvent } from '../../../../../../';
 
-import { Content, ScrollEvent } from '../../../../../../';
-
-import { Page1 } from '../page1/page1';
-
-
+@IonicPage()
 @Component({
-  templateUrl: 'root-page.html'
+  templateUrl: 'page-one.html'
 })
-export class RootPage {
+export class PageOne {
   @ViewChild(Content) content: Content;
-  page1 = Page1;
+  page1 = 'PageTwo';
   showToolbar: boolean = false;
 
   onScroll(ev: ScrollEvent) {
diff --git a/src/components/content/test/fullscreen/pages/page2/page2.html b/src/components/content/test/fullscreen/pages/page-three/page-three.html
similarity index 100%
rename from src/components/content/test/fullscreen/pages/page2/page2.html
rename to src/components/content/test/fullscreen/pages/page-three/page-three.html
diff --git a/src/components/content/test/fullscreen/pages/page-three/page-three.module.ts b/src/components/content/test/fullscreen/pages/page-three/page-three.module.ts
new file mode 100644
index 0000000000..b3c5a8088e
--- /dev/null
+++ b/src/components/content/test/fullscreen/pages/page-three/page-three.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { PageThree } from './page-three';
+
+@NgModule({
+  declarations: [
+    PageThree,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageThree)
+  ]
+})
+export class PageThreeModule {}
diff --git a/src/components/content/test/fullscreen/pages/page-three/page-three.ts b/src/components/content/test/fullscreen/pages/page-three/page-three.ts
new file mode 100644
index 0000000000..fb2c9da13d
--- /dev/null
+++ b/src/components/content/test/fullscreen/pages/page-three/page-three.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+import { IonicPage } from '../../../../../..';
+
+@IonicPage()
+@Component({
+  templateUrl: 'page-three.html'
+})
+export class PageThree {
+  page3 = 'PageFour';
+}
diff --git a/src/components/content/test/fullscreen/pages/page1/page1.html b/src/components/content/test/fullscreen/pages/page-two/page-two.html
similarity index 100%
rename from src/components/content/test/fullscreen/pages/page1/page1.html
rename to src/components/content/test/fullscreen/pages/page-two/page-two.html
diff --git a/src/components/content/test/fullscreen/pages/page-two/page-two.module.ts b/src/components/content/test/fullscreen/pages/page-two/page-two.module.ts
new file mode 100644
index 0000000000..8774af30fd
--- /dev/null
+++ b/src/components/content/test/fullscreen/pages/page-two/page-two.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { PageTwo } from './page-two';
+
+@NgModule({
+  declarations: [
+    PageTwo,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageTwo)
+  ]
+})
+export class PageTwoModule {}
diff --git a/src/components/content/test/basic/pages/page1/page1.ts b/src/components/content/test/fullscreen/pages/page-two/page-two.ts
similarity index 57%
rename from src/components/content/test/basic/pages/page1/page1.ts
rename to src/components/content/test/fullscreen/pages/page-two/page-two.ts
index 6b45fe8f45..bc0b93210c 100644
--- a/src/components/content/test/basic/pages/page1/page1.ts
+++ b/src/components/content/test/fullscreen/pages/page-two/page-two.ts
@@ -1,11 +1,10 @@
 import { Component } from '@angular/core';
+import { IonicPage } from '../../../../../..';
 
-import { Page2 } from '../page2/page2';
-
-
+@IonicPage()
 @Component({
   templateUrl: 'page1.html'
 })
 export class Page1 {
-  page2 = Page2;
+  page2 = 'PageThree';
 }
diff --git a/src/components/content/test/fullscreen/pages/page1/page1.ts b/src/components/content/test/fullscreen/pages/page1/page1.ts
deleted file mode 100644
index 6b45fe8f45..0000000000
--- a/src/components/content/test/fullscreen/pages/page1/page1.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Component } from '@angular/core';
-
-import { Page2 } from '../page2/page2';
-
-
-@Component({
-  templateUrl: 'page1.html'
-})
-export class Page1 {
-  page2 = Page2;
-}
diff --git a/src/components/content/test/fullscreen/pages/page2/page2.ts b/src/components/content/test/fullscreen/pages/page2/page2.ts
deleted file mode 100644
index 043ea25bd5..0000000000
--- a/src/components/content/test/fullscreen/pages/page2/page2.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Component } from '@angular/core';
-
-import { Page3 } from '../page3/page3';
-
-
-@Component({
-  templateUrl: 'page2.html'
-})
-export class Page2 {
-  page3 = Page3;
-}
diff --git a/src/components/content/test/fullscreen/pages/page3/page3.ts b/src/components/content/test/fullscreen/pages/page3/page3.ts
deleted file mode 100644
index 1be9147b96..0000000000
--- a/src/components/content/test/fullscreen/pages/page3/page3.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Component } from '@angular/core';
-
-import { Page4 } from '../page4/page4';
-
-
-@Component({
-  templateUrl: 'page3.html'
-})
-export class Page3 {
-  page4 = Page4;
-}
diff --git a/src/components/content/test/fullscreen/pages/page4/page4.ts b/src/components/content/test/fullscreen/pages/page4/page4.ts
deleted file mode 100644
index 1516a84e40..0000000000
--- a/src/components/content/test/fullscreen/pages/page4/page4.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Component } from '@angular/core';
-
-import { TabsPage } from '../tabs/tabs';
-
-
-@Component({
-  templateUrl: 'page4.html'
-})
-export class Page4 {
-  tabsPage = TabsPage;
-}
diff --git a/src/components/content/test/fullscreen/pages/tabs/tabs.html b/src/components/content/test/fullscreen/pages/tabs-page/tabs-page.html
similarity index 100%
rename from src/components/content/test/fullscreen/pages/tabs/tabs.html
rename to src/components/content/test/fullscreen/pages/tabs-page/tabs-page.html
diff --git a/src/components/content/test/fullscreen/pages/tabs-page/tabs-page.module.ts b/src/components/content/test/fullscreen/pages/tabs-page/tabs-page.module.ts
new file mode 100644
index 0000000000..b708dd044a
--- /dev/null
+++ b/src/components/content/test/fullscreen/pages/tabs-page/tabs-page.module.ts
@@ -0,0 +1,16 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { TabsPage } from './tabs-page';
+import { PageOneModule } from '../page-one/page-one.module';
+
+@NgModule({
+  declarations: [
+    TabsPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(TabsPage),
+    PageOneModule
+  ]
+})
+export class TabsPageModule {}
diff --git a/src/components/content/test/fullscreen/pages/tabs-page/tabs-page.ts b/src/components/content/test/fullscreen/pages/tabs-page/tabs-page.ts
new file mode 100644
index 0000000000..05fa618284
--- /dev/null
+++ b/src/components/content/test/fullscreen/pages/tabs-page/tabs-page.ts
@@ -0,0 +1,16 @@
+import { Component } from '@angular/core';
+import { IonicPage } from '../../../../../..';
+
+import { PageOne } from '../page-one/page-one';
+
+@IonicPage()
+@Component({
+  templateUrl: 'tabs-page.html'
+})
+export class TabsPage {
+  rootPage = PageOne;
+  page1 = 'PageTwo';
+  page2 = 'PageThree';
+  page3 = 'PageFour';
+  page4 = 'PageFive';
+}
diff --git a/src/components/content/test/fullscreen/pages/tabs/tabs.ts b/src/components/content/test/fullscreen/pages/tabs/tabs.ts
deleted file mode 100644
index 54c95977fd..0000000000
--- a/src/components/content/test/fullscreen/pages/tabs/tabs.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Component } from '@angular/core';
-
-import { RootPage } from '../root-page/root-page';
-import { Page1 } from '../page1/page1';
-import { Page2 } from '../page2/page2';
-import { Page3 } from '../page3/page3';
-import { Page4 } from '../page4/page4';
-
-
-@Component({
-  templateUrl: 'tabs.html'
-})
-export class TabsPage {
-  rootPage = RootPage;
-  page1 = Page1;
-  page2 = Page2;
-  page3 = Page3;
-  page4 = Page4;
-}
diff --git a/src/components/datetime/test/basic/app/app.component.ts b/src/components/datetime/test/basic/app/app.component.ts
index dcf2f9e7e7..1318493908 100644
--- a/src/components/datetime/test/basic/app/app.component.ts
+++ b/src/components/datetime/test/basic/app/app.component.ts
@@ -1,5 +1,4 @@
 import { Component } from '@angular/core';
-
 import { RootPage } from '../pages/root-page/root-page';
 
 @Component({
diff --git a/src/components/datetime/test/basic/app/app.module.ts b/src/components/datetime/test/basic/app/app.module.ts
index a97cc075e4..7fb2e9ecf9 100644
--- a/src/components/datetime/test/basic/app/app.module.ts
+++ b/src/components/datetime/test/basic/app/app.module.ts
@@ -3,20 +3,17 @@ import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
 import { AppComponent } from './app.component';
-import { RootPage } from '../pages/root-page/root-page';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    RootPage
-  ]
 })
 export class AppModule {}
diff --git a/src/components/datetime/test/basic/pages/root-page/root-page.module.ts b/src/components/datetime/test/basic/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/datetime/test/basic/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/datetime/test/labels/app/app.module.ts b/src/components/datetime/test/labels/app/app.module.ts
index a97cc075e4..30df6df8e7 100644
--- a/src/components/datetime/test/labels/app/app.module.ts
+++ b/src/components/datetime/test/labels/app/app.module.ts
@@ -3,20 +3,17 @@ import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
 import { AppComponent } from './app.component';
-import { RootPage } from '../pages/root-page/root-page';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
     AppComponent,
-    RootPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    RootPage
-  ]
+  bootstrap: [IonicApp]
 })
 export class AppModule {}
diff --git a/src/components/datetime/test/labels/pages/root-page/root-page.module.ts b/src/components/datetime/test/labels/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/datetime/test/labels/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/fab/test/basic/app/app.module.ts b/src/components/fab/test/basic/app/app.module.ts
index a97cc075e4..30df6df8e7 100644
--- a/src/components/fab/test/basic/app/app.module.ts
+++ b/src/components/fab/test/basic/app/app.module.ts
@@ -3,20 +3,17 @@ import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
 import { AppComponent } from './app.component';
-import { RootPage } from '../pages/root-page/root-page';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
     AppComponent,
-    RootPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    RootPage
-  ]
+  bootstrap: [IonicApp]
 })
 export class AppModule {}
diff --git a/src/components/fab/test/basic/pages/root-page/root-page.module.ts b/src/components/fab/test/basic/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/fab/test/basic/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/grid/test/basic/app/app.module.ts b/src/components/grid/test/basic/app/app.module.ts
index a97cc075e4..7f76975a26 100644
--- a/src/components/grid/test/basic/app/app.module.ts
+++ b/src/components/grid/test/basic/app/app.module.ts
@@ -3,20 +3,17 @@ import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
 import { AppComponent } from './app.component';
-import { RootPage } from '../pages/root-page/root-page';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    RootPage
-  ]
+  bootstrap: [IonicApp]
 })
 export class AppModule {}
diff --git a/src/components/grid/test/basic/pages/root-page/root-page.module.ts b/src/components/grid/test/basic/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/grid/test/basic/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/img/test/basic/app/app.module.ts b/src/components/img/test/basic/app/app.module.ts
index cb678aeefc..7f76975a26 100644
--- a/src/components/img/test/basic/app/app.module.ts
+++ b/src/components/img/test/basic/app/app.module.ts
@@ -3,23 +3,17 @@ import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
 import { AppComponent } from './app.component';
-import { RootPage } from '../pages/root-page/root-page';
-import { MyImg } from '../pages/my-img/my-img';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage,
-    MyImg
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    RootPage,
-    MyImg
-  ]
+  bootstrap: [IonicApp]
 })
 export class AppModule {}
diff --git a/src/components/img/test/basic/pages/my-img/my-img.module.ts b/src/components/img/test/basic/pages/my-img/my-img.module.ts
new file mode 100644
index 0000000000..db742bc313
--- /dev/null
+++ b/src/components/img/test/basic/pages/my-img/my-img.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { MyImg } from './my-img';
+
+@NgModule({
+  declarations: [
+    MyImg,
+  ],
+  imports: [
+    IonicPageModule.forChild(MyImg)
+  ]
+})
+export class MyImgModule {}
diff --git a/src/components/img/test/basic/pages/my-img/my-img.ts b/src/components/img/test/basic/pages/my-img/my-img.ts
index e7f3e2e386..0698c37005 100644
--- a/src/components/img/test/basic/pages/my-img/my-img.ts
+++ b/src/components/img/test/basic/pages/my-img/my-img.ts
@@ -1,6 +1,5 @@
 import { Component, Input } from '@angular/core';
 
-
 @Component({
   selector: '<my-img>',
   template: '<ion-img [width]="width" [height]="height" [src]="src"></ion-img>'
diff --git a/src/components/img/test/basic/pages/root-page/root-page.module.ts b/src/components/img/test/basic/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..4f2feb406a
--- /dev/null
+++ b/src/components/img/test/basic/pages/root-page/root-page.module.ts
@@ -0,0 +1,16 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+import { MyImgModule } from '../my-img/my-img.module';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage),
+    MyImgModule
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/input/test/clear-after-edit/app/app.module.ts b/src/components/input/test/clear-after-edit/app/app.module.ts
index a97cc075e4..7fb2e9ecf9 100644
--- a/src/components/input/test/clear-after-edit/app/app.module.ts
+++ b/src/components/input/test/clear-after-edit/app/app.module.ts
@@ -3,20 +3,17 @@ import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
 import { AppComponent } from './app.component';
-import { RootPage } from '../pages/root-page/root-page';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    RootPage
-  ]
 })
 export class AppModule {}
diff --git a/src/components/input/test/clear-after-edit/pages/root-page/root-page.module.ts b/src/components/input/test/clear-after-edit/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/input/test/clear-after-edit/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/input/test/clear-input/app/app.module.ts b/src/components/input/test/clear-input/app/app.module.ts
index a97cc075e4..7f76975a26 100644
--- a/src/components/input/test/clear-input/app/app.module.ts
+++ b/src/components/input/test/clear-input/app/app.module.ts
@@ -3,20 +3,17 @@ import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
 import { AppComponent } from './app.component';
-import { RootPage } from '../pages/root-page/root-page';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    RootPage
-  ]
+  bootstrap: [IonicApp]
 })
 export class AppModule {}
diff --git a/src/components/input/test/clear-input/pages/root-page/root-page.module.ts b/src/components/input/test/clear-input/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/input/test/clear-input/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/input/test/events/app/app.component.ts b/src/components/input/test/events/app/app.component.ts
new file mode 100644
index 0000000000..62fd18e310
--- /dev/null
+++ b/src/components/input/test/events/app/app.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { RootPage } from '../pages/root-page/root-page';
+
+@Component({
+  template: '<ion-nav [root]="rootPage"></ion-nav>'
+})
+export class AppComponent {
+  rootPage = RootPage;
+}
diff --git a/src/components/input/test/events/app/app.module.ts b/src/components/input/test/events/app/app.module.ts
index ca2bdc1886..7f76975a26 100644
--- a/src/components/input/test/events/app/app.module.ts
+++ b/src/components/input/test/events/app/app.module.ts
@@ -1,28 +1,19 @@
-import { Component, NgModule } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { RootPage } from '../pages/root-page/root-page';
-
-@Component({
-  template: '<ion-nav [root]="rootPage"></ion-nav>'
-})
-export class AppComponent {
-  rootPage = RootPage;
-}
+import { AppComponent } from './app.component';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    RootPage
-  ]
+  bootstrap: [IonicApp]
 })
 export class AppModule {}
diff --git a/src/components/input/test/events/pages/root-page/root-page.module.ts b/src/components/input/test/events/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/input/test/events/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/input/test/fixed-inline-labels/app/app.component.ts b/src/components/input/test/fixed-inline-labels/app/app.component.ts
new file mode 100644
index 0000000000..dcf2f9e7e7
--- /dev/null
+++ b/src/components/input/test/fixed-inline-labels/app/app.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+import { RootPage } from '../pages/root-page/root-page';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = RootPage;
+}
diff --git a/src/components/input/test/fixed-inline-labels/app/app.module.ts b/src/components/input/test/fixed-inline-labels/app/app.module.ts
index bbf8e0f769..7f76975a26 100644
--- a/src/components/input/test/fixed-inline-labels/app/app.module.ts
+++ b/src/components/input/test/fixed-inline-labels/app/app.module.ts
@@ -1,28 +1,19 @@
-import { Component, NgModule } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import { IonicApp, IonicModule } from '../../../../../';
+import { IonicApp, IonicModule } from '../../../../..';
 
-import { RootPage } from '../pages/root-page/root-page';
-
-@Component({
-  template: '<ion-nav [root]="root"></ion-nav>'
-})
-export class AppComponent {
-  root = RootPage;
-}
+import { AppComponent } from './app.component';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    RootPage
-  ]
+  bootstrap: [IonicApp]
 })
 export class AppModule {}
diff --git a/src/components/input/test/fixed-inline-labels/pages/root-page/root-page.module.ts b/src/components/input/test/fixed-inline-labels/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/input/test/fixed-inline-labels/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/input/test/floating-labels/app/app.component.ts b/src/components/input/test/floating-labels/app/app.component.ts
new file mode 100644
index 0000000000..dcf2f9e7e7
--- /dev/null
+++ b/src/components/input/test/floating-labels/app/app.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+import { RootPage } from '../pages/root-page/root-page';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = RootPage;
+}
diff --git a/src/components/input/test/floating-labels/app/app.module.ts b/src/components/input/test/floating-labels/app/app.module.ts
index 3e5fb63209..7f76975a26 100644
--- a/src/components/input/test/floating-labels/app/app.module.ts
+++ b/src/components/input/test/floating-labels/app/app.module.ts
@@ -1,28 +1,19 @@
-import { Component, NgModule } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import { IonicApp, IonicModule } from '../../../../../';
+import { IonicApp, IonicModule } from '../../../../..';
 
-import { RootPage } from '../pages/root-page/root-page';
-
-@Component({
-  template: '<ion-nav [root]="rootPage"></ion-nav>'
-})
-export class AppComponent {
-  rootPage = RootPage;
-}
+import { AppComponent } from './app.component';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    RootPage
-  ]
+  bootstrap: [IonicApp]
 })
 export class AppModule {}
diff --git a/src/components/input/test/floating-labels/pages/root-page/root-page.module.ts b/src/components/input/test/floating-labels/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/input/test/floating-labels/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/input/test/footer-inputs/app/app.component.ts b/src/components/input/test/footer-inputs/app/app.component.ts
new file mode 100644
index 0000000000..dcf2f9e7e7
--- /dev/null
+++ b/src/components/input/test/footer-inputs/app/app.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+import { RootPage } from '../pages/root-page/root-page';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = RootPage;
+}
diff --git a/src/components/input/test/footer-inputs/app/app.module.ts b/src/components/input/test/footer-inputs/app/app.module.ts
index ca2bdc1886..7f76975a26 100644
--- a/src/components/input/test/footer-inputs/app/app.module.ts
+++ b/src/components/input/test/footer-inputs/app/app.module.ts
@@ -1,28 +1,19 @@
-import { Component, NgModule } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { RootPage } from '../pages/root-page/root-page';
-
-@Component({
-  template: '<ion-nav [root]="rootPage"></ion-nav>'
-})
-export class AppComponent {
-  rootPage = RootPage;
-}
+import { AppComponent } from './app.component';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    RootPage
-  ]
+  bootstrap: [IonicApp]
 })
 export class AppModule {}
diff --git a/src/components/input/test/footer-inputs/pages/root-page/root-page.module.ts b/src/components/input/test/footer-inputs/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/input/test/footer-inputs/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/input/test/form-inputs/app/app.component.ts b/src/components/input/test/form-inputs/app/app.component.ts
new file mode 100644
index 0000000000..dcf2f9e7e7
--- /dev/null
+++ b/src/components/input/test/form-inputs/app/app.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+import { RootPage } from '../pages/root-page/root-page';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = RootPage;
+}
diff --git a/src/components/input/test/form-inputs/app/app.module.ts b/src/components/input/test/form-inputs/app/app.module.ts
index 91edc82841..7f76975a26 100644
--- a/src/components/input/test/form-inputs/app/app.module.ts
+++ b/src/components/input/test/form-inputs/app/app.module.ts
@@ -1,28 +1,19 @@
-import { Component, NgModule } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { RootPage } from '../pages/root-page/root-page';
-
-@Component({
-  template: '<ion-nav [root]="root"></ion-nav>'
-})
-export class AppComponent {
-  root = RootPage;
-}
+import { AppComponent } from './app.component';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    RootPage
-  ]
+  bootstrap: [IonicApp]
 })
 export class AppModule {}
diff --git a/src/components/input/test/form-inputs/pages/root-page/root-page.module.ts b/src/components/input/test/form-inputs/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/input/test/form-inputs/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/input/test/highlight/app/app.component.ts b/src/components/input/test/highlight/app/app.component.ts
new file mode 100644
index 0000000000..dcf2f9e7e7
--- /dev/null
+++ b/src/components/input/test/highlight/app/app.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+import { RootPage } from '../pages/root-page/root-page';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = RootPage;
+}
diff --git a/src/components/input/test/highlight/app/app.module.ts b/src/components/input/test/highlight/app/app.module.ts
index 7b3247e989..7f76975a26 100644
--- a/src/components/input/test/highlight/app/app.module.ts
+++ b/src/components/input/test/highlight/app/app.module.ts
@@ -1,29 +1,19 @@
-import { Component, NgModule } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { RootPage } from '../pages/root-page/root-page';
-
-@Component({
-  template: '<ion-nav [root]="root"></ion-nav>'
-})
-export class AppComponent {
-  root = RootPage;
-}
+import { AppComponent } from './app.component';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    AppComponent,
-    RootPage
-  ]
+  bootstrap: [IonicApp]
 })
 export class AppModule {}
diff --git a/src/components/input/test/highlight/pages/root-page/root-page.module.ts b/src/components/input/test/highlight/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/input/test/highlight/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/input/test/inline-labels/app/app.component.ts b/src/components/input/test/inline-labels/app/app.component.ts
new file mode 100644
index 0000000000..dcf2f9e7e7
--- /dev/null
+++ b/src/components/input/test/inline-labels/app/app.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+import { RootPage } from '../pages/root-page/root-page';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = RootPage;
+}
diff --git a/src/components/input/test/inline-labels/app/app.module.ts b/src/components/input/test/inline-labels/app/app.module.ts
index ca2bdc1886..7f76975a26 100644
--- a/src/components/input/test/inline-labels/app/app.module.ts
+++ b/src/components/input/test/inline-labels/app/app.module.ts
@@ -1,28 +1,19 @@
-import { Component, NgModule } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { RootPage } from '../pages/root-page/root-page';
-
-@Component({
-  template: '<ion-nav [root]="rootPage"></ion-nav>'
-})
-export class AppComponent {
-  rootPage = RootPage;
-}
+import { AppComponent } from './app.component';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    RootPage
-  ]
+  bootstrap: [IonicApp]
 })
 export class AppModule {}
diff --git a/src/components/input/test/inline-labels/pages/root-page/root-page.module.ts b/src/components/input/test/inline-labels/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/input/test/inline-labels/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/input/test/inset-inputs/app/app.component.ts b/src/components/input/test/inset-inputs/app/app.component.ts
new file mode 100644
index 0000000000..dcf2f9e7e7
--- /dev/null
+++ b/src/components/input/test/inset-inputs/app/app.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+import { RootPage } from '../pages/root-page/root-page';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = RootPage;
+}
diff --git a/src/components/input/test/inset-inputs/app/app.module.ts b/src/components/input/test/inset-inputs/app/app.module.ts
index 5fe591a3ea..7f76975a26 100644
--- a/src/components/input/test/inset-inputs/app/app.module.ts
+++ b/src/components/input/test/inset-inputs/app/app.module.ts
@@ -1,29 +1,19 @@
-import { Component, NgModule } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { RootPage } from '../pages/root-page/root-page';
-
-@Component({
-  template: '<ion-nav [root]="rootPage"></ion-nav>'
-})
-export class AppComponent {
-  rootPage = RootPage;
-}
+import { AppComponent } from './app.component';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    AppComponent,
-    RootPage
-  ]
+  bootstrap: [IonicApp]
 })
 export class AppModule {}
diff --git a/src/components/input/test/inset-inputs/pages/root-page/root-page.module.ts b/src/components/input/test/inset-inputs/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/input/test/inset-inputs/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/input/test/placeholder-labels/app/app.component.ts b/src/components/input/test/placeholder-labels/app/app.component.ts
new file mode 100644
index 0000000000..dcf2f9e7e7
--- /dev/null
+++ b/src/components/input/test/placeholder-labels/app/app.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+import { RootPage } from '../pages/root-page/root-page';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = RootPage;
+}
diff --git a/src/components/input/test/placeholder-labels/app/app.module.ts b/src/components/input/test/placeholder-labels/app/app.module.ts
index 5fe591a3ea..7f76975a26 100644
--- a/src/components/input/test/placeholder-labels/app/app.module.ts
+++ b/src/components/input/test/placeholder-labels/app/app.module.ts
@@ -1,29 +1,19 @@
-import { Component, NgModule } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { RootPage } from '../pages/root-page/root-page';
-
-@Component({
-  template: '<ion-nav [root]="rootPage"></ion-nav>'
-})
-export class AppComponent {
-  rootPage = RootPage;
-}
+import { AppComponent } from './app.component';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    AppComponent,
-    RootPage
-  ]
+  bootstrap: [IonicApp]
 })
 export class AppModule {}
diff --git a/src/components/input/test/placeholder-labels/pages/root-page/root-page.module.ts b/src/components/input/test/placeholder-labels/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/input/test/placeholder-labels/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/input/test/stacked-labels/app/app.component.ts b/src/components/input/test/stacked-labels/app/app.component.ts
new file mode 100644
index 0000000000..dcf2f9e7e7
--- /dev/null
+++ b/src/components/input/test/stacked-labels/app/app.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+import { RootPage } from '../pages/root-page/root-page';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = RootPage;
+}
diff --git a/src/components/input/test/stacked-labels/app/app.module.ts b/src/components/input/test/stacked-labels/app/app.module.ts
index 7b3247e989..7f76975a26 100644
--- a/src/components/input/test/stacked-labels/app/app.module.ts
+++ b/src/components/input/test/stacked-labels/app/app.module.ts
@@ -1,29 +1,19 @@
-import { Component, NgModule } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { RootPage } from '../pages/root-page/root-page';
-
-@Component({
-  template: '<ion-nav [root]="root"></ion-nav>'
-})
-export class AppComponent {
-  root = RootPage;
-}
+import { AppComponent } from './app.component';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    AppComponent,
-    RootPage
-  ]
+  bootstrap: [IonicApp]
 })
 export class AppModule {}
diff --git a/src/components/input/test/stacked-labels/pages/root-page/root-page.module.ts b/src/components/input/test/stacked-labels/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/input/test/stacked-labels/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/item/test/buttons/app/app.component.ts b/src/components/item/test/buttons/app/app.component.ts
new file mode 100644
index 0000000000..1318493908
--- /dev/null
+++ b/src/components/item/test/buttons/app/app.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { RootPage } from '../pages/root-page/root-page';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = RootPage;
+}
diff --git a/src/components/item/test/buttons/app/app.module.ts b/src/components/item/test/buttons/app/app.module.ts
index 5fe591a3ea..7fb2e9ecf9 100644
--- a/src/components/item/test/buttons/app/app.module.ts
+++ b/src/components/item/test/buttons/app/app.module.ts
@@ -1,29 +1,19 @@
-import { Component, NgModule } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { RootPage } from '../pages/root-page/root-page';
-
-@Component({
-  template: '<ion-nav [root]="rootPage"></ion-nav>'
-})
-export class AppComponent {
-  rootPage = RootPage;
-}
+import { AppComponent } from './app.component';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    AppComponent,
-    RootPage
-  ]
 })
 export class AppModule {}
diff --git a/src/components/item/test/buttons/pages/root-page/root-page.module.ts b/src/components/item/test/buttons/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/item/test/buttons/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/item/test/colors/app/app.component.ts b/src/components/item/test/colors/app/app.component.ts
new file mode 100644
index 0000000000..1318493908
--- /dev/null
+++ b/src/components/item/test/colors/app/app.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { RootPage } from '../pages/root-page/root-page';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = RootPage;
+}
diff --git a/src/components/item/test/colors/app/app.module.ts b/src/components/item/test/colors/app/app.module.ts
index 5fe591a3ea..7fb2e9ecf9 100644
--- a/src/components/item/test/colors/app/app.module.ts
+++ b/src/components/item/test/colors/app/app.module.ts
@@ -1,29 +1,19 @@
-import { Component, NgModule } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { RootPage } from '../pages/root-page/root-page';
-
-@Component({
-  template: '<ion-nav [root]="rootPage"></ion-nav>'
-})
-export class AppComponent {
-  rootPage = RootPage;
-}
+import { AppComponent } from './app.component';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    AppComponent,
-    RootPage
-  ]
 })
 export class AppModule {}
diff --git a/src/components/item/test/colors/pages/root-page/root-page.module.ts b/src/components/item/test/colors/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/item/test/colors/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/item/test/dividers/app/app.component.ts b/src/components/item/test/dividers/app/app.component.ts
new file mode 100644
index 0000000000..1318493908
--- /dev/null
+++ b/src/components/item/test/dividers/app/app.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { RootPage } from '../pages/root-page/root-page';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = RootPage;
+}
diff --git a/src/components/item/test/dividers/app/app.module.ts b/src/components/item/test/dividers/app/app.module.ts
index 5fe591a3ea..7fb2e9ecf9 100644
--- a/src/components/item/test/dividers/app/app.module.ts
+++ b/src/components/item/test/dividers/app/app.module.ts
@@ -1,29 +1,19 @@
-import { Component, NgModule } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { RootPage } from '../pages/root-page/root-page';
-
-@Component({
-  template: '<ion-nav [root]="rootPage"></ion-nav>'
-})
-export class AppComponent {
-  rootPage = RootPage;
-}
+import { AppComponent } from './app.component';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    AppComponent,
-    RootPage
-  ]
 })
 export class AppModule {}
diff --git a/src/components/item/test/dividers/pages/root-page/root-page.module.ts b/src/components/item/test/dividers/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/item/test/dividers/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/item/test/icons/app/app.component.ts b/src/components/item/test/icons/app/app.component.ts
new file mode 100644
index 0000000000..1318493908
--- /dev/null
+++ b/src/components/item/test/icons/app/app.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { RootPage } from '../pages/root-page/root-page';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = RootPage;
+}
diff --git a/src/components/item/test/icons/app/app.module.ts b/src/components/item/test/icons/app/app.module.ts
index 5fe591a3ea..7fb2e9ecf9 100644
--- a/src/components/item/test/icons/app/app.module.ts
+++ b/src/components/item/test/icons/app/app.module.ts
@@ -1,29 +1,19 @@
-import { Component, NgModule } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { RootPage } from '../pages/root-page/root-page';
-
-@Component({
-  template: '<ion-nav [root]="rootPage"></ion-nav>'
-})
-export class AppComponent {
-  rootPage = RootPage;
-}
+import { AppComponent } from './app.component';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    AppComponent,
-    RootPage
-  ]
 })
 export class AppModule {}
diff --git a/src/components/item/test/icons/pages/root-page/root-page.module.ts b/src/components/item/test/icons/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/item/test/icons/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/item/test/images/app/app.component.ts b/src/components/item/test/images/app/app.component.ts
new file mode 100644
index 0000000000..1318493908
--- /dev/null
+++ b/src/components/item/test/images/app/app.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { RootPage } from '../pages/root-page/root-page';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = RootPage;
+}
diff --git a/src/components/item/test/images/app/app.module.ts b/src/components/item/test/images/app/app.module.ts
index 5fe591a3ea..7fb2e9ecf9 100644
--- a/src/components/item/test/images/app/app.module.ts
+++ b/src/components/item/test/images/app/app.module.ts
@@ -1,29 +1,19 @@
-import { Component, NgModule } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { RootPage } from '../pages/root-page/root-page';
-
-@Component({
-  template: '<ion-nav [root]="rootPage"></ion-nav>'
-})
-export class AppComponent {
-  rootPage = RootPage;
-}
+import { AppComponent } from './app.component';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    AppComponent,
-    RootPage
-  ]
 })
 export class AppModule {}
diff --git a/src/components/item/test/images/pages/root-page/root-page.module.ts b/src/components/item/test/images/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/item/test/images/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/item/test/inputs/app/app.component.ts b/src/components/item/test/inputs/app/app.component.ts
new file mode 100644
index 0000000000..1318493908
--- /dev/null
+++ b/src/components/item/test/inputs/app/app.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { RootPage } from '../pages/root-page/root-page';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = RootPage;
+}
diff --git a/src/components/item/test/inputs/app/app.module.ts b/src/components/item/test/inputs/app/app.module.ts
index b87e5fbaa3..7fb2e9ecf9 100644
--- a/src/components/item/test/inputs/app/app.module.ts
+++ b/src/components/item/test/inputs/app/app.module.ts
@@ -1,30 +1,19 @@
-import { Component, NgModule } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { RootPage } from '../pages/root-page/root-page';
-
-
-@Component({
-  template: '<ion-nav [root]="rootPage"></ion-nav>'
-})
-export class AppComponent {
-  rootPage = RootPage;
-}
+import { AppComponent } from './app.component';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    AppComponent,
-    RootPage
-  ]
 })
 export class AppModule {}
diff --git a/src/components/item/test/inputs/pages/root-page/root-page.module.ts b/src/components/item/test/inputs/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/item/test/inputs/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/item/test/media/app/app.component.ts b/src/components/item/test/media/app/app.component.ts
new file mode 100644
index 0000000000..1318493908
--- /dev/null
+++ b/src/components/item/test/media/app/app.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { RootPage } from '../pages/root-page/root-page';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = RootPage;
+}
diff --git a/src/components/item/test/media/app/app.module.ts b/src/components/item/test/media/app/app.module.ts
index b87e5fbaa3..7fb2e9ecf9 100644
--- a/src/components/item/test/media/app/app.module.ts
+++ b/src/components/item/test/media/app/app.module.ts
@@ -1,30 +1,19 @@
-import { Component, NgModule } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { RootPage } from '../pages/root-page/root-page';
-
-
-@Component({
-  template: '<ion-nav [root]="rootPage"></ion-nav>'
-})
-export class AppComponent {
-  rootPage = RootPage;
-}
+import { AppComponent } from './app.component';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    AppComponent,
-    RootPage
-  ]
 })
 export class AppModule {}
diff --git a/src/components/item/test/media/pages/root-page/root-page.module.ts b/src/components/item/test/media/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/item/test/media/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/range/test/basic/app/main.html b/src/components/range/test/basic/app/app.component.html
similarity index 100%
rename from src/components/range/test/basic/app/main.html
rename to src/components/range/test/basic/app/app.component.html
diff --git a/src/components/range/test/basic/app/app.component.ts b/src/components/range/test/basic/app/app.component.ts
new file mode 100644
index 0000000000..113defb8e4
--- /dev/null
+++ b/src/components/range/test/basic/app/app.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { RootPage } from '../pages/root-page/root-page';
+
+@Component({
+  templateUrl: 'app.component.html'
+})
+export class AppComponent {
+  root = RootPage;
+}
diff --git a/src/components/range/test/basic/app/app.module.ts b/src/components/range/test/basic/app/app.module.ts
index 63200ca53f..7fb2e9ecf9 100644
--- a/src/components/range/test/basic/app/app.module.ts
+++ b/src/components/range/test/basic/app/app.module.ts
@@ -1,29 +1,19 @@
-import { Component, NgModule } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { RootPage } from '../pages/root-page/root-page';
-
-@Component({
-  templateUrl: 'main.html'
-})
-export class AppComponent {
-  rootPage = RootPage;
-}
+import { AppComponent } from './app.component';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    AppComponent,
-    RootPage
-  ]
 })
 export class AppModule {}
diff --git a/src/components/range/test/basic/pages/root-page/root-page.module.ts b/src/components/range/test/basic/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/range/test/basic/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/split-pane/test/basic/app.module.ts b/src/components/split-pane/test/basic/app.module.ts
deleted file mode 100644
index 8cf1505d90..0000000000
--- a/src/components/split-pane/test/basic/app.module.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, NavController, MenuController, SplitPane } from '../../../..';
-
-
-@Component({
-  template: `
-  <ion-header>
-  <ion-navbar><ion-title>Navigation</ion-title></ion-navbar>
-  </ion-header>
-  <ion-content>
-  <ion-list>
-    <ion-item>Hola 1</ion-item>
-    <ion-item>Hola 2</ion-item>
-    <ion-item>Hola 3</ion-item>
-    <button ion-item (click)="push()">Push</button>
-    <ion-item>Hola</ion-item>
-    <ion-item>Hola</ion-item>
-    <ion-item>Hola</ion-item>
-
-  </ion-list>
-  </ion-content>
-  `
-})
-export class SidePage {
-  constructor(public navCtrl: NavController) { }
-  push() {
-    this.navCtrl.push(SidePage);
-  }
-}
-
-@Component({
-  template: `
-  <ion-header>
-    <ion-navbar>
-      <button ion-button menuToggle>
-        <ion-icon name="menu"></ion-icon>
-      </button>
-      <ion-title>Page 2</ion-title>
-    </ion-navbar>
-  </ion-header>
-  <ion-content padding>
-    <h1>Page 2</h1>
-  </ion-content>
-  `
-})
-export class E2EPage2 {}
-
-
-@Component({
-  template: `
-  <ion-header>
-    <ion-navbar>
-      <button ion-button menuToggle>
-        <ion-icon name="menu"></ion-icon>
-      </button>
-      <ion-title>Navigation</ion-title>
-    </ion-navbar>
-  </ion-header>
-  <ion-content padding>
-    <h1>Page 1</h1>
-    <button ion-button (click)="push()">Push</button>
-    <button ion-button (click)="menu()">Disable/enable menu</button>
-    <div f></div>
-    <div f></div>
-    <div f></div>
-    <div f></div>
-
-  </ion-content>
-  `
-})
-export class E2EPage {
-  constructor(
-    public navCtrl: NavController,
-    public menuCtrl: MenuController,
-  ) { }
-
-  push() {
-    this.navCtrl.push(E2EPage2);
-  }
-
-  menu() {
-    this.menuCtrl.enable(!this.menuCtrl.isEnabled());
-  }
-}
-
-
-@Component({
-  templateUrl: 'main.html'
-})
-export class AppComponent {
-  root = E2EPage;
-  root2 = SidePage;
-
-  splitPaneChanged(splitPane: SplitPane) {
-    console.log('Split pane changed, visible: ', splitPane.isVisible());
-  }
-}
-
-@NgModule({
-  declarations: [
-    AppComponent,
-    E2EPage,
-    E2EPage2,
-    SidePage,
-  ],
-  imports: [
-    IonicModule.forRoot(AppComponent, {
-      swipeBackEnabled: true
-    })
-  ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    AppComponent,
-    E2EPage,
-    E2EPage2,
-    SidePage,
-  ]
-})
-export class AppModule {}
-
diff --git a/src/components/split-pane/test/basic/main.html b/src/components/split-pane/test/basic/app/app.component.html
similarity index 100%
rename from src/components/split-pane/test/basic/main.html
rename to src/components/split-pane/test/basic/app/app.component.html
diff --git a/src/components/split-pane/test/basic/app/app.component.ts b/src/components/split-pane/test/basic/app/app.component.ts
new file mode 100644
index 0000000000..a77b8de43d
--- /dev/null
+++ b/src/components/split-pane/test/basic/app/app.component.ts
@@ -0,0 +1,17 @@
+import { Component } from '@angular/core';
+import { SplitPane } from '../../../../..';
+
+import { PageOne } from '../pages/page-one/page-one';
+import { SidePage } from '../pages/side-page/side-page';
+
+@Component({
+  templateUrl: 'app.component.html'
+})
+export class AppComponent {
+  root = PageOne;
+  root2 = SidePage;
+
+  splitPaneChanged(splitPane: SplitPane) {
+    console.log('Split pane changed, visible: ', splitPane.isVisible());
+  }
+}
diff --git a/src/components/split-pane/test/basic/app/app.module.ts b/src/components/split-pane/test/basic/app/app.module.ts
new file mode 100644
index 0000000000..f1f116c6c7
--- /dev/null
+++ b/src/components/split-pane/test/basic/app/app.module.ts
@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core';
+import { IonicApp, IonicModule } from '../../../../..';
+
+import { AppComponent } from './app.component';
+import { PageOneModule } from '../pages/page-one/page-one.module';
+import { SidePageModule } from '../pages/side-page/side-page.module';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    IonicModule.forRoot(AppComponent, {
+      swipeBackEnabled: true
+    }),
+    PageOneModule,
+    SidePageModule
+  ],
+  bootstrap: [IonicApp]
+})
+export class AppModule {}
+
diff --git a/src/components/split-pane/test/basic/main.ts b/src/components/split-pane/test/basic/app/main.ts
similarity index 100%
rename from src/components/split-pane/test/basic/main.ts
rename to src/components/split-pane/test/basic/app/main.ts
diff --git a/src/components/split-pane/test/basic/pages/page-one/page-one.module.ts b/src/components/split-pane/test/basic/pages/page-one/page-one.module.ts
new file mode 100644
index 0000000000..b9640b7046
--- /dev/null
+++ b/src/components/split-pane/test/basic/pages/page-one/page-one.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { PageOne } from './page-one';
+
+@NgModule({
+  declarations: [
+    PageOne,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageOne)
+  ]
+})
+export class PageOneModule {}
diff --git a/src/components/split-pane/test/basic/pages/page-one/page-one.ts b/src/components/split-pane/test/basic/pages/page-one/page-one.ts
new file mode 100644
index 0000000000..36afe51904
--- /dev/null
+++ b/src/components/split-pane/test/basic/pages/page-one/page-one.ts
@@ -0,0 +1,39 @@
+import { Component } from '@angular/core';
+import { MenuController, NavController } from '../../../../../..';
+
+@Component({
+  template: `
+  <ion-header>
+    <ion-navbar>
+      <button ion-button menuToggle>
+        <ion-icon name="menu"></ion-icon>
+      </button>
+      <ion-title>Navigation</ion-title>
+    </ion-navbar>
+  </ion-header>
+  <ion-content padding>
+    <h1>Page 1</h1>
+    <button ion-button (click)="push()">Push</button>
+    <button ion-button (click)="menu()">Disable/enable menu</button>
+    <div f></div>
+    <div f></div>
+    <div f></div>
+    <div f></div>
+
+  </ion-content>
+  `
+})
+export class PageOne {
+  constructor(
+    public navCtrl: NavController,
+    public menuCtrl: MenuController,
+  ) { }
+
+  push() {
+    this.navCtrl.push('PageTwo');
+  }
+
+  menu() {
+    this.menuCtrl.enable(!this.menuCtrl.isEnabled());
+  }
+}
diff --git a/src/components/split-pane/test/basic/pages/page-two/page-two.module.ts b/src/components/split-pane/test/basic/pages/page-two/page-two.module.ts
new file mode 100644
index 0000000000..8774af30fd
--- /dev/null
+++ b/src/components/split-pane/test/basic/pages/page-two/page-two.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { PageTwo } from './page-two';
+
+@NgModule({
+  declarations: [
+    PageTwo,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageTwo)
+  ]
+})
+export class PageTwoModule {}
diff --git a/src/components/split-pane/test/basic/pages/page-two/page-two.ts b/src/components/split-pane/test/basic/pages/page-two/page-two.ts
new file mode 100644
index 0000000000..ccbc7acc99
--- /dev/null
+++ b/src/components/split-pane/test/basic/pages/page-two/page-two.ts
@@ -0,0 +1,20 @@
+import { Component } from '@angular/core';
+import { IonicPage } from '../../../../../..';
+
+@IonicPage()
+@Component({
+  template: `
+  <ion-header>
+    <ion-navbar>
+      <button ion-button menuToggle>
+        <ion-icon name="menu"></ion-icon>
+      </button>
+      <ion-title>Page 2</ion-title>
+    </ion-navbar>
+  </ion-header>
+  <ion-content padding>
+    <h1>Page 2</h1>
+  </ion-content>
+  `
+})
+export class PageTwo {}
diff --git a/src/components/split-pane/test/basic/pages/side-page/side-page.module.ts b/src/components/split-pane/test/basic/pages/side-page/side-page.module.ts
new file mode 100644
index 0000000000..eed65e5edb
--- /dev/null
+++ b/src/components/split-pane/test/basic/pages/side-page/side-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { SidePage } from './side-page';
+
+@NgModule({
+  declarations: [
+    SidePage,
+  ],
+  imports: [
+    IonicPageModule.forChild(SidePage)
+  ]
+})
+export class SidePageModule {}
diff --git a/src/components/split-pane/test/basic/pages/side-page/side-page.ts b/src/components/split-pane/test/basic/pages/side-page/side-page.ts
new file mode 100644
index 0000000000..18754a72eb
--- /dev/null
+++ b/src/components/split-pane/test/basic/pages/side-page/side-page.ts
@@ -0,0 +1,28 @@
+import { Component } from '@angular/core';
+import { NavController } from '../../../../../..';
+
+@Component({
+  template: `
+  <ion-header>
+  <ion-navbar><ion-title>Navigation</ion-title></ion-navbar>
+  </ion-header>
+  <ion-content>
+  <ion-list>
+    <ion-item>Hola 1</ion-item>
+    <ion-item>Hola 2</ion-item>
+    <ion-item>Hola 3</ion-item>
+    <button ion-item (click)="push()">Push</button>
+    <ion-item>Hola</ion-item>
+    <ion-item>Hola</ion-item>
+    <ion-item>Hola</ion-item>
+
+  </ion-list>
+  </ion-content>
+  `
+})
+export class SidePage {
+  constructor(public navCtrl: NavController) { }
+  push() {
+    this.navCtrl.push(SidePage);
+  }
+}
diff --git a/src/components/split-pane/test/menus/app.module.ts b/src/components/split-pane/test/menus/app.module.ts
deleted file mode 100644
index 346bd0c63d..0000000000
--- a/src/components/split-pane/test/menus/app.module.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, NavController, MenuController, SplitPane } from '../../../..';
-
-@Component({
-  template: `
-  <ion-header>
-    <ion-navbar>
-      <button ion-button menuToggle>
-        <ion-icon name="menu"></ion-icon>
-      </button>
-      <ion-title>Page 2</ion-title>
-    </ion-navbar>
-  </ion-header>
-  <ion-content padding>
-    <h1>Page 2</h1>
-  </ion-content>
-  `
-})
-export class E2EPage2 {}
-
-
-@Component({
-  template: `
-  <ion-header>
-    <ion-navbar>
-      <button ion-button menuToggle>
-        <ion-icon name="menu"></ion-icon>
-      </button>
-      <ion-title>Navigation</ion-title>
-    </ion-navbar>
-  </ion-header>
-  <ion-content padding>
-    <h1>Page 1</h1>
-    <button ion-button (click)="push()">Push</button>
-    <button ion-button (click)="menu1Active()">Enable menu 1</button>
-    <button ion-button (click)="menu2Active()">Enable menu 2</button>
-    <button ion-button (click)="menu3Active()">Enable menu 3</button>
-    <button ion-button (click)="menu4Active()">Enable menu 4 (right)</button>
-
-    <button ion-button (click)="disableAll()">Disable all</button>
-
-    <div f></div>
-    <div f></div>
-    <div f></div>
-    <div f></div>
-
-  </ion-content>
-  `
-})
-export class E2EPage {
-  constructor(
-    public navCtrl: NavController,
-    public menuCtrl: MenuController,
-  ) {
-    this.menuCtrl.enable(false, 'menu4');
-  }
-
-  push() {
-    this.navCtrl.push(E2EPage2);
-  }
-
-  menu1Active() {
-    this.menuCtrl.enable(false, 'menu4');
-    this.menuCtrl.enable(true, 'menu1');
-  }
-  menu2Active() {
-    this.menuCtrl.enable(false, 'menu4');
-    this.menuCtrl.enable(true, 'menu2');
-  }
-  menu3Active() {
-    this.menuCtrl.enable(false, 'menu4');
-    this.menuCtrl.enable(true, 'menu3');
-  }
-  menu4Active() {
-    this.menuCtrl.enable(false, 'menu1');
-    this.menuCtrl.enable(false, 'menu2');
-    this.menuCtrl.enable(false, 'menu3');
-
-    this.menuCtrl.enable(true, 'menu4');
-  }
-  disableAll() {
-    this.menuCtrl.enable(false);
-  }
-}
-
-
-@Component({
-  templateUrl: 'main.html'
-})
-export class AppComponent {
-  root = E2EPage;
-
-  splitPaneChanged(splitPane: SplitPane) {
-    console.log('Split pane changed, visible: ', splitPane.isVisible());
-  }
-}
-
-@NgModule({
-  declarations: [
-    AppComponent,
-    E2EPage,
-    E2EPage2,
-  ],
-  imports: [
-    IonicModule.forRoot(AppComponent, {
-      swipeBackEnabled: true
-    })
-  ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    AppComponent,
-    E2EPage,
-    E2EPage2,
-  ]
-})
-export class AppModule {}
-
diff --git a/src/components/split-pane/test/menus/main.html b/src/components/split-pane/test/menus/app/app.component.html
similarity index 100%
rename from src/components/split-pane/test/menus/main.html
rename to src/components/split-pane/test/menus/app/app.component.html
diff --git a/src/components/split-pane/test/menus/app/app.component.ts b/src/components/split-pane/test/menus/app/app.component.ts
new file mode 100644
index 0000000000..bd2ca1ff91
--- /dev/null
+++ b/src/components/split-pane/test/menus/app/app.component.ts
@@ -0,0 +1,14 @@
+import { Component } from '@angular/core';
+import { SplitPane } from '../../../../..';
+import { PageOne } from '../pages/page-one/page-one';
+
+@Component({
+  templateUrl: 'app.component.html'
+})
+export class AppComponent {
+  root = PageOne;
+
+  splitPaneChanged(splitPane: SplitPane) {
+    console.log('Split pane changed, visible: ', splitPane.isVisible());
+  }
+}
diff --git a/src/components/split-pane/test/menus/app/app.module.ts b/src/components/split-pane/test/menus/app/app.module.ts
new file mode 100644
index 0000000000..561a2c3155
--- /dev/null
+++ b/src/components/split-pane/test/menus/app/app.module.ts
@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { IonicApp, IonicModule } from '../../../../..';
+
+import { AppComponent } from './app.component';
+import { PageOneModule } from '../pages/page-one/page-one.module';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    IonicModule.forRoot(AppComponent, {
+      swipeBackEnabled: true
+    }),
+    PageOneModule
+  ],
+  bootstrap: [IonicApp]
+})
+export class AppModule {}
+
diff --git a/src/components/split-pane/test/menus/main.ts b/src/components/split-pane/test/menus/app/main.ts
similarity index 100%
rename from src/components/split-pane/test/menus/main.ts
rename to src/components/split-pane/test/menus/app/main.ts
diff --git a/src/components/split-pane/test/menus/pages/page-one/page-one.html b/src/components/split-pane/test/menus/pages/page-one/page-one.html
new file mode 100644
index 0000000000..7297a79c8d
--- /dev/null
+++ b/src/components/split-pane/test/menus/pages/page-one/page-one.html
@@ -0,0 +1,22 @@
+<ion-header>
+  <ion-navbar>
+    <button ion-button menuToggle>
+      <ion-icon name="menu"></ion-icon>
+    </button>
+    <ion-title>Navigation</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content padding>
+  <h1>Page 1</h1>
+  <button ion-button (click)="push()">Push</button>
+  <button ion-button (click)="menu1Active()">Enable menu 1</button>
+  <button ion-button (click)="menu2Active()">Enable menu 2</button>
+  <button ion-button (click)="menu3Active()">Enable menu 3</button>
+  <button ion-button (click)="disableAll()">Disable all</button>
+
+  <div f></div>
+  <div f></div>
+  <div f></div>
+  <div f></div>
+
+</ion-content>
\ No newline at end of file
diff --git a/src/components/split-pane/test/menus/pages/page-one/page-one.module.ts b/src/components/split-pane/test/menus/pages/page-one/page-one.module.ts
new file mode 100644
index 0000000000..b9640b7046
--- /dev/null
+++ b/src/components/split-pane/test/menus/pages/page-one/page-one.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { PageOne } from './page-one';
+
+@NgModule({
+  declarations: [
+    PageOne,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageOne)
+  ]
+})
+export class PageOneModule {}
diff --git a/src/components/split-pane/test/menus/pages/page-one/page-one.ts b/src/components/split-pane/test/menus/pages/page-one/page-one.ts
new file mode 100644
index 0000000000..94a626ca50
--- /dev/null
+++ b/src/components/split-pane/test/menus/pages/page-one/page-one.ts
@@ -0,0 +1,28 @@
+import { Component } from '@angular/core';
+import { MenuController, NavController } from '../../../../../..';
+
+@Component({
+  templateUrl: 'page-one.html'
+})
+export class PageOne {
+  constructor(
+    public navCtrl: NavController,
+    public menuCtrl: MenuController,
+  ) { }
+
+  push() {
+    this.navCtrl.push('PageTwo');
+  }
+  menu1Active() {
+    this.menuCtrl.enable(true, 'menu1');
+  }
+  menu2Active() {
+    this.menuCtrl.enable(true, 'menu2');
+  }
+  menu3Active() {
+    this.menuCtrl.enable(true, 'menu3');
+  }
+  disableAll() {
+    this.menuCtrl.enable(false);
+  }
+}
diff --git a/src/components/split-pane/test/menus/pages/page-two/page-two.html b/src/components/split-pane/test/menus/pages/page-two/page-two.html
new file mode 100644
index 0000000000..b563962fa8
--- /dev/null
+++ b/src/components/split-pane/test/menus/pages/page-two/page-two.html
@@ -0,0 +1,11 @@
+<ion-header>
+  <ion-navbar>
+    <button ion-button menuToggle>
+      <ion-icon name="menu"></ion-icon>
+    </button>
+    <ion-title>Page 2</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content padding>
+  <h1>Page 2</h1>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/split-pane/test/menus/pages/page-two/page-two.module.ts b/src/components/split-pane/test/menus/pages/page-two/page-two.module.ts
new file mode 100644
index 0000000000..8774af30fd
--- /dev/null
+++ b/src/components/split-pane/test/menus/pages/page-two/page-two.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { PageTwo } from './page-two';
+
+@NgModule({
+  declarations: [
+    PageTwo,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageTwo)
+  ]
+})
+export class PageTwoModule {}
diff --git a/src/components/split-pane/test/menus/pages/page-two/page-two.ts b/src/components/split-pane/test/menus/pages/page-two/page-two.ts
new file mode 100644
index 0000000000..9badbd33e5
--- /dev/null
+++ b/src/components/split-pane/test/menus/pages/page-two/page-two.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+import { IonicPage } from '../../../../../..';
+
+@IonicPage()
+@Component({
+  templateUrl: 'page-two.html'
+})
+export class PageTwo {}
diff --git a/src/components/split-pane/test/nested/app.module.ts b/src/components/split-pane/test/nested/app.module.ts
deleted file mode 100644
index cb426385da..0000000000
--- a/src/components/split-pane/test/nested/app.module.ts
+++ /dev/null
@@ -1,162 +0,0 @@
-import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, NavController } from '../../../..';
-
-
-@Component({
-  template: `
-  <ion-header>
-    <ion-navbar><ion-title>Nested 1</ion-title></ion-navbar>
-  </ion-header>
-  <ion-content padding>
-    <button ion-button (click)="push()">Push</button>
-    <div f></div>
-    <div f></div>
-    <div f></div>
-    <div f></div>
-  </ion-content>
-  `
-})
-export class E2ENested {
-  constructor(
-    public navCtrl: NavController,
-  ) { }
-
-  push() {
-    this.navCtrl.push(E2ENested);
-  }
-}
-
-@Component({
-  template: `
-  <ion-header>
-    <ion-navbar><ion-title>Nested 2</ion-title></ion-navbar>
-  </ion-header>
-  <ion-content padding>
-    <button ion-button (click)="push()">Push</button>
-    <div f></div>
-    <div f></div>
-    <div f></div>
-    <div f></div>
-  </ion-content>
-  `
-})
-export class E2ENested2 {
-  constructor(
-    public navCtrl: NavController,
-  ) { }
-
-  push() {
-    this.navCtrl.push(E2ENested2);
-  }
-}
-
-@Component({
-  template: `
-  <ion-header>
-    <ion-navbar>
-      <button ion-button menuToggle>
-        <ion-icon name="menu"></ion-icon>
-      </button>
-      <ion-title>Nested 3</ion-title>
-    </ion-navbar>
-  </ion-header>
-  <ion-content padding>
-    <button ion-button (click)="push()">Push</button>
-    <div f></div>
-    <div f></div>
-    <div f></div>
-    <div f></div>
-  </ion-content>
-  `
-})
-export class E2ENested3 {
-  constructor(
-    public navCtrl: NavController,
-  ) { }
-
-  push() {
-    this.navCtrl.push(E2ENested3);
-  }
-}
-
-
-@Component({
-  template: `
-  <ion-header>
-  <ion-navbar><ion-title>Navigation</ion-title></ion-navbar>
-  </ion-header>
-  <ion-content>
-  <ion-list>
-    <ion-item>Hola</ion-item>
-    <ion-item>Hola</ion-item>
-    <ion-item>Hola</ion-item>
-    <button ion-item (click)="push()">Push</button>
-    <ion-item>Hola</ion-item>
-    <ion-item>Hola</ion-item>
-    <ion-item>Hola</ion-item>
-
-  </ion-list>
-  </ion-content>
-  `
-})
-export class SidePage {
-  constructor(public navCtrl: NavController) { }
-  push() {
-    this.navCtrl.push(SidePage);
-  }
-}
-
-@Component({
-  template: `
-<ion-split-pane>
-  <ion-nav [root]="root"></ion-nav>
-
-  <ion-split-pane when="lg" main >
-    <ion-nav [root]="root2"></ion-nav>
-    <ion-nav [root]="root3" main ></ion-nav>
-  </ion-split-pane>
-
-</ion-split-pane>
-  `
-})
-export class E2EPage {
-  root = E2ENested;
-  root2 = E2ENested2;
-  root3 = E2ENested3;
-}
-
-
-@Component({
-  templateUrl: 'main.html'
-})
-export class AppComponent {
-  root = E2EPage;
-  root2 = SidePage;
-}
-
-@NgModule({
-  declarations: [
-    AppComponent,
-    E2EPage,
-    SidePage,
-    E2ENested,
-    E2ENested2,
-    E2ENested3
-  ],
-  imports: [
-    IonicModule.forRoot(AppComponent, {
-      swipeBackEnabled: true
-    })
-  ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    AppComponent,
-    E2EPage,
-    SidePage,
-    E2ENested,
-    E2ENested2,
-    E2ENested3
-  ]
-})
-export class AppModule {}
-
diff --git a/src/components/split-pane/test/nested/main.html b/src/components/split-pane/test/nested/app/app.component.html
similarity index 100%
rename from src/components/split-pane/test/nested/main.html
rename to src/components/split-pane/test/nested/app/app.component.html
diff --git a/src/components/split-pane/test/nested/app/app.component.ts b/src/components/split-pane/test/nested/app/app.component.ts
new file mode 100644
index 0000000000..0731cbea76
--- /dev/null
+++ b/src/components/split-pane/test/nested/app/app.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+
+import { PageOne } from '../pages/page-one/page-one';
+import { SidePage } from '../pages/side-page/side-page';
+
+@Component({
+  templateUrl: 'app.component.html'
+})
+export class AppComponent {
+  root = PageOne;
+  root2 = SidePage;
+}
diff --git a/src/components/split-pane/test/nested/app/app.module.ts b/src/components/split-pane/test/nested/app/app.module.ts
new file mode 100644
index 0000000000..f1f116c6c7
--- /dev/null
+++ b/src/components/split-pane/test/nested/app/app.module.ts
@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core';
+import { IonicApp, IonicModule } from '../../../../..';
+
+import { AppComponent } from './app.component';
+import { PageOneModule } from '../pages/page-one/page-one.module';
+import { SidePageModule } from '../pages/side-page/side-page.module';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    IonicModule.forRoot(AppComponent, {
+      swipeBackEnabled: true
+    }),
+    PageOneModule,
+    SidePageModule
+  ],
+  bootstrap: [IonicApp]
+})
+export class AppModule {}
+
diff --git a/src/components/split-pane/test/nested/main.ts b/src/components/split-pane/test/nested/app/main.ts
similarity index 100%
rename from src/components/split-pane/test/nested/main.ts
rename to src/components/split-pane/test/nested/app/main.ts
diff --git a/src/components/split-pane/test/nested/pages/page-four/page-four.html b/src/components/split-pane/test/nested/pages/page-four/page-four.html
new file mode 100644
index 0000000000..93dcd57abc
--- /dev/null
+++ b/src/components/split-pane/test/nested/pages/page-four/page-four.html
@@ -0,0 +1,15 @@
+<ion-header>
+  <ion-navbar>
+    <button ion-button menuToggle>
+      <ion-icon name="menu"></ion-icon>
+    </button>
+    <ion-title>Nested 3</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content padding>
+  <button ion-button (click)="push()">Push</button>
+  <div f></div>
+  <div f></div>
+  <div f></div>
+  <div f></div>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/split-pane/test/nested/pages/page-four/page-four.module.ts b/src/components/split-pane/test/nested/pages/page-four/page-four.module.ts
new file mode 100644
index 0000000000..c2c73b3bd8
--- /dev/null
+++ b/src/components/split-pane/test/nested/pages/page-four/page-four.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { PageFour } from './page-four';
+
+@NgModule({
+  declarations: [
+    PageFour,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageFour)
+  ]
+})
+export class PageFourModule {}
diff --git a/src/components/split-pane/test/nested/pages/page-four/page-four.ts b/src/components/split-pane/test/nested/pages/page-four/page-four.ts
new file mode 100644
index 0000000000..0ca2588bef
--- /dev/null
+++ b/src/components/split-pane/test/nested/pages/page-four/page-four.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import { NavController } from '../../../../../..';
+
+@Component({
+  templateUrl: 'page-four.html'
+})
+export class PageFour {
+  constructor(
+    public navCtrl: NavController,
+  ) { }
+
+  push() {
+    this.navCtrl.push(PageFour);
+  }
+}
diff --git a/src/components/split-pane/test/nested/pages/page-one/page-one.html b/src/components/split-pane/test/nested/pages/page-one/page-one.html
new file mode 100644
index 0000000000..120710b7b7
--- /dev/null
+++ b/src/components/split-pane/test/nested/pages/page-one/page-one.html
@@ -0,0 +1,9 @@
+<ion-split-pane>
+  <ion-nav [root]="root"></ion-nav>
+
+  <ion-split-pane when="lg" main >
+    <ion-nav [root]="root2"></ion-nav>
+    <ion-nav [root]="root3" main ></ion-nav>
+  </ion-split-pane>
+
+</ion-split-pane>
\ No newline at end of file
diff --git a/src/components/split-pane/test/nested/pages/page-one/page-one.module.ts b/src/components/split-pane/test/nested/pages/page-one/page-one.module.ts
new file mode 100644
index 0000000000..1e8a338655
--- /dev/null
+++ b/src/components/split-pane/test/nested/pages/page-one/page-one.module.ts
@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { PageOne } from './page-one';
+
+import { PageTwoModule } from '../page-two/page-two.module';
+import { PageThreeModule } from '../page-three/page-three.module';
+import { PageFourModule } from '../page-four/page-four.module';
+
+@NgModule({
+  declarations: [
+    PageOne,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageOne),
+    PageTwoModule,
+    PageThreeModule,
+    PageFourModule
+  ]
+})
+export class PageOneModule {}
diff --git a/src/components/split-pane/test/nested/pages/page-one/page-one.ts b/src/components/split-pane/test/nested/pages/page-one/page-one.ts
new file mode 100644
index 0000000000..f55791d494
--- /dev/null
+++ b/src/components/split-pane/test/nested/pages/page-one/page-one.ts
@@ -0,0 +1,14 @@
+import { Component } from '@angular/core';
+
+import { PageTwo } from '../page-two/page-two';
+import { PageThree } from '../page-three/page-three';
+import { PageFour } from '../page-four/page-four';
+
+@Component({
+  templateUrl: 'page-one.html'
+})
+export class PageOne {
+  root = PageTwo;
+  root2 = PageThree;
+  root3 = PageFour;
+}
diff --git a/src/components/split-pane/test/nested/pages/page-three/page-three.html b/src/components/split-pane/test/nested/pages/page-three/page-three.html
new file mode 100644
index 0000000000..f9fdc61eaa
--- /dev/null
+++ b/src/components/split-pane/test/nested/pages/page-three/page-three.html
@@ -0,0 +1,10 @@
+<ion-header>
+  <ion-navbar><ion-title>Nested 2</ion-title></ion-navbar>
+</ion-header>
+<ion-content padding>
+  <button ion-button (click)="push()">Push</button>
+  <div f></div>
+  <div f></div>
+  <div f></div>
+  <div f></div>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/split-pane/test/nested/pages/page-three/page-three.module.ts b/src/components/split-pane/test/nested/pages/page-three/page-three.module.ts
new file mode 100644
index 0000000000..b3c5a8088e
--- /dev/null
+++ b/src/components/split-pane/test/nested/pages/page-three/page-three.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { PageThree } from './page-three';
+
+@NgModule({
+  declarations: [
+    PageThree,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageThree)
+  ]
+})
+export class PageThreeModule {}
diff --git a/src/components/split-pane/test/nested/pages/page-three/page-three.ts b/src/components/split-pane/test/nested/pages/page-three/page-three.ts
new file mode 100644
index 0000000000..ca118ae8cc
--- /dev/null
+++ b/src/components/split-pane/test/nested/pages/page-three/page-three.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import { NavController } from '../../../../../..';
+
+@Component({
+  templateUrl: 'page-three.html'
+})
+export class PageThree {
+  constructor(
+    public navCtrl: NavController,
+  ) { }
+
+  push() {
+    this.navCtrl.push(PageThree);
+  }
+}
diff --git a/src/components/split-pane/test/nested/pages/page-two/page-two.html b/src/components/split-pane/test/nested/pages/page-two/page-two.html
new file mode 100644
index 0000000000..6997783806
--- /dev/null
+++ b/src/components/split-pane/test/nested/pages/page-two/page-two.html
@@ -0,0 +1,10 @@
+<ion-header>
+  <ion-navbar><ion-title>Nested 1</ion-title></ion-navbar>
+</ion-header>
+<ion-content padding>
+  <button ion-button (click)="push()">Push</button>
+  <div f></div>
+  <div f></div>
+  <div f></div>
+  <div f></div>
+</ion-content>
diff --git a/src/components/split-pane/test/nested/pages/page-two/page-two.module.ts b/src/components/split-pane/test/nested/pages/page-two/page-two.module.ts
new file mode 100644
index 0000000000..8774af30fd
--- /dev/null
+++ b/src/components/split-pane/test/nested/pages/page-two/page-two.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { PageTwo } from './page-two';
+
+@NgModule({
+  declarations: [
+    PageTwo,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageTwo)
+  ]
+})
+export class PageTwoModule {}
diff --git a/src/components/split-pane/test/nested/pages/page-two/page-two.ts b/src/components/split-pane/test/nested/pages/page-two/page-two.ts
new file mode 100644
index 0000000000..5c096ef314
--- /dev/null
+++ b/src/components/split-pane/test/nested/pages/page-two/page-two.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import { NavController } from '../../../../../..';
+
+@Component({
+  templateUrl: 'page-two.html'
+})
+export class PageTwo {
+  constructor(
+    public navCtrl: NavController,
+  ) { }
+
+  push() {
+    this.navCtrl.push(PageTwo);
+  }
+}
diff --git a/src/components/split-pane/test/nested/pages/side-page/side-page.html b/src/components/split-pane/test/nested/pages/side-page/side-page.html
new file mode 100644
index 0000000000..d743735270
--- /dev/null
+++ b/src/components/split-pane/test/nested/pages/side-page/side-page.html
@@ -0,0 +1,15 @@
+<ion-header>
+  <ion-navbar><ion-title>Navigation</ion-title></ion-navbar>
+</ion-header>
+<ion-content>
+  <ion-list>
+    <ion-item>Hola</ion-item>
+    <ion-item>Hola</ion-item>
+    <ion-item>Hola</ion-item>
+    <button ion-item (click)="push()">Push</button>
+    <ion-item>Hola</ion-item>
+    <ion-item>Hola</ion-item>
+    <ion-item>Hola</ion-item>
+
+  </ion-list>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/split-pane/test/nested/pages/side-page/side-page.module.ts b/src/components/split-pane/test/nested/pages/side-page/side-page.module.ts
new file mode 100644
index 0000000000..eed65e5edb
--- /dev/null
+++ b/src/components/split-pane/test/nested/pages/side-page/side-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { SidePage } from './side-page';
+
+@NgModule({
+  declarations: [
+    SidePage,
+  ],
+  imports: [
+    IonicPageModule.forChild(SidePage)
+  ]
+})
+export class SidePageModule {}
diff --git a/src/components/split-pane/test/nested/pages/side-page/side-page.ts b/src/components/split-pane/test/nested/pages/side-page/side-page.ts
new file mode 100644
index 0000000000..e77be72d71
--- /dev/null
+++ b/src/components/split-pane/test/nested/pages/side-page/side-page.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+import { NavController } from '../../../../../..';
+
+@Component({
+  templateUrl: 'side-page.html'
+})
+export class SidePage {
+  constructor(public navCtrl: NavController) { }
+  push() {
+    this.navCtrl.push(SidePage);
+  }
+}
diff --git a/src/components/split-pane/test/tabs/app.module.ts b/src/components/split-pane/test/tabs/app.module.ts
deleted file mode 100644
index ceb07ce31c..0000000000
--- a/src/components/split-pane/test/tabs/app.module.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, NavController, MenuController } from '../../../..';
-
-
-@Component({
-  template: `
-  <ion-header>
-  <ion-navbar><ion-title>Navigation</ion-title></ion-navbar>
-  </ion-header>
-  <ion-content>
-
-    <ion-slides style="background: black"
-                pager="true"
-                effect="flip">
-
-      <ion-slide style="background: red; color: white;">
-        <h1>Slide 1</h1>
-      </ion-slide>
-
-      <ion-slide style="background: white; color: blue;">
-        <h1>Slide 2</h1>
-      </ion-slide>
-
-      <ion-slide style="background: blue; color: white;">
-        <h1>Slide 3</h1>
-      </ion-slide>
-
-    </ion-slides>
-  </ion-content>
-  `
-})
-export class SidePage {
-  constructor(public navCtrl: NavController) { }
-  push() {
-    this.navCtrl.push(SidePage);
-  }
-}
-
-
-@Component({
-  template: `
-  <ion-header>
-    <ion-navbar>
-      <button ion-button menuToggle>
-        <ion-icon name="menu"></ion-icon>
-      </button>
-      <ion-title>Navigation</ion-title>
-    </ion-navbar>
-  </ion-header>
-  <ion-content padding>
-
-    <button ion-button (click)="push()">Push</button>
-    <div f></div>
-    <div f></div>
-    <div f></div>
-    <div f></div>
-
-  </ion-content>
-  `
-})
-export class E2EPage {
-
-  constructor(
-    public navCtrl: NavController,
-    public menuCtrl: MenuController,
-  ) { }
-
-  push() {
-    this.navCtrl.push(E2EPage);
-  }
-}
-
-
-@Component({
-  templateUrl: 'main.html'
-})
-export class AppComponent {
-  root = E2EPage;
-  root2 = SidePage;
-  side = 'right';
-}
-
-@NgModule({
-  declarations: [
-    AppComponent,
-    E2EPage,
-    SidePage,
-  ],
-  imports: [
-    IonicModule.forRoot(AppComponent, {
-      swipeBackEnabled: true
-    })
-  ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    AppComponent,
-    E2EPage,
-    SidePage,
-  ]
-})
-export class AppModule {}
-
diff --git a/src/components/split-pane/test/tabs/main.html b/src/components/split-pane/test/tabs/app/app.component.html
similarity index 100%
rename from src/components/split-pane/test/tabs/main.html
rename to src/components/split-pane/test/tabs/app/app.component.html
diff --git a/src/components/split-pane/test/tabs/app/app.component.ts b/src/components/split-pane/test/tabs/app/app.component.ts
new file mode 100644
index 0000000000..0731cbea76
--- /dev/null
+++ b/src/components/split-pane/test/tabs/app/app.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+
+import { PageOne } from '../pages/page-one/page-one';
+import { SidePage } from '../pages/side-page/side-page';
+
+@Component({
+  templateUrl: 'app.component.html'
+})
+export class AppComponent {
+  root = PageOne;
+  root2 = SidePage;
+}
diff --git a/src/components/split-pane/test/tabs/app/app.module.ts b/src/components/split-pane/test/tabs/app/app.module.ts
new file mode 100644
index 0000000000..f1f116c6c7
--- /dev/null
+++ b/src/components/split-pane/test/tabs/app/app.module.ts
@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core';
+import { IonicApp, IonicModule } from '../../../../..';
+
+import { AppComponent } from './app.component';
+import { PageOneModule } from '../pages/page-one/page-one.module';
+import { SidePageModule } from '../pages/side-page/side-page.module';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    IonicModule.forRoot(AppComponent, {
+      swipeBackEnabled: true
+    }),
+    PageOneModule,
+    SidePageModule
+  ],
+  bootstrap: [IonicApp]
+})
+export class AppModule {}
+
diff --git a/src/components/split-pane/test/tabs/main.ts b/src/components/split-pane/test/tabs/app/main.ts
similarity index 100%
rename from src/components/split-pane/test/tabs/main.ts
rename to src/components/split-pane/test/tabs/app/main.ts
diff --git a/src/components/split-pane/test/tabs/pages/page-one/page-one.html b/src/components/split-pane/test/tabs/pages/page-one/page-one.html
new file mode 100644
index 0000000000..a87eefdc5b
--- /dev/null
+++ b/src/components/split-pane/test/tabs/pages/page-one/page-one.html
@@ -0,0 +1,16 @@
+<ion-header>
+  <ion-navbar>
+    <button ion-button menuToggle>
+      <ion-icon name="menu"></ion-icon>
+    </button>
+    <ion-title>Navigation</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content padding>
+  <button ion-button (click)="push()">Push</button>
+  <div f></div>
+  <div f></div>
+  <div f></div>
+  <div f></div>
+
+</ion-content>
\ No newline at end of file
diff --git a/src/components/split-pane/test/tabs/pages/page-one/page-one.module.ts b/src/components/split-pane/test/tabs/pages/page-one/page-one.module.ts
new file mode 100644
index 0000000000..b9640b7046
--- /dev/null
+++ b/src/components/split-pane/test/tabs/pages/page-one/page-one.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { PageOne } from './page-one';
+
+@NgModule({
+  declarations: [
+    PageOne,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageOne)
+  ]
+})
+export class PageOneModule {}
diff --git a/src/components/split-pane/test/tabs/pages/page-one/page-one.ts b/src/components/split-pane/test/tabs/pages/page-one/page-one.ts
new file mode 100644
index 0000000000..1cfa5ae007
--- /dev/null
+++ b/src/components/split-pane/test/tabs/pages/page-one/page-one.ts
@@ -0,0 +1,16 @@
+import { Component } from '@angular/core';
+import { MenuController, NavController } from '../../../../../..';
+
+@Component({
+  templateUrl: 'page-one.html'
+})
+export class PageOne {
+  constructor(
+    public navCtrl: NavController,
+    public menuCtrl: MenuController,
+  ) { }
+
+  push() {
+    this.navCtrl.push(PageOne);
+  }
+}
diff --git a/src/components/split-pane/test/tabs/pages/side-page/side-page.html b/src/components/split-pane/test/tabs/pages/side-page/side-page.html
new file mode 100644
index 0000000000..95783d90e2
--- /dev/null
+++ b/src/components/split-pane/test/tabs/pages/side-page/side-page.html
@@ -0,0 +1,22 @@
+<ion-header>
+  <ion-navbar><ion-title>Navigation</ion-title></ion-navbar>
+</ion-header>
+<ion-content>
+  <ion-slides style="background: black"
+              pager="true"
+              effect="flip">
+
+    <ion-slide style="background: red; color: white;">
+      <h1>Slide 1</h1>
+    </ion-slide>
+
+    <ion-slide style="background: white; color: blue;">
+      <h1>Slide 2</h1>
+    </ion-slide>
+
+    <ion-slide style="background: blue; color: white;">
+      <h1>Slide 3</h1>
+    </ion-slide>
+
+  </ion-slides>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/split-pane/test/tabs/pages/side-page/side-page.module.ts b/src/components/split-pane/test/tabs/pages/side-page/side-page.module.ts
new file mode 100644
index 0000000000..eed65e5edb
--- /dev/null
+++ b/src/components/split-pane/test/tabs/pages/side-page/side-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { SidePage } from './side-page';
+
+@NgModule({
+  declarations: [
+    SidePage,
+  ],
+  imports: [
+    IonicPageModule.forChild(SidePage)
+  ]
+})
+export class SidePageModule {}
diff --git a/src/components/split-pane/test/tabs/pages/side-page/side-page.ts b/src/components/split-pane/test/tabs/pages/side-page/side-page.ts
new file mode 100644
index 0000000000..2b6fd32136
--- /dev/null
+++ b/src/components/split-pane/test/tabs/pages/side-page/side-page.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+import { NavController } from '../../../../..';
+
+@Component({
+  templateUrl: 'side-page.html'
+})
+export class SidePage {
+  constructor(public navCtrl: NavController) { }
+  push() {
+    this.navCtrl.push(SidePage);
+  }
+}
diff --git a/src/components/tabs/test/tab-bar-scenarios/app/main.html b/src/components/tabs/test/tab-bar-scenarios/app/app.component.html
similarity index 100%
rename from src/components/tabs/test/tab-bar-scenarios/app/main.html
rename to src/components/tabs/test/tab-bar-scenarios/app/app.component.html
diff --git a/src/components/tabs/test/tab-bar-scenarios/app/app.component.ts b/src/components/tabs/test/tab-bar-scenarios/app/app.component.ts
new file mode 100644
index 0000000000..ce5ff6399b
--- /dev/null
+++ b/src/components/tabs/test/tab-bar-scenarios/app/app.component.ts
@@ -0,0 +1,28 @@
+import { Component, ViewEncapsulation } from '@angular/core';
+import { RootPage } from '../pages/root-page/root-page';
+
+@Component({
+  templateUrl: 'app.component.html',
+  encapsulation: ViewEncapsulation.None,
+  styles: [
+    `
+    ion-tabs {
+      margin-bottom: 20px;
+      contain: none;
+    }
+    `,
+    `
+    ion-tabs,
+    ion-tabs ion-tabbar {
+      position: relative;
+      top: auto;
+      height: auto;
+      visibility: visible;
+      opacity: 1;
+    }
+    `
+  ]
+})
+export class AppComponent {
+  root = RootPage;
+}
diff --git a/src/components/tabs/test/tab-bar-scenarios/app/app.module.ts b/src/components/tabs/test/tab-bar-scenarios/app/app.module.ts
index 59d5acd811..7fb2e9ecf9 100644
--- a/src/components/tabs/test/tab-bar-scenarios/app/app.module.ts
+++ b/src/components/tabs/test/tab-bar-scenarios/app/app.module.ts
@@ -1,48 +1,19 @@
-import { Component, ViewEncapsulation, NgModule } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { RootPage } from '../pages/root-page/root-page';
-
-@Component({
-  templateUrl: 'main.html',
-  encapsulation: ViewEncapsulation.None,
-  styles: [
-    `
-    ion-tabs {
-      margin-bottom: 20px;
-      contain: none;
-    }
-    `,
-    `
-    ion-tabs,
-    ion-tabs ion-tabbar {
-      position: relative;
-      top: auto;
-      height: auto;
-      visibility: visible;
-      opacity: 1;
-    }
-    `
-  ]
-})
-export class AppComponent {
-  root = RootPage;
-}
+import { AppComponent } from './app.component';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    AppComponent,
-    RootPage
-  ]
 })
 export class AppModule {}
diff --git a/src/components/tabs/test/tab-bar-scenarios/pages/root-page/root-page.module.ts b/src/components/tabs/test/tab-bar-scenarios/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/tabs/test/tab-bar-scenarios/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/toggle/test/basic/app/app.component.ts b/src/components/toggle/test/basic/app/app.component.ts
new file mode 100644
index 0000000000..1318493908
--- /dev/null
+++ b/src/components/toggle/test/basic/app/app.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { RootPage } from '../pages/root-page/root-page';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = RootPage;
+}
diff --git a/src/components/toggle/test/basic/app/app.module.ts b/src/components/toggle/test/basic/app/app.module.ts
index 7b3247e989..7fb2e9ecf9 100644
--- a/src/components/toggle/test/basic/app/app.module.ts
+++ b/src/components/toggle/test/basic/app/app.module.ts
@@ -1,29 +1,19 @@
-import { Component, NgModule } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { RootPage } from '../pages/root-page/root-page';
-
-@Component({
-  template: '<ion-nav [root]="root"></ion-nav>'
-})
-export class AppComponent {
-  root = RootPage;
-}
+import { AppComponent } from './app.component';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    AppComponent,
-    RootPage
-  ]
 })
 export class AppModule {}
diff --git a/src/components/toggle/test/basic/pages/root-page/root-page.module.ts b/src/components/toggle/test/basic/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/toggle/test/basic/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/toolbar/test/basic/app/app.component.ts b/src/components/toolbar/test/basic/app/app.component.ts
new file mode 100644
index 0000000000..1318493908
--- /dev/null
+++ b/src/components/toolbar/test/basic/app/app.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { RootPage } from '../pages/root-page/root-page';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = RootPage;
+}
diff --git a/src/components/toolbar/test/basic/app/app.module.ts b/src/components/toolbar/test/basic/app/app.module.ts
index 2e81e35ab4..7fb2e9ecf9 100644
--- a/src/components/toolbar/test/basic/app/app.module.ts
+++ b/src/components/toolbar/test/basic/app/app.module.ts
@@ -1,29 +1,19 @@
-import { Component, NgModule } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { RootPage } from '../pages/root-page/root-page';
-
-@Component({
-  template: '<ion-nav [root]="rootPage"></ion-nav>'
-})
-export class AppComponent {
-  rootPage = RootPage;
-}
+import { AppComponent } from './app.component';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    AppComponent,
-    RootPage
-  ]
 })
-export class AppModule { }
+export class AppModule {}
diff --git a/src/components/toolbar/test/basic/pages/root-page/root-page.module.ts b/src/components/toolbar/test/basic/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/toolbar/test/basic/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/toolbar/test/colors/app/app.component.ts b/src/components/toolbar/test/colors/app/app.component.ts
new file mode 100644
index 0000000000..1318493908
--- /dev/null
+++ b/src/components/toolbar/test/colors/app/app.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { RootPage } from '../pages/root-page/root-page';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = RootPage;
+}
diff --git a/src/components/toolbar/test/colors/app/app.module.ts b/src/components/toolbar/test/colors/app/app.module.ts
index ccb01b4d83..7fb2e9ecf9 100644
--- a/src/components/toolbar/test/colors/app/app.module.ts
+++ b/src/components/toolbar/test/colors/app/app.module.ts
@@ -1,18 +1,19 @@
 import { NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../../../';
+import { BrowserModule } from '@angular/platform-browser';
+import { IonicApp, IonicModule } from '../../../../..';
 
-import { RootPage } from '../pages/root-page/root-page';
+import { AppComponent } from './app.component';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    RootPage
+    AppComponent
   ],
   imports: [
-    IonicModule.forRoot(RootPage)
+    BrowserModule,
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    RootPage
-  ]
 })
 export class AppModule {}
diff --git a/src/components/toolbar/test/colors/pages/root-page/root-page.module.ts b/src/components/toolbar/test/colors/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/toolbar/test/colors/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/toolbar/test/scenarios/app/app.component.ts b/src/components/toolbar/test/scenarios/app/app.component.ts
new file mode 100644
index 0000000000..1318493908
--- /dev/null
+++ b/src/components/toolbar/test/scenarios/app/app.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { RootPage } from '../pages/root-page/root-page';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = RootPage;
+}
diff --git a/src/components/toolbar/test/scenarios/app/app.module.ts b/src/components/toolbar/test/scenarios/app/app.module.ts
index ce5f782bce..7fb2e9ecf9 100644
--- a/src/components/toolbar/test/scenarios/app/app.module.ts
+++ b/src/components/toolbar/test/scenarios/app/app.module.ts
@@ -2,19 +2,18 @@ import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { RootPage } from '../pages/root-page/root-page';
+import { AppComponent } from './app.component';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(RootPage)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    RootPage
-  ]
 })
 export class AppModule {}
diff --git a/src/components/toolbar/test/scenarios/pages/root-page/root-page.module.ts b/src/components/toolbar/test/scenarios/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/toolbar/test/scenarios/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/typography/test/basic/app/app.component.ts b/src/components/typography/test/basic/app/app.component.ts
new file mode 100644
index 0000000000..1318493908
--- /dev/null
+++ b/src/components/typography/test/basic/app/app.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { RootPage } from '../pages/root-page/root-page';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = RootPage;
+}
diff --git a/src/components/typography/test/basic/app/app.module.ts b/src/components/typography/test/basic/app/app.module.ts
index 7b3247e989..7fb2e9ecf9 100644
--- a/src/components/typography/test/basic/app/app.module.ts
+++ b/src/components/typography/test/basic/app/app.module.ts
@@ -1,29 +1,19 @@
-import { Component, NgModule } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { RootPage } from '../pages/root-page/root-page';
-
-@Component({
-  template: '<ion-nav [root]="root"></ion-nav>'
-})
-export class AppComponent {
-  root = RootPage;
-}
+import { AppComponent } from './app.component';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    AppComponent,
-    RootPage
-  ]
 })
 export class AppModule {}
diff --git a/src/components/typography/test/basic/pages/root-page/root-page.module.ts b/src/components/typography/test/basic/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/typography/test/basic/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}
diff --git a/src/components/virtual-scroll/test/media/app/app.component.ts b/src/components/virtual-scroll/test/media/app/app.component.ts
new file mode 100644
index 0000000000..1318493908
--- /dev/null
+++ b/src/components/virtual-scroll/test/media/app/app.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { RootPage } from '../pages/root-page/root-page';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = RootPage;
+}
diff --git a/src/components/virtual-scroll/test/media/app/app.module.ts b/src/components/virtual-scroll/test/media/app/app.module.ts
index 529bc4b190..7fb2e9ecf9 100644
--- a/src/components/virtual-scroll/test/media/app/app.module.ts
+++ b/src/components/virtual-scroll/test/media/app/app.module.ts
@@ -1,30 +1,19 @@
-import { Component, NgModule } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { RootPage } from '../pages/root-page/root-page';
-
-@Component({
-  template: '<ion-nav [root]="root"></ion-nav>'
-})
-export class AppComponent {
-  root = RootPage;
-}
-
+import { AppComponent } from './app.component';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    AppComponent,
-    RootPage
-  ]
 })
 export class AppModule {}
diff --git a/src/components/virtual-scroll/test/media/pages/root-page/root-page.module.ts b/src/components/virtual-scroll/test/media/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..85fba79181
--- /dev/null
+++ b/src/components/virtual-scroll/test/media/pages/root-page/root-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}