diff --git a/package.json b/package.json
index e632ad2077..29cc0fb389 100644
--- a/package.json
+++ b/package.json
@@ -25,15 +25,15 @@
     "link": "gulp release.prepareReleasePackage && cd dist/ionic-angular && npm link"
   },
   "dependencies": {
-    "@angular/common": "4.0.0-rc.2",
-    "@angular/compiler": "4.0.0-rc.2",
-    "@angular/compiler-cli": "4.0.0-rc.2",
-    "@angular/core": "4.0.0-rc.2",
-    "@angular/forms": "4.0.0-rc.2",
-    "@angular/http": "4.0.0-rc.2",
-    "@angular/platform-browser": "4.0.0-rc.2",
-    "@angular/platform-browser-dynamic": "4.0.0-rc.2",
-    "@angular/platform-server": "4.0.0-rc.2",
+    "@angular/common": "4.0.0-rc.3",
+    "@angular/compiler": "4.0.0-rc.3",
+    "@angular/compiler-cli": "4.0.0-rc.3",
+    "@angular/core": "4.0.0-rc.3",
+    "@angular/forms": "4.0.0-rc.3",
+    "@angular/http": "4.0.0-rc.3",
+    "@angular/platform-browser": "4.0.0-rc.3",
+    "@angular/platform-browser-dynamic": "4.0.0-rc.3",
+    "@angular/platform-server": "4.0.0-rc.3",
     "ionicons": "~3.0.0",
     "rxjs": "5.1.1",
     "zone.js": "^0.7.2"
diff --git a/scripts/gulp/utils/app-scripts-worker-client.ts b/scripts/gulp/utils/app-scripts-worker-client.ts
index 073aa0c193..e07200fdd1 100644
--- a/scripts/gulp/utils/app-scripts-worker-client.ts
+++ b/scripts/gulp/utils/app-scripts-worker-client.ts
@@ -1,5 +1,5 @@
 import { fork, ChildProcess } from 'child_process';
-import { join } from 'path';
+import { dirname, join } from 'path';
 
 import { MessageToWorker, WorkerProcess } from './interfaces';
 
@@ -55,11 +55,15 @@ export function createWorker(msg: MessageToWorker): any {
     }
   }
 
+  // default it to use the test/basic, or test/xyz directory
+  const deepLinksDir = dirname(dirname(msg.appNgModulePath));
+
   try {
       let scriptArgs = [
       'build',
       '--appEntryPoint', msg.appEntryPoint,
       '--appNgModulePath', msg.appNgModulePath,
+      '--deepLinksDir', deepLinksDir,
       '--srcDir', msg.srcDir,
       '--wwwDir', msg.distDir,
       '--tsconfig', msg.tsConfig,
diff --git a/src/components/action-sheet/test/basic/app/app.module.ts b/src/components/action-sheet/test/basic/app/app.module.ts
index 2425dd19a5..50143d2e7d 100644
--- a/src/components/action-sheet/test/basic/app/app.module.ts
+++ b/src/components/action-sheet/test/basic/app/app.module.ts
@@ -12,11 +12,7 @@ import { PageOneModule } from '../pages/page-one/page-one.module';
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent, {}, {
-      links: [
-        { loadChildren: '../pages/modal-page/modal-page.module#ModalPageModule', name: 'modal-page' }
-      ]
-    }),
+    IonicModule.forRoot(AppComponent, {}),
     ModalPageModule,
     PageOneModule
   ],
diff --git a/src/components/action-sheet/test/basic/pages/modal-page/modal-page.ts b/src/components/action-sheet/test/basic/pages/modal-page/modal-page.ts
index ef943c06da..6b22b0c1a1 100644
--- a/src/components/action-sheet/test/basic/pages/modal-page/modal-page.ts
+++ b/src/components/action-sheet/test/basic/pages/modal-page/modal-page.ts
@@ -1,6 +1,9 @@
 import { Component } from '@angular/core';
-import { ViewController } from '../../../../../..';
+import { DeepLink, ViewController } from '../../../../../..';
 
+@DeepLink({
+  name: 'modal-page'
+})
 @Component({
   template: `
     <ion-header>
diff --git a/src/components/action-sheet/test/basic/pages/page-one/page-one.ts b/src/components/action-sheet/test/basic/pages/page-one/page-one.ts
index d2851c4051..d6c7c8b6ba 100644
--- a/src/components/action-sheet/test/basic/pages/page-one/page-one.ts
+++ b/src/components/action-sheet/test/basic/pages/page-one/page-one.ts
@@ -1,6 +1,7 @@
 import { Component } from '@angular/core';
-import { ActionSheetController, AlertController, ModalController, Platform } from '../../../../../..';
+import { ActionSheetController, AlertController, DeepLink, ModalController, Platform } from '../../../../../..';
 
+@DeepLink()
 @Component({
   templateUrl: 'page-one.html'
 })
diff --git a/src/components/alert/test/basic/app/app.module.ts b/src/components/alert/test/basic/app/app.module.ts
index ab223f69f3..7249f00c76 100644
--- a/src/components/alert/test/basic/app/app.module.ts
+++ b/src/components/alert/test/basic/app/app.module.ts
@@ -11,11 +11,7 @@ import { PageOneModule } from '../pages/page-one/page-one.module';
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp, {}, {
-      links: [
-        { loadChildren: '../pages/modal-page/modal-page.module#ModalPageModule', name: 'modal-page'}
-      ]
-    }),
+    IonicModule.forRoot(E2EApp, {}),
     PageOneModule
   ],
   bootstrap: [IonicApp]
diff --git a/src/components/alert/test/basic/pages/modal-page/modal-page.ts b/src/components/alert/test/basic/pages/modal-page/modal-page.ts
index e556ca7302..fadb3620d4 100644
--- a/src/components/alert/test/basic/pages/modal-page/modal-page.ts
+++ b/src/components/alert/test/basic/pages/modal-page/modal-page.ts
@@ -1,6 +1,9 @@
 import { Component } from '@angular/core';
-import { ViewController } from '../../../../../..';
+import { DeepLink, ViewController } from '../../../../../..';
 
+@DeepLink({
+  name: 'modal-page'
+})
 @Component({
   template: `
     <ion-header>
diff --git a/src/components/alert/test/basic/pages/page-one/page-one.ts b/src/components/alert/test/basic/pages/page-one/page-one.ts
index 7d826e26e4..0c2e7d4133 100644
--- a/src/components/alert/test/basic/pages/page-one/page-one.ts
+++ b/src/components/alert/test/basic/pages/page-one/page-one.ts
@@ -1,6 +1,7 @@
 import { Component } from '@angular/core';
-import { AlertController, ModalController } from '../../../../../..';
+import { AlertController, DeepLink, ModalController } from '../../../../../..';
 
+@DeepLink()
 @Component({
   templateUrl: 'page-one.html'
 })
diff --git a/src/components/app/test/cordova/app/app.module.ts b/src/components/app/test/cordova/app/app.module.ts
index ffa43eed57..f224094c51 100644
--- a/src/components/app/test/cordova/app/app.module.ts
+++ b/src/components/app/test/cordova/app/app.module.ts
@@ -3,7 +3,6 @@ import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
 import { E2EApp } from './app.component';
-import { PageOne } from '../pages/page-one/page-one';
 import { PageOneModule } from '../pages/page-one/page-one.module';
 
 @NgModule({
@@ -12,16 +11,7 @@ import { PageOneModule } from '../pages/page-one/page-one.module';
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp, { statusbarPadding: true }, {
-      links: [
-        { name: 'page-one', component: PageOne },
-        { name: 'page-two', loadChildren: '../pages/page-two/page-two.module#PageTwoModule'},
-        { name: 'page-three', loadChildren: '../pages/page-three/page-three.module#PageThreeModule'},
-        { name: 'tabs-page', loadChildren: '../pages/tabs/tabs-page.module#TabsPageModule'},
-        { name: 'tabs-page-one', loadChildren: '../pages/tabs-page-one/tabs-page-one.module#TabsPageOneModule'},
-        { name: 'modal-page', loadChildren: '../pages/modal/modal.module#ModalPageModule'}
-      ]
-    }),
+    IonicModule.forRoot(E2EApp, { statusbarPadding: true }),
     PageOneModule
   ],
   bootstrap: [IonicApp],
diff --git a/src/components/app/test/cordova/pages/modal/modal.module.ts b/src/components/app/test/cordova/pages/modal/modal-page.module.ts
similarity index 100%
rename from src/components/app/test/cordova/pages/modal/modal.module.ts
rename to src/components/app/test/cordova/pages/modal/modal-page.module.ts
diff --git a/src/components/app/test/cordova/pages/modal/modal-page.ts b/src/components/app/test/cordova/pages/modal/modal-page.ts
index cc67e6c450..91670a65b9 100644
--- a/src/components/app/test/cordova/pages/modal/modal-page.ts
+++ b/src/components/app/test/cordova/pages/modal/modal-page.ts
@@ -1,6 +1,9 @@
 import { Component } from '@angular/core';
-import { ViewController } from '../../../../../..';
+import { DeepLink, ViewController } from '../../../../../..';
 
+@DeepLink({
+  name: 'modal-page'
+})
 @Component({
   template: `
   <ion-header>
diff --git a/src/components/app/test/cordova/pages/page-one/page-one.ts b/src/components/app/test/cordova/pages/page-one/page-one.ts
index a2aa17580a..2bce7a0b0c 100644
--- a/src/components/app/test/cordova/pages/page-one/page-one.ts
+++ b/src/components/app/test/cordova/pages/page-one/page-one.ts
@@ -1,9 +1,12 @@
 import { Component } from '@angular/core';
-import { NavController } from '../../../../../..';
+import { DeepLink, NavController } from '../../../../../..';
 
 import { SomeData } from './provider-one';
 import { OtherData } from './provider-two';
 
+@DeepLink({
+  name: 'page-one'
+})
 @Component({
   templateUrl: 'page-one.html'
 })
diff --git a/src/components/app/test/cordova/pages/page-three/page-three.ts b/src/components/app/test/cordova/pages/page-three/page-three.ts
index 7944b2178f..28df360723 100644
--- a/src/components/app/test/cordova/pages/page-three/page-three.ts
+++ b/src/components/app/test/cordova/pages/page-three/page-three.ts
@@ -1,6 +1,9 @@
 import { Component } from '@angular/core';
-import { NavController } from '../../../../../..';
+import { DeepLink, NavController } from '../../../../../..';
 
+@DeepLink({
+  name: 'page-three'
+})
 @Component({
   templateUrl: 'page-three.html'
 })
diff --git a/src/components/app/test/cordova/pages/page-two/page-two.ts b/src/components/app/test/cordova/pages/page-two/page-two.ts
index f8aeb131ea..71d73c6a3c 100644
--- a/src/components/app/test/cordova/pages/page-two/page-two.ts
+++ b/src/components/app/test/cordova/pages/page-two/page-two.ts
@@ -1,6 +1,9 @@
 import { Component } from '@angular/core';
-import { ModalController } from '../../../../../..';
+import { DeepLink, ModalController } from '../../../../../..';
 
+@DeepLink({
+  name: 'page-two'
+})
 @Component({
   templateUrl: 'page-two.html'
 })
diff --git a/src/components/app/test/cordova/pages/tabs-page-one/tabs-page-one.ts b/src/components/app/test/cordova/pages/tabs-page-one/tabs-page-one.ts
index 26afa72082..20f9b2601c 100644
--- a/src/components/app/test/cordova/pages/tabs-page-one/tabs-page-one.ts
+++ b/src/components/app/test/cordova/pages/tabs-page-one/tabs-page-one.ts
@@ -1,5 +1,9 @@
 import { Component } from '@angular/core';
+import { DeepLink } from '../../../../../..';
 
+@DeepLink({
+  name: 'tabs-page-one'
+})
 @Component({
   template: `
   <ion-header>
diff --git a/src/components/app/test/cordova/pages/tabs/tabs-page.ts b/src/components/app/test/cordova/pages/tabs/tabs-page.ts
index 3ef8aefdd7..7db12354de 100644
--- a/src/components/app/test/cordova/pages/tabs/tabs-page.ts
+++ b/src/components/app/test/cordova/pages/tabs/tabs-page.ts
@@ -1,6 +1,9 @@
 import { Component } from '@angular/core';
-import { NavController } from '../../../../../..';
+import { DeepLink, NavController } from '../../../../../..';
 
+@DeepLink({
+  name: 'tabs-page'
+})
 @Component({
   templateUrl: 'tabs-page.html'
 })
diff --git a/src/components/app/test/gesture-collision/app/app.module.ts b/src/components/app/test/gesture-collision/app/app.module.ts
index cd041f97e3..5f208149a9 100644
--- a/src/components/app/test/gesture-collision/app/app.module.ts
+++ b/src/components/app/test/gesture-collision/app/app.module.ts
@@ -11,12 +11,7 @@ import { PageOneModule } from '../pages/page-one/page-one.module';
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(AppComponent, {}, {
-      links: [
-        { name: 'page-one', loadChildren: '../pages/page-one/page-one.module#PageOneModule'},
-        { name: 'page-two', loadChildren: '../pages/page-two/page-two.module#PageTwoModule'},
-      ]
-    }),
+    IonicModule.forRoot(AppComponent, {}),
     PageOneModule
   ],
   bootstrap: [IonicApp],
diff --git a/src/components/app/test/gesture-collision/pages/page-one/page-one.ts b/src/components/app/test/gesture-collision/pages/page-one/page-one.ts
index 033c86fc59..e32fac90de 100644
--- a/src/components/app/test/gesture-collision/pages/page-one/page-one.ts
+++ b/src/components/app/test/gesture-collision/pages/page-one/page-one.ts
@@ -1,7 +1,9 @@
 import { Component, ViewChild } from '@angular/core';
-import { MenuController, Nav } from '../../../../../..';
-
+import { DeepLink, MenuController, Nav } from '../../../../../..';
 
+@DeepLink({
+  name: 'page-one'
+})
 @Component({
   templateUrl: 'page-one.html'
 })
diff --git a/src/components/app/test/gesture-collision/pages/page-two/page-two.ts b/src/components/app/test/gesture-collision/pages/page-two/page-two.ts
index 0eca3529d4..c363a05ee1 100644
--- a/src/components/app/test/gesture-collision/pages/page-two/page-two.ts
+++ b/src/components/app/test/gesture-collision/pages/page-two/page-two.ts
@@ -1,6 +1,9 @@
 import { Component } from '@angular/core';
-import { AlertController, NavController, Refresher } from '../../../../../..';
+import { AlertController, DeepLink, NavController, Refresher } from '../../../../../..';
 
+@DeepLink({
+  name: 'page-two'
+})
 @Component({
   templateUrl: 'page-two.html'
 })
diff --git a/src/components/item/test/groups/app/app.component.ts b/src/components/item/test/groups/app/app.component.ts
new file mode 100644
index 0000000000..b69e8fc404
--- /dev/null
+++ b/src/components/item/test/groups/app/app.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { SessionList } from '../pages/session-list/session-list';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = SessionList;
+}
diff --git a/src/components/item/test/groups/app/app.module.ts b/src/components/item/test/groups/app/app.module.ts
index a0022f5c1c..94af18cd4e 100644
--- a/src/components/item/test/groups/app/app.module.ts
+++ b/src/components/item/test/groups/app/app.module.ts
@@ -1,35 +1,20 @@
-import { Component, NgModule } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { SessionList } from '../pages/session-list/session-list';
-
-
-@Component({
-  template: '<ion-nav [root]="root"></ion-nav>'
-})
-export class E2EApp {
-  root = SessionList;
-}
+import { AppComponent } from './app.component';
+import { SessionListModule } from '../pages/session-list/session-list.module';
 
 @NgModule({
   declarations: [
-    E2EApp,
-    SessionList
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp, {}, {
-      links: [
-        { loadChildren: '../pages/session-detail/session-detail.module#SessionDetailModule', name: 'SessionDetail'}
-      ]
-    })
+    IonicModule.forRoot(AppComponent, {}),
+    SessionListModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    E2EApp,
-    SessionList
-  ]
 })
 export class AppModule {}
 
diff --git a/src/components/item/test/groups/pages/session-detail/session-detail.ts b/src/components/item/test/groups/pages/session-detail/session-detail.ts
index 736f2f1b10..f8c2df8a0f 100644
--- a/src/components/item/test/groups/pages/session-detail/session-detail.ts
+++ b/src/components/item/test/groups/pages/session-detail/session-detail.ts
@@ -1,6 +1,7 @@
 import { Component } from '@angular/core';
-import { NavController, NavParams } from '../../../../../..';
+import { DeepLink, NavController, NavParams } from '../../../../../..';
 
+@DeepLink()
 @Component({
   templateUrl: 'session-detail.html'
 })
diff --git a/src/components/item/test/groups/pages/session-list/session-list.module.ts b/src/components/item/test/groups/pages/session-list/session-list.module.ts
new file mode 100644
index 0000000000..82aed6751d
--- /dev/null
+++ b/src/components/item/test/groups/pages/session-list/session-list.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { SessionList } from './session-list';
+import { DeepLinkModule } from '../../../../../..';
+
+@NgModule({
+  declarations: [
+    SessionList
+  ],
+  imports: [
+    DeepLinkModule.forChild(SessionList)
+  ]
+})
+export class SessionListModule {}
diff --git a/src/components/item/test/groups/pages/session-list/session-list.ts b/src/components/item/test/groups/pages/session-list/session-list.ts
index 14e964a5da..ae67f499f2 100644
--- a/src/components/item/test/groups/pages/session-list/session-list.ts
+++ b/src/components/item/test/groups/pages/session-list/session-list.ts
@@ -1,6 +1,7 @@
 import { Component } from '@angular/core';
-import { NavController } from '../../../../../..';
+import { DeepLink, NavController } from '../../../../../..';
 
+@DeepLink()
 @Component({
   templateUrl: 'session-list.html'
 })
diff --git a/src/components/list/test/headers/app/app.component.ts b/src/components/list/test/headers/app/app.component.ts
index 2702201592..40cb41e266 100644
--- a/src/components/list/test/headers/app/app.component.ts
+++ b/src/components/list/test/headers/app/app.component.ts
@@ -1,9 +1,9 @@
 import { Component } from '@angular/core';
-import { E2EPage } from '../pages/e2e-page/e2e-page';
+import { PageOne } from '../pages/page-one/page-one';
 
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-export class E2EApp {
-  rootPage = E2EPage;
+export class AppComponent {
+  rootPage = PageOne;
 }
diff --git a/src/components/list/test/headers/app/app.module.ts b/src/components/list/test/headers/app/app.module.ts
index 5d45a8bfa4..68b7bae9d1 100644
--- a/src/components/list/test/headers/app/app.module.ts
+++ b/src/components/list/test/headers/app/app.module.ts
@@ -2,26 +2,18 @@ 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';
+import { AppComponent } from './app.component';
+import { PageOneModule } from '../pages/page-one/page-one.module';
 
 @NgModule({
   declarations: [
-    E2EApp,
-    E2EPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp, {}, {
-      links: [
-        { component: E2EPage, name: 'e2e-page' }
-      ]
-    })
+    IonicModule.forRoot(AppComponent, {}),
+    PageOneModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    E2EApp,
-    E2EPage
-  ]
 })
 export class AppModule { }
diff --git a/src/components/list/test/headers/pages/e2e-page/main.html b/src/components/list/test/headers/pages/page-one/page-one.html
similarity index 100%
rename from src/components/list/test/headers/pages/e2e-page/main.html
rename to src/components/list/test/headers/pages/page-one/page-one.html
diff --git a/src/components/menu/test/basic/pages/page2/page2.module.ts b/src/components/list/test/headers/pages/page-one/page-one.module.ts
similarity index 51%
rename from src/components/menu/test/basic/pages/page2/page2.module.ts
rename to src/components/list/test/headers/pages/page-one/page-one.module.ts
index 0454380308..a8db211523 100644
--- a/src/components/menu/test/basic/pages/page2/page2.module.ts
+++ b/src/components/list/test/headers/pages/page-one/page-one.module.ts
@@ -1,17 +1,14 @@
 import { NgModule } from '@angular/core';
 import { DeepLinkModule } from '../../../../../..';
 
-import { Page2 } from './page2';
+import { PageOne } from './page-one';
 
 @NgModule({
   declarations: [
-    Page2,
+    PageOne,
   ],
   imports: [
-    DeepLinkModule.forChild(Page2)
-  ],
-  entryComponents: [
-    Page2,
+    DeepLinkModule.forChild(PageOne),
   ]
 })
-export class Page2Module {}
+export class PageOneModule {}
diff --git a/src/components/list/test/headers/pages/e2e-page/e2e-page.ts b/src/components/list/test/headers/pages/page-one/page-one.ts
similarity index 51%
rename from src/components/list/test/headers/pages/e2e-page/e2e-page.ts
rename to src/components/list/test/headers/pages/page-one/page-one.ts
index 44c7913473..a6b94828d7 100644
--- a/src/components/list/test/headers/pages/e2e-page/e2e-page.ts
+++ b/src/components/list/test/headers/pages/page-one/page-one.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
 @Component({
-  templateUrl: 'main.html'
+  templateUrl: 'page-one.html'
 })
-export class E2EPage { }
+export class PageOne { }
diff --git a/src/components/list/test/inset/app/app.component.ts b/src/components/list/test/inset/app/app.component.ts
index 604be14520..40cb41e266 100644
--- a/src/components/list/test/inset/app/app.component.ts
+++ b/src/components/list/test/inset/app/app.component.ts
@@ -1,8 +1,9 @@
 import { Component } from '@angular/core';
-import { E2EPage } from '../pages/e2e-page/e2e-page';
+import { PageOne } from '../pages/page-one/page-one';
+
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-export class E2EApp {
-  rootPage = E2EPage;
+export class AppComponent {
+  rootPage = PageOne;
 }
diff --git a/src/components/list/test/inset/app/app.module.ts b/src/components/list/test/inset/app/app.module.ts
index 5d45a8bfa4..362061f7bf 100644
--- a/src/components/list/test/inset/app/app.module.ts
+++ b/src/components/list/test/inset/app/app.module.ts
@@ -2,26 +2,18 @@ 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';
+import { AppComponent } from './app.component';
+import { PageOneModule } from '../pages/page-one/page-one.module';
 
 @NgModule({
   declarations: [
-    E2EApp,
-    E2EPage
+    AppComponent,
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp, {}, {
-      links: [
-        { component: E2EPage, name: 'e2e-page' }
-      ]
-    })
+    IonicModule.forRoot(AppComponent, {}),
+    PageOneModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    E2EApp,
-    E2EPage
-  ]
 })
 export class AppModule { }
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
deleted file mode 100644
index 44c7913473..0000000000
--- a/src/components/list/test/inset/pages/e2e-page/e2e-page.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { Component } from '@angular/core';
-@Component({
-  templateUrl: 'main.html'
-})
-export class E2EPage { }
diff --git a/src/components/list/test/inset/pages/e2e-page/main.html b/src/components/list/test/inset/pages/page-one/page-one.html
similarity index 100%
rename from src/components/list/test/inset/pages/e2e-page/main.html
rename to src/components/list/test/inset/pages/page-one/page-one.html
diff --git a/src/components/loading/test/tabs/pages/page2/page2.module.ts b/src/components/list/test/inset/pages/page-one/page-one.module.ts
similarity index 51%
rename from src/components/loading/test/tabs/pages/page2/page2.module.ts
rename to src/components/list/test/inset/pages/page-one/page-one.module.ts
index 0454380308..a8db211523 100644
--- a/src/components/loading/test/tabs/pages/page2/page2.module.ts
+++ b/src/components/list/test/inset/pages/page-one/page-one.module.ts
@@ -1,17 +1,14 @@
 import { NgModule } from '@angular/core';
 import { DeepLinkModule } from '../../../../../..';
 
-import { Page2 } from './page2';
+import { PageOne } from './page-one';
 
 @NgModule({
   declarations: [
-    Page2,
+    PageOne,
   ],
   imports: [
-    DeepLinkModule.forChild(Page2)
-  ],
-  entryComponents: [
-    Page2,
+    DeepLinkModule.forChild(PageOne),
   ]
 })
-export class Page2Module {}
+export class PageOneModule {}
diff --git a/src/components/list/test/inset/pages/page-one/page-one.ts b/src/components/list/test/inset/pages/page-one/page-one.ts
new file mode 100644
index 0000000000..57f5283bb5
--- /dev/null
+++ b/src/components/list/test/inset/pages/page-one/page-one.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+import { DeepLink } from '../../../../../..';
+
+@DeepLink()
+@Component({
+  templateUrl: 'page-one.html'
+})
+export class PageOne { }
diff --git a/src/components/list/test/no-lines/app/app.component.ts b/src/components/list/test/no-lines/app/app.component.ts
index 0064586967..40cb41e266 100644
--- a/src/components/list/test/no-lines/app/app.component.ts
+++ b/src/components/list/test/no-lines/app/app.component.ts
@@ -1,10 +1,9 @@
 import { Component } from '@angular/core';
-import { E2EPage } from '../pages/e2e-page/e2e-page';
+import { PageOne } from '../pages/page-one/page-one';
 
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-export class E2EApp {
-  rootPage = E2EPage;
+export class AppComponent {
+  rootPage = PageOne;
 }
-
diff --git a/src/components/list/test/no-lines/app/app.module.ts b/src/components/list/test/no-lines/app/app.module.ts
index e047e2b8f8..e4d0dde57c 100644
--- a/src/components/list/test/no-lines/app/app.module.ts
+++ b/src/components/list/test/no-lines/app/app.module.ts
@@ -1,27 +1,20 @@
 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';
+
+import { AppComponent } from './app.component';
+import { PageOneModule } from '../pages/page-one/page-one.module';
 
 
 @NgModule({
   declarations: [
-    E2EApp,
-    E2EPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp, {}, {
-      links: [
-        { component: E2EPage, name: 'e2e-page' }
-      ]
-    })
+    IonicModule.forRoot(AppComponent, {}),
+    PageOneModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    E2EApp,
-    E2EPage
-  ]
 })
 export class AppModule { }
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
deleted file mode 100644
index 073b8215df..0000000000
--- a/src/components/list/test/no-lines/pages/e2e-page/e2e-page.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  templateUrl: 'main.html'
-})
-export class E2EPage { }
diff --git a/src/components/list/test/no-lines/pages/e2e-page/main.html b/src/components/list/test/no-lines/pages/page-one/page-one.html
similarity index 100%
rename from src/components/list/test/no-lines/pages/e2e-page/main.html
rename to src/components/list/test/no-lines/pages/page-one/page-one.html
diff --git a/src/components/menu/test/basic/pages/page1/page1.module.ts b/src/components/list/test/no-lines/pages/page-one/page-one.module.ts
similarity index 51%
rename from src/components/menu/test/basic/pages/page1/page1.module.ts
rename to src/components/list/test/no-lines/pages/page-one/page-one.module.ts
index 6176a20dde..a8db211523 100644
--- a/src/components/menu/test/basic/pages/page1/page1.module.ts
+++ b/src/components/list/test/no-lines/pages/page-one/page-one.module.ts
@@ -1,17 +1,14 @@
 import { NgModule } from '@angular/core';
 import { DeepLinkModule } from '../../../../../..';
 
-import { Page1 } from './page1';
+import { PageOne } from './page-one';
 
 @NgModule({
   declarations: [
-    Page1,
+    PageOne,
   ],
   imports: [
-    DeepLinkModule.forChild(Page1)
-  ],
-  entryComponents: [
-    Page1,
+    DeepLinkModule.forChild(PageOne),
   ]
 })
-export class Page1Module {}
+export class PageOneModule {}
diff --git a/src/components/list/test/no-lines/pages/page-one/page-one.ts b/src/components/list/test/no-lines/pages/page-one/page-one.ts
new file mode 100644
index 0000000000..57f5283bb5
--- /dev/null
+++ b/src/components/list/test/no-lines/pages/page-one/page-one.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+import { DeepLink } from '../../../../../..';
+
+@DeepLink()
+@Component({
+  templateUrl: 'page-one.html'
+})
+export class PageOne { }
diff --git a/src/components/loading/test/basic/app/app.component.ts b/src/components/loading/test/basic/app/app.component.ts
index 12de82c390..24bc0495b2 100644
--- a/src/components/loading/test/basic/app/app.component.ts
+++ b/src/components/loading/test/basic/app/app.component.ts
@@ -1,6 +1,6 @@
 import { Component, ViewEncapsulation } from '@angular/core';
 import { App } from '../../../../..';
-import { E2EPage } from '../pages/e2e-page/e2e-page';
+import { PageOne } from '../pages/page-one/page-one';
 
 @Component({
   template: `
@@ -8,8 +8,8 @@ import { E2EPage } from '../pages/e2e-page/e2e-page';
   `,
   encapsulation: ViewEncapsulation.None
 })
-export class E2EApp {
-  root = E2EPage;
+export class AppComponent {
+  root = PageOne;
 
   constructor(app: App) {
     app.viewDidLeave.subscribe((ev: any) => {
diff --git a/src/components/loading/test/basic/app/app.module.ts b/src/components/loading/test/basic/app/app.module.ts
index 9151e4f359..d9ff2157e5 100644
--- a/src/components/loading/test/basic/app/app.module.ts
+++ b/src/components/loading/test/basic/app/app.module.ts
@@ -2,29 +2,19 @@ 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';
+import { AppComponent } from './app.component';
+import { PageOneModule } from '../pages/page-one/page-one.module';
 
 @NgModule({
   declarations: [
-    E2EApp,
-    E2EPage,
+    AppComponent
   ],
   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' }
-      ]
-    })
+    IonicModule.forRoot(AppComponent, {}),
+    PageOneModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    E2EApp,
-    E2EPage,
-  ]
 })
 export class AppModule { }
 
diff --git a/src/components/loading/test/basic/pages/e2e-page/main.html b/src/components/loading/test/basic/pages/page-one/page-one.html
similarity index 100%
rename from src/components/loading/test/basic/pages/e2e-page/main.html
rename to src/components/loading/test/basic/pages/page-one/page-one.html
diff --git a/src/components/loading/test/basic/pages/page3/page3.module.ts b/src/components/loading/test/basic/pages/page-one/page-one.module.ts
similarity index 51%
rename from src/components/loading/test/basic/pages/page3/page3.module.ts
rename to src/components/loading/test/basic/pages/page-one/page-one.module.ts
index 9029bf9974..03a3b37c97 100644
--- a/src/components/loading/test/basic/pages/page3/page3.module.ts
+++ b/src/components/loading/test/basic/pages/page-one/page-one.module.ts
@@ -1,16 +1,13 @@
 import { NgModule } from '@angular/core';
 import { DeepLinkModule } from '../../../../../..';
-import { Page3 } from './page3';
+import { PageOne } from './page-one';
 
 @NgModule({
   imports: [
-    DeepLinkModule.forChild(Page3)
+    DeepLinkModule.forChild(PageOne)
   ],
   declarations: [
-    Page3
+    PageOne
   ],
-  entryComponents: [
-    Page3,
-  ]
 })
-export class Page3Module { }
+export class PageOneModule { }
diff --git a/src/components/loading/test/basic/pages/e2e-page/e2e-page.ts b/src/components/loading/test/basic/pages/page-one/page-one.ts
similarity index 94%
rename from src/components/loading/test/basic/pages/e2e-page/e2e-page.ts
rename to src/components/loading/test/basic/pages/page-one/page-one.ts
index cefe15f693..f6e5757e1c 100644
--- a/src/components/loading/test/basic/pages/e2e-page/e2e-page.ts
+++ b/src/components/loading/test/basic/pages/page-one/page-one.ts
@@ -1,7 +1,9 @@
 import { Component } from '@angular/core';
-import { LoadingController, NavController } from '../../../../../..';
+import { DeepLink, LoadingController, NavController } from '../../../../../..';
+
+@DeepLink()
 @Component({
-  templateUrl: 'main.html',
+  templateUrl: 'page-one.html',
   styles: [
     `
     /* Fix the spinner used in e2e */
@@ -77,7 +79,7 @@ import { LoadingController, NavController } from '../../../../../..';
     }`
   ]
 })
-export class E2EPage {
+export class PageOne {
   constructor(
     public loadingCtrl: LoadingController,
     public navCtrl: NavController
@@ -179,7 +181,7 @@ export class E2EPage {
     loading.present();
 
     setTimeout(() => {
-      this.navCtrl.push('page2');
+      this.navCtrl.push('PageTwo');
     }, 1000);
 
     setTimeout(() => {
@@ -188,7 +190,7 @@ export class E2EPage {
   }
 
   goToPage2() {
-    this.navCtrl.push('page2');
+    this.navCtrl.push('PageTwo');
   }
 
   presentLoadingMultiple() {
@@ -239,7 +241,7 @@ export class E2EPage {
         dismissOnPageChange: true
       }).present();
 
-      this.navCtrl.push('page2');
+      this.navCtrl.push('PageTwo');
 
     }, 500);
   }
@@ -252,7 +254,7 @@ export class E2EPage {
     }).present();
 
     setTimeout(() => {
-      this.navCtrl.push('page2');
+      this.navCtrl.push('PageTwo');
     }, 500);
   }
 
diff --git a/src/components/loading/test/basic/pages/page-three/page-three.html b/src/components/loading/test/basic/pages/page-three/page-three.html
new file mode 100644
index 0000000000..f8f341b479
--- /dev/null
+++ b/src/components/loading/test/basic/pages/page-three/page-three.html
@@ -0,0 +1,6 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Page 3</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content padding>Some content</ion-content>
\ No newline at end of file
diff --git a/src/components/loading/test/basic/pages/page-three/page-three.module.ts b/src/components/loading/test/basic/pages/page-three/page-three.module.ts
new file mode 100644
index 0000000000..aad6b04725
--- /dev/null
+++ b/src/components/loading/test/basic/pages/page-three/page-three.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+import { PageThree } from './page-three';
+
+@NgModule({
+  imports: [
+    DeepLinkModule.forChild(PageThree)
+  ],
+  declarations: [
+    PageThree
+  ]
+})
+export class PageThreeModule { }
diff --git a/src/components/loading/test/basic/pages/page-three/page-three.ts b/src/components/loading/test/basic/pages/page-three/page-three.ts
new file mode 100644
index 0000000000..bfcc20012c
--- /dev/null
+++ b/src/components/loading/test/basic/pages/page-three/page-three.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+
+import { DeepLink } from '../../../../../..';
+
+@DeepLink()
+@Component({
+  templateUrl: 'page-three.html'
+})
+export class PageThree {}
diff --git a/src/components/loading/test/basic/pages/page-two/page-two.html b/src/components/loading/test/basic/pages/page-two/page-two.html
new file mode 100644
index 0000000000..c148f81683
--- /dev/null
+++ b/src/components/loading/test/basic/pages/page-two/page-two.html
@@ -0,0 +1,16 @@
+<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>
\ No newline at end of file
diff --git a/src/components/loading/test/basic/pages/page-two/page-two.module.ts b/src/components/loading/test/basic/pages/page-two/page-two.module.ts
new file mode 100644
index 0000000000..c244d80e23
--- /dev/null
+++ b/src/components/loading/test/basic/pages/page-two/page-two.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+import { PageTwo } from './page-two';
+
+@NgModule({
+  imports: [
+    DeepLinkModule.forChild(PageTwo)
+  ],
+  declarations: [
+    PageTwo
+  ],
+})
+export class PageTwoModule { }
diff --git a/src/components/loading/test/basic/pages/page-two/page-two.ts b/src/components/loading/test/basic/pages/page-two/page-two.ts
new file mode 100644
index 0000000000..41f8c428fc
--- /dev/null
+++ b/src/components/loading/test/basic/pages/page-two/page-two.ts
@@ -0,0 +1,14 @@
+import { Component } from '@angular/core';
+import { DeepLink, NavController } from '../../../../../..';
+
+@DeepLink()
+@Component({
+  templateUrl: 'page-two.html'
+})
+export class PageTwo {
+  constructor(public navCtrl: NavController) {}
+
+  goToPage3() {
+    this.navCtrl.push('PageThree');
+  }
+}
diff --git a/src/components/loading/test/basic/pages/page2/page2.module.ts b/src/components/loading/test/basic/pages/page2/page2.module.ts
deleted file mode 100644
index 55ca588e3d..0000000000
--- a/src/components/loading/test/basic/pages/page2/page2.module.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-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
deleted file mode 100644
index b1157ceee0..0000000000
--- a/src/components/loading/test/basic/pages/page2/page2.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-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.ts b/src/components/loading/test/basic/pages/page3/page3.ts
deleted file mode 100644
index 052854dcfa..0000000000
--- a/src/components/loading/test/basic/pages/page3/page3.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-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 {}
diff --git a/src/components/loading/test/tabs/app/app.component.ts b/src/components/loading/test/tabs/app/app.component.ts
index 1049737093..07b31f5075 100644
--- a/src/components/loading/test/tabs/app/app.component.ts
+++ b/src/components/loading/test/tabs/app/app.component.ts
@@ -1,8 +1,10 @@
 import { Component } from '@angular/core';
 
+import { TabsPage } from '../pages/tabs-page/tabs-page';
+
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
-  root = 'TabsPage';
+export class AppComponent {
+  root = TabsPage;
 }
diff --git a/src/components/loading/test/tabs/app/app.module.ts b/src/components/loading/test/tabs/app/app.module.ts
index 0e57783871..2a9184c642 100644
--- a/src/components/loading/test/tabs/app/app.module.ts
+++ b/src/components/loading/test/tabs/app/app.module.ts
@@ -1,26 +1,19 @@
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
-import { E2EApp } from './app.component';
 
+import { AppComponent } from './app.component';
+import { TabsPageModule } from '../pages/tabs-page/tabs-page.module';
 
 @NgModule({
   declarations: [
-    E2EApp
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp, {}, {
-      links: [
-        { loadChildren: '../pages/main/main.module#E2EPageModule', name: 'E2EPage' },
-        { loadChildren: '../pages/page2/page2.module#Page2Module', name: 'Page2' },
-        { loadChildren: '../pages/tabs/tabs.module#TabsPageModule', name: 'TabsPage' }
-      ]
-    })
+    IonicModule.forRoot(AppComponent, {}),
+    TabsPageModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    E2EApp
-  ]
 })
 export class AppModule {}
diff --git a/src/components/loading/test/tabs/pages/main/main.module.ts b/src/components/loading/test/tabs/pages/main/main.module.ts
deleted file mode 100644
index 1cc785fd59..0000000000
--- a/src/components/loading/test/tabs/pages/main/main.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { DeepLinkModule } from '../../../../../..';
-
-import { E2EPage } from './main';
-
-@NgModule({
-  declarations: [
-    E2EPage,
-  ],
-  imports: [
-    DeepLinkModule.forChild(E2EPage)
-  ],
-  entryComponents: [
-    E2EPage,
-  ]
-})
-export class E2EPageModule {}
diff --git a/src/components/loading/test/tabs/pages/main/main.html b/src/components/loading/test/tabs/pages/page-one/page-one.html
similarity index 100%
rename from src/components/loading/test/tabs/pages/main/main.html
rename to src/components/loading/test/tabs/pages/page-one/page-one.html
diff --git a/src/components/loading/test/tabs/pages/page-one/page-one.module.ts b/src/components/loading/test/tabs/pages/page-one/page-one.module.ts
new file mode 100644
index 0000000000..8ff01f8895
--- /dev/null
+++ b/src/components/loading/test/tabs/pages/page-one/page-one.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+
+import { PageOne } from './page-one';
+
+@NgModule({
+  declarations: [
+    PageOne,
+  ],
+  imports: [
+    DeepLinkModule.forChild(PageOne)
+  ]
+})
+export class PageOneModule {}
diff --git a/src/components/loading/test/tabs/pages/main/main.ts b/src/components/loading/test/tabs/pages/page-one/page-one.ts
similarity index 75%
rename from src/components/loading/test/tabs/pages/main/main.ts
rename to src/components/loading/test/tabs/pages/page-one/page-one.ts
index 5d8b8a6a11..c58178de3b 100644
--- a/src/components/loading/test/tabs/pages/main/main.ts
+++ b/src/components/loading/test/tabs/pages/page-one/page-one.ts
@@ -1,10 +1,11 @@
 import { Component } from '@angular/core';
-import { LoadingController, NavController } from '../../../../../..';
+import { DeepLink, LoadingController, NavController } from '../../../../../..';
 
+@DeepLink()
 @Component({
-  templateUrl: 'main.html'
+  templateUrl: 'page-one.html'
 })
-export class E2EPage {
+export class PageOne {
   constructor(public loadingCtrl: LoadingController, public navCtrl: NavController) {}
 
   presentLoading() {
@@ -25,7 +26,7 @@ export class E2EPage {
     loading.present();
 
     setTimeout(() => {
-      this.navCtrl.push('Page2');
+      this.navCtrl.push('PageTwo');
 
       setTimeout(() => {
         loading.dismiss();
diff --git a/src/components/loading/test/tabs/pages/page-two/page-two.html b/src/components/loading/test/tabs/pages/page-two/page-two.html
new file mode 100644
index 0000000000..87e8d9aea2
--- /dev/null
+++ b/src/components/loading/test/tabs/pages/page-two/page-two.html
@@ -0,0 +1,6 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Page 2</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content padding>Some content</ion-content>
\ No newline at end of file
diff --git a/src/components/menu/test/basic/components/modal/modal.module.ts b/src/components/loading/test/tabs/pages/page-two/page-two.module.ts
similarity index 51%
rename from src/components/menu/test/basic/components/modal/modal.module.ts
rename to src/components/loading/test/tabs/pages/page-two/page-two.module.ts
index 95857e0e60..edde6623c9 100644
--- a/src/components/menu/test/basic/components/modal/modal.module.ts
+++ b/src/components/loading/test/tabs/pages/page-two/page-two.module.ts
@@ -1,17 +1,14 @@
 import { NgModule } from '@angular/core';
 import { DeepLinkModule } from '../../../../../..';
 
-import { Modal } from './modal';
+import { PageTwo } from './page-two';
 
 @NgModule({
   declarations: [
-    Modal,
+    PageTwo,
   ],
   imports: [
-    DeepLinkModule.forChild(Modal)
+    DeepLinkModule.forChild(PageTwo)
   ],
-  entryComponents: [
-    Modal,
-  ]
 })
-export class ModalModule {}
+export class PageTwoModule {}
diff --git a/src/components/loading/test/tabs/pages/page-two/page-two.ts b/src/components/loading/test/tabs/pages/page-two/page-two.ts
new file mode 100644
index 0000000000..cf57da059d
--- /dev/null
+++ b/src/components/loading/test/tabs/pages/page-two/page-two.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+import { DeepLink } from '../../../../../..';
+
+@DeepLink()
+@Component({
+  templateUrl: 'page-two.html'
+})
+export class PageTwo {}
diff --git a/src/components/loading/test/tabs/pages/page2/page2.ts b/src/components/loading/test/tabs/pages/page2/page2.ts
deleted file mode 100644
index 23d24bcc75..0000000000
--- a/src/components/loading/test/tabs/pages/page2/page2.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  template: `
-    <ion-header>
-      <ion-navbar>
-        <ion-title>Page 2</ion-title>
-      </ion-navbar>
-    </ion-header>
-    <ion-content padding>Some content</ion-content>
-  `
-})
-export class Page2 {}
diff --git a/src/components/loading/test/tabs/pages/tabs-page/tabs-page.html b/src/components/loading/test/tabs/pages/tabs-page/tabs-page.html
new file mode 100644
index 0000000000..90ac8b1b36
--- /dev/null
+++ b/src/components/loading/test/tabs/pages/tabs-page/tabs-page.html
@@ -0,0 +1,5 @@
+<ion-tabs>
+  <ion-tab tabTitle="Plain List" tabIcon="star" [root]="root1"></ion-tab>
+  <ion-tab tabTitle="Schedule" tabIcon="globe" [root]="root2"></ion-tab>
+  <ion-tab tabTitle="Stopwatch" tabIcon="stopwatch" [root]="root3"></ion-tab>
+</ion-tabs>
\ No newline at end of file
diff --git a/src/components/loading/test/tabs/pages/tabs/tabs.module.ts b/src/components/loading/test/tabs/pages/tabs-page/tabs-page.module.ts
similarity index 59%
rename from src/components/loading/test/tabs/pages/tabs/tabs.module.ts
rename to src/components/loading/test/tabs/pages/tabs-page/tabs-page.module.ts
index 75e3e2ff5c..714f3406d7 100644
--- a/src/components/loading/test/tabs/pages/tabs/tabs.module.ts
+++ b/src/components/loading/test/tabs/pages/tabs-page/tabs-page.module.ts
@@ -1,14 +1,16 @@
 import { NgModule } from '@angular/core';
 import { DeepLinkModule } from '../../../../../..';
 
-import { TabsPage } from './tabs';
+import { TabsPage } from './tabs-page';
+import { PageOneModule } from '../page-one/page-one.module';
 
 @NgModule({
   declarations: [
     TabsPage,
   ],
   imports: [
-    DeepLinkModule.forChild(TabsPage)
+    DeepLinkModule.forChild(TabsPage),
+    PageOneModule
   ],
   entryComponents: [
     TabsPage,
diff --git a/src/components/loading/test/tabs/pages/tabs-page/tabs-page.ts b/src/components/loading/test/tabs/pages/tabs-page/tabs-page.ts
new file mode 100644
index 0000000000..1501d8d95b
--- /dev/null
+++ b/src/components/loading/test/tabs/pages/tabs-page/tabs-page.ts
@@ -0,0 +1,14 @@
+import { Component } from '@angular/core';
+import { DeepLink } from '../../../../../..';
+
+import { PageOne} from '../page-one/page-one';
+
+@DeepLink()
+@Component({
+  templateUrl: 'tabs-page.html'
+})
+export class TabsPage {
+ root1 = PageOne;
+ root2 = 'PageTwo';
+ root3 = PageOne;
+}
diff --git a/src/components/loading/test/tabs/pages/tabs/tabs.ts b/src/components/loading/test/tabs/pages/tabs/tabs.ts
deleted file mode 100644
index 989b1e7cb9..0000000000
--- a/src/components/loading/test/tabs/pages/tabs/tabs.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  template: `
-    <ion-tabs>
-      <ion-tab tabTitle="Plain List" tabIcon="star" [root]="root1"></ion-tab>
-      <ion-tab tabTitle="Schedule" tabIcon="globe" [root]="root2"></ion-tab>
-      <ion-tab tabTitle="Stopwatch" tabIcon="stopwatch" [root]="root3"></ion-tab>
-    </ion-tabs>
-  `
-})
-export class TabsPage {
- root1 = 'E2EPage';
- root2 = 'Page2';
- root3 = 'E2EPage';
-}
diff --git a/src/components/menu/test/basic/app/app.component.ts b/src/components/menu/test/basic/app/app.component.ts
index 7054ee8e44..40cb41e266 100644
--- a/src/components/menu/test/basic/app/app.component.ts
+++ b/src/components/menu/test/basic/app/app.component.ts
@@ -1,8 +1,9 @@
 import { Component } from '@angular/core';
+import { PageOne } from '../pages/page-one/page-one';
 
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-export class E2EApp {
-  rootPage = 'E2EPage';
+export class AppComponent {
+  rootPage = PageOne;
 }
diff --git a/src/components/menu/test/basic/app/app.module.ts b/src/components/menu/test/basic/app/app.module.ts
index eed266a712..da6d10ea99 100644
--- a/src/components/menu/test/basic/app/app.module.ts
+++ b/src/components/menu/test/basic/app/app.module.ts
@@ -2,27 +2,18 @@ import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { E2EApp } from './app.component';
+import { AppComponent } from './app.component';
+import { PageOneModule } from '../pages/page-one/page-one.module';
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp, {}, {
-      links: [
-        { loadChildren: '../pages/main/main.module#E2EPageModule', name: 'E2EPage' },
-        { loadChildren: '../pages/page1/page1.module#Page1Module', name: 'Page1' },
-        { loadChildren: '../pages/page2/page2.module#Page2Module', name: 'Page2' },
-        { loadChildren: '../pages/page3/page3.module#Page3Module', name: 'Page3' },
-        { loadChildren: '../components/modal/modal.module#ModalModule', name: 'Modal' },
-      ]
-    })
+    IonicModule.forRoot(AppComponent, {}),
+    PageOneModule
   ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    E2EApp,
-  ]
+  bootstrap: [IonicApp]
 })
 export class AppModule { }
diff --git a/src/components/menu/test/basic/components/modal/modal.ts b/src/components/menu/test/basic/components/modal/modal.ts
deleted file mode 100644
index 44aeaa5a13..0000000000
--- a/src/components/menu/test/basic/components/modal/modal.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Component } from '@angular/core';
-import { ViewController } from '../../../../../..';
-
-@Component({ templateUrl: 'modal.html' })
-export class Modal {
-  constructor(public viewController: ViewController) { }
-  close() {
-    this.viewController.dismiss();
-  }
-}
diff --git a/src/components/menu/test/basic/pages/main/main.module.ts b/src/components/menu/test/basic/pages/main/main.module.ts
deleted file mode 100644
index 1cc785fd59..0000000000
--- a/src/components/menu/test/basic/pages/main/main.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { DeepLinkModule } from '../../../../../..';
-
-import { E2EPage } from './main';
-
-@NgModule({
-  declarations: [
-    E2EPage,
-  ],
-  imports: [
-    DeepLinkModule.forChild(E2EPage)
-  ],
-  entryComponents: [
-    E2EPage,
-  ]
-})
-export class E2EPageModule {}
diff --git a/src/components/menu/test/basic/components/modal/modal.html b/src/components/menu/test/basic/pages/modal-page/modal-page.html
similarity index 100%
rename from src/components/menu/test/basic/components/modal/modal.html
rename to src/components/menu/test/basic/pages/modal-page/modal-page.html
diff --git a/src/components/searchbar/test/nav/pages/modal-page/modal.module.ts b/src/components/menu/test/basic/pages/modal-page/modal-page.module.ts
similarity index 75%
rename from src/components/searchbar/test/nav/pages/modal-page/modal.module.ts
rename to src/components/menu/test/basic/pages/modal-page/modal-page.module.ts
index 0b6c80bb25..2ce0aa93ce 100644
--- a/src/components/searchbar/test/nav/pages/modal-page/modal.module.ts
+++ b/src/components/menu/test/basic/pages/modal-page/modal-page.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { DeepLinkModule } from '../../../../../..';
 
-import { ModalPage } from './modal';
+import { ModalPage } from './modal-page';
 
 @NgModule({
   declarations: [
@@ -9,9 +9,6 @@ import { ModalPage } from './modal';
   ],
   imports: [
     DeepLinkModule.forChild(ModalPage)
-  ],
-  entryComponents: [
-    ModalPage,
   ]
 })
 export class ModalPageModule {}
diff --git a/src/components/menu/test/basic/pages/modal-page/modal-page.ts b/src/components/menu/test/basic/pages/modal-page/modal-page.ts
new file mode 100644
index 0000000000..66b6884d72
--- /dev/null
+++ b/src/components/menu/test/basic/pages/modal-page/modal-page.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import { DeepLink, ViewController } from '../../../../../..';
+
+@DeepLink()
+@Component({
+  templateUrl: 'modal-page.html'
+})
+export class ModalPage {
+  constructor(public viewController: ViewController) {
+  }
+
+  close() {
+    this.viewController.dismiss();
+  }
+}
diff --git a/src/components/menu/test/basic/pages/page3/page3.html b/src/components/menu/test/basic/pages/page-four/page-four.html
similarity index 100%
rename from src/components/menu/test/basic/pages/page3/page3.html
rename to src/components/menu/test/basic/pages/page-four/page-four.html
diff --git a/src/components/menu/test/basic/pages/page-four/page-four.module.ts b/src/components/menu/test/basic/pages/page-four/page-four.module.ts
new file mode 100644
index 0000000000..867eae718c
--- /dev/null
+++ b/src/components/menu/test/basic/pages/page-four/page-four.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+
+import { PageFour } from './page-four';
+
+@NgModule({
+  declarations: [
+    PageFour,
+  ],
+  imports: [
+    DeepLinkModule.forChild(PageFour)
+  ]
+})
+export class PageFourModule {}
diff --git a/src/components/menu/test/basic/pages/page-four/page-four.ts b/src/components/menu/test/basic/pages/page-four/page-four.ts
new file mode 100644
index 0000000000..5f71a46c1f
--- /dev/null
+++ b/src/components/menu/test/basic/pages/page-four/page-four.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+import { DeepLink } from '../../../../../..';
+
+@DeepLink()
+@Component({
+  templateUrl: 'page-four.html'
+})
+export class PageFour { }
diff --git a/src/components/menu/test/basic/pages/main/main.html b/src/components/menu/test/basic/pages/page-one/page-one.html
similarity index 100%
rename from src/components/menu/test/basic/pages/main/main.html
rename to src/components/menu/test/basic/pages/page-one/page-one.html
diff --git a/src/components/menu/test/basic/pages/page-one/page-one.module.ts b/src/components/menu/test/basic/pages/page-one/page-one.module.ts
new file mode 100644
index 0000000000..0f5c7039be
--- /dev/null
+++ b/src/components/menu/test/basic/pages/page-one/page-one.module.ts
@@ -0,0 +1,16 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+
+import { PageOne } from './page-one';
+import { PageTwoModule } from '../page-two/page-two.module';
+
+@NgModule({
+  declarations: [
+    PageOne,
+  ],
+  imports: [
+    DeepLinkModule.forChild(PageOne),
+    PageTwoModule
+  ]
+})
+export class PageOneModule {}
diff --git a/src/components/menu/test/basic/pages/main/main.ts b/src/components/menu/test/basic/pages/page-one/page-one.ts
similarity index 74%
rename from src/components/menu/test/basic/pages/main/main.ts
rename to src/components/menu/test/basic/pages/page-one/page-one.ts
index bf4f31c0b2..2051b5d789 100644
--- a/src/components/menu/test/basic/pages/main/main.ts
+++ b/src/components/menu/test/basic/pages/page-one/page-one.ts
@@ -1,23 +1,25 @@
 import { Component, ViewChild } from '@angular/core';
-import { MenuController, Nav } from '../../../../../..';
+import { DeepLink, MenuController, Nav } from '../../../../../..';
 
+import { PageTwo } from '../page-two/page-two';
 
+@DeepLink()
 @Component({
-  templateUrl: 'main.html'
+  templateUrl: 'page-one.html'
 })
-export class E2EPage {
+export class PageOne {
   rootPage: any;
   changeDetectionCount: number = 0;
   pages: Array<{ title: string, component: any }>;
   @ViewChild(Nav) nav: Nav;
 
   constructor(public menuCtrl: MenuController) {
-    this.rootPage = 'Page1';
+    this.rootPage = PageTwo;
 
     this.pages = [
-      { title: 'Page 1', component: 'Page1' },
-      { title: 'Page 2', component: 'Page2' },
-      { title: 'Page 3', component: 'Page3' },
+      { title: 'Page 1', component: PageTwo },
+      { title: 'Page 2', component: 'PageThree' },
+      { title: 'Page 3', component: 'PageFour' },
     ];
   }
 
diff --git a/src/components/menu/test/basic/pages/page2/page2.html b/src/components/menu/test/basic/pages/page-three/page-three.html
similarity index 100%
rename from src/components/menu/test/basic/pages/page2/page2.html
rename to src/components/menu/test/basic/pages/page-three/page-three.html
diff --git a/src/components/menu/test/basic/pages/page-three/page-three.module.ts b/src/components/menu/test/basic/pages/page-three/page-three.module.ts
new file mode 100644
index 0000000000..073093b8dd
--- /dev/null
+++ b/src/components/menu/test/basic/pages/page-three/page-three.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+
+import { PageThree } from './page-three';
+
+@NgModule({
+  declarations: [
+    PageThree,
+  ],
+  imports: [
+    DeepLinkModule.forChild(PageThree)
+  ]
+})
+export class PageThreeModule {}
diff --git a/src/components/menu/test/basic/pages/page-three/page-three.ts b/src/components/menu/test/basic/pages/page-three/page-three.ts
new file mode 100644
index 0000000000..9b908bad19
--- /dev/null
+++ b/src/components/menu/test/basic/pages/page-three/page-three.ts
@@ -0,0 +1,14 @@
+import { Component } from '@angular/core';
+import { DeepLink, NavController } from '../../../../../..';
+
+@DeepLink()
+@Component({
+  templateUrl: 'page-three.html'
+})
+export class PageThree {
+  constructor(public navCtrl: NavController) { }
+
+  page3() {
+    this.navCtrl.push('PageFour');
+  }
+}
diff --git a/src/components/menu/test/basic/pages/page1/page1.html b/src/components/menu/test/basic/pages/page-two/page-two.html
similarity index 100%
rename from src/components/menu/test/basic/pages/page1/page1.html
rename to src/components/menu/test/basic/pages/page-two/page-two.html
diff --git a/src/components/menu/test/basic/pages/page-two/page-two.module.ts b/src/components/menu/test/basic/pages/page-two/page-two.module.ts
new file mode 100644
index 0000000000..cce23a5c33
--- /dev/null
+++ b/src/components/menu/test/basic/pages/page-two/page-two.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+
+import { PageTwo } from './page-two';
+
+@NgModule({
+  declarations: [
+    PageTwo,
+  ],
+  imports: [
+    DeepLinkModule.forChild(PageTwo)
+  ]
+})
+export class PageTwoModule {}
diff --git a/src/components/menu/test/basic/pages/page1/page1.ts b/src/components/menu/test/basic/pages/page-two/page-two.ts
similarity index 68%
rename from src/components/menu/test/basic/pages/page1/page1.ts
rename to src/components/menu/test/basic/pages/page-two/page-two.ts
index 5010b5f3f8..bb8003fed9 100644
--- a/src/components/menu/test/basic/pages/page1/page1.ts
+++ b/src/components/menu/test/basic/pages/page-two/page-two.ts
@@ -1,10 +1,11 @@
 import { Component } from '@angular/core';
-import { AlertController, ModalController, NavController } from '../../../../../..';
+import { AlertController, DeepLink, ModalController, NavController } from '../../../../../..';
 
+@DeepLink()
 @Component({
-  templateUrl: 'page1.html'
+  templateUrl: 'page-two.html'
 })
-export class Page1 {
+export class PageTwo {
   constructor(
     public navCtrl: NavController,
     public alertCtrl: AlertController,
@@ -23,11 +24,11 @@ export class Page1 {
   }
 
   presentModal() {
-    let modal = this.modalCtrl.create('Modal');
+    let modal = this.modalCtrl.create('ModalPage');
     modal.present();
   }
 
   goToPage2() {
-    this.navCtrl.push('Page2');
+    this.navCtrl.push('PageThree');
   }
 }
diff --git a/src/components/menu/test/basic/pages/page2/page2.ts b/src/components/menu/test/basic/pages/page2/page2.ts
deleted file mode 100644
index 6106dcaad0..0000000000
--- a/src/components/menu/test/basic/pages/page2/page2.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Component } from '@angular/core';
-import { NavController } from '../../../../../..';
-
-@Component({ templateUrl: 'page2.html' })
-export class Page2 {
-  constructor(public navCtrl: NavController) { }
-
-  page3() {
-    this.navCtrl.push('Page3');
-  }
-}
diff --git a/src/components/menu/test/basic/pages/page3/page3.module.ts b/src/components/menu/test/basic/pages/page3/page3.module.ts
deleted file mode 100644
index eb1c84e444..0000000000
--- a/src/components/menu/test/basic/pages/page3/page3.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { DeepLinkModule } from '../../../../../..';
-
-import { Page3 } from './page3';
-
-@NgModule({
-  declarations: [
-    Page3,
-  ],
-  imports: [
-    DeepLinkModule.forChild(Page3)
-  ],
-  entryComponents: [
-    Page3,
-  ]
-})
-export class Page3Module {}
diff --git a/src/components/menu/test/basic/pages/page3/page3.ts b/src/components/menu/test/basic/pages/page3/page3.ts
deleted file mode 100644
index 1ea510f4b8..0000000000
--- a/src/components/menu/test/basic/pages/page3/page3.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({ templateUrl: 'page3.html' })
-export class Page3 { }
diff --git a/src/components/modal/test/basic/app/app.component.ts b/src/components/modal/test/basic/app/app.component.ts
index af92e1d42e..fdf06bf0c1 100644
--- a/src/components/modal/test/basic/app/app.component.ts
+++ b/src/components/modal/test/basic/app/app.component.ts
@@ -1,8 +1,10 @@
 import { Component } from '@angular/core';
 
+import { PageOne } from '../pages/page-one/page-one';
+
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
-  root = 'E2EPage';
+export class AppComponent {
+  root = PageOne;
 }
diff --git a/src/components/modal/test/basic/app/app.module.ts b/src/components/modal/test/basic/app/app.module.ts
index 4f186a5f4e..ec89d90fe7 100644
--- a/src/components/modal/test/basic/app/app.module.ts
+++ b/src/components/modal/test/basic/app/app.module.ts
@@ -2,35 +2,25 @@ import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicModule, IonicApp } from '../../../../..';
 
-import { E2EApp } from './app.component';
+import { AppComponent } from './app.component';
+import { PageOneModule } from '../pages/page-one/page-one.module';
+
 import { SomeAppProvider } from '../services/some-app-provider';
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp, {
+    IonicModule.forRoot(AppComponent, {
       statusbarPadding: true,
       swipeBackEnabled: true
-    }, {
-      links: [
-        { loadChildren: '../pages/main/main.module#E2EPageModule', name: 'E2EPage' },
-        { loadChildren: '../pages/modal-first/modal-first.module#ModalFirstPageModule', name: 'ModalFirstPage' },
-        { loadChildren: '../pages/modal-second/modal-second.module#ModalSecondPageModule', name: 'ModalSecondPage' },
-        { loadChildren: '../components/contact-us/contact-us.module#ContactUsModalModule', name: 'ContactUsModal' },
-        { loadChildren: '../components/modal-pass-data/modal-pass-data.module#ModalPassDataModule', name: 'ModalPassData' },
-        { loadChildren: '../components/modal-with-inputs/modal-with-inputs.module#ModalWithInputsModule', name: 'ModalWithInputs' },
-        { loadChildren: '../components/toolbar/toolbar.module#ToolbarModalModule', name: 'ToolbarModal' },
-      ]
-    })
+    }),
+    PageOneModule
   ],
   bootstrap: [IonicApp],
   providers: [SomeAppProvider],
-  entryComponents: [
-    E2EApp,
-  ]
 })
 export class AppModule {}
 
diff --git a/src/components/modal/test/basic/components/contact-us/contact-us.module.ts b/src/components/modal/test/basic/components/contact-us/contact-us.module.ts
deleted file mode 100644
index fdf7f019f8..0000000000
--- a/src/components/modal/test/basic/components/contact-us/contact-us.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { DeepLinkModule } from '../../../../../..';
-
-import { ContactUsModal } from './contact-us';
-
-@NgModule({
-  declarations: [
-    ContactUsModal,
-  ],
-  imports: [
-    DeepLinkModule.forChild(ContactUsModal)
-  ],
-  entryComponents: [
-    ContactUsModal,
-  ]
-})
-export class ContactUsModalModule {}
diff --git a/src/components/modal/test/basic/components/modal-with-inputs/modal-with-inputs.ts b/src/components/modal/test/basic/components/modal-with-inputs/modal-with-inputs.ts
deleted file mode 100644
index 31ba682123..0000000000
--- a/src/components/modal/test/basic/components/modal-with-inputs/modal-with-inputs.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { Component } from '@angular/core';
-import { ViewController } from '../../../../../..';
-
-@Component({
-  template: `
-    <ion-header>
-      <ion-toolbar color="secondary">
-        <ion-buttons start>
-          <button ion-button (click)="dismiss()" strong>Close</button>
-        </ion-buttons>
-        <ion-title>Modal w/ Inputs</ion-title>
-      </ion-toolbar>
-    </ion-header>
-
-    <ion-content>
-      <form #addForm="ngForm" (submit)="save($event)" novalidate>
-        <ion-list>
-          <ion-item>
-            <ion-label floating>Title <span [hidden]="data.title.valid">(Required)</span></ion-label>
-            <ion-input [(ngModel)]="data.title" name="title" #title="ngModel" type="text" required autofocus></ion-input>
-          </ion-item>
-          <ion-item>
-            <ion-label floating>Note <span [hidden]="data.note.valid">(Required)</span></ion-label>
-            <ion-input [(ngModel)]="data.note" name="note" #note="ngModel" type="text" required></ion-input>
-          </ion-item>
-          <ion-item>
-            <ion-label floating>Icon</ion-label>
-            <ion-input [(ngModel)]="data.icon" name="icon" #icon="ngModel" type="text" autocomplete="on" autocorrect="on"></ion-input>
-          </ion-item>
-        </ion-list>
-        <div padding>
-          <button ion-button block large type="submit" [disabled]="!addForm.valid">Save</button>
-        </div>
-      </form>
-    </ion-content>
-  `
-})
-export class ModalWithInputs {
-  data: any;
-
-  constructor(public viewCtrl: ViewController) {
-    this.data = {
-      title: 'Title',
-      note: 'Note',
-      icon: 'home'
-    };
-  }
-
-  public save(ev: any) {
-    this.viewCtrl.dismiss(this.data);
-  }
-
-  public dismiss() {
-    this.viewCtrl.dismiss(null);
-  }
-}
diff --git a/src/components/modal/test/basic/components/toolbar/toolbar.ts b/src/components/modal/test/basic/components/toolbar/toolbar.ts
deleted file mode 100644
index 5c9899f0a1..0000000000
--- a/src/components/modal/test/basic/components/toolbar/toolbar.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { Component } from '@angular/core';
-import { ViewController, AlertController } from '../../../../../..';
-
-@Component({
-  template: `
-    <ion-header>
-      <ion-toolbar color="primary">
-        <ion-title>Toolbar 1</ion-title>
-      </ion-toolbar>
-
-      <ion-toolbar>
-        <ion-title>Toolbar 2</ion-title>
-      </ion-toolbar>
-    </ion-header>
-
-    <ion-content padding>
-      <button ion-button block color="danger" (click)="dismiss()" class="e2eCloseToolbarModal">
-        Dismission Modal
-      </button>
-
-      <div>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris vel ipsum in purus mollis dictum eget vitae purus. Nulla ultrices est odio, a maximus velit pretium ac. Donec vel elementum mi. Proin elementum pulvinar neque, in lacinia nibh tempus auctor. Nam sapien velit, commodo ac nibh a, maximus ullamcorper nunc. Integer luctus tortor dignissim, dictum neque at, scelerisque purus. Vivamus nec erat vel magna posuere euismod. Sed ac augue eu tellus tincidunt fermentum eget sit amet nunc. Donec sit amet mi libero. Cras nunc arcu, ultrices nec sapien eu, convallis posuere libero. Pellentesque vulputate lacus eros, at lobortis lorem egestas et. Vestibulum tempus quam in efficitur lobortis. Maecenas consectetur consequat sem pharetra aliquet. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.</div>
-
-      <div>Mauris ac ligula elit. Nulla pulvinar eget leo ut aliquet. Praesent sit amet luctus quam. Nam fringilla iaculis mi, ut maximus mauris molestie feugiat. Curabitur nec scelerisque elit. Nunc eu odio facilisis, tempor enim eget, venenatis sem. Sed vitae lorem vehicula, auctor orci ultrices, finibus mauris. Donec vitae pulvinar diam. Nulla luctus congue quam, sed lacinia arcu dictum a.</div>
-
-      <div>Morbi laoreet magna elit, id dapibus massa varius consequat. Praesent rhoncus nunc quam, eu mollis velit commodo ut. Etiam euismod elit mi, non auctor velit blandit ut. Aenean vitae pulvinar mi, ac pretium tellus. Morbi eu auctor sem, sollicitudin cursus felis. Praesent vestibulum velit sed eros iaculis ornare. Praesent diam diam, pellentesque eget scelerisque sed, bibendum ut risus. Sed sed fermentum sem. Integer vel justo felis. Proin eget quam est. In sit amet ipsum sagittis, convallis ipsum fringilla, interdum ante. Etiam vel tincidunt mauris. Nunc feugiat eros nunc, et vestibulum metus mollis et. Nullam eu viverra velit, id ultrices nisl. Donec non enim elementum, laoreet sapien id, feugiat tellus.</div>
-
-      <div>Sed pellentesque ipsum eget ante hendrerit maximus. Aliquam id venenatis nulla. Nullam in nibh at enim vestibulum ullamcorper. Nam felis dolor, lobortis vel est non, condimentum malesuada nisl. In metus sapien, malesuada at nulla in, pretium aliquam turpis. Quisque elementum purus mi, sed tristique turpis ultricies in. Donec feugiat dolor non ultricies ultricies. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin ut purus et diam porta cursus vitae semper mi. Donec fringilla tellus orci. Interdum et malesuada fames ac ante ipsum primis in faucibus. Nunc vitae commodo sem. Duis vehicula quam sit amet imperdiet facilisis. Pellentesque eget dignissim neque, et scelerisque libero. Maecenas molestie metus sed orci cursus, in venenatis justo dapibus.</div>
-
-      <div>Aenean rhoncus urna at interdum blandit. Donec ac massa nec libero vehicula tincidunt. Sed sit amet hendrerit risus. Aliquam vitae vestibulum ipsum, non feugiat orci. Vivamus eu rutrum elit. Nulla dapibus tortor non dignissim pretium. Nulla in luctus turpis. Etiam non mattis tortor, at aliquet ex. Nunc ut ante varius, auctor dui vel, volutpat elit. Nunc laoreet augue sit amet ultrices porta. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Vestibulum pellentesque lobortis est, ut tincidunt ligula mollis sit amet. In porta risus arcu, quis pellentesque dolor mattis non. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae;</div>
-
-      <button ion-button block color="danger" (click)="dismiss()">
-        Dismission Modal
-      </button>
-    </ion-content>
-  `
-})
-export class ToolbarModal {
-
-  constructor(public viewCtrl: ViewController, public alertCtrl: AlertController) {}
-
-  ionViewDidEnter() {
-    let alert = this.alertCtrl.create({
-        title: 'Test',
-        buttons: [
-            {
-                text: 'Something',
-                role: 'cancel'
-            }
-        ]
-    });
-    alert.present();
-  }
-
-  dismiss() {
-    this.viewCtrl.dismiss();
-  }
-
-}
diff --git a/src/components/modal/test/basic/pages/contact-us/contact-us.html b/src/components/modal/test/basic/pages/contact-us/contact-us.html
new file mode 100644
index 0000000000..94dcedac59
--- /dev/null
+++ b/src/components/modal/test/basic/pages/contact-us/contact-us.html
@@ -0,0 +1 @@
+<ion-nav [root]="root"></ion-nav>
\ No newline at end of file
diff --git a/src/components/modal/test/basic/pages/contact-us/contact-us.module.ts b/src/components/modal/test/basic/pages/contact-us/contact-us.module.ts
new file mode 100644
index 0000000000..ce8d674246
--- /dev/null
+++ b/src/components/modal/test/basic/pages/contact-us/contact-us.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+
+import { ContactUs } from './contact-us';
+
+@NgModule({
+  declarations: [
+    ContactUs,
+  ],
+  imports: [
+    DeepLinkModule.forChild(ContactUs)
+  ]
+})
+export class ContactUsModule {}
diff --git a/src/components/modal/test/basic/components/contact-us/contact-us.ts b/src/components/modal/test/basic/pages/contact-us/contact-us.ts
similarity index 80%
rename from src/components/modal/test/basic/components/contact-us/contact-us.ts
rename to src/components/modal/test/basic/pages/contact-us/contact-us.ts
index 987dbee20b..3fb47ea212 100644
--- a/src/components/modal/test/basic/components/contact-us/contact-us.ts
+++ b/src/components/modal/test/basic/pages/contact-us/contact-us.ts
@@ -1,10 +1,12 @@
 import { Component } from '@angular/core';
+import { DeepLink } from '../../../../../..';
 
+@DeepLink()
 @Component({
-  template: '<ion-nav [root]="root"></ion-nav>'
+  templateUrl: 'contact-us.html'
 })
-export class ContactUsModal {
-  root = 'ModalFirstPage';
+export class ContactUs {
+  root = 'PageTwo';
 
   constructor() {
     console.log('ContactUs constructor');
diff --git a/src/components/modal/test/basic/pages/main/main.module.ts b/src/components/modal/test/basic/pages/main/main.module.ts
deleted file mode 100644
index 1cc785fd59..0000000000
--- a/src/components/modal/test/basic/pages/main/main.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { DeepLinkModule } from '../../../../../..';
-
-import { E2EPage } from './main';
-
-@NgModule({
-  declarations: [
-    E2EPage,
-  ],
-  imports: [
-    DeepLinkModule.forChild(E2EPage)
-  ],
-  entryComponents: [
-    E2EPage,
-  ]
-})
-export class E2EPageModule {}
diff --git a/src/components/modal/test/basic/pages/modal-first/modal-first.module.ts b/src/components/modal/test/basic/pages/modal-first/modal-first.module.ts
deleted file mode 100644
index 638532fde9..0000000000
--- a/src/components/modal/test/basic/pages/modal-first/modal-first.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { DeepLinkModule } from '../../../../../..';
-
-import { ModalFirstPage } from './modal-first';
-
-@NgModule({
-  declarations: [
-    ModalFirstPage,
-  ],
-  imports: [
-    DeepLinkModule.forChild(ModalFirstPage)
-  ],
-  entryComponents: [
-    ModalFirstPage,
-  ]
-})
-export class ModalFirstPageModule {}
diff --git a/src/components/modal/test/basic/pages/modal-pass-data/modal-pass-data.html b/src/components/modal/test/basic/pages/modal-pass-data/modal-pass-data.html
new file mode 100644
index 0000000000..348f52a94d
--- /dev/null
+++ b/src/components/modal/test/basic/pages/modal-pass-data/modal-pass-data.html
@@ -0,0 +1,28 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Data in/out</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  <ion-list>
+    <ion-item>
+      <ion-label>UserId</ion-label>
+      <ion-input type="number" [(ngModel)]="data.userId"></ion-input>
+    </ion-item>
+    <ion-item>
+      <ion-label>Name</ion-label>
+      <ion-input [(ngModel)]="data.name"></ion-input>
+    </ion-item>
+  </ion-list>
+  <button ion-button full (click)="submit()">Submit</button>
+  <div padding>
+    <p>ionViewCanEnter ({{called.ionViewCanEnter}})</p>
+    <p>ionViewCanLeave ({{called.ionViewCanLeave}})</p>
+    <p>ionViewWillLoad ({{called.ionViewWillLoad}})</p>
+    <p>ionViewDidLoad ({{called.ionViewDidLoad}})</p>
+    <p>ionViewWillEnter ({{called.ionViewWillEnter}})</p>
+    <p>ionViewDidEnter ({{called.ionViewDidEnter}})</p>
+    <p>ionViewWillLeave ({{called.ionViewWillLeave}})</p>
+    <p>ionViewDidLeave ({{called.ionViewDidLeave}})</p>
+  </div>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/modal/test/basic/components/modal-pass-data/modal-pass-data.module.ts b/src/components/modal/test/basic/pages/modal-pass-data/modal-pass-data.module.ts
similarity index 76%
rename from src/components/modal/test/basic/components/modal-pass-data/modal-pass-data.module.ts
rename to src/components/modal/test/basic/pages/modal-pass-data/modal-pass-data.module.ts
index 9054bd3ee8..cd66a1a8da 100644
--- a/src/components/modal/test/basic/components/modal-pass-data/modal-pass-data.module.ts
+++ b/src/components/modal/test/basic/pages/modal-pass-data/modal-pass-data.module.ts
@@ -2,6 +2,7 @@ import { NgModule } from '@angular/core';
 import { DeepLinkModule } from '../../../../../..';
 
 import { ModalPassData } from './modal-pass-data';
+import { SomeComponentProvider } from './provider';
 
 @NgModule({
   declarations: [
@@ -10,8 +11,8 @@ import { ModalPassData } from './modal-pass-data';
   imports: [
     DeepLinkModule.forChild(ModalPassData)
   ],
-  entryComponents: [
-    ModalPassData,
+  providers: [
+    SomeComponentProvider
   ]
 })
 export class ModalPassDataModule {}
diff --git a/src/components/modal/test/basic/components/modal-pass-data/modal-pass-data.ts b/src/components/modal/test/basic/pages/modal-pass-data/modal-pass-data.ts
similarity index 61%
rename from src/components/modal/test/basic/components/modal-pass-data/modal-pass-data.ts
rename to src/components/modal/test/basic/pages/modal-pass-data/modal-pass-data.ts
index 485fdf09ca..8047d4c637 100644
--- a/src/components/modal/test/basic/components/modal-pass-data/modal-pass-data.ts
+++ b/src/components/modal/test/basic/pages/modal-pass-data/modal-pass-data.ts
@@ -1,51 +1,15 @@
-import { Injectable, Component } from '@angular/core';
-import { ViewController, ToastController, AlertController, NavParams, Config } from '../../../../../..';
+import { Component } from '@angular/core';
+import { AlertController, DeepLink, NavParams, ToastController, ViewController } from '../../../../../..';
 
 import { SomeAppProvider } from '../../services/some-app-provider';
+import { SomeComponentProvider } from './provider';
 
-@Injectable()
-export class SomeComponentProvider {
-  constructor(public config: Config) {
-    console.log('SomeComponentProvider constructor');
-  }
-
-  getName() {
-    return 'Jenny';
-  }
-}
-
+@DeepLink()
 @Component({
-  template: `
-    <ion-header>
-      <ion-navbar>
-        <ion-title>Data in/out</ion-title>
-      </ion-navbar>
-    </ion-header>
-    <ion-content>
-      <ion-list>
-        <ion-item>
-          <ion-label>UserId</ion-label>
-          <ion-input type="number" [(ngModel)]="data.userId"></ion-input>
-        </ion-item>
-        <ion-item>
-          <ion-label>Name</ion-label>
-          <ion-input [(ngModel)]="data.name"></ion-input>
-        </ion-item>
-      </ion-list>
-      <button ion-button full (click)="submit()">Submit</button>
-      <div padding>
-        <p>ionViewCanEnter ({{called.ionViewCanEnter}})</p>
-        <p>ionViewCanLeave ({{called.ionViewCanLeave}})</p>
-        <p>ionViewWillLoad ({{called.ionViewWillLoad}})</p>
-        <p>ionViewDidLoad ({{called.ionViewDidLoad}})</p>
-        <p>ionViewWillEnter ({{called.ionViewWillEnter}})</p>
-        <p>ionViewDidEnter ({{called.ionViewDidEnter}})</p>
-        <p>ionViewWillLeave ({{called.ionViewWillLeave}})</p>
-        <p>ionViewDidLeave ({{called.ionViewDidLeave}})</p>
-      </div>
-    </ion-content>
-  `,
-  providers: [SomeComponentProvider]
+  templateUrl: 'modal-pass-data.html',
+  providers: [
+    SomeComponentProvider
+  ]
 })
 export class ModalPassData {
   data: any;
diff --git a/src/components/modal/test/basic/pages/modal-pass-data/provider.ts b/src/components/modal/test/basic/pages/modal-pass-data/provider.ts
new file mode 100644
index 0000000000..6895f12795
--- /dev/null
+++ b/src/components/modal/test/basic/pages/modal-pass-data/provider.ts
@@ -0,0 +1,12 @@
+import { Injectable } from '@angular/core';
+import { Config } from '../../../../../..';
+
+@Injectable()
+export class SomeComponentProvider {
+  constructor(public config: Config) {
+  }
+
+  getName() {
+    return 'Jenny';
+  }
+}
diff --git a/src/components/modal/test/basic/pages/modal-second/modal-second.module.ts b/src/components/modal/test/basic/pages/modal-second/modal-second.module.ts
deleted file mode 100644
index 6ba3ccec6c..0000000000
--- a/src/components/modal/test/basic/pages/modal-second/modal-second.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { DeepLinkModule } from '../../../../../..';
-
-import { ModalSecondPage } from './modal-second';
-
-@NgModule({
-  declarations: [
-    ModalSecondPage,
-  ],
-  imports: [
-    DeepLinkModule.forChild(ModalSecondPage)
-  ],
-  entryComponents: [
-    ModalSecondPage,
-  ]
-})
-export class ModalSecondPageModule {}
diff --git a/src/components/modal/test/basic/pages/modal-second/modal-second.ts b/src/components/modal/test/basic/pages/modal-second/modal-second.ts
deleted file mode 100644
index 63099ae2c1..0000000000
--- a/src/components/modal/test/basic/pages/modal-second/modal-second.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { Component } from '@angular/core';
-import { NavController, NavParams } from '../../../../../..';
-
-@Component({
-  template: `
-    <ion-header>
-      <ion-navbar>
-        <ion-title>Second Page Header</ion-title>
-      </ion-navbar>
-    </ion-header>
-    <ion-content padding>
-      <p>
-        <button ion-button (click)="navCtrl.pop()">Pop (Go back to 1st)</button>
-      </p>
-      <div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div>
-      <div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div>
-    </ion-content>
-  `
-})
-export class ModalSecondPage {
-  constructor(public navCtrl: NavController, params: NavParams) {
-    console.log('Second page params:', params);
-  }
-
-  ionViewDidLoad() {
-    console.log('ModalSecondPage ionViewDidLoad');
-  }
-
-  ionViewWillEnter() {
-    console.log('ModalSecondPage ionViewWillEnter');
-  }
-
-  ionViewDidEnter() {
-    console.log('ModalSecondPage ionViewDidEnter');
-  }
-}
diff --git a/src/components/modal/test/basic/pages/modal-with-inputs/modal-with-inputs.html b/src/components/modal/test/basic/pages/modal-with-inputs/modal-with-inputs.html
new file mode 100644
index 0000000000..fd6193ba6b
--- /dev/null
+++ b/src/components/modal/test/basic/pages/modal-with-inputs/modal-with-inputs.html
@@ -0,0 +1,30 @@
+<ion-header>
+  <ion-toolbar color="secondary">
+    <ion-buttons start>
+      <button ion-button (click)="dismiss()" strong>Close</button>
+    </ion-buttons>
+    <ion-title>Modal w/ Inputs</ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content>
+  <form #addForm="ngForm" (submit)="save($event)" novalidate>
+    <ion-list>
+      <ion-item>
+        <ion-label floating>Title <span [hidden]="data.title.valid">(Required)</span></ion-label>
+        <ion-input [(ngModel)]="data.title" name="title" #title="ngModel" type="text" required autofocus></ion-input>
+      </ion-item>
+      <ion-item>
+        <ion-label floating>Note <span [hidden]="data.note.valid">(Required)</span></ion-label>
+        <ion-input [(ngModel)]="data.note" name="note" #note="ngModel" type="text" required></ion-input>
+      </ion-item>
+      <ion-item>
+        <ion-label floating>Icon</ion-label>
+        <ion-input [(ngModel)]="data.icon" name="icon" #icon="ngModel" type="text" autocomplete="on" autocorrect="on"></ion-input>
+      </ion-item>
+    </ion-list>
+    <div padding>
+      <button ion-button block large type="submit" [disabled]="!addForm.valid">Save</button>
+    </div>
+  </form>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/modal/test/basic/components/modal-with-inputs/modal-with-inputs.module.ts b/src/components/modal/test/basic/pages/modal-with-inputs/modal-with-inputs.module.ts
similarity index 86%
rename from src/components/modal/test/basic/components/modal-with-inputs/modal-with-inputs.module.ts
rename to src/components/modal/test/basic/pages/modal-with-inputs/modal-with-inputs.module.ts
index cc0718485c..eb93b946cf 100644
--- a/src/components/modal/test/basic/components/modal-with-inputs/modal-with-inputs.module.ts
+++ b/src/components/modal/test/basic/pages/modal-with-inputs/modal-with-inputs.module.ts
@@ -9,9 +9,6 @@ import { ModalWithInputs } from './modal-with-inputs';
   ],
   imports: [
     DeepLinkModule.forChild(ModalWithInputs)
-  ],
-  entryComponents: [
-    ModalWithInputs,
   ]
 })
 export class ModalWithInputsModule {}
diff --git a/src/components/modal/test/basic/pages/modal-with-inputs/modal-with-inputs.ts b/src/components/modal/test/basic/pages/modal-with-inputs/modal-with-inputs.ts
new file mode 100644
index 0000000000..ad6f53388e
--- /dev/null
+++ b/src/components/modal/test/basic/pages/modal-with-inputs/modal-with-inputs.ts
@@ -0,0 +1,26 @@
+import { Component } from '@angular/core';
+import { DeepLink, ViewController } from '../../../../../..';
+
+@DeepLink()
+@Component({
+  templateUrl: 'modal-with-inputs.html'
+})
+export class ModalWithInputs {
+  data: any;
+
+  constructor(public viewCtrl: ViewController) {
+    this.data = {
+      title: 'Title',
+      note: 'Note',
+      icon: 'home'
+    };
+  }
+
+  public save(ev: any) {
+    this.viewCtrl.dismiss(this.data);
+  }
+
+  public dismiss() {
+    this.viewCtrl.dismiss(null);
+  }
+}
diff --git a/src/components/modal/test/basic/pages/main/main.html b/src/components/modal/test/basic/pages/page-one/page-one.html
similarity index 100%
rename from src/components/modal/test/basic/pages/main/main.html
rename to src/components/modal/test/basic/pages/page-one/page-one.html
diff --git a/src/components/modal/test/basic/pages/page-one/page-one.module.ts b/src/components/modal/test/basic/pages/page-one/page-one.module.ts
new file mode 100644
index 0000000000..8ff01f8895
--- /dev/null
+++ b/src/components/modal/test/basic/pages/page-one/page-one.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+
+import { PageOne } from './page-one';
+
+@NgModule({
+  declarations: [
+    PageOne,
+  ],
+  imports: [
+    DeepLinkModule.forChild(PageOne)
+  ]
+})
+export class PageOneModule {}
diff --git a/src/components/modal/test/basic/pages/main/main.ts b/src/components/modal/test/basic/pages/page-one/page-one.ts
similarity index 90%
rename from src/components/modal/test/basic/pages/main/main.ts
rename to src/components/modal/test/basic/pages/page-one/page-one.ts
index b1acadd7f7..d5449b1648 100644
--- a/src/components/modal/test/basic/pages/main/main.ts
+++ b/src/components/modal/test/basic/pages/page-one/page-one.ts
@@ -1,10 +1,11 @@
 import { Component } from '@angular/core';
-import { NavController, ModalController, ToastController, Config, Platform } from '../../../../../..';
+import { Config, DeepLink, NavController, ModalController, ToastController, Platform } from '../../../../../..';
 
+@DeepLink()
 @Component({
-  templateUrl: 'main.html'
+  templateUrl: 'page-one.html'
 })
-export class E2EPage {
+export class PageOne {
   platforms: string[];
 
   constructor(
@@ -36,7 +37,7 @@ export class E2EPage {
   }
 
   push() {
-    this.navCtrl.push(E2EPage);
+    this.navCtrl.push(PageOne);
   }
 
   presentModal() {
@@ -57,7 +58,7 @@ export class E2EPage {
   }
 
   presentModalChildNav() {
-    this.modalCtrl.create('ContactUsModal', null, {
+    this.modalCtrl.create('ContactUs', null, {
       enableBackdropDismiss: false
     }).present();
   }
@@ -84,7 +85,7 @@ export class E2EPage {
     }).present();
 
     setTimeout(() => {
-      this.modalCtrl.create('ContactUsModal').present();
+      this.modalCtrl.create('ContactUs').present();
     }, 500);
   }
 
diff --git a/src/components/modal/test/basic/pages/page-three/page-three.html b/src/components/modal/test/basic/pages/page-three/page-three.html
new file mode 100644
index 0000000000..9d98185300
--- /dev/null
+++ b/src/components/modal/test/basic/pages/page-three/page-three.html
@@ -0,0 +1,12 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Second Page Header</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content padding>
+  <p>
+    <button ion-button (click)="navCtrl.pop()">Pop (Go back to 1st)</button>
+  </p>
+  <div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div>
+  <div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><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/modal/test/basic/pages/page-three/page-three.module.ts b/src/components/modal/test/basic/pages/page-three/page-three.module.ts
new file mode 100644
index 0000000000..073093b8dd
--- /dev/null
+++ b/src/components/modal/test/basic/pages/page-three/page-three.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+
+import { PageThree } from './page-three';
+
+@NgModule({
+  declarations: [
+    PageThree,
+  ],
+  imports: [
+    DeepLinkModule.forChild(PageThree)
+  ]
+})
+export class PageThreeModule {}
diff --git a/src/components/modal/test/basic/pages/page-three/page-three.ts b/src/components/modal/test/basic/pages/page-three/page-three.ts
new file mode 100644
index 0000000000..df1faeda90
--- /dev/null
+++ b/src/components/modal/test/basic/pages/page-three/page-three.ts
@@ -0,0 +1,24 @@
+import { Component } from '@angular/core';
+import { DeepLink, NavController, NavParams } from '../../../../../..';
+
+@DeepLink()
+@Component({
+  templateUrl: 'page-three.html'
+})
+export class PageThree {
+  constructor(public navCtrl: NavController, params: NavParams) {
+    console.log('Second page params:', params);
+  }
+
+  ionViewDidLoad() {
+    console.log('PageThree ionViewDidLoad');
+  }
+
+  ionViewWillEnter() {
+    console.log('PageThree ionViewWillEnter');
+  }
+
+  ionViewDidEnter() {
+    console.log('PageThree ionViewDidEnter');
+  }
+}
diff --git a/src/components/modal/test/basic/pages/page-two/page-two.html b/src/components/modal/test/basic/pages/page-two/page-two.html
new file mode 100644
index 0000000000..282b33762c
--- /dev/null
+++ b/src/components/modal/test/basic/pages/page-two/page-two.html
@@ -0,0 +1,35 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>First Page Header</ion-title>
+    <ion-buttons start>
+      <button ion-button class="e2eCloseMenu" (click)="dismiss()" strong>Close</button>
+    </ion-buttons>
+  </ion-navbar>
+</ion-header>
+
+<ion-content padding>
+  <p>ionViewCanEnter ({{called.ionViewCanEnter}})</p>
+  <p>ionViewCanLeave ({{called.ionViewCanLeave}})</p>
+  <p>ionViewWillLoad ({{called.ionViewWillLoad}})</p>
+  <p>ionViewDidLoad ({{called.ionViewDidLoad}})</p>
+  <p>ionViewWillEnter ({{called.ionViewWillEnter}})</p>
+  <p>ionViewDidEnter ({{called.ionViewDidEnter}})</p>
+  <p>ionViewWillLeave ({{called.ionViewWillLeave}})</p>
+  <p>ionViewDidLeave ({{called.ionViewDidLeave}})</p>
+  <p>
+    <button ion-button (click)="push()">Push (Go to 2nd)</button>
+  </p>
+  <p>
+    <button ion-button (click)="openActionSheet()">Open Action Sheet</button>
+  </p>
+  <p>
+    <button ion-button (click)="openModal()">Open same modal</button>
+  </p>
+  <div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div>
+  <div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div>
+  <ion-list>
+    <ion-item *ngFor="let item of items">
+      Item Number: {{item.value}}
+    </ion-item>
+  </ion-list>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/modal/test/basic/pages/page-two/page-two.module.ts b/src/components/modal/test/basic/pages/page-two/page-two.module.ts
new file mode 100644
index 0000000000..cce23a5c33
--- /dev/null
+++ b/src/components/modal/test/basic/pages/page-two/page-two.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+
+import { PageTwo } from './page-two';
+
+@NgModule({
+  declarations: [
+    PageTwo,
+  ],
+  imports: [
+    DeepLinkModule.forChild(PageTwo)
+  ]
+})
+export class PageTwoModule {}
diff --git a/src/components/modal/test/basic/pages/modal-first/modal-first.ts b/src/components/modal/test/basic/pages/page-two/page-two.ts
similarity index 56%
rename from src/components/modal/test/basic/pages/modal-first/modal-first.ts
rename to src/components/modal/test/basic/pages/page-two/page-two.ts
index d4b8a0c557..122c1837a2 100644
--- a/src/components/modal/test/basic/pages/modal-first/modal-first.ts
+++ b/src/components/modal/test/basic/pages/page-two/page-two.ts
@@ -1,46 +1,11 @@
 import { Component } from '@angular/core';
-import { NavController, App, ActionSheetController, ToastController, AlertController, ModalController } from '../../../../../..';
+import { App, ActionSheetController, AlertController, DeepLink, ModalController, NavController, ToastController } from '../../../../../..';
 
+@DeepLink()
 @Component({
-  template: `
-    <ion-header>
-      <ion-navbar>
-        <ion-title>First Page Header</ion-title>
-        <ion-buttons start>
-          <button ion-button class="e2eCloseMenu" (click)="dismiss()" strong>Close</button>
-        </ion-buttons>
-      </ion-navbar>
-    </ion-header>
-
-    <ion-content padding>
-      <p>ionViewCanEnter ({{called.ionViewCanEnter}})</p>
-      <p>ionViewCanLeave ({{called.ionViewCanLeave}})</p>
-      <p>ionViewWillLoad ({{called.ionViewWillLoad}})</p>
-      <p>ionViewDidLoad ({{called.ionViewDidLoad}})</p>
-      <p>ionViewWillEnter ({{called.ionViewWillEnter}})</p>
-      <p>ionViewDidEnter ({{called.ionViewDidEnter}})</p>
-      <p>ionViewWillLeave ({{called.ionViewWillLeave}})</p>
-      <p>ionViewDidLeave ({{called.ionViewDidLeave}})</p>
-      <p>
-        <button ion-button (click)="push()">Push (Go to 2nd)</button>
-      </p>
-      <p>
-        <button ion-button (click)="openActionSheet()">Open Action Sheet</button>
-      </p>
-      <p>
-        <button ion-button (click)="openModal()">Open same modal</button>
-      </p>
-      <div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div>
-      <div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div>
-      <ion-list>
-        <ion-item *ngFor="let item of items">
-          Item Number: {{item.value}}
-        </ion-item>
-      </ion-list>
-    </ion-content>
-  `
+  templateUrl: 'page-two.html'
 })
-export class ModalFirstPage {
+export class PageTwo {
   items: any[] = [];
   called: any;
 
@@ -77,7 +42,7 @@ export class ModalFirstPage {
     }).present();
 
     setTimeout(() => {
-      this.navCtrl.push('ModalSecondPage', {
+      this.navCtrl.push('PageThree', {
         id: 8675309,
         myData: [1, 2, 3, 4]
       });
@@ -89,34 +54,34 @@ export class ModalFirstPage {
   }
 
   ionViewCanEnter() {
-    console.log('ModalFirstPage ionViewCanEnter fired');
+    console.log('PageTwo ionViewCanEnter fired');
     this.called.ionViewCanEnter++;
     return true;
   }
 
   ionViewCanLeave() {
-    console.log('ModalFirstPage ionViewCanLeave fired');
+    console.log('PageTwo ionViewCanLeave fired');
     this.called.ionViewCanLeave++;
     return true;
   }
 
   ionViewWillLoad() {
-    console.log('ModalFirstPage ionViewWillLoad fired');
+    console.log('PageTwo ionViewWillLoad fired');
     this.called.ionViewWillLoad++;
   }
 
   ionViewDidLoad() {
-    console.log('ModalFirstPage ionViewDidLoad fired');
+    console.log('PageTwo ionViewDidLoad fired');
     this.called.ionViewDidLoad++;
   }
 
   ionViewWillEnter() {
-    console.log('ModalFirstPage ionViewWillEnter fired');
+    console.log('PageTwo ionViewWillEnter fired');
     this.called.ionViewWillEnter++;
   }
 
   ionViewDidEnter() {
-    console.log('ModalFirstPage ionViewDidEnter fired');
+    console.log('PageTwo ionViewDidEnter fired');
     let alert = this.alertCtrl.create({
       title: 'Test',
       buttons: [
@@ -131,12 +96,12 @@ export class ModalFirstPage {
   }
 
   ionViewWillLeave() {
-    console.log('ModalFirstPage ionViewWillLeave fired');
+    console.log('PageTwo ionViewWillLeave fired');
     this.called.ionViewWillLeave++;
   }
 
   ionViewDidLeave() {
-    console.log('ModalFirstPage ionViewDidLeave fired');
+    console.log('PageTwo ionViewDidLeave fired');
     this.called.ionViewDidLeave++;
   }
 
diff --git a/src/components/modal/test/basic/pages/toolbar/toolbar.html b/src/components/modal/test/basic/pages/toolbar/toolbar.html
new file mode 100644
index 0000000000..ac123b0ca0
--- /dev/null
+++ b/src/components/modal/test/basic/pages/toolbar/toolbar.html
@@ -0,0 +1,29 @@
+<ion-header>
+  <ion-toolbar color="primary">
+    <ion-title>Toolbar 1</ion-title>
+  </ion-toolbar>
+
+  <ion-toolbar>
+    <ion-title>Toolbar 2</ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content padding>
+  <button ion-button block color="danger" (click)="dismiss()" class="e2eCloseToolbarModal">
+    Dismission Modal
+  </button>
+
+  <div>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris vel ipsum in purus mollis dictum eget vitae purus. Nulla ultrices est odio, a maximus velit pretium ac. Donec vel elementum mi. Proin elementum pulvinar neque, in lacinia nibh tempus auctor. Nam sapien velit, commodo ac nibh a, maximus ullamcorper nunc. Integer luctus tortor dignissim, dictum neque at, scelerisque purus. Vivamus nec erat vel magna posuere euismod. Sed ac augue eu tellus tincidunt fermentum eget sit amet nunc. Donec sit amet mi libero. Cras nunc arcu, ultrices nec sapien eu, convallis posuere libero. Pellentesque vulputate lacus eros, at lobortis lorem egestas et. Vestibulum tempus quam in efficitur lobortis. Maecenas consectetur consequat sem pharetra aliquet. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.</div>
+
+  <div>Mauris ac ligula elit. Nulla pulvinar eget leo ut aliquet. Praesent sit amet luctus quam. Nam fringilla iaculis mi, ut maximus mauris molestie feugiat. Curabitur nec scelerisque elit. Nunc eu odio facilisis, tempor enim eget, venenatis sem. Sed vitae lorem vehicula, auctor orci ultrices, finibus mauris. Donec vitae pulvinar diam. Nulla luctus congue quam, sed lacinia arcu dictum a.</div>
+
+  <div>Morbi laoreet magna elit, id dapibus massa varius consequat. Praesent rhoncus nunc quam, eu mollis velit commodo ut. Etiam euismod elit mi, non auctor velit blandit ut. Aenean vitae pulvinar mi, ac pretium tellus. Morbi eu auctor sem, sollicitudin cursus felis. Praesent vestibulum velit sed eros iaculis ornare. Praesent diam diam, pellentesque eget scelerisque sed, bibendum ut risus. Sed sed fermentum sem. Integer vel justo felis. Proin eget quam est. In sit amet ipsum sagittis, convallis ipsum fringilla, interdum ante. Etiam vel tincidunt mauris. Nunc feugiat eros nunc, et vestibulum metus mollis et. Nullam eu viverra velit, id ultrices nisl. Donec non enim elementum, laoreet sapien id, feugiat tellus.</div>
+
+  <div>Sed pellentesque ipsum eget ante hendrerit maximus. Aliquam id venenatis nulla. Nullam in nibh at enim vestibulum ullamcorper. Nam felis dolor, lobortis vel est non, condimentum malesuada nisl. In metus sapien, malesuada at nulla in, pretium aliquam turpis. Quisque elementum purus mi, sed tristique turpis ultricies in. Donec feugiat dolor non ultricies ultricies. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin ut purus et diam porta cursus vitae semper mi. Donec fringilla tellus orci. Interdum et malesuada fames ac ante ipsum primis in faucibus. Nunc vitae commodo sem. Duis vehicula quam sit amet imperdiet facilisis. Pellentesque eget dignissim neque, et scelerisque libero. Maecenas molestie metus sed orci cursus, in venenatis justo dapibus.</div>
+
+  <div>Aenean rhoncus urna at interdum blandit. Donec ac massa nec libero vehicula tincidunt. Sed sit amet hendrerit risus. Aliquam vitae vestibulum ipsum, non feugiat orci. Vivamus eu rutrum elit. Nulla dapibus tortor non dignissim pretium. Nulla in luctus turpis. Etiam non mattis tortor, at aliquet ex. Nunc ut ante varius, auctor dui vel, volutpat elit. Nunc laoreet augue sit amet ultrices porta. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Vestibulum pellentesque lobortis est, ut tincidunt ligula mollis sit amet. In porta risus arcu, quis pellentesque dolor mattis non. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae;</div>
+
+  <button ion-button block color="danger" (click)="dismiss()">
+    Dismission Modal
+  </button>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/modal/test/basic/components/toolbar/toolbar.module.ts b/src/components/modal/test/basic/pages/toolbar/toolbar.module.ts
similarity index 100%
rename from src/components/modal/test/basic/components/toolbar/toolbar.module.ts
rename to src/components/modal/test/basic/pages/toolbar/toolbar.module.ts
diff --git a/src/components/modal/test/basic/pages/toolbar/toolbar.ts b/src/components/modal/test/basic/pages/toolbar/toolbar.ts
new file mode 100644
index 0000000000..f8a5628ca0
--- /dev/null
+++ b/src/components/modal/test/basic/pages/toolbar/toolbar.ts
@@ -0,0 +1,29 @@
+import { Component } from '@angular/core';
+import { AlertController, DeepLink, ViewController } from '../../../../../..';
+
+@DeepLink()
+@Component({
+  templateUrl: 'toolbar.html'
+})
+export class ToolbarModal {
+
+  constructor(public viewCtrl: ViewController, public alertCtrl: AlertController) {}
+
+  ionViewDidEnter() {
+    let alert = this.alertCtrl.create({
+        title: 'Test',
+        buttons: [
+            {
+                text: 'Something',
+                role: 'cancel'
+            }
+        ]
+    });
+    alert.present();
+  }
+
+  dismiss() {
+    this.viewCtrl.dismiss();
+  }
+
+}
diff --git a/src/components/nav/test/basic/app/app.component.ts b/src/components/nav/test/basic/app/app.component.ts
index 9341f7ccf8..c5247b7a85 100644
--- a/src/components/nav/test/basic/app/app.component.ts
+++ b/src/components/nav/test/basic/app/app.component.ts
@@ -4,6 +4,6 @@ import { FirstPage} from '../pages/first-page/first-page';
 @Component({
   template: `<ion-nav [root]="root"></ion-nav>`
 })
-export class E2EApp {
+export class AppComponent {
   root = FirstPage;
 }
diff --git a/src/components/nav/test/basic/app/app.module.ts b/src/components/nav/test/basic/app/app.module.ts
index 058435d1af..02526d07d9 100644
--- a/src/components/nav/test/basic/app/app.module.ts
+++ b/src/components/nav/test/basic/app/app.module.ts
@@ -2,41 +2,19 @@ import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { E2EApp } from './app.component';
-import { FirstPage } from '../pages/first-page/first-page';
-import { MyCmpTest } from '../pages/first-page/my-component';
-import { MyCmpTest2 } from '../pages/first-page/my-component-two';
+import { AppComponent } from './app.component';
+import { FirstPageModule } from '../pages/first-page/first-page.module';
 
 
 @NgModule({
   declarations: [
-    E2EApp,
-    FirstPage,
-    MyCmpTest,
-    MyCmpTest2
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp, { swipeBackEnabled: true, preloadModules: true }, {
-      links: [
-        { name: 'first-page', component: FirstPage },
-        { name: 'another-page', priority: 'low', loadChildren: '../pages/another-page/another-page.module#AnotherPageModule' },
-        { name: 'full-page', priority: 'low', loadChildren: '../pages/full-page/full-page.module#FullPageModule', defaultHistory: ['first-page', 'another-page'] },
-        { name: 'primary-header-page', priority: 'high',  loadChildren: '../pages/primary-header-page/primary-header-page.module#PrimaryHeaderPageModule' },
-        { name: 'redirect-page', priority: 'low',  loadChildren: '../pages/redirect-page/redirect-page.module#RedirectPageModule' },
-        { name: 'tab-item-page', priority: 'high',  loadChildren: '../pages/tab-item-page/tab-item-page.module#TabItemPageModule' },
-        { name: 'another-one', priority: 'off', loadChildren: '../pages/tab-item-page/tab-item-page.module#TabItemPageModule' },
-        { name: 'tabs', priority: 'high',  loadChildren: '../pages/tabs/tabs.module#TabsPageModule' },
-        { name: 'tab-one', priority: 'off',  loadChildren: '../pages/tab-one/tab-one.module#Tab1Module' },
-        { name: 'tab-two', priority: 'low',  loadChildren: '../pages/tab-two/tab-two.module#Tab2Module' },
-        { name: 'tab-three', priority: 'low',  loadChildren: '../pages/tab-three/tab-three.module#Tab3Module' },
-      ]
-    })
+    IonicModule.forRoot(AppComponent, { swipeBackEnabled: true, preloadModules: true }),
+    FirstPageModule
   ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    E2EApp,
-    FirstPage
-  ]
+  bootstrap: [IonicApp]
 })
 export class AppModule {}
diff --git a/src/components/nav/test/basic/pages/another-page/another-page.ts b/src/components/nav/test/basic/pages/another-page/another-page.ts
index b5db5d1cf2..5219d90afb 100644
--- a/src/components/nav/test/basic/pages/another-page/another-page.ts
+++ b/src/components/nav/test/basic/pages/another-page/another-page.ts
@@ -1,7 +1,9 @@
 import { Component } from '@angular/core';
-import { NavController, ViewController } from '../../../../../..';
-
+import { DeepLink, NavController, ViewController } from '../../../../../..';
 
+@DeepLink({
+  name: 'another-page'
+})
 @Component({
   template: `
     <ion-header>
diff --git a/src/components/nav/test/basic/pages/first-page/first-page.module.ts b/src/components/nav/test/basic/pages/first-page/first-page.module.ts
new file mode 100644
index 0000000000..e738b49649
--- /dev/null
+++ b/src/components/nav/test/basic/pages/first-page/first-page.module.ts
@@ -0,0 +1,18 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+import { FirstPage } from './first-page';
+
+import { MyCmpTest } from './my-component';
+import { MyCmpTest2 } from './my-component-two';
+
+@NgModule({
+  imports: [
+    DeepLinkModule.forChild(FirstPage)
+  ],
+  declarations: [
+    FirstPage,
+    MyCmpTest,
+    MyCmpTest2
+  ]
+})
+export class FirstPageModule { }
diff --git a/src/components/nav/test/basic/pages/first-page/first-page.ts b/src/components/nav/test/basic/pages/first-page/first-page.ts
index 02bc7b76fd..ccf320eb1e 100644
--- a/src/components/nav/test/basic/pages/first-page/first-page.ts
+++ b/src/components/nav/test/basic/pages/first-page/first-page.ts
@@ -1,8 +1,11 @@
 import { Component, ViewChild } from '@angular/core';
-import { AlertController, Content, NavController, ViewController } from '../../../../../..';
+import { AlertController, Content, DeepLink, NavController, ViewController } from '../../../../../..';
 
 import { MyCmpTest } from './my-component';
 
+@DeepLink({
+  name: 'first-page'
+})
 @Component({
   templateUrl: 'first-page.html'
 })
diff --git a/src/components/nav/test/basic/pages/full-page/full-page.ts b/src/components/nav/test/basic/pages/full-page/full-page.ts
index 33c79ad710..d7828a48fc 100644
--- a/src/components/nav/test/basic/pages/full-page/full-page.ts
+++ b/src/components/nav/test/basic/pages/full-page/full-page.ts
@@ -1,7 +1,9 @@
 import { Component } from '@angular/core';
-import { App, AlertController, NavController, NavParams, ViewController } from '../../../../../..';
-
+import { App, AlertController, DeepLink, NavController, NavParams, ViewController } from '../../../../../..';
 
+@DeepLink({
+  name: 'full-page'
+})
 @Component({
   template: `
     <ion-content padding>
diff --git a/src/components/nav/test/basic/pages/primary-header-page/primary-header-page.ts b/src/components/nav/test/basic/pages/primary-header-page/primary-header-page.ts
index b518124072..8eda3c1924 100644
--- a/src/components/nav/test/basic/pages/primary-header-page/primary-header-page.ts
+++ b/src/components/nav/test/basic/pages/primary-header-page/primary-header-page.ts
@@ -1,6 +1,9 @@
 import { Component } from '@angular/core';
-import { AlertController, NavController, ViewController } from '../../../../../..';
+import { AlertController, DeepLink, NavController, ViewController } from '../../../../../..';
 
+@DeepLink({
+  name: 'primary-header-page'
+})
 @Component({
   template: `
     <ion-header>
diff --git a/src/components/nav/test/basic/pages/redirect-page/redirect-page.ts b/src/components/nav/test/basic/pages/redirect-page/redirect-page.ts
index 5382e42b0e..7a523c0c52 100644
--- a/src/components/nav/test/basic/pages/redirect-page/redirect-page.ts
+++ b/src/components/nav/test/basic/pages/redirect-page/redirect-page.ts
@@ -1,6 +1,9 @@
 import { Component } from '@angular/core';
-import { NavController } from '../../../../../..';
+import { DeepLink, NavController } from '../../../../../..';
 
+@DeepLink({
+  name: 'redirect-page'
+})
 @Component({
   template: '<ion-content></ion-content>'
 })
diff --git a/src/components/nav/test/basic/pages/tab-item-page/tab-item-page.ts b/src/components/nav/test/basic/pages/tab-item-page/tab-item-page.ts
index 2b6de2d57b..9197bbe921 100644
--- a/src/components/nav/test/basic/pages/tab-item-page/tab-item-page.ts
+++ b/src/components/nav/test/basic/pages/tab-item-page/tab-item-page.ts
@@ -1,6 +1,9 @@
 import { Component } from '@angular/core';
-import { App, Tabs} from '../../../../../..';
+import { App, DeepLink, Tabs} from '../../../../../..';
 
+@DeepLink({
+  name: 'tab-item-page'
+})
 @Component({
   template: `
     <ion-header>
diff --git a/src/components/nav/test/basic/pages/tab-one/tab-one.ts b/src/components/nav/test/basic/pages/tab-one/tab-one.ts
index e6e4ccc4bc..7f17282a65 100644
--- a/src/components/nav/test/basic/pages/tab-one/tab-one.ts
+++ b/src/components/nav/test/basic/pages/tab-one/tab-one.ts
@@ -1,6 +1,9 @@
 import { Component } from '@angular/core';
-import { App, NavController, Tabs } from '../../../../../..';
+import { App, DeepLink, NavController, Tabs } from '../../../../../..';
 
+@DeepLink({
+  name: 'tab-one'
+})
 @Component({
   template: `
     <ion-header>
diff --git a/src/components/nav/test/basic/pages/tab-three/tab-three.ts b/src/components/nav/test/basic/pages/tab-three/tab-three.ts
index 63ab6e06ce..7f380ab05f 100644
--- a/src/components/nav/test/basic/pages/tab-three/tab-three.ts
+++ b/src/components/nav/test/basic/pages/tab-three/tab-three.ts
@@ -1,6 +1,9 @@
 import { Component } from '@angular/core';
-import { AlertController, App, ModalController, Tabs } from '../../../../../..';
+import { AlertController, App, DeepLink, ModalController, Tabs } from '../../../../../..';
 
+@DeepLink({
+  name: 'tab-three'
+})
 @Component({
   template: `
     <ion-header>
diff --git a/src/components/nav/test/basic/pages/tab-two/tab-two.ts b/src/components/nav/test/basic/pages/tab-two/tab-two.ts
index c7f7a11bf5..c9342647ca 100644
--- a/src/components/nav/test/basic/pages/tab-two/tab-two.ts
+++ b/src/components/nav/test/basic/pages/tab-two/tab-two.ts
@@ -1,6 +1,9 @@
 import { Component } from '@angular/core';
-import { App, Tabs } from '../../../../../..';
+import { App, DeepLink, Tabs } from '../../../../../..';
 
+@DeepLink({
+  name: 'tab-two'
+})
 @Component({
   template: `
     <ion-header>
diff --git a/src/components/nav/test/basic/pages/tabs/tabs.ts b/src/components/nav/test/basic/pages/tabs/tabs.ts
index 9a2cf53aeb..15e8e331fa 100644
--- a/src/components/nav/test/basic/pages/tabs/tabs.ts
+++ b/src/components/nav/test/basic/pages/tabs/tabs.ts
@@ -1,6 +1,9 @@
 import { Component } from '@angular/core';
-import { Tab } from '../../../../../..';
+import { DeepLink, Tab } from '../../../../../..';
 
+@DeepLink({
+  name: 'tabs'
+})
 @Component({
   template: `
     <ion-menu [content]="content">
diff --git a/src/components/nav/test/child-navs/app/app.component.ts b/src/components/nav/test/child-navs/app/app.component.ts
index 6c84f6d770..35b87b0fc6 100644
--- a/src/components/nav/test/child-navs/app/app.component.ts
+++ b/src/components/nav/test/child-navs/app/app.component.ts
@@ -1,8 +1,10 @@
 import { Component } from '@angular/core';
 
+import { LandingPage } from '../pages/landing-page/landing-page';
+
 @Component({
   template: `<ion-nav [root]="root"></ion-nav>`,
 })
-export class E2EApp {
-  root = 'LandingPage';
+export class AppComponent {
+  root = LandingPage;
 }
diff --git a/src/components/nav/test/child-navs/app/app.module.ts b/src/components/nav/test/child-navs/app/app.module.ts
index ffc2a4cfc1..96ea9d1b60 100644
--- a/src/components/nav/test/child-navs/app/app.module.ts
+++ b/src/components/nav/test/child-navs/app/app.module.ts
@@ -2,27 +2,18 @@ import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { E2EApp } from './app.component';
+import { AppComponent } from './app.component';
+import { LandingPageModule } from '../pages/landing-page/landing-page.module';
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp, {}, {
-      links: [
-        { loadChildren: '../pages/landing-page/landing-page.module#LandingPageModule', name: 'LandingPage' },
-        { loadChildren: '../pages/first-page/first-page.module#FirstPageModule', name: 'FirstPage' },
-        { loadChildren: '../pages/second-page/second-page.module#SecondPageModule', name: 'SecondPage' },
-        { loadChildren: '../pages/third-page/third-page.module#ThirdPageModule', name: 'ThirdPage' },
-        { loadChildren: '../pages/fourth-page/fourth-page.module#FourthPageModule', name: 'FourthPage' },
-      ]
-    })
+    IonicModule.forRoot(AppComponent, {}),
+    LandingPageModule
   ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    E2EApp,
-  ]
+  bootstrap: [IonicApp]
 })
 export class AppModule {}
diff --git a/src/components/nav/test/child-navs/pages/first-page/first-page.ts b/src/components/nav/test/child-navs/pages/first-page/first-page.ts
index f1463835d7..c44a231484 100644
--- a/src/components/nav/test/child-navs/pages/first-page/first-page.ts
+++ b/src/components/nav/test/child-navs/pages/first-page/first-page.ts
@@ -1,5 +1,7 @@
 import { Component } from '@angular/core';
+import { DeepLink } from '../../../../../..';
 
+@DeepLink()
 @Component({
   template: `
   <ion-header>
diff --git a/src/components/nav/test/child-navs/pages/fourth-page/fourth-page.ts b/src/components/nav/test/child-navs/pages/fourth-page/fourth-page.ts
index 985b2a4b45..46586e0bc4 100644
--- a/src/components/nav/test/child-navs/pages/fourth-page/fourth-page.ts
+++ b/src/components/nav/test/child-navs/pages/fourth-page/fourth-page.ts
@@ -1,5 +1,7 @@
 import { Component } from '@angular/core';
+import { DeepLink } from '../../../../../..';
 
+@DeepLink()
 @Component({
   template: `
   <ion-content>
diff --git a/src/components/nav/test/child-navs/pages/landing-page/landing-page.ts b/src/components/nav/test/child-navs/pages/landing-page/landing-page.ts
index 5271c8360b..cc43f46d7b 100644
--- a/src/components/nav/test/child-navs/pages/landing-page/landing-page.ts
+++ b/src/components/nav/test/child-navs/pages/landing-page/landing-page.ts
@@ -1,6 +1,7 @@
 import { Component } from '@angular/core';
-import { NavController } from '../../../../../..';
+import { DeepLink, NavController } from '../../../../../..';
 
+@DeepLink()
 @Component({
   template: `
   <ion-header>
diff --git a/src/components/nav/test/child-navs/pages/second-page/second-page.ts b/src/components/nav/test/child-navs/pages/second-page/second-page.ts
index df70aad0f1..2feab389a5 100644
--- a/src/components/nav/test/child-navs/pages/second-page/second-page.ts
+++ b/src/components/nav/test/child-navs/pages/second-page/second-page.ts
@@ -1,5 +1,7 @@
 import { Component } from '@angular/core';
+import { DeepLink } from '../../../../../..';
 
+@DeepLink()
 @Component({
   template: `
   <ion-header>
diff --git a/src/components/nav/test/child-navs/pages/third-page/third-page.ts b/src/components/nav/test/child-navs/pages/third-page/third-page.ts
index cbdc664f57..39961e88a0 100644
--- a/src/components/nav/test/child-navs/pages/third-page/third-page.ts
+++ b/src/components/nav/test/child-navs/pages/third-page/third-page.ts
@@ -1,5 +1,7 @@
 import { Component } from '@angular/core';
+import { DeepLink } from '../../../../../..';
 
+@DeepLink()
 @Component({
   template: `
   <ion-header>
diff --git a/src/components/picker/test/basic/app/app.component.ts b/src/components/picker/test/basic/app/app.component.ts
index af92e1d42e..e84bb7d13a 100644
--- a/src/components/picker/test/basic/app/app.component.ts
+++ b/src/components/picker/test/basic/app/app.component.ts
@@ -1,8 +1,9 @@
 import { Component } from '@angular/core';
+import { PageOne } from '../pages/page-one/page-one';
 
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
-  root = 'E2EPage';
+export class AppComponent {
+  root = PageOne;
 }
diff --git a/src/components/picker/test/basic/app/app.module.ts b/src/components/picker/test/basic/app/app.module.ts
index 2ef661717c..7a61483171 100644
--- a/src/components/picker/test/basic/app/app.module.ts
+++ b/src/components/picker/test/basic/app/app.module.ts
@@ -2,23 +2,18 @@ import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { E2EApp } from './app.component';
+import { AppComponent } from './app.component';
+import { PageOneModule } from '../pages/page-one/page-one.module';
 
 @NgModule({
   declarations: [
-    E2EApp
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp, {}, {
-      links: [
-        { loadChildren: '../pages/main/main.module#E2EPageModule', name: 'E2EPage' },
-      ]
-    })
+    IonicModule.forRoot(AppComponent, {}),
+    PageOneModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    E2EApp
-  ]
 })
 export class AppModule {}
diff --git a/src/components/picker/test/basic/pages/main/main.module.ts b/src/components/picker/test/basic/pages/main/main.module.ts
deleted file mode 100644
index 1cc785fd59..0000000000
--- a/src/components/picker/test/basic/pages/main/main.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { DeepLinkModule } from '../../../../../..';
-
-import { E2EPage } from './main';
-
-@NgModule({
-  declarations: [
-    E2EPage,
-  ],
-  imports: [
-    DeepLinkModule.forChild(E2EPage)
-  ],
-  entryComponents: [
-    E2EPage,
-  ]
-})
-export class E2EPageModule {}
diff --git a/src/components/picker/test/basic/pages/main/main.html b/src/components/picker/test/basic/pages/page-one/page-one.html
similarity index 100%
rename from src/components/picker/test/basic/pages/main/main.html
rename to src/components/picker/test/basic/pages/page-one/page-one.html
diff --git a/src/components/picker/test/basic/pages/page-one/page-one.module.ts b/src/components/picker/test/basic/pages/page-one/page-one.module.ts
new file mode 100644
index 0000000000..8ff01f8895
--- /dev/null
+++ b/src/components/picker/test/basic/pages/page-one/page-one.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+
+import { PageOne } from './page-one';
+
+@NgModule({
+  declarations: [
+    PageOne,
+  ],
+  imports: [
+    DeepLinkModule.forChild(PageOne)
+  ]
+})
+export class PageOneModule {}
diff --git a/src/components/picker/test/basic/pages/main/main.ts b/src/components/picker/test/basic/pages/page-one/page-one.ts
similarity index 96%
rename from src/components/picker/test/basic/pages/main/main.ts
rename to src/components/picker/test/basic/pages/page-one/page-one.ts
index 57cdecc7d4..d66e5fc352 100644
--- a/src/components/picker/test/basic/pages/main/main.ts
+++ b/src/components/picker/test/basic/pages/page-one/page-one.ts
@@ -1,12 +1,13 @@
 import { Component, ViewEncapsulation } from '@angular/core';
 
-import { NavController, PickerController } from '../../../../../..';
+import { DeepLink, NavController, PickerController } from '../../../../../..';
 
+@DeepLink()
 @Component({
-  templateUrl: 'main.html',
+  templateUrl: 'page-one.html',
   encapsulation: ViewEncapsulation.None,
 })
-export class E2EPage {
+export class PageOne {
   smoothie: string;
   timer: string;
 
@@ -16,7 +17,7 @@ export class E2EPage {
   ) { }
 
   push() {
-    this.navCtrl.push(E2EPage);
+    this.navCtrl.push(PageOne);
   }
 
   twoColumns() {
diff --git a/src/components/popover/test/basic/app/app.component.ts b/src/components/popover/test/basic/app/app.component.ts
index 7d10722bb9..826bdcd749 100644
--- a/src/components/popover/test/basic/app/app.component.ts
+++ b/src/components/popover/test/basic/app/app.component.ts
@@ -1,9 +1,10 @@
 import { Component, ViewEncapsulation } from '@angular/core';
+import { PageOne } from '../pages/page-one/page-one';
 
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>',
   encapsulation: ViewEncapsulation.None
 })
-export class E2EApp {
-  root = 'E2EPage';
+export class AppComponent {
+  root = PageOne;
 }
diff --git a/src/components/popover/test/basic/app/app.module.ts b/src/components/popover/test/basic/app/app.module.ts
index 314b572a34..db30a4b820 100644
--- a/src/components/popover/test/basic/app/app.module.ts
+++ b/src/components/popover/test/basic/app/app.module.ts
@@ -2,26 +2,18 @@ import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { E2EApp } from './app.component';
+import { AppComponent } from './app.component';
+import { PageOneModule } from '../pages/page-one/page-one.module';
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp, {}, {
-      links: [
-        { loadChildren: '../pages/main/main.module#E2EPageModule', name: 'E2EPage' },
-        { loadChildren: '../pages/popover-long-list-page/popover-long-list-page.module#PopoverLongListPageModule', name: 'PopoverLongListPage' },
-        { loadChildren: '../pages/popover-list-page/popover-list-page.module#PopoverListPageModule', name: 'PopoverListPage' },
-        { loadChildren: '../pages/popover-radio-page/popover-radio-page.module#PopoverRadioPageModule', name: 'PopoverRadioPage' },
-      ]
-    })
+    IonicModule.forRoot(AppComponent, {}),
+    PageOneModule
   ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    E2EApp,
-  ]
+  bootstrap: [IonicApp]
 })
 export class AppModule {}
diff --git a/src/components/popover/test/basic/pages/main/main.module.ts b/src/components/popover/test/basic/pages/main/main.module.ts
deleted file mode 100644
index 1cc785fd59..0000000000
--- a/src/components/popover/test/basic/pages/main/main.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { DeepLinkModule } from '../../../../../..';
-
-import { E2EPage } from './main';
-
-@NgModule({
-  declarations: [
-    E2EPage,
-  ],
-  imports: [
-    DeepLinkModule.forChild(E2EPage)
-  ],
-  entryComponents: [
-    E2EPage,
-  ]
-})
-export class E2EPageModule {}
diff --git a/src/components/popover/test/basic/pages/main/main.html b/src/components/popover/test/basic/pages/page-one/page-one.html
similarity index 100%
rename from src/components/popover/test/basic/pages/main/main.html
rename to src/components/popover/test/basic/pages/page-one/page-one.html
diff --git a/src/components/popover/test/basic/pages/page-one/page-one.module.ts b/src/components/popover/test/basic/pages/page-one/page-one.module.ts
new file mode 100644
index 0000000000..8ff01f8895
--- /dev/null
+++ b/src/components/popover/test/basic/pages/page-one/page-one.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+
+import { PageOne } from './page-one';
+
+@NgModule({
+  declarations: [
+    PageOne,
+  ],
+  imports: [
+    DeepLinkModule.forChild(PageOne)
+  ]
+})
+export class PageOneModule {}
diff --git a/src/components/popover/test/basic/pages/main/main.ts b/src/components/popover/test/basic/pages/page-one/page-one.ts
similarity index 88%
rename from src/components/popover/test/basic/pages/main/main.ts
rename to src/components/popover/test/basic/pages/page-one/page-one.ts
index eb99191c65..22c5b7f552 100644
--- a/src/components/popover/test/basic/pages/main/main.ts
+++ b/src/components/popover/test/basic/pages/page-one/page-one.ts
@@ -1,12 +1,13 @@
 import { Component, ViewChild, ElementRef } from '@angular/core';
 
-import { PopoverController } from '../../../../../..';
+import { DeepLink, PopoverController } from '../../../../../..';
 
+@DeepLink()
 @Component({
-  templateUrl: 'main.html',
+  templateUrl: 'page-one.html',
   selector: 'e2e-popover-basic'
 })
-export class E2EPage {
+export class PageOne {
   @ViewChild('popoverContent', {read: ElementRef}) content: ElementRef;
   @ViewChild('popoverText', {read: ElementRef}) text: ElementRef;
 
diff --git a/src/components/popover/test/basic/pages/popover-list-page/popover-list-page.html b/src/components/popover/test/basic/pages/popover-list-page/popover-list-page.html
new file mode 100644
index 0000000000..3d5c6a9037
--- /dev/null
+++ b/src/components/popover/test/basic/pages/popover-list-page/popover-list-page.html
@@ -0,0 +1,9 @@
+<ion-list style="margin-bottom: 0">
+  <ion-list-header color="secondary">Ionic</ion-list-header>
+  <button ion-item (click)="close()">Learn Ionic</button>
+  <button ion-item (click)="close()">Documentation</button>
+</ion-list>
+<div padding style="padding-top: 0">
+  <p>Paragraph text</p>
+  Some more text and <span color="danger">danger span</span>.
+</div>
\ No newline at end of file
diff --git a/src/components/popover/test/basic/pages/popover-list-page/popover-list-page.ts b/src/components/popover/test/basic/pages/popover-list-page/popover-list-page.ts
index a6196ecd4a..8319782d94 100644
--- a/src/components/popover/test/basic/pages/popover-list-page/popover-list-page.ts
+++ b/src/components/popover/test/basic/pages/popover-list-page/popover-list-page.ts
@@ -1,18 +1,9 @@
 import { Component } from '@angular/core';
-import { ViewController } from '../../../../../..';
+import { DeepLink, ViewController } from '../../../../../..';
 
+@DeepLink()
 @Component({
-  template: `
-    <ion-list style="margin-bottom: 0">
-      <ion-list-header color="secondary">Ionic</ion-list-header>
-      <button ion-item (click)="close()">Learn Ionic</button>
-      <button ion-item (click)="close()">Documentation</button>
-    </ion-list>
-    <div padding style="padding-top: 0">
-      <p>Paragraph text</p>
-      Some more text and <span color="danger">danger span</span>.
-    </div>
-  `
+  templateUrl: 'popover-list-page.html'
 })
 export class PopoverListPage {
   constructor(private viewCtrl: ViewController) {}
diff --git a/src/components/popover/test/basic/pages/popover-long-list-page/popover-long-list-page.html b/src/components/popover/test/basic/pages/popover-long-list-page/popover-long-list-page.html
new file mode 100644
index 0000000000..5972bc73e0
--- /dev/null
+++ b/src/components/popover/test/basic/pages/popover-long-list-page/popover-long-list-page.html
@@ -0,0 +1,6 @@
+<ion-content>
+  <ion-list>
+    <ion-list-header>Ionic</ion-list-header>
+    <button ion-item *ngFor="let item of items">Item {{item}}</button>
+  </ion-list>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/popover/test/basic/pages/popover-long-list-page/popover-long-list-page.ts b/src/components/popover/test/basic/pages/popover-long-list-page/popover-long-list-page.ts
index 0bc759b81c..22d011af44 100644
--- a/src/components/popover/test/basic/pages/popover-long-list-page/popover-long-list-page.ts
+++ b/src/components/popover/test/basic/pages/popover-long-list-page/popover-long-list-page.ts
@@ -1,14 +1,9 @@
 import { Component } from '@angular/core';
+import { DeepLink } from '../../../../../..';
 
+@DeepLink()
 @Component({
-  template: `
-    <ion-content>
-      <ion-list>
-        <ion-list-header>Ionic</ion-list-header>
-        <button ion-item *ngFor="let item of items">Item {{item}}</button>
-      </ion-list>
-    </ion-content>
-  `
+  templateUrl: 'popover-long-list-page.html'
 })
 export class PopoverLongListPage {
   items: number[] = [];
diff --git a/src/components/popover/test/basic/pages/popover-radio-page/popover-radio-page.html b/src/components/popover/test/basic/pages/popover-radio-page/popover-radio-page.html
new file mode 100644
index 0000000000..d14158ceee
--- /dev/null
+++ b/src/components/popover/test/basic/pages/popover-radio-page/popover-radio-page.html
@@ -0,0 +1,57 @@
+<ion-content>
+  <ion-list radio-group [(ngModel)]="fontFamily" (ionChange)="changeFontFamily()">
+    <ion-row>
+      <ion-col>
+        <button (click)="changeFontSize('smaller')" ion-item detail-none class="text-button text-smaller">A</button>
+      </ion-col>
+      <ion-col>
+        <button (click)="changeFontSize('larger')" ion-item detail-none class="text-button text-larger">A</button>
+      </ion-col>
+    </ion-row>
+    <ion-row class="row-dots">
+      <ion-col>
+        <button ion-button="dot" (click)="changeBackground('white')" class="dot-white" [class.selected]="background == 'white'"></button>
+      </ion-col>
+      <ion-col>
+        <button ion-button="dot" (click)="changeBackground('tan')" class="dot-tan" [class.selected]="background == 'tan'"></button>
+      </ion-col>
+      <ion-col>
+        <button ion-button="dot" (click)="changeBackground('grey')" class="dot-grey" [class.selected]="background == 'grey'"></button>
+      </ion-col>
+      <ion-col>
+        <button ion-button="dot" (click)="changeBackground('black')" class="dot-black" [class.selected]="background == 'black'"></button>
+      </ion-col>
+    </ion-row>
+    <ion-item-divider color="dark">
+      <ion-label>Font Family</ion-label>
+    </ion-item-divider>
+    <ion-item class="text-athelas">
+      <ion-label>Athelas</ion-label>
+      <ion-radio value="Athelas"></ion-radio>
+    </ion-item>
+    <ion-item class="text-charter">
+      <ion-label>Charter</ion-label>
+      <ion-radio value="Charter"></ion-radio>
+    </ion-item>
+    <ion-item class="text-iowan">
+      <ion-label>Iowan</ion-label>
+      <ion-radio value="Iowan"></ion-radio>
+    </ion-item>
+    <ion-item class="text-palatino">
+      <ion-label>Palatino</ion-label>
+      <ion-radio value="Palatino"></ion-radio>
+    </ion-item>
+    <ion-item class="text-san-francisco">
+      <ion-label>San Francisco</ion-label>
+      <ion-radio value="San Francisco"></ion-radio>
+    </ion-item>
+    <ion-item class="text-seravek">
+      <ion-label>Seravek</ion-label>
+      <ion-radio value="Seravek"></ion-radio>
+    </ion-item>
+    <ion-item class="text-times-new-roman">
+      <ion-label>Times New Roman</ion-label>
+      <ion-radio value="Times New Roman"></ion-radio>
+    </ion-item>
+  </ion-list>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/popover/test/basic/pages/popover-radio-page/popover-radio-page.ts b/src/components/popover/test/basic/pages/popover-radio-page/popover-radio-page.ts
index 7c8680b22a..5210778d98 100644
--- a/src/components/popover/test/basic/pages/popover-radio-page/popover-radio-page.ts
+++ b/src/components/popover/test/basic/pages/popover-radio-page/popover-radio-page.ts
@@ -1,66 +1,9 @@
 import { Component } from '@angular/core';
-import { NavParams } from '../../../../../..';
+import { DeepLink, NavParams } from '../../../../../..';
 
+@DeepLink()
 @Component({
-  template: `
-    <ion-content>
-      <ion-list radio-group [(ngModel)]="fontFamily" (ionChange)="changeFontFamily()">
-        <ion-row>
-          <ion-col>
-            <button (click)="changeFontSize('smaller')" ion-item detail-none class="text-button text-smaller">A</button>
-          </ion-col>
-          <ion-col>
-            <button (click)="changeFontSize('larger')" ion-item detail-none class="text-button text-larger">A</button>
-          </ion-col>
-        </ion-row>
-        <ion-row class="row-dots">
-          <ion-col>
-            <button ion-button="dot" (click)="changeBackground('white')" class="dot-white" [class.selected]="background == 'white'"></button>
-          </ion-col>
-          <ion-col>
-            <button ion-button="dot" (click)="changeBackground('tan')" class="dot-tan" [class.selected]="background == 'tan'"></button>
-          </ion-col>
-          <ion-col>
-            <button ion-button="dot" (click)="changeBackground('grey')" class="dot-grey" [class.selected]="background == 'grey'"></button>
-          </ion-col>
-          <ion-col>
-            <button ion-button="dot" (click)="changeBackground('black')" class="dot-black" [class.selected]="background == 'black'"></button>
-          </ion-col>
-        </ion-row>
-        <ion-item-divider color="dark">
-          <ion-label>Font Family</ion-label>
-        </ion-item-divider>
-        <ion-item class="text-athelas">
-          <ion-label>Athelas</ion-label>
-          <ion-radio value="Athelas"></ion-radio>
-        </ion-item>
-        <ion-item class="text-charter">
-          <ion-label>Charter</ion-label>
-          <ion-radio value="Charter"></ion-radio>
-        </ion-item>
-        <ion-item class="text-iowan">
-          <ion-label>Iowan</ion-label>
-          <ion-radio value="Iowan"></ion-radio>
-        </ion-item>
-        <ion-item class="text-palatino">
-          <ion-label>Palatino</ion-label>
-          <ion-radio value="Palatino"></ion-radio>
-        </ion-item>
-        <ion-item class="text-san-francisco">
-          <ion-label>San Francisco</ion-label>
-          <ion-radio value="San Francisco"></ion-radio>
-        </ion-item>
-        <ion-item class="text-seravek">
-          <ion-label>Seravek</ion-label>
-          <ion-radio value="Seravek"></ion-radio>
-        </ion-item>
-        <ion-item class="text-times-new-roman">
-          <ion-label>Times New Roman</ion-label>
-          <ion-radio value="Times New Roman"></ion-radio>
-        </ion-item>
-      </ion-list>
-    </ion-content>
-  `,
+  templateUrl: 'popover-radio-page.html',
   selector: 'e2e-popover-basic'
 })
 export class PopoverRadioPage {
diff --git a/src/components/radio/test/basic/app/app.component.ts b/src/components/radio/test/basic/app/app.component.ts
index af92e1d42e..e84bb7d13a 100644
--- a/src/components/radio/test/basic/app/app.component.ts
+++ b/src/components/radio/test/basic/app/app.component.ts
@@ -1,8 +1,9 @@
 import { Component } from '@angular/core';
+import { PageOne } from '../pages/page-one/page-one';
 
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
-  root = 'E2EPage';
+export class AppComponent {
+  root = PageOne;
 }
diff --git a/src/components/radio/test/basic/app/app.module.ts b/src/components/radio/test/basic/app/app.module.ts
index 791669231e..db30a4b820 100644
--- a/src/components/radio/test/basic/app/app.module.ts
+++ b/src/components/radio/test/basic/app/app.module.ts
@@ -2,23 +2,18 @@ import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { E2EApp } from './app.component';
+import { AppComponent } from './app.component';
+import { PageOneModule } from '../pages/page-one/page-one.module';
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp, {}, {
-      links: [
-        { loadChildren: '../pages/main/main.module#E2EPageModule', name: 'E2EPage' },
-      ]
-    })
+    IonicModule.forRoot(AppComponent, {}),
+    PageOneModule
   ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    E2EApp,
-  ]
+  bootstrap: [IonicApp]
 })
 export class AppModule {}
diff --git a/src/components/radio/test/basic/pages/main/main.module.ts b/src/components/radio/test/basic/pages/main/main.module.ts
deleted file mode 100644
index 1cc785fd59..0000000000
--- a/src/components/radio/test/basic/pages/main/main.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { DeepLinkModule } from '../../../../../..';
-
-import { E2EPage } from './main';
-
-@NgModule({
-  declarations: [
-    E2EPage,
-  ],
-  imports: [
-    DeepLinkModule.forChild(E2EPage)
-  ],
-  entryComponents: [
-    E2EPage,
-  ]
-})
-export class E2EPageModule {}
diff --git a/src/components/radio/test/basic/pages/main/main.html b/src/components/radio/test/basic/pages/page-one/page-one.html
similarity index 100%
rename from src/components/radio/test/basic/pages/main/main.html
rename to src/components/radio/test/basic/pages/page-one/page-one.html
diff --git a/src/components/radio/test/basic/pages/page-one/page-one.module.ts b/src/components/radio/test/basic/pages/page-one/page-one.module.ts
new file mode 100644
index 0000000000..8ff01f8895
--- /dev/null
+++ b/src/components/radio/test/basic/pages/page-one/page-one.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+
+import { PageOne } from './page-one';
+
+@NgModule({
+  declarations: [
+    PageOne,
+  ],
+  imports: [
+    DeepLinkModule.forChild(PageOne)
+  ]
+})
+export class PageOneModule {}
diff --git a/src/components/radio/test/basic/pages/main/main.ts b/src/components/radio/test/basic/pages/page-one/page-one.ts
similarity index 92%
rename from src/components/radio/test/basic/pages/main/main.ts
rename to src/components/radio/test/basic/pages/page-one/page-one.ts
index cb19144eda..3e39410caa 100644
--- a/src/components/radio/test/basic/pages/main/main.ts
+++ b/src/components/radio/test/basic/pages/page-one/page-one.ts
@@ -1,12 +1,13 @@
 import { Component } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
 
-import { RadioButton, RadioGroup } from '../../../../../..';
+import { DeepLink, RadioButton, RadioGroup } from '../../../../../..';
 
+@DeepLink()
 @Component({
-  templateUrl: 'main.html'
+  templateUrl: 'page-one.html'
 })
-export class E2EPage {
+export class PageOne {
   currencies: Array<string>;
   items: Array<{description: string, value: any}>;
   relationship: string;
diff --git a/src/components/searchbar/test/basic/app/app.component.ts b/src/components/searchbar/test/basic/app/app.component.ts
new file mode 100644
index 0000000000..1318493908
--- /dev/null
+++ b/src/components/searchbar/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/searchbar/test/basic/app/app.module.ts b/src/components/searchbar/test/basic/app/app.module.ts
index 2bca994a45..2d98a47fb0 100644
--- a/src/components/searchbar/test/basic/app/app.module.ts
+++ b/src/components/searchbar/test/basic/app/app.module.ts
@@ -1,29 +1,20 @@
-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';
+import { AppComponent } from './app.component';
+import { RootPageModule } from '../pages/root-page/root-page.module';
 
-@Component({
-  template: '<ion-nav [root]="root"></ion-nav>'
-})
-export class E2EApp {
-  root = RootPage;
-}
 
 @NgModule({
   declarations: [
-    E2EApp,
-    RootPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    E2EApp,
-    RootPage
-  ]
 })
 export class AppModule {}
diff --git a/src/components/toast/test/basic/pages/root-page/root-page.module.ts b/src/components/searchbar/test/basic/pages/root-page/root-page.module.ts
similarity index 61%
rename from src/components/toast/test/basic/pages/root-page/root-page.module.ts
rename to src/components/searchbar/test/basic/pages/root-page/root-page.module.ts
index 3f1ee9b73a..566dcc420f 100644
--- a/src/components/toast/test/basic/pages/root-page/root-page.module.ts
+++ b/src/components/searchbar/test/basic/pages/root-page/root-page.module.ts
@@ -1,17 +1,14 @@
 import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+
 import { RootPage } from './root-page';
-import { DeepLinkModule } from '../../../../../../';
 
 @NgModule({
   declarations: [
-    RootPage
+    RootPage,
   ],
   imports: [
     DeepLinkModule.forChild(RootPage)
-  ],
-  entryComponents: [
-    RootPage
-  ],
-  providers: []
+  ]
 })
 export class RootPageModule {}
diff --git a/src/components/searchbar/test/basic/pages/root-page/root-page.ts b/src/components/searchbar/test/basic/pages/root-page/root-page.ts
index 3384e760da..7ba0f36a29 100644
--- a/src/components/searchbar/test/basic/pages/root-page/root-page.ts
+++ b/src/components/searchbar/test/basic/pages/root-page/root-page.ts
@@ -1,5 +1,7 @@
 import { Component, ChangeDetectorRef } from '@angular/core';
+import { DeepLink } from '../../../../../..';
 
+@DeepLink()
 @Component({
   templateUrl: 'root-page.html'
 })
diff --git a/src/components/searchbar/test/nav/app/app.component.ts b/src/components/searchbar/test/nav/app/app.component.ts
index 1049737093..83c732951d 100644
--- a/src/components/searchbar/test/nav/app/app.component.ts
+++ b/src/components/searchbar/test/nav/app/app.component.ts
@@ -1,8 +1,9 @@
 import { Component } from '@angular/core';
+import { TabsPage } from '../pages/tabs-page/tabs-page';
 
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
-  root = 'TabsPage';
+export class AppComponent {
+  root = TabsPage;
 }
diff --git a/src/components/searchbar/test/nav/app/app.module.ts b/src/components/searchbar/test/nav/app/app.module.ts
index 478f1be3b9..dbed50ee82 100644
--- a/src/components/searchbar/test/nav/app/app.module.ts
+++ b/src/components/searchbar/test/nav/app/app.module.ts
@@ -2,27 +2,18 @@ import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { E2EApp } from './app.component';
+import { AppComponent } from './app.component';
+import { TabsPageModule } from '../pages/tabs-page/tabs-page.module';
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp, {}, {
-      links: [
-        { loadChildren: '../pages/detail-page/detail.module#DetailPageModule', name: 'DetailPage' },
-        { loadChildren: '../pages/main-page/main.module#MainPageModule', name: 'MainPage' },
-        { loadChildren: '../pages/modal-page/modal.module#ModalPageModule', name: 'ModalPage' },
-        { loadChildren: '../pages/search-page/search.module#SearchPageModule', name: 'SearchPage' },
-        { loadChildren: '../pages/tabs-page/tabs.module#TabsPageModule', name: 'TabsPage' },
-      ]
-    })
+    IonicModule.forRoot(AppComponent, {}),
+    TabsPageModule
   ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    E2EApp,
-  ]
+  bootstrap: [IonicApp]
 })
 export class AppModule {}
diff --git a/src/components/searchbar/test/nav/pages/detail-page/detail.html b/src/components/searchbar/test/nav/pages/detail-page/detail-page.html
similarity index 100%
rename from src/components/searchbar/test/nav/pages/detail-page/detail.html
rename to src/components/searchbar/test/nav/pages/detail-page/detail-page.html
diff --git a/src/components/searchbar/test/nav/pages/detail-page/detail.module.ts b/src/components/searchbar/test/nav/pages/detail-page/detail-page.module.ts
similarity index 74%
rename from src/components/searchbar/test/nav/pages/detail-page/detail.module.ts
rename to src/components/searchbar/test/nav/pages/detail-page/detail-page.module.ts
index 61b23439be..1749a1b1b5 100644
--- a/src/components/searchbar/test/nav/pages/detail-page/detail.module.ts
+++ b/src/components/searchbar/test/nav/pages/detail-page/detail-page.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { DeepLinkModule } from '../../../../../..';
 
-import { DetailPage } from './detail';
+import { DetailPage } from './detail-page';
 
 @NgModule({
   declarations: [
@@ -9,9 +9,6 @@ import { DetailPage } from './detail';
   ],
   imports: [
     DeepLinkModule.forChild(DetailPage)
-  ],
-  entryComponents: [
-    DetailPage,
   ]
 })
 export class DetailPageModule {}
diff --git a/src/components/searchbar/test/nav/pages/detail-page/detail.ts b/src/components/searchbar/test/nav/pages/detail-page/detail-page.ts
similarity index 65%
rename from src/components/searchbar/test/nav/pages/detail-page/detail.ts
rename to src/components/searchbar/test/nav/pages/detail-page/detail-page.ts
index b50bffda15..ede0a13cd2 100644
--- a/src/components/searchbar/test/nav/pages/detail-page/detail.ts
+++ b/src/components/searchbar/test/nav/pages/detail-page/detail-page.ts
@@ -1,8 +1,9 @@
 import { Component } from '@angular/core';
-import { NavParams } from '../../../../../..';
+import { DeepLink, NavParams } from '../../../../../..';
 
+@DeepLink()
 @Component({
-  templateUrl: 'detail.html'
+  templateUrl: 'detail-page.html'
 })
 export class DetailPage {
   city: string;
diff --git a/src/components/searchbar/test/nav/pages/main-page/main.html b/src/components/searchbar/test/nav/pages/main-page/main-page.html
similarity index 100%
rename from src/components/searchbar/test/nav/pages/main-page/main.html
rename to src/components/searchbar/test/nav/pages/main-page/main-page.html
diff --git a/src/components/searchbar/test/nav/pages/main-page/main.module.ts b/src/components/searchbar/test/nav/pages/main-page/main-page.module.ts
similarity index 75%
rename from src/components/searchbar/test/nav/pages/main-page/main.module.ts
rename to src/components/searchbar/test/nav/pages/main-page/main-page.module.ts
index 851189fb1b..5b02e7ccd0 100644
--- a/src/components/searchbar/test/nav/pages/main-page/main.module.ts
+++ b/src/components/searchbar/test/nav/pages/main-page/main-page.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { DeepLinkModule } from '../../../../../..';
 
-import { MainPage } from './main';
+import { MainPage } from './main-page';
 
 @NgModule({
   declarations: [
@@ -9,9 +9,6 @@ import { MainPage } from './main';
   ],
   imports: [
     DeepLinkModule.forChild(MainPage)
-  ],
-  entryComponents: [
-    MainPage,
   ]
 })
 export class MainPageModule {}
diff --git a/src/components/searchbar/test/nav/pages/main-page/main.ts b/src/components/searchbar/test/nav/pages/main-page/main-page.ts
similarity index 64%
rename from src/components/searchbar/test/nav/pages/main-page/main.ts
rename to src/components/searchbar/test/nav/pages/main-page/main-page.ts
index fe729d6ab1..9c1e8d5257 100644
--- a/src/components/searchbar/test/nav/pages/main-page/main.ts
+++ b/src/components/searchbar/test/nav/pages/main-page/main-page.ts
@@ -1,8 +1,9 @@
 import { Component } from '@angular/core';
-import { NavController } from '../../../../../..';
+import { DeepLink, NavController } from '../../../../../..';
 
+@DeepLink()
 @Component({
-  templateUrl: 'main.html'
+  templateUrl: 'main-page.html'
 })
 export class MainPage {
   constructor(public navCtrl: NavController) { }
diff --git a/src/components/searchbar/test/nav/pages/modal-page/modal.html b/src/components/searchbar/test/nav/pages/modal-page/modal-page.html
similarity index 100%
rename from src/components/searchbar/test/nav/pages/modal-page/modal.html
rename to src/components/searchbar/test/nav/pages/modal-page/modal-page.html
diff --git a/src/components/searchbar/test/nav/pages/modal-page/modal-page.module.ts b/src/components/searchbar/test/nav/pages/modal-page/modal-page.module.ts
new file mode 100644
index 0000000000..2ce0aa93ce
--- /dev/null
+++ b/src/components/searchbar/test/nav/pages/modal-page/modal-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+
+import { ModalPage } from './modal-page';
+
+@NgModule({
+  declarations: [
+    ModalPage,
+  ],
+  imports: [
+    DeepLinkModule.forChild(ModalPage)
+  ]
+})
+export class ModalPageModule {}
diff --git a/src/components/searchbar/test/nav/pages/modal-page/modal.ts b/src/components/searchbar/test/nav/pages/modal-page/modal-page.ts
similarity index 62%
rename from src/components/searchbar/test/nav/pages/modal-page/modal.ts
rename to src/components/searchbar/test/nav/pages/modal-page/modal-page.ts
index 4bb4b39c6b..4c49f9cb26 100644
--- a/src/components/searchbar/test/nav/pages/modal-page/modal.ts
+++ b/src/components/searchbar/test/nav/pages/modal-page/modal-page.ts
@@ -1,8 +1,9 @@
 import { Component } from '@angular/core';
-import { ViewController } from '../../../../../..';
+import { DeepLink, ViewController } from '../../../../../..';
 
+@DeepLink()
 @Component({
-  templateUrl: 'modal.html'
+  templateUrl: 'modal-page.html'
 })
 export class ModalPage {
  constructor(public viewCtrl: ViewController) {}
diff --git a/src/components/searchbar/test/nav/pages/search-page/search.html b/src/components/searchbar/test/nav/pages/search-page/search-page.html
similarity index 100%
rename from src/components/searchbar/test/nav/pages/search-page/search.html
rename to src/components/searchbar/test/nav/pages/search-page/search-page.html
diff --git a/src/components/searchbar/test/nav/pages/search-page/search.module.ts b/src/components/searchbar/test/nav/pages/search-page/search-page.module.ts
similarity index 74%
rename from src/components/searchbar/test/nav/pages/search-page/search.module.ts
rename to src/components/searchbar/test/nav/pages/search-page/search-page.module.ts
index 76e2d0bfb9..bbbccacf19 100644
--- a/src/components/searchbar/test/nav/pages/search-page/search.module.ts
+++ b/src/components/searchbar/test/nav/pages/search-page/search-page.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { DeepLinkModule } from '../../../../../..';
 
-import { SearchPage } from './search';
+import { SearchPage } from './search-page';
 
 @NgModule({
   declarations: [
@@ -9,9 +9,6 @@ import { SearchPage } from './search';
   ],
   imports: [
     DeepLinkModule.forChild(SearchPage)
-  ],
-  entryComponents: [
-    SearchPage,
   ]
 })
 export class SearchPageModule {}
diff --git a/src/components/searchbar/test/nav/pages/search-page/search.ts b/src/components/searchbar/test/nav/pages/search-page/search-page.ts
similarity index 92%
rename from src/components/searchbar/test/nav/pages/search-page/search.ts
rename to src/components/searchbar/test/nav/pages/search-page/search-page.ts
index fc9693318f..671d637615 100644
--- a/src/components/searchbar/test/nav/pages/search-page/search.ts
+++ b/src/components/searchbar/test/nav/pages/search-page/search-page.ts
@@ -1,8 +1,9 @@
 import { Component } from '@angular/core';
-import { NavController, ModalController } from '../../../../../..';
+import { DeepLink, NavController, ModalController } from '../../../../../..';
 
+@DeepLink()
 @Component({
-  templateUrl: 'search.html'
+  templateUrl: 'search-page.html'
 })
 export class SearchPage {
   items: string[];
diff --git a/src/components/searchbar/test/nav/pages/tabs-page/tabs.html b/src/components/searchbar/test/nav/pages/tabs-page/tabs-page.html
similarity index 100%
rename from src/components/searchbar/test/nav/pages/tabs-page/tabs.html
rename to src/components/searchbar/test/nav/pages/tabs-page/tabs-page.html
diff --git a/src/components/tabs/test/basic/pages/tabs-page/tabs.module.ts b/src/components/searchbar/test/nav/pages/tabs-page/tabs-page.module.ts
similarity index 53%
rename from src/components/tabs/test/basic/pages/tabs-page/tabs.module.ts
rename to src/components/searchbar/test/nav/pages/tabs-page/tabs-page.module.ts
index 75e3e2ff5c..566ed545d8 100644
--- a/src/components/tabs/test/basic/pages/tabs-page/tabs.module.ts
+++ b/src/components/searchbar/test/nav/pages/tabs-page/tabs-page.module.ts
@@ -1,17 +1,16 @@
 import { NgModule } from '@angular/core';
 import { DeepLinkModule } from '../../../../../..';
 
-import { TabsPage } from './tabs';
+import { TabsPage } from './tabs-page';
+import { SearchPageModule } from '../search-page/search-page.module';
 
 @NgModule({
   declarations: [
     TabsPage,
   ],
   imports: [
-    DeepLinkModule.forChild(TabsPage)
-  ],
-  entryComponents: [
-    TabsPage,
+    DeepLinkModule.forChild(TabsPage),
+    SearchPageModule
   ]
 })
 export class TabsPageModule {}
diff --git a/src/components/searchbar/test/nav/pages/tabs-page/tabs-page.ts b/src/components/searchbar/test/nav/pages/tabs-page/tabs-page.ts
new file mode 100644
index 0000000000..e77e73c890
--- /dev/null
+++ b/src/components/searchbar/test/nav/pages/tabs-page/tabs-page.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+import { DeepLink } from '../../../../../..';
+
+import { SearchPage } from '../search-page/search-page';
+
+@DeepLink()
+@Component({
+  templateUrl: 'tabs-page.html'
+})
+export class TabsPage {
+  mainPage = 'MainPage';
+  searchPage = SearchPage;
+}
diff --git a/src/components/searchbar/test/nav/pages/tabs-page/tabs.ts b/src/components/searchbar/test/nav/pages/tabs-page/tabs.ts
deleted file mode 100644
index f980e32707..0000000000
--- a/src/components/searchbar/test/nav/pages/tabs-page/tabs.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  templateUrl: 'tabs.html'
-})
-export class TabsPage {
-  mainPage = 'MainPage';
-  searchPage = 'SearchPage';
-}
diff --git a/src/components/searchbar/test/toolbar/app/app.component.ts b/src/components/searchbar/test/toolbar/app/app.component.ts
index bd93804d26..70eba67014 100644
--- a/src/components/searchbar/test/toolbar/app/app.component.ts
+++ b/src/components/searchbar/test/toolbar/app/app.component.ts
@@ -4,6 +4,6 @@ import {HomePage} from '../pages/home-page/home-page';
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = HomePage;
 }
diff --git a/src/components/searchbar/test/toolbar/app/app.module.ts b/src/components/searchbar/test/toolbar/app/app.module.ts
index aa9e970afc..31d7c2e6d7 100644
--- a/src/components/searchbar/test/toolbar/app/app.module.ts
+++ b/src/components/searchbar/test/toolbar/app/app.module.ts
@@ -1,25 +1,20 @@
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
-import { E2EApp } from './app.component';
-import { HomePage } from '../pages/home-page/home-page';
+
+import { AppComponent } from './app.component';
+import { HomePageModule } from '../pages/home-page/home-page.module';
+
+
 @NgModule({
   declarations: [
-    E2EApp,
-    HomePage
+    AppComponent,
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp, {}, {
-      links: [
-        { component: HomePage, name: 'home-page' }
-      ]
-    })
+    IonicModule.forRoot(AppComponent, {}),
+    HomePageModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    E2EApp,
-    HomePage
-  ]
 })
 export class AppModule { }
diff --git a/src/components/searchbar/test/toolbar/pages/home-page/home-page.html b/src/components/searchbar/test/toolbar/pages/home-page/home-page.html
new file mode 100644
index 0000000000..f2f20bdc77
--- /dev/null
+++ b/src/components/searchbar/test/toolbar/pages/home-page/home-page.html
@@ -0,0 +1,32 @@
+<ion-header>
+
+  <ion-navbar>
+    <ion-title>Searchbar Toolbars</ion-title>
+  </ion-navbar>
+
+</ion-header>
+
+
+<ion-content>
+
+  <h5 padding-left padding-top> Search - Default Toolbar </h5>
+  <ion-toolbar>
+    <ion-searchbar [(ngModel)]="defaultToolbarSearch"></ion-searchbar>
+  </ion-toolbar>
+
+  <h5 padding-left padding-top> Search - Primary Toolbar </h5>
+  <ion-toolbar color="primary">
+    <ion-searchbar dark [(ngModel)]="primaryToolbarSearch" showCancelButton></ion-searchbar>
+  </ion-toolbar>
+
+  <h5 padding-left padding-top> Search - Dark Toolbar </h5>
+  <ion-toolbar color="dark">
+    <ion-searchbar dark placeholder="Filter Schedules" [(ngModel)]="darkToolbarSearch"></ion-searchbar>
+  </ion-toolbar>
+
+  <h5 padding-left padding-top> Search - Light Toolbar </h5>
+  <ion-toolbar color="light">
+    <ion-searchbar [(ngModel)]="lightToolbarSearch" showCancelButton></ion-searchbar>
+  </ion-toolbar>
+
+</ion-content>
\ No newline at end of file
diff --git a/src/components/searchbar/test/toolbar/pages/home-page/home-page.module.ts b/src/components/searchbar/test/toolbar/pages/home-page/home-page.module.ts
new file mode 100644
index 0000000000..bcc3d1a39f
--- /dev/null
+++ b/src/components/searchbar/test/toolbar/pages/home-page/home-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+
+import { HomePage } from './home-page';
+
+@NgModule({
+  declarations: [
+    HomePage,
+  ],
+  imports: [
+    DeepLinkModule.forChild(HomePage)
+  ]
+})
+export class HomePageModule {}
diff --git a/src/components/searchbar/test/toolbar/pages/home-page/home-page.ts b/src/components/searchbar/test/toolbar/pages/home-page/home-page.ts
index f057f31757..8c1126aa51 100644
--- a/src/components/searchbar/test/toolbar/pages/home-page/home-page.ts
+++ b/src/components/searchbar/test/toolbar/pages/home-page/home-page.ts
@@ -1,40 +1,7 @@
 import { Component } from '@angular/core';
 
 @Component({
-  template: `
-    <ion-header>
-
-      <ion-navbar>
-        <ion-title>Searchbar Toolbars</ion-title>
-      </ion-navbar>
-
-    </ion-header>
-
-
-    <ion-content>
-
-      <h5 padding-left padding-top> Search - Default Toolbar </h5>
-      <ion-toolbar>
-        <ion-searchbar [(ngModel)]="defaultToolbarSearch"></ion-searchbar>
-      </ion-toolbar>
-
-      <h5 padding-left padding-top> Search - Primary Toolbar </h5>
-      <ion-toolbar color="primary">
-        <ion-searchbar dark [(ngModel)]="primaryToolbarSearch" showCancelButton></ion-searchbar>
-      </ion-toolbar>
-
-      <h5 padding-left padding-top> Search - Dark Toolbar </h5>
-      <ion-toolbar color="dark">
-        <ion-searchbar dark placeholder="Filter Schedules" [(ngModel)]="darkToolbarSearch"></ion-searchbar>
-      </ion-toolbar>
-
-      <h5 padding-left padding-top> Search - Light Toolbar </h5>
-      <ion-toolbar color="light">
-        <ion-searchbar [(ngModel)]="lightToolbarSearch" showCancelButton></ion-searchbar>
-      </ion-toolbar>
-
-    </ion-content>
-  `
+  templateUrl: 'home-page.html'
 })
 export class HomePage {
   defaultToolbarSearch: string = '';
diff --git a/src/components/segment/test/basic/app/app.component.ts b/src/components/segment/test/basic/app/app.component.ts
index 96f506a105..49e19784c0 100644
--- a/src/components/segment/test/basic/app/app.component.ts
+++ b/src/components/segment/test/basic/app/app.component.ts
@@ -1,8 +1,9 @@
 import { Component } from '@angular/core';
 import {HomePage} from '../pages/home-page/home-page';
+
 @Component({
   template: `<ion-nav [root]="root"></ion-nav>`
 })
-export class E2EApp {
+export class AppComponent {
   root = HomePage;
 }
diff --git a/src/components/segment/test/basic/app/app.module.ts b/src/components/segment/test/basic/app/app.module.ts
index cba941d3db..ea3c3247a3 100644
--- a/src/components/segment/test/basic/app/app.module.ts
+++ b/src/components/segment/test/basic/app/app.module.ts
@@ -2,25 +2,18 @@ import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { E2EApp } from './app.component';
-import { HomePage } from '../pages/home-page/home-page';
+import { AppComponent } from './app.component';
+import { HomePageModule } from '../pages/home-page/home-page.module';
+
 @NgModule({
   declarations: [
-    E2EApp,
-    HomePage
+    AppComponent,
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp, {}, {
-      links: [
-        { component: HomePage, name: 'home-page' }
-      ]
-    })
+    IonicModule.forRoot(AppComponent, {}),
+    HomePageModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    E2EApp,
-    HomePage
-  ]
 })
 export class AppModule { }
diff --git a/src/components/segment/test/basic/pages/home-page/home-page.html b/src/components/segment/test/basic/pages/home-page/home-page.html
new file mode 100644
index 0000000000..fe333557ed
--- /dev/null
+++ b/src/components/segment/test/basic/pages/home-page/home-page.html
@@ -0,0 +1,127 @@
+<ion-header>
+  <ion-toolbar>
+    <ion-segment id="segment" [(ngModel)]="relationship" (ionChange)="onSegmentChanged($event)">
+      <ion-segment-button value="friends" (ionSelect)="onSegmentSelected($event)" class="e2eSegmentFriends">
+        Friends
+      </ion-segment-button>
+      <ion-segment-button value="enemies" (ionSelect)="onSegmentSelected($event)">
+        Enemies
+      </ion-segment-button>
+    </ion-segment>
+  </ion-toolbar>
+  <ion-toolbar>
+    <ion-buttons end>
+      <button ion-button icon-only>
+        <ion-icon name="search"></ion-icon>
+      </button>
+    </ion-buttons>
+    <ion-segment [(ngModel)]="icons" color="secondary">
+      <ion-segment-button value="camera">
+        <ion-icon name="camera"></ion-icon>
+      </ion-segment-button>
+      <ion-segment-button value="bookmark">
+        <ion-icon name="bookmark"></ion-icon>
+      </ion-segment-button>
+    </ion-segment>
+  </ion-toolbar>
+</ion-header>
+<ion-content padding>
+  <div>Are we friends or enemies? <b>{{ relationship }}</b></div>
+  <h4>Map mode: formControlName</h4>
+  <form (submit)="doSubmit($event)" [formGroup]="myForm">
+    <ion-segment formControlName="mapStyle" color="danger">
+      <ion-segment-button value="active" class="e2eSegmentStandard">
+        Active
+      </ion-segment-button>
+      <ion-segment-button value="disabled" [disabled]="isDisabled">
+        Disabled
+      </ion-segment-button>
+      <ion-segment-button value="inactive" disabled="false">
+        Inactive
+      </ion-segment-button>
+    </ion-segment>
+  </form>
+  <p>
+    Map mode: <b>{{myForm.controls.mapStyle.value}}</b> -
+    <span [ngSwitch]="myForm.controls.mapStyle.value">
+      <span *ngSwitchCase="'standard'">
+        <b>Standard</b>
+      </span>
+      <span *ngSwitchCase="'hybrid'">
+        <b>Hybrid</b>
+      </span>
+      <span *ngSwitchCase="'sat'">
+        <b>Satellite</b>
+      </span>
+    </span>
+  </p>
+  <hr>
+  <h4>Model style: NgModel</h4>
+  <ion-segment [(ngModel)]="modelStyle" color="dark">
+    <ion-segment-button value="A">
+      Model A
+    </ion-segment-button>
+    <ion-segment-button value="B">
+      Model B
+    </ion-segment-button>
+    <ion-segment-button value="C" class="e2eSegmentModelC">
+      Model C
+    </ion-segment-button>
+    <ion-segment-button value="D" [disabled]="isDisabled">
+      Model D
+    </ion-segment-button>
+  </ion-segment>
+  <p>Model Style: <b>Model {{ modelStyle }}</b></p>
+  <ion-segment [(ngModel)]="icons">
+    <ion-segment-button value="camera">
+      <ion-icon name="camera"></ion-icon>
+    </ion-segment-button>
+    <ion-segment-button value="bookmark">
+      <ion-icon name="bookmark"></ion-icon>
+    </ion-segment-button>
+  </ion-segment>
+  <button ion-button block color="dark" (click)="toggleDisabled()">Toggle Disabled</button>
+</ion-content>
+
+
+<ion-footer>
+  <ion-toolbar color="primary">
+    <ion-segment [(ngModel)]="appType" color="light">
+      <ion-segment-button value="paid">
+        Primary
+      </ion-segment-button>
+      <ion-segment-button value="free">
+        Toolbar
+      </ion-segment-button>
+      <ion-segment-button value="top" class="e2eSegmentTopGrossing">
+        Light Segment
+      </ion-segment-button>
+    </ion-segment>
+  </ion-toolbar>
+  <ion-toolbar>
+    <ion-segment [(ngModel)]="appType" color="danger">
+      <ion-segment-button value="paid">
+        Default
+      </ion-segment-button>
+      <ion-segment-button value="free">
+        Toolbar
+      </ion-segment-button>
+      <ion-segment-button value="top">
+        Danger Segment
+      </ion-segment-button>
+    </ion-segment>
+  </ion-toolbar>
+  <ion-toolbar>
+    <ion-segment [(ngModel)]="appType" color="dark" [disabled]="isDisabled">
+      <ion-segment-button value="paid">
+        Default
+      </ion-segment-button>
+      <ion-segment-button value="free">
+        Toolbar
+      </ion-segment-button>
+      <ion-segment-button value="top">
+        Dark Segment
+      </ion-segment-button>
+    </ion-segment>
+  </ion-toolbar>
+</ion-footer>
\ No newline at end of file
diff --git a/src/components/segment/test/basic/pages/home-page/home-page.module.ts b/src/components/segment/test/basic/pages/home-page/home-page.module.ts
new file mode 100644
index 0000000000..bcc3d1a39f
--- /dev/null
+++ b/src/components/segment/test/basic/pages/home-page/home-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+
+import { HomePage } from './home-page';
+
+@NgModule({
+  declarations: [
+    HomePage,
+  ],
+  imports: [
+    DeepLinkModule.forChild(HomePage)
+  ]
+})
+export class HomePageModule {}
diff --git a/src/components/segment/test/basic/pages/home-page/home-page.ts b/src/components/segment/test/basic/pages/home-page/home-page.ts
index 59fe893212..08fb938067 100644
--- a/src/components/segment/test/basic/pages/home-page/home-page.ts
+++ b/src/components/segment/test/basic/pages/home-page/home-page.ts
@@ -1,138 +1,10 @@
 import { Component } from '@angular/core';
 import { FormBuilder, Validators } from '@angular/forms';
-import { SegmentButton } from '../../../../../..';
-
+import { DeepLink, SegmentButton } from '../../../../../..';
 
+@DeepLink()
 @Component({
-  template: `
-    <ion-header>
-      <ion-toolbar>
-        <ion-segment id="segment" [(ngModel)]="relationship" (ionChange)="onSegmentChanged($event)">
-          <ion-segment-button value="friends" (ionSelect)="onSegmentSelected($event)" class="e2eSegmentFriends">
-            Friends
-          </ion-segment-button>
-          <ion-segment-button value="enemies" (ionSelect)="onSegmentSelected($event)">
-            Enemies
-          </ion-segment-button>
-        </ion-segment>
-      </ion-toolbar>
-      <ion-toolbar>
-        <ion-buttons end>
-          <button ion-button icon-only>
-            <ion-icon name="search"></ion-icon>
-          </button>
-        </ion-buttons>
-        <ion-segment [(ngModel)]="icons" color="secondary">
-          <ion-segment-button value="camera">
-            <ion-icon name="camera"></ion-icon>
-          </ion-segment-button>
-          <ion-segment-button value="bookmark">
-            <ion-icon name="bookmark"></ion-icon>
-          </ion-segment-button>
-        </ion-segment>
-      </ion-toolbar>
-    </ion-header>
-    <ion-content padding>
-      <div>Are we friends or enemies? <b>{{ relationship }}</b></div>
-      <h4>Map mode: formControlName</h4>
-      <form (submit)="doSubmit($event)" [formGroup]="myForm">
-        <ion-segment formControlName="mapStyle" color="danger">
-          <ion-segment-button value="active" class="e2eSegmentStandard">
-            Active
-          </ion-segment-button>
-          <ion-segment-button value="disabled" [disabled]="isDisabled">
-            Disabled
-          </ion-segment-button>
-          <ion-segment-button value="inactive" disabled="false">
-            Inactive
-          </ion-segment-button>
-        </ion-segment>
-      </form>
-      <p>
-        Map mode: <b>{{myForm.controls.mapStyle.value}}</b> -
-        <span [ngSwitch]="myForm.controls.mapStyle.value">
-          <span *ngSwitchCase="'standard'">
-            <b>Standard</b>
-          </span>
-          <span *ngSwitchCase="'hybrid'">
-            <b>Hybrid</b>
-          </span>
-          <span *ngSwitchCase="'sat'">
-            <b>Satellite</b>
-          </span>
-        </span>
-      </p>
-      <hr>
-      <h4>Model style: NgModel</h4>
-      <ion-segment [(ngModel)]="modelStyle" color="dark">
-        <ion-segment-button value="A">
-          Model A
-        </ion-segment-button>
-        <ion-segment-button value="B">
-          Model B
-        </ion-segment-button>
-        <ion-segment-button value="C" class="e2eSegmentModelC">
-          Model C
-        </ion-segment-button>
-        <ion-segment-button value="D" [disabled]="isDisabled">
-          Model D
-        </ion-segment-button>
-      </ion-segment>
-      <p>Model Style: <b>Model {{ modelStyle }}</b></p>
-      <ion-segment [(ngModel)]="icons">
-        <ion-segment-button value="camera">
-          <ion-icon name="camera"></ion-icon>
-        </ion-segment-button>
-        <ion-segment-button value="bookmark">
-          <ion-icon name="bookmark"></ion-icon>
-        </ion-segment-button>
-      </ion-segment>
-      <button ion-button block color="dark" (click)="toggleDisabled()">Toggle Disabled</button>
-    </ion-content>
-
-
-    <ion-footer>
-      <ion-toolbar color="primary">
-        <ion-segment [(ngModel)]="appType" color="light">
-          <ion-segment-button value="paid">
-            Primary
-          </ion-segment-button>
-          <ion-segment-button value="free">
-            Toolbar
-          </ion-segment-button>
-          <ion-segment-button value="top" class="e2eSegmentTopGrossing">
-            Light Segment
-          </ion-segment-button>
-        </ion-segment>
-      </ion-toolbar>
-      <ion-toolbar>
-        <ion-segment [(ngModel)]="appType" color="danger">
-          <ion-segment-button value="paid">
-            Default
-          </ion-segment-button>
-          <ion-segment-button value="free">
-            Toolbar
-          </ion-segment-button>
-          <ion-segment-button value="top">
-            Danger Segment
-          </ion-segment-button>
-        </ion-segment>
-      </ion-toolbar>
-      <ion-toolbar>
-        <ion-segment [(ngModel)]="appType" color="dark" [disabled]="isDisabled">
-          <ion-segment-button value="paid">
-            Default
-          </ion-segment-button>
-          <ion-segment-button value="free">
-            Toolbar
-          </ion-segment-button>
-          <ion-segment-button value="top">
-            Dark Segment
-          </ion-segment-button>
-        </ion-segment>
-      </ion-toolbar>
-    </ion-footer>
-  `
+  templateUrl: 'home-page.html'
 })
 export class HomePage {
   relationship: string = 'enemies';
diff --git a/src/components/segment/test/nav/app/app.component.ts b/src/components/segment/test/nav/app/app.component.ts
index 61b8edef12..8037e15df4 100644
--- a/src/components/segment/test/nav/app/app.component.ts
+++ b/src/components/segment/test/nav/app/app.component.ts
@@ -1,8 +1,9 @@
 import { Component } from '@angular/core';
 import { FirstPage } from '../pages/first-page/first-page';
+
 @Component({
   template: `<ion-nav [root]="root"></ion-nav>`
 })
-export class E2EApp {
+export class AppComponent {
   root = FirstPage;
 }
diff --git a/src/components/segment/test/nav/app/app.module.ts b/src/components/segment/test/nav/app/app.module.ts
index 4b0b3a845a..91596c468c 100644
--- a/src/components/segment/test/nav/app/app.module.ts
+++ b/src/components/segment/test/nav/app/app.module.ts
@@ -2,27 +2,18 @@ import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { E2EApp } from './app.component';
-import { FirstPage } from '../pages/first-page/first-page';
+import { AppComponent } from './app.component';
+import { FirstPageModule } from '../pages/first-page/first-page.module';
 
 @NgModule({
   declarations: [
-    E2EApp,
-    FirstPage
+    AppComponent,
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp, {}, {
-      links: [
-        { name: 'first-page', component: FirstPage },
-        { name: 'second-page', loadChildren: '../pages/second-page/second-page.module#SecondPageModule' },
-      ]
-    })
+    IonicModule.forRoot(AppComponent, {}),
+    FirstPageModule
   ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    E2EApp,
-    FirstPage
-  ]
+  bootstrap: [IonicApp]
 })
 export class AppModule { }
diff --git a/src/components/segment/test/nav/pages/first-page/first-page.html b/src/components/segment/test/nav/pages/first-page/first-page.html
new file mode 100644
index 0000000000..9e161a7399
--- /dev/null
+++ b/src/components/segment/test/nav/pages/first-page/first-page.html
@@ -0,0 +1,45 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>
+      Segment under Navbar
+    </ion-title>
+  </ion-navbar>
+  <ion-toolbar>
+    <ion-segment [(ngModel)]="signInType">
+      <ion-segment-button value="new">
+        New
+      </ion-segment-button>
+      <ion-segment-button value="existing" class="e2eSegmentExistingSegment">
+        Existing
+      </ion-segment-button>
+      <ion-segment-button value="test">
+        Test
+      </ion-segment-button>
+    </ion-segment>
+  </ion-toolbar>
+</ion-header>
+<ion-content padding>
+  <ion-row>
+    <ion-col>
+      <button ion-button block (click)="signInType='new'">New</button>
+    </ion-col>
+    <ion-col>
+      <button ion-button color="light" block (click)="signInType='existing'">Existing</button>
+    </ion-col>
+    <ion-col>
+      <button ion-button color="dark" block (click)="signInType='test'" class="e2eSegmentTestButton">Test</button>
+    </ion-col>
+  </ion-row>
+  <div [ngSwitch]="signInType">
+    <div *ngSwitchCase="'existing'">
+      Signing up as an <b>Existing User</b>.
+    </div>
+    <div *ngSwitchCase="'new'">
+      Signing up as a <b>New User</b>.
+    </div>
+    <div *ngSwitchCase="'test'">
+      Signing up as a <b>Test User</b>.
+    </div>
+  </div>
+  <button ion-button block (click)="goToPage2()">Next Page</button>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/segment/test/nav/pages/first-page/first-page.module.ts b/src/components/segment/test/nav/pages/first-page/first-page.module.ts
new file mode 100644
index 0000000000..e5cab60caf
--- /dev/null
+++ b/src/components/segment/test/nav/pages/first-page/first-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+import { FirstPage } from './first-page';
+
+@NgModule({
+  imports: [
+    DeepLinkModule.forChild(FirstPage)
+  ],
+  declarations: [
+    FirstPage
+  ]
+})
+export class FirstPageModule { }
diff --git a/src/components/segment/test/nav/pages/first-page/first-page.ts b/src/components/segment/test/nav/pages/first-page/first-page.ts
index 0ad4ace680..787bf26e6e 100644
--- a/src/components/segment/test/nav/pages/first-page/first-page.ts
+++ b/src/components/segment/test/nav/pages/first-page/first-page.ts
@@ -1,53 +1,9 @@
 import { Component } from '@angular/core';
-import { NavController } from '../../../../../..';
+import { DeepLink, NavController } from '../../../../../..';
+
+@DeepLink()
 @Component({
-  template: `
-    <ion-header>
-      <ion-navbar>
-        <ion-title>
-          Segment under Navbar
-        </ion-title>
-      </ion-navbar>
-      <ion-toolbar>
-        <ion-segment [(ngModel)]="signInType">
-          <ion-segment-button value="new">
-            New
-          </ion-segment-button>
-          <ion-segment-button value="existing" class="e2eSegmentExistingSegment">
-            Existing
-          </ion-segment-button>
-          <ion-segment-button value="test">
-            Test
-          </ion-segment-button>
-        </ion-segment>
-      </ion-toolbar>
-    </ion-header>
-    <ion-content padding>
-      <ion-row>
-        <ion-col>
-          <button ion-button block (click)="signInType='new'">New</button>
-        </ion-col>
-        <ion-col>
-          <button ion-button color="light" block (click)="signInType='existing'">Existing</button>
-        </ion-col>
-        <ion-col>
-          <button ion-button color="dark" block (click)="signInType='test'" class="e2eSegmentTestButton">Test</button>
-        </ion-col>
-      </ion-row>
-      <div [ngSwitch]="signInType">
-        <div *ngSwitchCase="'existing'">
-          Signing up as an <b>Existing User</b>.
-        </div>
-        <div *ngSwitchCase="'new'">
-          Signing up as a <b>New User</b>.
-        </div>
-        <div *ngSwitchCase="'test'">
-          Signing up as a <b>Test User</b>.
-        </div>
-     </div>
-     <button ion-button block (click)="goToPage2()">Next Page</button>
-    </ion-content>
-  `
+  templateUrl: 'first-page.html'
 })
 export class FirstPage {
   signInType: string;
@@ -55,6 +11,6 @@ export class FirstPage {
     this.signInType = 'new';
   }
   goToPage2() {
-    this.navCtrl.push('second-page');
+    this.navCtrl.push('SecondPage');
   }
 }
diff --git a/src/components/segment/test/nav/pages/second-page/second-page.html b/src/components/segment/test/nav/pages/second-page/second-page.html
new file mode 100644
index 0000000000..c42fcce4dc
--- /dev/null
+++ b/src/components/segment/test/nav/pages/second-page/second-page.html
@@ -0,0 +1,13 @@
+<ion-header>
+  <ion-navbar hideBackButton>
+    <button ion-button menuToggle>
+      <ion-icon name="menu"></ion-icon>
+    </button>
+    <ion-title>
+      Second Page
+    </ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  <h1>Page 2</h1>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/segment/test/nav/pages/second-page/second-page.ts b/src/components/segment/test/nav/pages/second-page/second-page.ts
index 7cb8988dac..8f459145ac 100644
--- a/src/components/segment/test/nav/pages/second-page/second-page.ts
+++ b/src/components/segment/test/nav/pages/second-page/second-page.ts
@@ -1,20 +1,8 @@
 import { Component } from '@angular/core';
+import { DeepLink } from '../../../../../..';
 
+@DeepLink()
 @Component({
-  template: `
-    <ion-header>
-      <ion-navbar hideBackButton>
-        <button ion-button menuToggle>
-          <ion-icon name="menu"></ion-icon>
-        </button>
-        <ion-title>
-          Second Page
-        </ion-title>
-      </ion-navbar>
-    </ion-header>
-    <ion-content>
-      <h1>Page 2</h1>
-    </ion-content>
-  `
+  templateUrl: 'second-page.html'
 })
 export class SecondPage {}
diff --git a/src/components/select/test/multiple-value/app/app.component.ts b/src/components/select/test/multiple-value/app/app.component.ts
index b03e55bbb6..e84bb7d13a 100644
--- a/src/components/select/test/multiple-value/app/app.component.ts
+++ b/src/components/select/test/multiple-value/app/app.component.ts
@@ -1,8 +1,9 @@
 import { Component } from '@angular/core';
-import { E2EPage } from '../pages/e2e-page/e2e-page';
+import { PageOne } from '../pages/page-one/page-one';
+
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
-  root = E2EPage;
+export class AppComponent {
+  root = PageOne;
 }
diff --git a/src/components/select/test/multiple-value/app/app.module.ts b/src/components/select/test/multiple-value/app/app.module.ts
index 34aac1b029..79a2b762c9 100644
--- a/src/components/select/test/multiple-value/app/app.module.ts
+++ b/src/components/select/test/multiple-value/app/app.module.ts
@@ -1,25 +1,19 @@
 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';
+
+import { AppComponent } from './app.component';
+import { PageOneModule} from '../pages/page-one/page-one.module';
+
 @NgModule({
   declarations: [
-    E2EApp,
-    E2EPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp, {}, {
-      links: [
-        {component: E2EPage, name: 'e2e-page'}
-      ]
-    })
+    IonicModule.forRoot(AppComponent, {}),
+    PageOneModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    E2EApp,
-    E2EPage
-  ]
 })
 export class AppModule {}
diff --git a/src/components/select/test/multiple-value/pages/e2e-page/main.html b/src/components/select/test/multiple-value/pages/page-one/page-one.html
similarity index 100%
rename from src/components/select/test/multiple-value/pages/e2e-page/main.html
rename to src/components/select/test/multiple-value/pages/page-one/page-one.html
diff --git a/src/components/select/test/multiple-value/pages/page-one/page-one.module.ts b/src/components/select/test/multiple-value/pages/page-one/page-one.module.ts
new file mode 100644
index 0000000000..8ff01f8895
--- /dev/null
+++ b/src/components/select/test/multiple-value/pages/page-one/page-one.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+
+import { PageOne } from './page-one';
+
+@NgModule({
+  declarations: [
+    PageOne,
+  ],
+  imports: [
+    DeepLinkModule.forChild(PageOne)
+  ]
+})
+export class PageOneModule {}
diff --git a/src/components/select/test/multiple-value/pages/e2e-page/e2e-page.ts b/src/components/select/test/multiple-value/pages/page-one/page-one.ts
similarity index 90%
rename from src/components/select/test/multiple-value/pages/e2e-page/e2e-page.ts
rename to src/components/select/test/multiple-value/pages/page-one/page-one.ts
index ee3d1d87e0..409f6010bd 100644
--- a/src/components/select/test/multiple-value/pages/e2e-page/e2e-page.ts
+++ b/src/components/select/test/multiple-value/pages/page-one/page-one.ts
@@ -1,10 +1,12 @@
 import { Component } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
+import { DeepLink } from '../../../../../..';
 
+@DeepLink()
 @Component({
-  templateUrl: 'main.html'
+  templateUrl: 'page-one.html'
 })
-export class E2EPage {
+export class PageOne {
   toppings: Array<string>;
   carFeatures: Array<string>;
   pets: Array<string>;
diff --git a/src/components/select/test/single-value/app/app.component.ts b/src/components/select/test/single-value/app/app.component.ts
index 13b1c4a2c6..e84bb7d13a 100644
--- a/src/components/select/test/single-value/app/app.component.ts
+++ b/src/components/select/test/single-value/app/app.component.ts
@@ -1,9 +1,9 @@
 import { Component } from '@angular/core';
-import { E2EPage } from '../pages/e2e-page/e2e-page';
+import { PageOne } from '../pages/page-one/page-one';
 
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
-  root = E2EPage;
+export class AppComponent {
+  root = PageOne;
 }
diff --git a/src/components/select/test/single-value/app/app.module.ts b/src/components/select/test/single-value/app/app.module.ts
index 5d45a8bfa4..7246a34df5 100644
--- a/src/components/select/test/single-value/app/app.module.ts
+++ b/src/components/select/test/single-value/app/app.module.ts
@@ -2,26 +2,18 @@ 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';
+import { AppComponent } from './app.component';
+import { PageOneModule } from '../pages/page-one/page-one.module';
 
 @NgModule({
   declarations: [
-    E2EApp,
-    E2EPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp, {}, {
-      links: [
-        { component: E2EPage, name: 'e2e-page' }
-      ]
-    })
+    IonicModule.forRoot(AppComponent, {}),
+    PageOneModule
   ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    E2EApp,
-    E2EPage
-  ]
+  bootstrap: [IonicApp]
 })
 export class AppModule { }
diff --git a/src/components/select/test/single-value/pages/e2e-page/main.html b/src/components/select/test/single-value/pages/page-one/page-one.html
similarity index 100%
rename from src/components/select/test/single-value/pages/e2e-page/main.html
rename to src/components/select/test/single-value/pages/page-one/page-one.html
diff --git a/src/components/select/test/single-value/pages/page-one/page-one.module.ts b/src/components/select/test/single-value/pages/page-one/page-one.module.ts
new file mode 100644
index 0000000000..8ff01f8895
--- /dev/null
+++ b/src/components/select/test/single-value/pages/page-one/page-one.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+
+import { PageOne } from './page-one';
+
+@NgModule({
+  declarations: [
+    PageOne,
+  ],
+  imports: [
+    DeepLinkModule.forChild(PageOne)
+  ]
+})
+export class PageOneModule {}
diff --git a/src/components/select/test/single-value/pages/e2e-page/e2e-page.ts b/src/components/select/test/single-value/pages/page-one/page-one.ts
similarity index 94%
rename from src/components/select/test/single-value/pages/e2e-page/e2e-page.ts
rename to src/components/select/test/single-value/pages/page-one/page-one.ts
index f0a9b0b86e..fbb4952bc7 100644
--- a/src/components/select/test/single-value/pages/e2e-page/e2e-page.ts
+++ b/src/components/select/test/single-value/pages/page-one/page-one.ts
@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
+import { DeepLink } from '../../../../../..';
 
 export interface Currency {
   symbol: string;
@@ -7,10 +8,11 @@ export interface Currency {
   name: string;
 }
 
+@DeepLink()
 @Component({
-  templateUrl: 'main.html'
+  templateUrl: 'page-one.html'
 })
-export class E2EPage {
+export class PageOne {
   notifications: any;
   musicSelectOpts: any = {
     title: '1994 Music',
diff --git a/src/components/tabs/test/advanced/app/app.component.ts b/src/components/tabs/test/advanced/app/app.component.ts
index 44eb48b99d..2f20cff319 100644
--- a/src/components/tabs/test/advanced/app/app.component.ts
+++ b/src/components/tabs/test/advanced/app/app.component.ts
@@ -1,8 +1,9 @@
 import { Component } from '@angular/core';
-import { SignIn } from '../pages/signin-page/signIn';
+import { SignInPage } from '../pages/signin-page/sign-in-page';
+
 @Component({
   template: '<ion-nav [root]="rootPage" swipeBackEnabled="false"></ion-nav>'
 })
-export class E2EApp {
-  rootPage = SignIn;
+export class AppComponent {
+  rootPage = SignInPage;
 }
diff --git a/src/components/tabs/test/advanced/app/app.module.ts b/src/components/tabs/test/advanced/app/app.module.ts
index dedb1d1a97..98063b15f3 100644
--- a/src/components/tabs/test/advanced/app/app.module.ts
+++ b/src/components/tabs/test/advanced/app/app.module.ts
@@ -1,36 +1,19 @@
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
-import {E2EApp} from './app.component';
-import {SignIn} from '../pages/signin-page/signIn';
-import {ModalChat} from '../pages/modalChat/modalChat';
+
+import { AppComponent } from './app.component';
+import { SignInPageModule } from '../pages/signin-page/sign-in-page.module';
+
 @NgModule({
   declarations: [
-    E2EApp,
-    SignIn,
-    ModalChat
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp, {tabsHideOnSubPages: true}, {
-      links: [
-        { component: SignIn, name: 'sign-in' },
-        { loadChildren: '../pages/tabs-page/tabs.module#TabsPageModule', name: 'tabs' },
-        { loadChildren: '../pages/tab1-page1/tab1-page1.module#Tab1Page1Module', name: 'tab1-page1' },
-        { loadChildren: '../pages/tab1-page2/tab1-page2.module#Tab1Page2Module', name: 'tab1-page2' },
-        { loadChildren: '../pages/tab1-page3/tab1-page3.module#Tab1Page3Module', name: 'tab1-page3' },
-        { loadChildren: '../pages/tab2-page1/tab2-page1.module#Tab2Page1Module', name: 'tab2-page1' },
-        { loadChildren: '../pages/tab2-page2/tab2-page2.module#Tab2Page2Module', name: 'tab2-page2' },
-        { loadChildren: '../pages/tab2-page3/tab2-page3.module#Tab2Page3Module', name: 'tab2-page3' },
-        { loadChildren: '../pages/tab3-page1/tab3-page1.module#Tab3Page1Module', name: 'tab3-page1' },
-      ]
-    })
+    IonicModule.forRoot(AppComponent, {tabsHideOnSubPages: true}),
+    SignInPageModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    E2EApp,
-    SignIn,
-    ModalChat
-  ]
 })
 export class AppModule {}
diff --git a/src/components/tabs/test/advanced/pages/modalChat/modalChat.html b/src/components/tabs/test/advanced/pages/modal-chat-page/modal-chat-page.html
similarity index 100%
rename from src/components/tabs/test/advanced/pages/modalChat/modalChat.html
rename to src/components/tabs/test/advanced/pages/modal-chat-page/modal-chat-page.html
diff --git a/src/components/tabs/test/advanced/pages/modal-chat-page/modal-chat-page.module.ts b/src/components/tabs/test/advanced/pages/modal-chat-page/modal-chat-page.module.ts
new file mode 100644
index 0000000000..11f8b55a23
--- /dev/null
+++ b/src/components/tabs/test/advanced/pages/modal-chat-page/modal-chat-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+
+import { ModalChatPage } from './modal-chat-page';
+
+@NgModule({
+  declarations: [
+    ModalChatPage,
+  ],
+  imports: [
+    DeepLinkModule.forChild(ModalChatPage)
+  ]
+})
+export class ModalChatPageModule {}
diff --git a/src/components/tabs/test/advanced/pages/modalChat/modalChat.ts b/src/components/tabs/test/advanced/pages/modal-chat-page/modal-chat-page.ts
similarity index 61%
rename from src/components/tabs/test/advanced/pages/modalChat/modalChat.ts
rename to src/components/tabs/test/advanced/pages/modal-chat-page/modal-chat-page.ts
index 5d14cc2262..4481b9ba8c 100644
--- a/src/components/tabs/test/advanced/pages/modalChat/modalChat.ts
+++ b/src/components/tabs/test/advanced/pages/modal-chat-page/modal-chat-page.ts
@@ -1,9 +1,13 @@
 import { Component } from '@angular/core';
-import { ViewController } from '../../../../../..';
-@Component({
-  templateUrl: './modalChat.html'
+import { DeepLink, ViewController } from '../../../../../..';
+
+@DeepLink({
+  name: 'modal-chat-page'
 })
-export class ModalChat {
+@Component({
+  templateUrl: './modal-chat-page.html'
+})
+export class ModalChatPage {
 
   constructor(
     public viewCtrl: ViewController
diff --git a/src/components/tabs/test/advanced/pages/signin-page/signIn.html b/src/components/tabs/test/advanced/pages/signin-page/sign-in-page.html
similarity index 100%
rename from src/components/tabs/test/advanced/pages/signin-page/signIn.html
rename to src/components/tabs/test/advanced/pages/signin-page/sign-in-page.html
diff --git a/src/components/tabs/test/advanced/pages/signin-page/sign-in-page.module.ts b/src/components/tabs/test/advanced/pages/signin-page/sign-in-page.module.ts
new file mode 100644
index 0000000000..dc5d359431
--- /dev/null
+++ b/src/components/tabs/test/advanced/pages/signin-page/sign-in-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+
+import { SignInPage } from './sign-in-page';
+
+@NgModule({
+  declarations: [
+    SignInPage,
+  ],
+  imports: [
+    DeepLinkModule.forChild(SignInPage)
+  ]
+})
+export class SignInPageModule {}
diff --git a/src/components/tabs/test/advanced/pages/signin-page/sign-in-page.ts b/src/components/tabs/test/advanced/pages/signin-page/sign-in-page.ts
new file mode 100644
index 0000000000..528760c956
--- /dev/null
+++ b/src/components/tabs/test/advanced/pages/signin-page/sign-in-page.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+import { DeepLink } from '../../../../../..';
+
+@DeepLink({
+  name: 'sign-in'
+})
+@Component({
+  templateUrl: './sign-in-page.html'
+})
+export class SignInPage {
+  tabsPage = 'tabs-page';
+}
diff --git a/src/components/tabs/test/advanced/pages/signin-page/signIn.ts b/src/components/tabs/test/advanced/pages/signin-page/signIn.ts
deleted file mode 100644
index 228598279f..0000000000
--- a/src/components/tabs/test/advanced/pages/signin-page/signIn.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  templateUrl: './signIn.html'
-})
-export class SignIn {
-  tabsPage = 'tabs';
-}
diff --git a/src/components/tabs/test/advanced/pages/tab1-page1/tab1page1.html b/src/components/tabs/test/advanced/pages/tab1-page1/tab1-page1.html
similarity index 100%
rename from src/components/tabs/test/advanced/pages/tab1-page1/tab1page1.html
rename to src/components/tabs/test/advanced/pages/tab1-page1/tab1-page1.html
diff --git a/src/components/tabs/test/advanced/pages/tab1-page1/tab1-page1.ts b/src/components/tabs/test/advanced/pages/tab1-page1/tab1-page1.ts
index 4a530deed3..96acb45c3a 100644
--- a/src/components/tabs/test/advanced/pages/tab1-page1/tab1-page1.ts
+++ b/src/components/tabs/test/advanced/pages/tab1-page1/tab1-page1.ts
@@ -1,8 +1,11 @@
 import { Component } from '@angular/core';
-import { App, NavController, NavParams, Tabs } from '../../../../../..';
+import { App, DeepLink, NavController, NavParams, Tabs } from '../../../../../..';
 
+@DeepLink({
+  name: 'tab1-page1'
+})
 @Component({
-  templateUrl: './tab1page1.html'
+  templateUrl: './tab1-page1.html'
 })
 export class Tab1Page1 {
   tab1Page2 = 'tab1-page2';
diff --git a/src/components/tabs/test/advanced/pages/tab1-page2/tab1page2.html b/src/components/tabs/test/advanced/pages/tab1-page2/tab1-page2.html
similarity index 100%
rename from src/components/tabs/test/advanced/pages/tab1-page2/tab1page2.html
rename to src/components/tabs/test/advanced/pages/tab1-page2/tab1-page2.html
diff --git a/src/components/tabs/test/advanced/pages/tab1-page2/tab1-page2.module.ts b/src/components/tabs/test/advanced/pages/tab1-page2/tab1-page2.module.ts
index a8955796f9..5b21e47166 100644
--- a/src/components/tabs/test/advanced/pages/tab1-page2/tab1-page2.module.ts
+++ b/src/components/tabs/test/advanced/pages/tab1-page2/tab1-page2.module.ts
@@ -9,9 +9,6 @@ import { Tab1Page2 } from './tab1-page2';
   ],
   declarations: [
     Tab1Page2
-  ],
-  entryComponents: [
-    Tab1Page2,
   ]
 })
 export class Tab1Page2Module { }
diff --git a/src/components/tabs/test/advanced/pages/tab1-page2/tab1-page2.ts b/src/components/tabs/test/advanced/pages/tab1-page2/tab1-page2.ts
index 4c08ef0418..3e8d92c3b4 100644
--- a/src/components/tabs/test/advanced/pages/tab1-page2/tab1-page2.ts
+++ b/src/components/tabs/test/advanced/pages/tab1-page2/tab1-page2.ts
@@ -1,8 +1,11 @@
 import { Component } from '@angular/core';
-import { Tabs } from '../../../../../..';
+import { DeepLink, Tabs } from '../../../../../..';
 
+@DeepLink({
+  name: 'tab1-page2'
+})
 @Component({
-  templateUrl: './tab1page2.html'
+  templateUrl: './tab1-page2.html'
 })
 export class Tab1Page2 {
   tab1Page3 = 'tab1-page3';
diff --git a/src/components/tabs/test/advanced/pages/tab1-page3/tab1page3.html b/src/components/tabs/test/advanced/pages/tab1-page3/tab1-page3.html
similarity index 100%
rename from src/components/tabs/test/advanced/pages/tab1-page3/tab1page3.html
rename to src/components/tabs/test/advanced/pages/tab1-page3/tab1-page3.html
diff --git a/src/components/tabs/test/advanced/pages/tab1-page3/tab1-page3.module.ts b/src/components/tabs/test/advanced/pages/tab1-page3/tab1-page3.module.ts
index 09314f4792..4304e4ee50 100644
--- a/src/components/tabs/test/advanced/pages/tab1-page3/tab1-page3.module.ts
+++ b/src/components/tabs/test/advanced/pages/tab1-page3/tab1-page3.module.ts
@@ -9,9 +9,6 @@ import { Tab1Page3 } from './tab1-page3';
   ],
   declarations: [
     Tab1Page3
-  ],
-  entryComponents: [
-    Tab1Page3,
   ]
 })
 export class Tab1Page3Module { }
diff --git a/src/components/tabs/test/advanced/pages/tab1-page3/tab1-page3.ts b/src/components/tabs/test/advanced/pages/tab1-page3/tab1-page3.ts
index c1bcc112f6..79dfedd362 100644
--- a/src/components/tabs/test/advanced/pages/tab1-page3/tab1-page3.ts
+++ b/src/components/tabs/test/advanced/pages/tab1-page3/tab1-page3.ts
@@ -1,6 +1,11 @@
 import { Component } from '@angular/core';
+import { DeepLink } from '../../../../../..';
+
+@DeepLink({
+  name: 'tab1-page3'
+})
 @Component({
-  templateUrl: './tab1page3.html'
+  templateUrl: './tab1-page3.html'
 })
 export class Tab1Page3 {
 
diff --git a/src/components/tabs/test/advanced/pages/tab2-page1/tab2page1.html b/src/components/tabs/test/advanced/pages/tab2-page1/tab2-page1.html
similarity index 100%
rename from src/components/tabs/test/advanced/pages/tab2-page1/tab2page1.html
rename to src/components/tabs/test/advanced/pages/tab2-page1/tab2-page1.html
diff --git a/src/components/tabs/test/advanced/pages/tab2-page1/tab2-page1.module.ts b/src/components/tabs/test/advanced/pages/tab2-page1/tab2-page1.module.ts
index 1a6cffac5e..3972964808 100644
--- a/src/components/tabs/test/advanced/pages/tab2-page1/tab2-page1.module.ts
+++ b/src/components/tabs/test/advanced/pages/tab2-page1/tab2-page1.module.ts
@@ -9,9 +9,6 @@ import { Tab2Page1 } from './tab2-page1';
   ],
   declarations: [
     Tab2Page1
-  ],
-  entryComponents: [
-    Tab2Page1,
   ]
 })
 export class Tab2Page1Module { }
diff --git a/src/components/tabs/test/advanced/pages/tab2-page1/tab2-page1.ts b/src/components/tabs/test/advanced/pages/tab2-page1/tab2-page1.ts
index ab95ca8a84..74d8ca45ec 100644
--- a/src/components/tabs/test/advanced/pages/tab2-page1/tab2-page1.ts
+++ b/src/components/tabs/test/advanced/pages/tab2-page1/tab2-page1.ts
@@ -1,7 +1,11 @@
 import { Component } from '@angular/core';
+import { DeepLink } from '../../../../../..';
 
+@DeepLink({
+  name: 'tab2-page1'
+})
 @Component({
-  templateUrl: './tab2page1.html'
+  templateUrl: './tab2-page1.html'
 })
 export class Tab2Page1 {
   tab2Page2 = 'tab2-page2';
diff --git a/src/components/tabs/test/advanced/pages/tab2-page2/tab2page2.html b/src/components/tabs/test/advanced/pages/tab2-page2/tab2-page2.html
similarity index 100%
rename from src/components/tabs/test/advanced/pages/tab2-page2/tab2page2.html
rename to src/components/tabs/test/advanced/pages/tab2-page2/tab2-page2.html
diff --git a/src/components/tabs/test/advanced/pages/tab2-page2/tab2-page2.module.ts b/src/components/tabs/test/advanced/pages/tab2-page2/tab2-page2.module.ts
index 991f1d5076..d515db7de6 100644
--- a/src/components/tabs/test/advanced/pages/tab2-page2/tab2-page2.module.ts
+++ b/src/components/tabs/test/advanced/pages/tab2-page2/tab2-page2.module.ts
@@ -9,9 +9,6 @@ import { Tab2Page2 } from './tab2-page2';
   ],
   declarations: [
     Tab2Page2
-  ],
-  entryComponents: [
-    Tab2Page2,
   ]
 })
 export class Tab2Page2Module { }
diff --git a/src/components/tabs/test/advanced/pages/tab2-page2/tab2-page2.ts b/src/components/tabs/test/advanced/pages/tab2-page2/tab2-page2.ts
index 18e85311ad..bc62c31428 100644
--- a/src/components/tabs/test/advanced/pages/tab2-page2/tab2-page2.ts
+++ b/src/components/tabs/test/advanced/pages/tab2-page2/tab2-page2.ts
@@ -1,6 +1,11 @@
 import { Component } from '@angular/core';
+import { DeepLink } from '../../../../../..';
+
+@DeepLink({
+  name: 'tab2-page2'
+})
 @Component({
-  templateUrl: './tab2page2.html'
+  templateUrl: './tab2-page2.html'
 })
 export class Tab2Page2 {
   tab2Page3 = 'tab2-page3';
diff --git a/src/components/tabs/test/advanced/pages/tab2-page3/tab2page3.html b/src/components/tabs/test/advanced/pages/tab2-page3/tab2-page3.html
similarity index 100%
rename from src/components/tabs/test/advanced/pages/tab2-page3/tab2page3.html
rename to src/components/tabs/test/advanced/pages/tab2-page3/tab2-page3.html
diff --git a/src/components/tabs/test/advanced/pages/tab2-page3/tab2-page3.module.ts b/src/components/tabs/test/advanced/pages/tab2-page3/tab2-page3.module.ts
index 991ba62c8a..89bd6c0657 100644
--- a/src/components/tabs/test/advanced/pages/tab2-page3/tab2-page3.module.ts
+++ b/src/components/tabs/test/advanced/pages/tab2-page3/tab2-page3.module.ts
@@ -9,9 +9,6 @@ import { Tab2Page3 } from './tab2-page3';
   ],
   declarations: [
     Tab2Page3
-  ],
-  entryComponents: [
-    Tab2Page3,
   ]
 })
 export class Tab2Page3Module { }
diff --git a/src/components/tabs/test/advanced/pages/tab2-page3/tab2-page3.ts b/src/components/tabs/test/advanced/pages/tab2-page3/tab2-page3.ts
index dee4fe1a44..2a7ebec6c8 100644
--- a/src/components/tabs/test/advanced/pages/tab2-page3/tab2-page3.ts
+++ b/src/components/tabs/test/advanced/pages/tab2-page3/tab2-page3.ts
@@ -1,7 +1,11 @@
 import { Component } from '@angular/core';
-import { NavController} from '../../../../../..';
+import { DeepLink, NavController} from '../../../../../..';
+
+@DeepLink({
+  name: 'tab2-page3'
+})
 @Component({
-  templateUrl: './tab2page3.html'
+  templateUrl: './tab2-page3.html'
 })
 export class Tab2Page3 {
 
diff --git a/src/components/tabs/test/advanced/pages/tab3-page1/tab3page1.html b/src/components/tabs/test/advanced/pages/tab3-page1/tab3-page1.html
similarity index 100%
rename from src/components/tabs/test/advanced/pages/tab3-page1/tab3page1.html
rename to src/components/tabs/test/advanced/pages/tab3-page1/tab3-page1.html
diff --git a/src/components/tabs/test/advanced/pages/tab3-page1/tab3-page1.module.ts b/src/components/tabs/test/advanced/pages/tab3-page1/tab3-page1.module.ts
index 39603eb16f..8e73a71517 100644
--- a/src/components/tabs/test/advanced/pages/tab3-page1/tab3-page1.module.ts
+++ b/src/components/tabs/test/advanced/pages/tab3-page1/tab3-page1.module.ts
@@ -10,9 +10,6 @@ import { Tab3Page1 } from './tab3-page1';
   ],
   declarations: [
     Tab3Page1
-  ],
-  entryComponents: [
-    Tab3Page1,
   ]
 })
 export class Tab3Page1Module { }
diff --git a/src/components/tabs/test/advanced/pages/tab3-page1/tab3-page1.ts b/src/components/tabs/test/advanced/pages/tab3-page1/tab3-page1.ts
index 45f664c925..5221d3c2ea 100644
--- a/src/components/tabs/test/advanced/pages/tab3-page1/tab3-page1.ts
+++ b/src/components/tabs/test/advanced/pages/tab3-page1/tab3-page1.ts
@@ -1,6 +1,11 @@
 import { Component } from '@angular/core';
+import { DeepLink } from '../../../../../..';
+
+@DeepLink({
+  name: 'tab3-page1'
+})
 @Component({
-  templateUrl: './tab3page1.html'
+  templateUrl: './tab3-page1.html'
 })
 export class Tab3Page1 {
 
diff --git a/src/components/tabs/test/advanced/pages/tabs-page/tabs.module.ts b/src/components/tabs/test/advanced/pages/tabs-page/tabs.module.ts
index 2efc02aa79..0daf566e80 100644
--- a/src/components/tabs/test/advanced/pages/tabs-page/tabs.module.ts
+++ b/src/components/tabs/test/advanced/pages/tabs-page/tabs.module.ts
@@ -9,9 +9,6 @@ import { TabsPage } from './tabs';
   ],
   declarations: [
     TabsPage
-  ],
-  entryComponents: [
-    TabsPage,
   ]
 })
 export class TabsPageModule { }
diff --git a/src/components/tabs/test/advanced/pages/tabs-page/tabs.ts b/src/components/tabs/test/advanced/pages/tabs-page/tabs.ts
index a3bee4c163..7f9d6a672f 100644
--- a/src/components/tabs/test/advanced/pages/tabs-page/tabs.ts
+++ b/src/components/tabs/test/advanced/pages/tabs-page/tabs.ts
@@ -1,7 +1,9 @@
 import { Component, ViewChild } from '@angular/core';
-import { AlertController, NavController, NavParams, ModalController, Tabs, Tab } from '../../../../../..';
-import { ModalChat } from '../modalChat/modalChat';
+import { AlertController, DeepLink, NavController, NavParams, ModalController, Tabs, Tab } from '../../../../../..';
 
+@DeepLink({
+  name: 'tabs-page'
+})
 @Component({
   templateUrl: './tabs.html'
 })
@@ -70,7 +72,7 @@ export class TabsPage {
 
   chat() {
     console.log('Chat clicked!');
-    this.modalCtrl.create(ModalChat).present();
+    this.modalCtrl.create('modal-chat-page').present();
   }
 
   ionViewWillEnter() {
diff --git a/src/components/tabs/test/badges/app/app.html b/src/components/tabs/test/badges/app/app.component.html
similarity index 100%
rename from src/components/tabs/test/badges/app/app.html
rename to src/components/tabs/test/badges/app/app.component.html
diff --git a/src/components/tabs/test/badges/app/app.component.ts b/src/components/tabs/test/badges/app/app.component.ts
index d39d5d5b31..92e18fce37 100644
--- a/src/components/tabs/test/badges/app/app.component.ts
+++ b/src/components/tabs/test/badges/app/app.component.ts
@@ -1,7 +1,8 @@
 import { Component, ViewEncapsulation } from '@angular/core';
+import { PageOne } from '../pages/page-one/page-one';
 
 @Component({
-  templateUrl: 'app.html',
+  templateUrl: 'app.component.html',
   encapsulation: ViewEncapsulation.None,
   styles: [
     `
@@ -22,7 +23,7 @@ import { Component, ViewEncapsulation } from '@angular/core';
     `
   ]
 })
-export class E2EApp {
-  root = 'E2EPage';
+export class AppComponent {
+  root = PageOne;
   myBadge: number = 55;
 }
diff --git a/src/components/tabs/test/badges/app/app.module.ts b/src/components/tabs/test/badges/app/app.module.ts
index dbf18fdf93..db30a4b820 100644
--- a/src/components/tabs/test/badges/app/app.module.ts
+++ b/src/components/tabs/test/badges/app/app.module.ts
@@ -2,23 +2,18 @@ import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { E2EApp } from './app.component';
+import { AppComponent } from './app.component';
+import { PageOneModule } from '../pages/page-one/page-one.module';
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp, {}, {
-      links: [
-        { loadChildren: '../pages/main-page/main.module#E2EPageModule', name: 'E2EPage' },
-      ]
-    })
+    IonicModule.forRoot(AppComponent, {}),
+    PageOneModule
   ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    E2EApp,
-  ]
+  bootstrap: [IonicApp]
 })
 export class AppModule {}
diff --git a/src/components/tabs/test/badges/pages/main-page/main.module.ts b/src/components/tabs/test/badges/pages/main-page/main.module.ts
deleted file mode 100644
index 1cc785fd59..0000000000
--- a/src/components/tabs/test/badges/pages/main-page/main.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { DeepLinkModule } from '../../../../../..';
-
-import { E2EPage } from './main';
-
-@NgModule({
-  declarations: [
-    E2EPage,
-  ],
-  imports: [
-    DeepLinkModule.forChild(E2EPage)
-  ],
-  entryComponents: [
-    E2EPage,
-  ]
-})
-export class E2EPageModule {}
diff --git a/src/components/tabs/test/badges/pages/main-page/main.ts b/src/components/tabs/test/badges/pages/main-page/main.ts
deleted file mode 100644
index ee769e7472..0000000000
--- a/src/components/tabs/test/badges/pages/main-page/main.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({template: 'hi'})
-export class E2EPage {}
diff --git a/src/components/tabs/test/badges/pages/page-one/page-one.module.ts b/src/components/tabs/test/badges/pages/page-one/page-one.module.ts
new file mode 100644
index 0000000000..8ff01f8895
--- /dev/null
+++ b/src/components/tabs/test/badges/pages/page-one/page-one.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+
+import { PageOne } from './page-one';
+
+@NgModule({
+  declarations: [
+    PageOne,
+  ],
+  imports: [
+    DeepLinkModule.forChild(PageOne)
+  ]
+})
+export class PageOneModule {}
diff --git a/src/components/tabs/test/badges/pages/page-one/page-one.ts b/src/components/tabs/test/badges/pages/page-one/page-one.ts
new file mode 100644
index 0000000000..a6c2e51cd2
--- /dev/null
+++ b/src/components/tabs/test/badges/pages/page-one/page-one.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+import { DeepLink } from '../../../../../..';
+
+@DeepLink()
+@Component({
+  template: 'hi'
+})
+export class PageOne {}
diff --git a/src/components/tabs/test/basic/app/app.component.ts b/src/components/tabs/test/basic/app/app.component.ts
index 46db227ce4..c49c14f63d 100644
--- a/src/components/tabs/test/basic/app/app.component.ts
+++ b/src/components/tabs/test/basic/app/app.component.ts
@@ -1,8 +1,9 @@
 import { Component } from '@angular/core';
+import { TabsPage } from '../pages/tabs-page/tabs-page';
 
 @Component({
   template: `<ion-nav [root]="root"></ion-nav>`
 })
-export class E2EApp {
-  root = 'TabsPage';
+export class AppComponent {
+  root = TabsPage;
 }
diff --git a/src/components/tabs/test/basic/app/app.module.ts b/src/components/tabs/test/basic/app/app.module.ts
index 465bcfba47..2eb2467409 100644
--- a/src/components/tabs/test/basic/app/app.module.ts
+++ b/src/components/tabs/test/basic/app/app.module.ts
@@ -2,35 +2,20 @@ import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { E2EApp } from './app.component';
-import { Tab1 } from '../components/tab1';
-import { Tab2 } from '../components/tab2';
-import { Tab3 } from '../components/tab3';
+import { AppComponent } from './app.component';
+import { TabsPageModule } from '../pages/tabs-page/tabs-page.module';
 
 @NgModule({
   declarations: [
-    E2EApp,
-    Tab1,
-    Tab2,
-    Tab3,
+    AppComponent,
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp, {
+    IonicModule.forRoot(AppComponent, {
       tabsHighlight: true,
-    }, {
-      links: [
-        { loadChildren: '../pages/tabs-page/tabs.module#TabsPageModule', name: 'TabsPage' },
-        { loadChildren: '../components/modal/modal.module#MyModalModule', name: 'MyModal' },
-      ]
-    })
+    }),
+    TabsPageModule
   ],
   bootstrap: [IonicApp],
-  entryComponents: [
-    E2EApp,
-    Tab1,
-    Tab2,
-    Tab3,
-  ]
 })
 export class AppModule {}
diff --git a/src/components/tabs/test/basic/components/tab1.ts b/src/components/tabs/test/basic/components/tab1.ts
deleted file mode 100644
index 93d30af186..0000000000
--- a/src/components/tabs/test/basic/components/tab1.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { Component } from '@angular/core';
-import { App, Tabs } from '../../../../..';
-
-@Component({
-  template: `
-    <ion-header>
-      <ion-navbar>
-        <ion-title>Settings</ion-title>
-      </ion-navbar>
-    </ion-header>
-
-    <ion-content>
-      <ion-list>
-        <ion-list-header>
-          Tab 1
-        </ion-list-header>
-        <ion-item *ngFor="let i of items">Item {{i}} {{i}} {{i}} {{i}}</ion-item>
-      </ion-list>
-      <p>
-        <button ion-button (click)="selectPrevious()">Select Previous Tab</button>
-      </p>
-      <p>
-        <button ion-button (click)="appNavPop()">App Nav Pop</button>
-      </p>
-    </ion-content>
-    `
-})
-export class Tab1 {
-  items: any[] = [];
-
-  constructor(private tabs: Tabs, private app: App) {
-    for (var i = 1; i <= 250; i++) {
-      this.items.push(i);
-    }
-  }
-
-  selectPrevious() {
-    this.tabs.select(this.tabs.previousTab());
-  }
-
-  appNavPop() {
-    this.app.navPop();
-  }
-}
diff --git a/src/components/tabs/test/basic/components/tab2.ts b/src/components/tabs/test/basic/components/tab2.ts
deleted file mode 100644
index 3cd06b9db9..0000000000
--- a/src/components/tabs/test/basic/components/tab2.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { Component } from '@angular/core';
-import { App, Tabs } from '../../../../..';
-
-@Component({
-  template: `
-    <ion-header>
-      <ion-navbar>
-        <ion-title>Schedule</ion-title>
-      </ion-navbar>
-    </ion-header>
-
-    <ion-content>
-      <ion-list>
-        <ion-item-sliding *ngFor="let session of sessions" #slidingItem>
-          <ion-item>
-            <h3>{{session.name}} {{session.name}} {{session.name}}</h3>
-            <p>{{session.location}} {{session.location}} {{session.location}}</p>
-          </ion-item>
-          <ion-item-options>
-            <button ion-button color="primary">Speaker<br>Info</button>
-            <button ion-button color="secondary">Add to<br>Favorites</button>
-          </ion-item-options>
-        </ion-item-sliding>
-      </ion-list>
-      <p>
-        <button ion-button (click)="selectPrevious()">Select Previous Tab</button>
-      </p>
-      <p>
-        <button ion-button (click)="appNavPop()">App Nav Pop</button>
-      </p>
-    </ion-content>
-  `
-})
-export class Tab2 {
-  sessions: any[] = [];
-
-  constructor(private tabs: Tabs, private app: App) {
-    for (var i = 1; i <= 250; i++) {
-      this.sessions.push({
-        name: 'Name ' + i,
-        location: 'Location: ' + i
-      });
-    }
-  }
-
-  selectPrevious() {
-    this.tabs.select(this.tabs.previousTab());
-  }
-
-  appNavPop() {
-    this.app.navPop();
-  }
-}
diff --git a/src/components/tabs/test/basic/components/tab3.ts b/src/components/tabs/test/basic/components/tab3.ts
deleted file mode 100644
index ae976c3c00..0000000000
--- a/src/components/tabs/test/basic/components/tab3.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import { Component } from '@angular/core';
-import { App, AlertController, ModalController, Tabs } from '../../../../..';
-
-@Component({
-  template: `
-    <ion-header>
-      <ion-navbar>
-        <button ion-button menuToggle>
-          <ion-icon name="menu"></ion-icon>
-        </button>
-        <ion-title>Stopwatch</ion-title>
-      </ion-navbar>
-    </ion-header>
-
-    <ion-content padding>
-      <h2>Tab 3</h2>
-      <p>
-        <button ion-button (click)="presentAlert()">Present Alert</button>
-        <button ion-button (click)="presentModal()">Present Modal</button>
-      </p>
-      <p>
-        <button ion-button (click)="selectPrevious()">Select Previous Tab</button>
-        <button ion-button (click)="appNavPop()">App Nav Pop</button>
-      </p>
-
-      <ion-list [virtualScroll]="items">
-
-        <ion-item *virtualItem="let item">
-          Item: {{item}}
-        </ion-item>
-
-      </ion-list>
-
-    </ion-content>
-    `
-})
-export class Tab3 {
-  items: number[] = [];
-
-  constructor(private alertCtrl: AlertController, private modalCtrl: ModalController, private tabs: Tabs, private app: App) {
-    for (var i = 0; i < 100; i++) {
-      this.items.push(i);
-    }
-  }
-
-  presentAlert() {
-    let alert = this.alertCtrl.create({
-      title: 'Alert Title!',
-      buttons: ['Dismiss']
-    });
-    alert.present();
-  }
-
-  presentModal() {
-    this.modalCtrl.create('MyModal').present();
-  }
-
-  selectPrevious() {
-    this.tabs.select(this.tabs.previousTab());
-  }
-
-  appNavPop() {
-    this.app.navPop();
-  }
-}
diff --git a/src/components/tabs/test/basic/pages/modal-page/modal-page.html b/src/components/tabs/test/basic/pages/modal-page/modal-page.html
new file mode 100644
index 0000000000..9bdd5415b2
--- /dev/null
+++ b/src/components/tabs/test/basic/pages/modal-page/modal-page.html
@@ -0,0 +1,35 @@
+<ion-header>
+<ion-toolbar>
+  <ion-buttons start>
+    <button ion-button (click)="dismiss()">Cancel</button>
+  </ion-buttons>
+
+  <ion-title>
+    Filter Sessions
+  </ion-title>
+
+  <ion-buttons end>
+    <button ion-button (click)="dismiss()">Done</button>
+  </ion-buttons>
+</ion-toolbar>
+</ion-header>
+
+<ion-content class="outer-content">
+<ion-list>
+  <ion-list-header>Tracks</ion-list-header>
+
+  <ion-item *ngFor="let i of items">
+    <ion-label>Toggle {{i}}</ion-label>
+    <ion-toggle color="secondary"></ion-toggle>
+  </ion-item>
+</ion-list>
+
+<ion-list>
+  <button ion-item color="danger" detail-none>
+    Reset All Filters
+  </button>
+  <button ion-item color="danger" detail-none (click)="appNavPop()">
+    App Nav Pop
+  </button>
+</ion-list>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/tabs/test/basic/pages/modal-page/modal-page.module.ts b/src/components/tabs/test/basic/pages/modal-page/modal-page.module.ts
new file mode 100644
index 0000000000..2ce0aa93ce
--- /dev/null
+++ b/src/components/tabs/test/basic/pages/modal-page/modal-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+
+import { ModalPage } from './modal-page';
+
+@NgModule({
+  declarations: [
+    ModalPage,
+  ],
+  imports: [
+    DeepLinkModule.forChild(ModalPage)
+  ]
+})
+export class ModalPageModule {}
diff --git a/src/components/tabs/test/basic/pages/modal-page/modal-page.ts b/src/components/tabs/test/basic/pages/modal-page/modal-page.ts
new file mode 100644
index 0000000000..c58ce21236
--- /dev/null
+++ b/src/components/tabs/test/basic/pages/modal-page/modal-page.ts
@@ -0,0 +1,26 @@
+import { Component } from '@angular/core';
+import { App, DeepLink, ViewController } from '../../../../../..';
+
+@DeepLink()
+@Component({
+  templateUrl: 'modal-page.html'
+})
+export class ModalPage {
+  items: any[] = [];
+
+  constructor(private viewCtrl: ViewController, private app: App) {
+    for (var i = 1; i <= 10; i++) {
+      this.items.push(i);
+    }
+  }
+
+  dismiss() {
+    // using the injected ViewController this page
+    // can "dismiss" itself and pass back data
+    this.viewCtrl.dismiss();
+  }
+
+  appNavPop() {
+    this.app.navPop();
+  }
+}
diff --git a/src/components/tabs/test/basic/pages/tab-one/tab-one.html b/src/components/tabs/test/basic/pages/tab-one/tab-one.html
new file mode 100644
index 0000000000..f5a92975bd
--- /dev/null
+++ b/src/components/tabs/test/basic/pages/tab-one/tab-one.html
@@ -0,0 +1,20 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Settings</ion-title>
+  </ion-navbar>
+</ion-header>
+
+<ion-content>
+  <ion-list>
+    <ion-list-header>
+      Tab 1
+    </ion-list-header>
+    <ion-item *ngFor="let i of items">Item {{i}} {{i}} {{i}} {{i}}</ion-item>
+  </ion-list>
+  <p>
+    <button ion-button (click)="selectPrevious()">Select Previous Tab</button>
+  </p>
+  <p>
+    <button ion-button (click)="appNavPop()">App Nav Pop</button>
+  </p>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/tabs/test/basic/pages/tab-one/tab-one.module.ts b/src/components/tabs/test/basic/pages/tab-one/tab-one.module.ts
new file mode 100644
index 0000000000..51f5c21ce5
--- /dev/null
+++ b/src/components/tabs/test/basic/pages/tab-one/tab-one.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+
+import { TabOne } from './tab-one';
+
+@NgModule({
+  declarations: [
+    TabOne,
+  ],
+  imports: [
+    DeepLinkModule.forChild(TabOne)
+  ]
+})
+export class TabOneModule {}
diff --git a/src/components/tabs/test/basic/pages/tab-one/tab-one.ts b/src/components/tabs/test/basic/pages/tab-one/tab-one.ts
new file mode 100644
index 0000000000..a820171c77
--- /dev/null
+++ b/src/components/tabs/test/basic/pages/tab-one/tab-one.ts
@@ -0,0 +1,24 @@
+import { Component } from '@angular/core';
+import { App, DeepLink, Tabs } from '../../../../../..';
+
+@DeepLink()
+@Component({
+  templateUrl: 'tab-one.html'
+})
+export class TabOne {
+  items: any[] = [];
+
+  constructor(private tabs: Tabs, private app: App) {
+    for (var i = 1; i <= 250; i++) {
+      this.items.push(i);
+    }
+  }
+
+  selectPrevious() {
+    this.tabs.select(this.tabs.previousTab());
+  }
+
+  appNavPop() {
+    this.app.navPop();
+  }
+}
diff --git a/src/components/tabs/test/basic/pages/tab-three/tab-three.html b/src/components/tabs/test/basic/pages/tab-three/tab-three.html
new file mode 100644
index 0000000000..c680a2504b
--- /dev/null
+++ b/src/components/tabs/test/basic/pages/tab-three/tab-three.html
@@ -0,0 +1,29 @@
+<ion-header>
+  <ion-navbar>
+    <button ion-button menuToggle>
+      <ion-icon name="menu"></ion-icon>
+    </button>
+    <ion-title>Stopwatch</ion-title>
+  </ion-navbar>
+</ion-header>
+
+<ion-content padding>
+  <h2>Tab 3</h2>
+  <p>
+    <button ion-button (click)="presentAlert()">Present Alert</button>
+    <button ion-button (click)="presentModal()">Present Modal</button>
+  </p>
+  <p>
+    <button ion-button (click)="selectPrevious()">Select Previous Tab</button>
+    <button ion-button (click)="appNavPop()">App Nav Pop</button>
+  </p>
+
+  <ion-list [virtualScroll]="items">
+
+    <ion-item *virtualItem="let item">
+      Item: {{item}}
+    </ion-item>
+
+  </ion-list>
+
+</ion-content>
\ No newline at end of file
diff --git a/src/components/tabs/test/basic/pages/tab-three/tab-three.module.ts b/src/components/tabs/test/basic/pages/tab-three/tab-three.module.ts
new file mode 100644
index 0000000000..dd328d8d63
--- /dev/null
+++ b/src/components/tabs/test/basic/pages/tab-three/tab-three.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+
+import { TabThree } from './tab-three';
+
+@NgModule({
+  declarations: [
+    TabThree,
+  ],
+  imports: [
+    DeepLinkModule.forChild(TabThree)
+  ]
+})
+export class TabThreeModule {}
diff --git a/src/components/tabs/test/basic/pages/tab-three/tab-three.ts b/src/components/tabs/test/basic/pages/tab-three/tab-three.ts
new file mode 100644
index 0000000000..475860ebb0
--- /dev/null
+++ b/src/components/tabs/test/basic/pages/tab-three/tab-three.ts
@@ -0,0 +1,36 @@
+import { Component } from '@angular/core';
+import { App, AlertController, DeepLink, ModalController, Tabs } from '../../../../../..';
+
+@DeepLink()
+@Component({
+  templateUrl: 'tab-three.html'
+})
+export class TabThree {
+  items: number[] = [];
+
+  constructor(private alertCtrl: AlertController, private modalCtrl: ModalController, private tabs: Tabs, private app: App) {
+    for (var i = 0; i < 100; i++) {
+      this.items.push(i);
+    }
+  }
+
+  presentAlert() {
+    let alert = this.alertCtrl.create({
+      title: 'Alert Title!',
+      buttons: ['Dismiss']
+    });
+    alert.present();
+  }
+
+  presentModal() {
+    this.modalCtrl.create('ModalPage').present();
+  }
+
+  selectPrevious() {
+    this.tabs.select(this.tabs.previousTab());
+  }
+
+  appNavPop() {
+    this.app.navPop();
+  }
+}
diff --git a/src/components/tabs/test/basic/pages/tab-two/tab-two.html b/src/components/tabs/test/basic/pages/tab-two/tab-two.html
new file mode 100644
index 0000000000..9b97fbd53f
--- /dev/null
+++ b/src/components/tabs/test/basic/pages/tab-two/tab-two.html
@@ -0,0 +1,26 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Schedule</ion-title>
+  </ion-navbar>
+</ion-header>
+
+<ion-content>
+  <ion-list>
+    <ion-item-sliding *ngFor="let session of sessions" #slidingItem>
+      <ion-item>
+        <h3>{{session.name}} {{session.name}} {{session.name}}</h3>
+        <p>{{session.location}} {{session.location}} {{session.location}}</p>
+      </ion-item>
+      <ion-item-options>
+        <button ion-button color="primary">Speaker<br>Info</button>
+        <button ion-button color="secondary">Add to<br>Favorites</button>
+      </ion-item-options>
+    </ion-item-sliding>
+  </ion-list>
+  <p>
+    <button ion-button (click)="selectPrevious()">Select Previous Tab</button>
+  </p>
+  <p>
+    <button ion-button (click)="appNavPop()">App Nav Pop</button>
+  </p>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/tabs/test/basic/pages/tab-two/tab-two.module.ts b/src/components/tabs/test/basic/pages/tab-two/tab-two.module.ts
new file mode 100644
index 0000000000..5852705841
--- /dev/null
+++ b/src/components/tabs/test/basic/pages/tab-two/tab-two.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+
+import { TabTwo } from './tab-two';
+
+@NgModule({
+  declarations: [
+    TabTwo,
+  ],
+  imports: [
+    DeepLinkModule.forChild(TabTwo)
+  ]
+})
+export class TabTwoModule {}
diff --git a/src/components/tabs/test/basic/pages/tab-two/tab-two.ts b/src/components/tabs/test/basic/pages/tab-two/tab-two.ts
new file mode 100644
index 0000000000..48d3a71eaa
--- /dev/null
+++ b/src/components/tabs/test/basic/pages/tab-two/tab-two.ts
@@ -0,0 +1,27 @@
+import { Component } from '@angular/core';
+import { App, DeepLink, Tabs } from '../../../../../..';
+
+@DeepLink()
+@Component({
+  templateUrl: 'tab-two.html'
+})
+export class TabTwo {
+  sessions: any[] = [];
+
+  constructor(private tabs: Tabs, private app: App) {
+    for (var i = 1; i <= 250; i++) {
+      this.sessions.push({
+        name: 'Name ' + i,
+        location: 'Location: ' + i
+      });
+    }
+  }
+
+  selectPrevious() {
+    this.tabs.select(this.tabs.previousTab());
+  }
+
+  appNavPop() {
+    this.app.navPop();
+  }
+}
diff --git a/src/components/tabs/test/basic/pages/tabs-page/tabs-page.html b/src/components/tabs/test/basic/pages/tabs-page/tabs-page.html
new file mode 100644
index 0000000000..9517412edf
--- /dev/null
+++ b/src/components/tabs/test/basic/pages/tabs-page/tabs-page.html
@@ -0,0 +1,22 @@
+<ion-menu [content]="content">
+  <ion-header>
+    <ion-toolbar color="secondary">
+      <ion-title>Menu</ion-title>
+    </ion-toolbar>
+  </ion-header>
+  <ion-content>
+    <ion-list>
+      <button ion-item menuClose detail-none>
+        Close Menu
+      </button>
+    </ion-list>
+  </ion-content>
+</ion-menu>
+
+<ion-tabs #content (ionChange)="onChange($event)" [color]="myColor">
+  <ion-tab tabTitle="Plain List" tabIcon="star" [root]="root1" (ionSelect)="onSelect($event)"></ion-tab>
+  <ion-tab tabTitle="Schedule" tabIcon="globe" [root]="root2"></ion-tab>
+  <ion-tab tabTitle="Stopwatch" tabIcon="logo-facebook" [root]="root3"></ion-tab>
+  <ion-tab tabTitle="Messages" tabIcon="md-chatboxes" [root]="root1"></ion-tab>
+  <ion-tab tabTitle="My Profile" tabIcon="ios-person" [root]="root2"></ion-tab>
+</ion-tabs>
\ No newline at end of file
diff --git a/src/components/searchbar/test/nav/pages/tabs-page/tabs.module.ts b/src/components/tabs/test/basic/pages/tabs-page/tabs-page.module.ts
similarity index 56%
rename from src/components/searchbar/test/nav/pages/tabs-page/tabs.module.ts
rename to src/components/tabs/test/basic/pages/tabs-page/tabs-page.module.ts
index 75e3e2ff5c..52d3abb70d 100644
--- a/src/components/searchbar/test/nav/pages/tabs-page/tabs.module.ts
+++ b/src/components/tabs/test/basic/pages/tabs-page/tabs-page.module.ts
@@ -1,17 +1,16 @@
 import { NgModule } from '@angular/core';
 import { DeepLinkModule } from '../../../../../..';
 
-import { TabsPage } from './tabs';
+import { TabsPage } from './tabs-page';
+import { TabOneModule } from '../tab-one/tab-one.module';
 
 @NgModule({
   declarations: [
     TabsPage,
   ],
   imports: [
-    DeepLinkModule.forChild(TabsPage)
-  ],
-  entryComponents: [
-    TabsPage,
+    DeepLinkModule.forChild(TabsPage),
+    TabOneModule
   ]
 })
 export class TabsPageModule {}
diff --git a/src/components/tabs/test/basic/pages/tabs-page/tabs-page.ts b/src/components/tabs/test/basic/pages/tabs-page/tabs-page.ts
new file mode 100644
index 0000000000..a65d2837f4
--- /dev/null
+++ b/src/components/tabs/test/basic/pages/tabs-page/tabs-page.ts
@@ -0,0 +1,27 @@
+import { Component } from '@angular/core';
+import { Config, DeepLink, Tab } from '../../../../../..';
+
+import { TabOne } from '../tab-one/tab-one';
+
+@DeepLink()
+@Component({
+  templateUrl: 'tabs-page.html'
+})
+export class TabsPage {
+  root1 = TabOne;
+  root2 = 'TabTwo';
+  root3 = 'TabThree';
+  myColor: string;
+
+  constructor(config: Config) {
+    this.myColor = (config.get('mode') !== 'ios') ? 'primary' : null;
+  }
+
+  onChange(ev: Tab) {
+    console.log('Changed tab', ev);
+  }
+
+  onSelect(ev: Tab) {
+    console.log('Selected tab', ev);
+  }
+}
diff --git a/src/components/tabs/test/basic/pages/tabs-page/tabs.ts b/src/components/tabs/test/basic/pages/tabs-page/tabs.ts
deleted file mode 100644
index a33f3db31f..0000000000
--- a/src/components/tabs/test/basic/pages/tabs-page/tabs.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { Component } from '@angular/core';
-import { Config, Tab } from '../../../../../..';
-
-import { Tab1 } from '../../components/tab1';
-import { Tab2 } from '../../components/tab2';
-import { Tab3 } from '../../components/tab3';
-
-@Component({
-  template: `
-    <ion-menu [content]="content">
-      <ion-header>
-        <ion-toolbar color="secondary">
-          <ion-title>Menu</ion-title>
-        </ion-toolbar>
-      </ion-header>
-      <ion-content>
-        <ion-list>
-          <button ion-item menuClose detail-none>
-            Close Menu
-          </button>
-        </ion-list>
-      </ion-content>
-    </ion-menu>
-
-    <ion-tabs #content (ionChange)="onChange($event)" [color]="myColor">
-      <ion-tab tabTitle="Plain List" tabIcon="star" [root]="root1" (ionSelect)="onSelect($event)"></ion-tab>
-      <ion-tab tabTitle="Schedule" tabIcon="globe" [root]="root2"></ion-tab>
-      <ion-tab tabTitle="Stopwatch" tabIcon="logo-facebook" [root]="root3"></ion-tab>
-      <ion-tab tabTitle="Messages" tabIcon="md-chatboxes" [root]="root1"></ion-tab>
-      <ion-tab tabTitle="My Profile" tabIcon="ios-person" [root]="root2"></ion-tab>
-    </ion-tabs>
-  `
-})
-export class TabsPage {
-  root1 = Tab1;
-  root2 = Tab2;
-  root3 = Tab3;
-  myColor: string;
-
-  constructor(config: Config) {
-    this.myColor = (config.get('mode') !== 'ios') ? 'primary' : null;
-  }
-
-  onChange(ev: Tab) {
-    console.log('Changed tab', ev);
-  }
-
-  onSelect(ev: Tab) {
-    console.log('Selected tab', ev);
-  }
-}
diff --git a/src/components/tabs/test/colors/app/app.html b/src/components/tabs/test/colors/app/app.component.html
similarity index 100%
rename from src/components/tabs/test/colors/app/app.html
rename to src/components/tabs/test/colors/app/app.component.html
diff --git a/src/components/tabs/test/colors/app/app.component.ts b/src/components/tabs/test/colors/app/app.component.ts
index ba713b7aa0..937ce96677 100644
--- a/src/components/tabs/test/colors/app/app.component.ts
+++ b/src/components/tabs/test/colors/app/app.component.ts
@@ -1,7 +1,8 @@
 import { Component, ViewEncapsulation } from '@angular/core';
+import { PageOne } from '../pages/page-one/page-one';
 
 @Component({
-  templateUrl: 'app.html',
+  templateUrl: 'app.component.html',
   encapsulation: ViewEncapsulation.None,
   styles: [
     `
@@ -23,6 +24,6 @@ import { Component, ViewEncapsulation } from '@angular/core';
     `
   ]
 })
-export class E2EApp {
-  root = 'E2EPage';
+export class AppComponent {
+  root = PageOne;
 }
diff --git a/src/components/tabs/test/colors/app/app.module.ts b/src/components/tabs/test/colors/app/app.module.ts
index 791669231e..db30a4b820 100644
--- a/src/components/tabs/test/colors/app/app.module.ts
+++ b/src/components/tabs/test/colors/app/app.module.ts
@@ -2,23 +2,18 @@ import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { E2EApp } from './app.component';
+import { AppComponent } from './app.component';
+import { PageOneModule } from '../pages/page-one/page-one.module';
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp, {}, {
-      links: [
-        { loadChildren: '../pages/main/main.module#E2EPageModule', name: 'E2EPage' },
-      ]
-    })
+    IonicModule.forRoot(AppComponent, {}),
+    PageOneModule
   ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    E2EApp,
-  ]
+  bootstrap: [IonicApp]
 })
 export class AppModule {}
diff --git a/src/components/tabs/test/colors/pages/main/main.module.ts b/src/components/tabs/test/colors/pages/main/main.module.ts
deleted file mode 100644
index 1cc785fd59..0000000000
--- a/src/components/tabs/test/colors/pages/main/main.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { DeepLinkModule } from '../../../../../..';
-
-import { E2EPage } from './main';
-
-@NgModule({
-  declarations: [
-    E2EPage,
-  ],
-  imports: [
-    DeepLinkModule.forChild(E2EPage)
-  ],
-  entryComponents: [
-    E2EPage,
-  ]
-})
-export class E2EPageModule {}
diff --git a/src/components/tabs/test/colors/pages/main/main.ts b/src/components/tabs/test/colors/pages/main/main.ts
deleted file mode 100644
index ee769e7472..0000000000
--- a/src/components/tabs/test/colors/pages/main/main.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({template: 'hi'})
-export class E2EPage {}
diff --git a/src/components/tabs/test/colors/pages/page-one/page-one.module.ts b/src/components/tabs/test/colors/pages/page-one/page-one.module.ts
new file mode 100644
index 0000000000..8ff01f8895
--- /dev/null
+++ b/src/components/tabs/test/colors/pages/page-one/page-one.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+
+import { PageOne } from './page-one';
+
+@NgModule({
+  declarations: [
+    PageOne,
+  ],
+  imports: [
+    DeepLinkModule.forChild(PageOne)
+  ]
+})
+export class PageOneModule {}
diff --git a/src/components/tabs/test/colors/pages/page-one/page-one.ts b/src/components/tabs/test/colors/pages/page-one/page-one.ts
new file mode 100644
index 0000000000..a6c2e51cd2
--- /dev/null
+++ b/src/components/tabs/test/colors/pages/page-one/page-one.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+import { DeepLink } from '../../../../../..';
+
+@DeepLink()
+@Component({
+  template: 'hi'
+})
+export class PageOne {}
diff --git a/src/components/toast/test/basic/app/app.component.ts b/src/components/toast/test/basic/app/app.component.ts
new file mode 100644
index 0000000000..e84bb7d13a
--- /dev/null
+++ b/src/components/toast/test/basic/app/app.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { PageOne } from '../pages/page-one/page-one';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = PageOne;
+}
diff --git a/src/components/toast/test/basic/app/app.module.ts b/src/components/toast/test/basic/app/app.module.ts
index 9fa31dbf42..c2bb850b8f 100644
--- a/src/components/toast/test/basic/app/app.module.ts
+++ b/src/components/toast/test/basic/app/app.module.ts
@@ -1,108 +1,19 @@
-import { Component, NgModule } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import { IonicApp, IonicModule, Toast, ToastController, NavController } from '../../../../..';
+import { IonicApp, IonicModule } from '../../../../..';
 
-@Component({
-  templateUrl: 'main.html'
-})
-export class E2EPage {
-
-  constructor(public toastCtrl: ToastController, public navCtrl: NavController) { }
-
-  showToast() {
-    const toast = this.toastCtrl.create({
-      message: 'User was created successfully'
-    });
-
-    toast.onDidDismiss(() => {
-      console.log('Dismissed toast');
-    });
-
-    toast.present();
-
-    setTimeout(() => {
-      this.navCtrl.push('RootPage');
-    }, 1000);
-
-    setTimeout(() => {
-      toast.dismiss();
-    }, 2000);
-  }
-
-  showLongToast() {
-    const toast = this.toastCtrl.create({
-      message: 'Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ea voluptatibus quibusdam eum nihil optio, ullam accusamus magni, nobis suscipit reprehenderit, sequi quam amet impedit. Accusamus dolorem voluptates laborum dolor obcaecati.',
-      duration: 5000,
-      cssClass: 'custom-class my-toast'
-    });
-
-    toast.onDidDismiss(this.dismissHandler);
-    toast.present();
-  }
-
-  showDismissDurationToast() {
-    const toast = this.toastCtrl.create({
-      message: 'I am dismissed after 1.5 seconds',
-      duration: 1500
-    });
-    toast.onDidDismiss(this.dismissHandler);
-    toast.present();
-  }
-
-  showToastWithCloseButton(positionString: string) {
-    const toast = this.toastCtrl.create({
-      message: 'Your internet connection appears to be offline. Data integrity is not gauranteed.',
-      showCloseButton: true,
-      closeButtonText: 'Ok',
-      position: positionString
-    });
-    toast.onDidDismiss(this.dismissHandler);
-    toast.present();
-  }
-
-  showDismissPageChangeToast() {
-    const toast = this.toastCtrl.create({
-      message: 'I am dismissed on page change',
-      dismissOnPageChange: true
-    });
-    toast.onDidDismiss(this.dismissHandler);
-    toast.present();
-
-    setTimeout(() => {
-      this.navCtrl.push('RootPage');
-    }, 1000);
-  }
-
-  private dismissHandler(toast: Toast) {
-    console.info('Toast onDidDismiss()');
-  }
-
-}
-
-@Component({
-  template: '<ion-nav [root]="root"></ion-nav>'
-})
-export class E2EApp {
-  root = E2EPage;
-}
+import { AppComponent } from './app.component';
+import { PageOneModule } from '../pages/page-one/page-one.module';
 
 @NgModule({
   declarations: [
-    E2EApp,
-    E2EPage
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp, {}, {
-      links: [
-        { loadChildren: '../pages/root-page/root-page.module#RootPageModule', name: 'RootPage' }
-      ]
-    })
+    IonicModule.forRoot(AppComponent, {}),
+    PageOneModule
   ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    E2EApp,
-    E2EPage
-  ]
+  bootstrap: [IonicApp]
 })
 export class AppModule {}
diff --git a/src/components/toast/test/basic/app/main.html b/src/components/toast/test/basic/pages/page-one/page-one.html
similarity index 100%
rename from src/components/toast/test/basic/app/main.html
rename to src/components/toast/test/basic/pages/page-one/page-one.html
diff --git a/src/components/toast/test/basic/pages/page-one/page-one.module.ts b/src/components/toast/test/basic/pages/page-one/page-one.module.ts
new file mode 100644
index 0000000000..530eef8465
--- /dev/null
+++ b/src/components/toast/test/basic/pages/page-one/page-one.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../../';
+
+import { PageOne } from './page-one';
+
+@NgModule({
+  declarations: [
+    PageOne
+  ],
+  imports: [
+    DeepLinkModule.forChild(PageOne)
+  ]
+})
+export class PageOneModule {}
diff --git a/src/components/toast/test/basic/pages/page-one/page-one.ts b/src/components/toast/test/basic/pages/page-one/page-one.ts
new file mode 100644
index 0000000000..0718f5490b
--- /dev/null
+++ b/src/components/toast/test/basic/pages/page-one/page-one.ts
@@ -0,0 +1,80 @@
+import { Component } from '@angular/core';
+import { DeepLink, NavController, Toast, ToastController } from '../../../../../..';
+
+@DeepLink()
+@Component({
+  templateUrl: 'page-one.html'
+})
+export class PageOne {
+
+  constructor(public navCtrl: NavController, public toastCtrl: ToastController) { }
+
+  showToast() {
+    const toast = this.toastCtrl.create({
+      message: 'User was created successfully'
+    });
+
+    toast.onDidDismiss(() => {
+      console.log('Dismissed toast');
+    });
+
+    toast.present();
+
+    setTimeout(() => {
+      this.navCtrl.push('PageTwo');
+    }, 1000);
+
+    setTimeout(() => {
+      toast.dismiss();
+    }, 2000);
+  }
+
+  showLongToast() {
+    const toast = this.toastCtrl.create({
+      message: 'Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ea voluptatibus quibusdam eum nihil optio, ullam accusamus magni, nobis suscipit reprehenderit, sequi quam amet impedit. Accusamus dolorem voluptates laborum dolor obcaecati.',
+      duration: 5000,
+      cssClass: 'custom-class my-toast'
+    });
+
+    toast.onDidDismiss(this.dismissHandler);
+    toast.present();
+  }
+
+  showDismissDurationToast() {
+    const toast = this.toastCtrl.create({
+      message: 'I am dismissed after 1.5 seconds',
+      duration: 1500
+    });
+    toast.onDidDismiss(this.dismissHandler);
+    toast.present();
+  }
+
+  showToastWithCloseButton(positionString: string) {
+    const toast = this.toastCtrl.create({
+      message: 'Your internet connection appears to be offline. Data integrity is not gauranteed.',
+      showCloseButton: true,
+      closeButtonText: 'Ok',
+      position: positionString
+    });
+    toast.onDidDismiss(this.dismissHandler);
+    toast.present();
+  }
+
+  showDismissPageChangeToast() {
+    const toast = this.toastCtrl.create({
+      message: 'I am dismissed on page change',
+      dismissOnPageChange: true
+    });
+    toast.onDidDismiss(this.dismissHandler);
+    toast.present();
+
+    setTimeout(() => {
+      this.navCtrl.push('PageTwo');
+    }, 1000);
+  }
+
+  private dismissHandler(toast: Toast) {
+    console.info('Toast onDidDismiss()');
+  }
+
+}
diff --git a/src/components/toast/test/basic/pages/page-two/page-two.html b/src/components/toast/test/basic/pages/page-two/page-two.html
new file mode 100644
index 0000000000..c0c251d47e
--- /dev/null
+++ b/src/components/toast/test/basic/pages/page-two/page-two.html
@@ -0,0 +1,8 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Another Page</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content padding>
+  <p>This is another page to show that the toast stays.</p>
+</ion-content>
\ No newline at end of file
diff --git a/src/components/toast/test/basic/pages/page-two/page-two.module.ts b/src/components/toast/test/basic/pages/page-two/page-two.module.ts
new file mode 100644
index 0000000000..f77abe6f1a
--- /dev/null
+++ b/src/components/toast/test/basic/pages/page-two/page-two.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../../';
+
+import { PageTwo } from './page-two';
+
+@NgModule({
+  declarations: [
+    PageTwo
+  ],
+  imports: [
+    DeepLinkModule.forChild(PageTwo)
+  ]
+})
+export class PageTwoModule {}
diff --git a/src/components/toast/test/basic/pages/page-two/page-two.ts b/src/components/toast/test/basic/pages/page-two/page-two.ts
new file mode 100644
index 0000000000..cf57da059d
--- /dev/null
+++ b/src/components/toast/test/basic/pages/page-two/page-two.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+import { DeepLink } from '../../../../../..';
+
+@DeepLink()
+@Component({
+  templateUrl: 'page-two.html'
+})
+export class PageTwo {}
diff --git a/src/components/toast/test/basic/pages/root-page/root-page.ts b/src/components/toast/test/basic/pages/root-page/root-page.ts
deleted file mode 100644
index e5253b27c0..0000000000
--- a/src/components/toast/test/basic/pages/root-page/root-page.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  template: `
-    <ion-header>
-      <ion-navbar>
-        <ion-title>Another Page</ion-title>
-      </ion-navbar>
-    </ion-header>
-    <ion-content padding>
-      <p>This is another page to show that the toast stays.</p>
-    </ion-content>
-  `
-})
-export class RootPage {}