diff --git a/src/components/list/test/headers/app.module.ts b/src/components/list/test/headers/app.module.ts
deleted file mode 100644
index 56f5e35494..0000000000
--- a/src/components/list/test/headers/app.module.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Component, NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { IonicApp, IonicModule } from '../../../..';
-
-
-@Component({
-  templateUrl: 'main.html'
-})
-export class E2EPage {}
-
-@Component({
-  template: '<ion-nav [root]="rootPage"></ion-nav>'
-})
-export class E2EApp {
-  rootPage = E2EPage;
-}
-
-@NgModule({
-  declarations: [
-    E2EApp,
-    E2EPage
-  ],
-  imports: [
-    BrowserModule,
-    IonicModule.forRoot(E2EApp)
-  ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    E2EApp,
-    E2EPage
-  ]
-})
-export class AppModule {}
diff --git a/src/components/list/test/headers/app/app.component.ts b/src/components/list/test/headers/app/app.component.ts
new file mode 100644
index 0000000000..2702201592
--- /dev/null
+++ b/src/components/list/test/headers/app/app.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { E2EPage } from '../pages/e2e-page/e2e-page';
+
+@Component({
+  template: '<ion-nav [root]="rootPage"></ion-nav>'
+})
+export class E2EApp {
+  rootPage = E2EPage;
+}
diff --git a/src/components/list/test/headers/app/app.module.ts b/src/components/list/test/headers/app/app.module.ts
new file mode 100644
index 0000000000..5d45a8bfa4
--- /dev/null
+++ b/src/components/list/test/headers/app/app.module.ts
@@ -0,0 +1,27 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { IonicApp, IonicModule } from '../../../../..';
+
+import { E2EApp } from './app.component';
+import { E2EPage } from '../pages/e2e-page/e2e-page';
+
+@NgModule({
+  declarations: [
+    E2EApp,
+    E2EPage
+  ],
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(E2EApp, {}, {
+      links: [
+        { component: E2EPage, name: 'e2e-page' }
+      ]
+    })
+  ],
+  bootstrap: [IonicApp],
+  entryComponents: [
+    E2EApp,
+    E2EPage
+  ]
+})
+export class AppModule { }
diff --git a/src/components/list/test/headers/main.ts b/src/components/list/test/headers/app/main.ts
similarity index 100%
rename from src/components/list/test/headers/main.ts
rename to src/components/list/test/headers/app/main.ts
diff --git a/src/components/list/test/headers/pages/e2e-page/e2e-page.ts b/src/components/list/test/headers/pages/e2e-page/e2e-page.ts
new file mode 100644
index 0000000000..44c7913473
--- /dev/null
+++ b/src/components/list/test/headers/pages/e2e-page/e2e-page.ts
@@ -0,0 +1,5 @@
+import { Component } from '@angular/core';
+@Component({
+  templateUrl: 'main.html'
+})
+export class E2EPage { }
diff --git a/src/components/list/test/headers/main.html b/src/components/list/test/headers/pages/e2e-page/main.html
similarity index 100%
rename from src/components/list/test/headers/main.html
rename to src/components/list/test/headers/pages/e2e-page/main.html
diff --git a/src/components/list/test/inset/app.module.ts b/src/components/list/test/inset/app.module.ts
deleted file mode 100644
index 56f5e35494..0000000000
--- a/src/components/list/test/inset/app.module.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Component, NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { IonicApp, IonicModule } from '../../../..';
-
-
-@Component({
-  templateUrl: 'main.html'
-})
-export class E2EPage {}
-
-@Component({
-  template: '<ion-nav [root]="rootPage"></ion-nav>'
-})
-export class E2EApp {
-  rootPage = E2EPage;
-}
-
-@NgModule({
-  declarations: [
-    E2EApp,
-    E2EPage
-  ],
-  imports: [
-    BrowserModule,
-    IonicModule.forRoot(E2EApp)
-  ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    E2EApp,
-    E2EPage
-  ]
-})
-export class AppModule {}
diff --git a/src/components/list/test/inset/app/app.component.ts b/src/components/list/test/inset/app/app.component.ts
new file mode 100644
index 0000000000..604be14520
--- /dev/null
+++ b/src/components/list/test/inset/app/app.component.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+import { E2EPage } from '../pages/e2e-page/e2e-page';
+@Component({
+  template: '<ion-nav [root]="rootPage"></ion-nav>'
+})
+export class E2EApp {
+  rootPage = E2EPage;
+}
diff --git a/src/components/list/test/inset/app/app.module.ts b/src/components/list/test/inset/app/app.module.ts
new file mode 100644
index 0000000000..5d45a8bfa4
--- /dev/null
+++ b/src/components/list/test/inset/app/app.module.ts
@@ -0,0 +1,27 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { IonicApp, IonicModule } from '../../../../..';
+
+import { E2EApp } from './app.component';
+import { E2EPage } from '../pages/e2e-page/e2e-page';
+
+@NgModule({
+  declarations: [
+    E2EApp,
+    E2EPage
+  ],
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(E2EApp, {}, {
+      links: [
+        { component: E2EPage, name: 'e2e-page' }
+      ]
+    })
+  ],
+  bootstrap: [IonicApp],
+  entryComponents: [
+    E2EApp,
+    E2EPage
+  ]
+})
+export class AppModule { }
diff --git a/src/components/list/test/inset/main.ts b/src/components/list/test/inset/app/main.ts
similarity index 100%
rename from src/components/list/test/inset/main.ts
rename to src/components/list/test/inset/app/main.ts
diff --git a/src/components/list/test/inset/pages/e2e-page/e2e-page.ts b/src/components/list/test/inset/pages/e2e-page/e2e-page.ts
new file mode 100644
index 0000000000..44c7913473
--- /dev/null
+++ b/src/components/list/test/inset/pages/e2e-page/e2e-page.ts
@@ -0,0 +1,5 @@
+import { Component } from '@angular/core';
+@Component({
+  templateUrl: 'main.html'
+})
+export class E2EPage { }
diff --git a/src/components/list/test/inset/main.html b/src/components/list/test/inset/pages/e2e-page/main.html
similarity index 100%
rename from src/components/list/test/inset/main.html
rename to src/components/list/test/inset/pages/e2e-page/main.html
diff --git a/src/components/list/test/no-lines/app.module.ts b/src/components/list/test/no-lines/app.module.ts
deleted file mode 100644
index 56f5e35494..0000000000
--- a/src/components/list/test/no-lines/app.module.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Component, NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { IonicApp, IonicModule } from '../../../..';
-
-
-@Component({
-  templateUrl: 'main.html'
-})
-export class E2EPage {}
-
-@Component({
-  template: '<ion-nav [root]="rootPage"></ion-nav>'
-})
-export class E2EApp {
-  rootPage = E2EPage;
-}
-
-@NgModule({
-  declarations: [
-    E2EApp,
-    E2EPage
-  ],
-  imports: [
-    BrowserModule,
-    IonicModule.forRoot(E2EApp)
-  ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    E2EApp,
-    E2EPage
-  ]
-})
-export class AppModule {}
diff --git a/src/components/list/test/no-lines/app/app.component.ts b/src/components/list/test/no-lines/app/app.component.ts
new file mode 100644
index 0000000000..0064586967
--- /dev/null
+++ b/src/components/list/test/no-lines/app/app.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+import { E2EPage } from '../pages/e2e-page/e2e-page';
+
+@Component({
+  template: '<ion-nav [root]="rootPage"></ion-nav>'
+})
+export class E2EApp {
+  rootPage = E2EPage;
+}
+
diff --git a/src/components/list/test/no-lines/app/app.module.ts b/src/components/list/test/no-lines/app/app.module.ts
new file mode 100644
index 0000000000..e047e2b8f8
--- /dev/null
+++ b/src/components/list/test/no-lines/app/app.module.ts
@@ -0,0 +1,27 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { IonicApp, IonicModule } from '../../../../..';
+import { E2EApp } from './app.component';
+import { E2EPage } from '../pages/e2e-page/e2e-page';
+
+
+@NgModule({
+  declarations: [
+    E2EApp,
+    E2EPage
+  ],
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(E2EApp, {}, {
+      links: [
+        { component: E2EPage, name: 'e2e-page' }
+      ]
+    })
+  ],
+  bootstrap: [IonicApp],
+  entryComponents: [
+    E2EApp,
+    E2EPage
+  ]
+})
+export class AppModule { }
diff --git a/src/components/list/test/no-lines/main.ts b/src/components/list/test/no-lines/app/main.ts
similarity index 100%
rename from src/components/list/test/no-lines/main.ts
rename to src/components/list/test/no-lines/app/main.ts
diff --git a/src/components/list/test/no-lines/pages/e2e-page/e2e-page.ts b/src/components/list/test/no-lines/pages/e2e-page/e2e-page.ts
new file mode 100644
index 0000000000..073b8215df
--- /dev/null
+++ b/src/components/list/test/no-lines/pages/e2e-page/e2e-page.ts
@@ -0,0 +1,6 @@
+import { Component } from '@angular/core';
+
+@Component({
+  templateUrl: 'main.html'
+})
+export class E2EPage { }
diff --git a/src/components/list/test/no-lines/main.html b/src/components/list/test/no-lines/pages/e2e-page/main.html
similarity index 100%
rename from src/components/list/test/no-lines/main.html
rename to src/components/list/test/no-lines/pages/e2e-page/main.html
diff --git a/src/components/loading/test/basic/app/app.component.ts b/src/components/loading/test/basic/app/app.component.ts
new file mode 100644
index 0000000000..12de82c390
--- /dev/null
+++ b/src/components/loading/test/basic/app/app.component.ts
@@ -0,0 +1,23 @@
+import { Component, ViewEncapsulation } from '@angular/core';
+import { App } from '../../../../..';
+import { E2EPage } from '../pages/e2e-page/e2e-page';
+
+@Component({
+  template: `
+    <ion-nav [root]="root"></ion-nav>
+  `,
+  encapsulation: ViewEncapsulation.None
+})
+export class E2EApp {
+  root = E2EPage;
+
+  constructor(app: App) {
+    app.viewDidLeave.subscribe((ev: any) => {
+      console.log('App didLeave');
+    });
+
+    app.viewWillLeave.subscribe((ev: any) => {
+      console.log('App willLeave');
+    });
+  }
+}
diff --git a/src/components/loading/test/basic/app/app.module.ts b/src/components/loading/test/basic/app/app.module.ts
new file mode 100644
index 0000000000..9151e4f359
--- /dev/null
+++ b/src/components/loading/test/basic/app/app.module.ts
@@ -0,0 +1,30 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { IonicApp, IonicModule } from '../../../../..';
+
+import { E2EApp } from './app.component';
+import { E2EPage } from '../pages/e2e-page/e2e-page';
+
+@NgModule({
+  declarations: [
+    E2EApp,
+    E2EPage,
+  ],
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(E2EApp, {}, {
+      links: [
+        { component: E2EPage, name: 'e2e-page' },
+        { loadChildren: '../pages/page2/page2.module#Page2Module', name: 'page2' },
+        { loadChildren: '../pages/page3/page3.module#Page3Module', name: 'page3' }
+      ]
+    })
+  ],
+  bootstrap: [IonicApp],
+  entryComponents: [
+    E2EApp,
+    E2EPage,
+  ]
+})
+export class AppModule { }
+
diff --git a/src/components/loading/test/basic/main.ts b/src/components/loading/test/basic/app/main.ts
similarity index 100%
rename from src/components/loading/test/basic/main.ts
rename to src/components/loading/test/basic/app/main.ts
diff --git a/src/components/loading/test/basic/app.module.ts b/src/components/loading/test/basic/pages/e2e-page/e2e-page.ts
similarity index 70%
rename from src/components/loading/test/basic/app.module.ts
rename to src/components/loading/test/basic/pages/e2e-page/e2e-page.ts
index 7b54d69809..c4de81b41d 100644
--- a/src/components/loading/test/basic/app.module.ts
+++ b/src/components/loading/test/basic/pages/e2e-page/e2e-page.ts
@@ -1,8 +1,5 @@
-import { Component, ViewEncapsulation, NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { App, IonicApp, IonicModule, LoadingController, NavController } from '../../../..';
-
-
+import { Component } from '@angular/core';
+import { LoadingController, NavController } from '../../../../../..';
 @Component({
   templateUrl: 'main.html',
   styles: [
@@ -81,7 +78,10 @@ import { App, IonicApp, IonicModule, LoadingController, NavController } from '..
   ]
 })
 export class E2EPage {
-  constructor(public loadingCtrl: LoadingController, public navCtrl: NavController) {}
+  constructor(
+    public loadingCtrl: LoadingController,
+    public navCtrl: NavController
+  ) { }
 
   presentLoadingIos() {
     let loading = this.loadingCtrl.create({
@@ -91,7 +91,7 @@ export class E2EPage {
     });
 
     loading.onDidDismiss(() => {
-     console.log('Dismissed loading');
+      console.log('Dismissed loading');
     });
 
     loading.present();
@@ -179,7 +179,7 @@ export class E2EPage {
     loading.present();
 
     setTimeout(() => {
-      this.navCtrl.push(Page2);
+      this.navCtrl.push('page2');
     }, 1000);
 
     setTimeout(() => {
@@ -188,7 +188,7 @@ export class E2EPage {
   }
 
   goToPage2() {
-    this.navCtrl.push(Page2);
+    this.navCtrl.push('page2');
   }
 
   presentLoadingMultiple() {
@@ -214,12 +214,12 @@ export class E2EPage {
     });
 
     setTimeout(() => {
+
       loading3.present();
 
       loading3.dismiss();
       loading2.dismiss();
       loading.dismiss();
-
     }, 2000);
 
   }
@@ -239,7 +239,7 @@ export class E2EPage {
         dismissOnPageChange: true
       }).present();
 
-      this.navCtrl.push(Page2);
+      this.navCtrl.push('page2');
 
     }, 500);
   }
@@ -252,88 +252,7 @@ export class E2EPage {
     }).present();
 
     setTimeout(() => {
-      this.navCtrl.push(Page2);
+      this.navCtrl.push('page2');
     }, 500);
   }
 }
-
-@Component({
-  template: `
-    <ion-header>
-      <ion-navbar>
-        <ion-title>Page 2</ion-title>
-      </ion-navbar>
-    </ion-header>
-    <ion-content padding>Some content</ion-content>
-    <ion-footer>
-      <ion-toolbar>
-        <ion-buttons end>
-          <button ion-button icon-right (click)="goToPage3()">
-            Navigate
-            <ion-icon name="arrow-forward"></ion-icon>
-          </button>
-        </ion-buttons>
-      </ion-toolbar>
-    </ion-footer>
-  `
-})
-export class Page2 {
-  constructor(public navCtrl: NavController) {}
-
-  goToPage3() {
-    this.navCtrl.push(Page3);
-  }
-}
-
-@Component({
-  template: `
-    <ion-header>
-      <ion-navbar>
-        <ion-title>Page 3</ion-title>
-      </ion-navbar>
-    </ion-header>
-    <ion-content padding>Some content</ion-content>
-  `
-})
-export class Page3 {}
-
-@Component({
-  template: `
-    <ion-nav [root]="root"></ion-nav>
-  `,
-  encapsulation: ViewEncapsulation.None
-})
-export class E2EApp {
-  root = E2EPage;
-
-  constructor(app: App) {
-    app.viewDidLeave.subscribe((ev: any) => {
-      console.log('App didLeave');
-    });
-
-    app.viewWillLeave.subscribe((ev: any) => {
-      console.log('App willLeave');
-    });
-  }
-}
-
-@NgModule({
-  declarations: [
-    E2EApp,
-    E2EPage,
-    Page2,
-    Page3
-  ],
-  imports: [
-    BrowserModule,
-    IonicModule.forRoot(E2EApp)
-  ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    E2EApp,
-    E2EPage,
-    Page2,
-    Page3
-  ]
-})
-export class AppModule {}
diff --git a/src/components/loading/test/basic/main.html b/src/components/loading/test/basic/pages/e2e-page/main.html
similarity index 100%
rename from src/components/loading/test/basic/main.html
rename to src/components/loading/test/basic/pages/e2e-page/main.html
diff --git a/src/components/loading/test/basic/pages/page2/page2.module.ts b/src/components/loading/test/basic/pages/page2/page2.module.ts
new file mode 100644
index 0000000000..55ca588e3d
--- /dev/null
+++ b/src/components/loading/test/basic/pages/page2/page2.module.ts
@@ -0,0 +1,9 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+import { Page2 } from './page2';
+@NgModule({
+  imports: [DeepLinkModule.forChild(Page2)],
+  declarations: [Page2],
+  entryComponents: [Page2]
+})
+export class Page2Module { }
diff --git a/src/components/loading/test/basic/pages/page2/page2.ts b/src/components/loading/test/basic/pages/page2/page2.ts
new file mode 100644
index 0000000000..b1157ceee0
--- /dev/null
+++ b/src/components/loading/test/basic/pages/page2/page2.ts
@@ -0,0 +1,29 @@
+import { Component } from '@angular/core';
+import { NavController } from '../../../../../..';
+@Component({
+  template: `
+    <ion-header>
+      <ion-navbar>
+        <ion-title>Page 2</ion-title>
+      </ion-navbar>
+    </ion-header>
+    <ion-content padding>Some content</ion-content>
+    <ion-footer>
+      <ion-toolbar>
+        <ion-buttons end>
+          <button ion-button icon-right (click)="goToPage3()">
+            Navigate
+            <ion-icon name="arrow-forward"></ion-icon>
+          </button>
+        </ion-buttons>
+      </ion-toolbar>
+    </ion-footer>
+  `
+})
+export class Page2 {
+  constructor(public navCtrl: NavController) {}
+
+  goToPage3() {
+    this.navCtrl.push('page3');
+  }
+}
diff --git a/src/components/loading/test/basic/pages/page3/page3.module.ts b/src/components/loading/test/basic/pages/page3/page3.module.ts
new file mode 100644
index 0000000000..9029bf9974
--- /dev/null
+++ b/src/components/loading/test/basic/pages/page3/page3.module.ts
@@ -0,0 +1,16 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+import { Page3 } from './page3';
+
+@NgModule({
+  imports: [
+    DeepLinkModule.forChild(Page3)
+  ],
+  declarations: [
+    Page3
+  ],
+  entryComponents: [
+    Page3,
+  ]
+})
+export class Page3Module { }
diff --git a/src/components/loading/test/basic/pages/page3/page3.ts b/src/components/loading/test/basic/pages/page3/page3.ts
new file mode 100644
index 0000000000..052854dcfa
--- /dev/null
+++ b/src/components/loading/test/basic/pages/page3/page3.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+@Component({
+  template: `
+    <ion-header>
+      <ion-navbar>
+        <ion-title>Page 3</ion-title>
+      </ion-navbar>
+    </ion-header>
+    <ion-content padding>Some content</ion-content>
+  `
+})
+export class Page3 {}