diff --git a/src/components/toggle/test/basic/app/app.module.ts b/src/components/toggle/test/basic/app/app.module.ts
new file mode 100644
index 0000000000..2bca994a45
--- /dev/null
+++ b/src/components/toggle/test/basic/app/app.module.ts
@@ -0,0 +1,29 @@
+import { Component, 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 E2EApp {
+  root = RootPage;
+}
+
+@NgModule({
+  declarations: [
+    E2EApp,
+    RootPage
+  ],
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(E2EApp)
+  ],
+  bootstrap: [IonicApp],
+  entryComponents: [
+    E2EApp,
+    RootPage
+  ]
+})
+export class AppModule {}
diff --git a/src/components/toggle/test/basic/main.ts b/src/components/toggle/test/basic/app/main.ts
similarity index 100%
rename from src/components/toggle/test/basic/main.ts
rename to src/components/toggle/test/basic/app/main.ts
diff --git a/src/components/toggle/test/basic/main.html b/src/components/toggle/test/basic/pages/root-page/root-page.html
similarity index 100%
rename from src/components/toggle/test/basic/main.html
rename to src/components/toggle/test/basic/pages/root-page/root-page.html
diff --git a/src/components/toggle/test/basic/app.module.ts b/src/components/toggle/test/basic/pages/root-page/root-page.ts
similarity index 71%
rename from src/components/toggle/test/basic/app.module.ts
rename to src/components/toggle/test/basic/pages/root-page/root-page.ts
index b19be4ffef..86fd1566d8 100644
--- a/src/components/toggle/test/basic/app.module.ts
+++ b/src/components/toggle/test/basic/pages/root-page/root-page.ts
@@ -1,13 +1,12 @@
-import { Component, NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
+import { Component } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
-import { IonicApp, IonicModule, Toggle } from '../../../..';
 
+import { Toggle } from '../../../../../../';
 
 @Component({
-  templateUrl: 'main.html'
+  templateUrl: 'root-page.html'
 })
-export class E2EPage {
+export class RootPage {
   grapeDisabled: boolean;
   grapeChecked: boolean;
   kiwiValue: boolean;
@@ -63,27 +62,3 @@ export class E2EPage {
     ev.preventDefault();
   }
 }
-
-@Component({
-  template: '<ion-nav [root]="root"></ion-nav>'
-})
-export class E2EApp {
-  root = E2EPage;
-}
-
-@NgModule({
-  declarations: [
-    E2EApp,
-    E2EPage
-  ],
-  imports: [
-    BrowserModule,
-    IonicModule.forRoot(E2EApp)
-  ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    E2EApp,
-    E2EPage
-  ]
-})
-export class AppModule {}
diff --git a/src/components/toolbar/test/basic/app.module.ts b/src/components/toolbar/test/basic/app/app.module.ts
similarity index 70%
rename from src/components/toolbar/test/basic/app.module.ts
rename to src/components/toolbar/test/basic/app/app.module.ts
index b454b94710..8da432ed93 100644
--- a/src/components/toolbar/test/basic/app.module.ts
+++ b/src/components/toolbar/test/basic/app/app.module.ts
@@ -1,27 +1,20 @@
 import { Component, NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import { IonicApp, IonicModule } from '../../../..';
-
-
-@Component({
-  templateUrl: 'main.html'
-})
-export class E2EPage {
-
-}
+import { IonicApp, IonicModule } from '../../../../..';
 
+import { RootPage } from '../pages/root-page/root-page';
 
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
 export class E2EApp {
-  rootPage = E2EPage;
+  rootPage = RootPage;
 }
 
 @NgModule({
   declarations: [
     E2EApp,
-    E2EPage
+    RootPage
   ],
   imports: [
     BrowserModule,
@@ -30,7 +23,7 @@ export class E2EApp {
   bootstrap: [IonicApp],
   entryComponents: [
     E2EApp,
-    E2EPage
+    RootPage
   ]
 })
 export class AppModule { }
diff --git a/src/components/toolbar/test/basic/main.ts b/src/components/toolbar/test/basic/app/main.ts
similarity index 100%
rename from src/components/toolbar/test/basic/main.ts
rename to src/components/toolbar/test/basic/app/main.ts
diff --git a/src/components/toolbar/test/basic/main.html b/src/components/toolbar/test/basic/pages/root-page/root-page.html
similarity index 99%
rename from src/components/toolbar/test/basic/main.html
rename to src/components/toolbar/test/basic/pages/root-page/root-page.html
index dd4fed610f..33c3a811d5 100644
--- a/src/components/toolbar/test/basic/main.html
+++ b/src/components/toolbar/test/basic/pages/root-page/root-page.html
@@ -103,4 +103,4 @@
       Footer
     </ion-title>
   </ion-toolbar>
-</ion-footer>
+</ion-footer>
\ No newline at end of file
diff --git a/src/components/toolbar/test/basic/pages/root-page/root-page.ts b/src/components/toolbar/test/basic/pages/root-page/root-page.ts
new file mode 100644
index 0000000000..067caddbcc
--- /dev/null
+++ b/src/components/toolbar/test/basic/pages/root-page/root-page.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+
+@Component({
+  templateUrl: 'root-page.html'
+})
+export class RootPage {
+
+}
diff --git a/src/components/toolbar/test/colors/app.module.ts b/src/components/toolbar/test/colors/app.module.ts
index e2e5f18343..8336aff2a0 100644
--- a/src/components/toolbar/test/colors/app.module.ts
+++ b/src/components/toolbar/test/colors/app.module.ts
@@ -1,6 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../';
 
 
 @Component({
@@ -19,7 +18,6 @@ export class E2EApp {
     E2EApp
   ],
   imports: [
-    BrowserModule,
     IonicModule.forRoot(E2EApp)
   ],
   bootstrap: [IonicApp],
diff --git a/src/components/typography/test/basic/app/app.module.ts b/src/components/typography/test/basic/app/app.module.ts
new file mode 100644
index 0000000000..2bca994a45
--- /dev/null
+++ b/src/components/typography/test/basic/app/app.module.ts
@@ -0,0 +1,29 @@
+import { Component, 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 E2EApp {
+  root = RootPage;
+}
+
+@NgModule({
+  declarations: [
+    E2EApp,
+    RootPage
+  ],
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(E2EApp)
+  ],
+  bootstrap: [IonicApp],
+  entryComponents: [
+    E2EApp,
+    RootPage
+  ]
+})
+export class AppModule {}
diff --git a/src/components/toolbar/test/colors/main.ts b/src/components/typography/test/basic/app/main.ts
similarity index 100%
rename from src/components/toolbar/test/colors/main.ts
rename to src/components/typography/test/basic/app/main.ts
diff --git a/src/components/typography/test/basic/main.html b/src/components/typography/test/basic/pages/root-page/root-page.html
similarity index 100%
rename from src/components/typography/test/basic/main.html
rename to src/components/typography/test/basic/pages/root-page/root-page.html
diff --git a/src/components/typography/test/basic/pages/root-page/root-page.ts b/src/components/typography/test/basic/pages/root-page/root-page.ts
new file mode 100644
index 0000000000..b655a69f1d
--- /dev/null
+++ b/src/components/typography/test/basic/pages/root-page/root-page.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+
+@Component({
+  templateUrl: 'root-page.html'
+})
+export class RootPage {
+  dynamicColor: string = 'secondary';
+}
diff --git a/src/components/typography/test/basic/app.module.ts b/src/components/virtual-scroll/test/media/app/app.module.ts
similarity index 67%
rename from src/components/typography/test/basic/app.module.ts
rename to src/components/virtual-scroll/test/media/app/app.module.ts
index 288c0cfe85..be8ec28c5b 100644
--- a/src/components/typography/test/basic/app.module.ts
+++ b/src/components/virtual-scroll/test/media/app/app.module.ts
@@ -1,26 +1,21 @@
 import { Component, NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../..';
 
-
-@Component({
-  templateUrl: 'main.html'
-})
-export class E2EPage {
-  dynamicColor: string = 'secondary';
-}
+import { RootPage } from '../pages/root-page/root-page';
 
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
 export class E2EApp {
-  root = E2EPage;
+  root = RootPage;
 }
 
+
 @NgModule({
   declarations: [
     E2EApp,
-    E2EPage
+    RootPage
   ],
   imports: [
     BrowserModule,
@@ -29,7 +24,7 @@ export class E2EApp {
   bootstrap: [IonicApp],
   entryComponents: [
     E2EApp,
-    E2EPage
+    RootPage
   ]
 })
 export class AppModule {}
diff --git a/src/components/typography/test/basic/main.ts b/src/components/virtual-scroll/test/media/app/main.ts
similarity index 100%
rename from src/components/typography/test/basic/main.ts
rename to src/components/virtual-scroll/test/media/app/main.ts
diff --git a/src/components/virtual-scroll/test/media/main.ts b/src/components/virtual-scroll/test/media/main.ts
deleted file mode 100644
index 6af7a5b2ae..0000000000
--- a/src/components/virtual-scroll/test/media/main.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-
-import { AppModule } from './app.module';
-
-platformBrowserDynamic().bootstrapModule(AppModule);
diff --git a/src/components/virtual-scroll/test/media/main.html b/src/components/virtual-scroll/test/media/pages/root-page/root-page.html
similarity index 97%
rename from src/components/virtual-scroll/test/media/main.html
rename to src/components/virtual-scroll/test/media/pages/root-page/root-page.html
index fd8881c03e..4a20da2fae 100644
--- a/src/components/virtual-scroll/test/media/main.html
+++ b/src/components/virtual-scroll/test/media/pages/root-page/root-page.html
@@ -20,4 +20,4 @@
       <ion-range *ngIf="item.type === 'range'"></ion-range>
     </ion-item>
   </ion-list>
-</ion-content>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/virtual-scroll/test/media/app.module.ts b/src/components/virtual-scroll/test/media/pages/root-page/root-page.ts
similarity index 62%
rename from src/components/virtual-scroll/test/media/app.module.ts
rename to src/components/virtual-scroll/test/media/pages/root-page/root-page.ts
index 4ad07a2163..684a579c9f 100644
--- a/src/components/virtual-scroll/test/media/app.module.ts
+++ b/src/components/virtual-scroll/test/media/pages/root-page/root-page.ts
@@ -1,12 +1,10 @@
-import { Component, NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { IonicApp, IonicModule, Platform } from '../../../..';
-
+import { Component } from '@angular/core';
+import { Platform } from '../../../../../../';
 
 @Component({
-  templateUrl: 'main.html'
+  templateUrl: 'root-page.html'
 })
-export class E2EPage {
+export class RootPage {
   items: any[] = [];
   webview: string = '';
   type: string = 'range';
@@ -55,29 +53,3 @@ export class E2EPage {
   }
 
 }
-
-
-@Component({
-  template: '<ion-nav [root]="root"></ion-nav>'
-})
-export class E2EApp {
-  root = E2EPage;
-}
-
-
-@NgModule({
-  declarations: [
-    E2EApp,
-    E2EPage
-  ],
-  imports: [
-    BrowserModule,
-    IonicModule.forRoot(E2EApp)
-  ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    E2EApp,
-    E2EPage
-  ]
-})
-export class AppModule {}