diff --git a/ionic/components/app/test/animations/index.ts b/demos/animations/index.ts
similarity index 100%
rename from ionic/components/app/test/animations/index.ts
rename to demos/animations/index.ts
diff --git a/ionic/components/app/test/animations/main.html b/demos/animations/main.html
similarity index 100%
rename from ionic/components/app/test/animations/main.html
rename to demos/animations/main.html
diff --git a/ionic/components/app/test/barkpark/index.ts b/demos/barkpark/index.ts
similarity index 100%
rename from ionic/components/app/test/barkpark/index.ts
rename to demos/barkpark/index.ts
diff --git a/ionic/components/app/test/barkpark/pages/app.html b/demos/barkpark/pages/app.html
similarity index 100%
rename from ionic/components/app/test/barkpark/pages/app.html
rename to demos/barkpark/pages/app.html
diff --git a/ionic/components/app/test/barkpark/pages/login.html b/demos/barkpark/pages/login.html
similarity index 100%
rename from ionic/components/app/test/barkpark/pages/login.html
rename to demos/barkpark/pages/login.html
diff --git a/ionic/components/app/test/barkpark/pages/post/detail.html b/demos/barkpark/pages/post/detail.html
similarity index 100%
rename from ionic/components/app/test/barkpark/pages/post/detail.html
rename to demos/barkpark/pages/post/detail.html
diff --git a/ionic/components/app/test/barkpark/pages/signup.html b/demos/barkpark/pages/signup.html
similarity index 100%
rename from ionic/components/app/test/barkpark/pages/signup.html
rename to demos/barkpark/pages/signup.html
diff --git a/ionic/components/app/test/barkpark/pages/splash.html b/demos/barkpark/pages/splash.html
similarity index 100%
rename from ionic/components/app/test/barkpark/pages/splash.html
rename to demos/barkpark/pages/splash.html
diff --git a/ionic/components/app/test/barkpark/pages/tabs/home.html b/demos/barkpark/pages/tabs/home.html
similarity index 100%
rename from ionic/components/app/test/barkpark/pages/tabs/home.html
rename to demos/barkpark/pages/tabs/home.html
diff --git a/ionic/components/app/test/hn/hn.ts b/demos/hn/hn.ts
similarity index 100%
rename from ionic/components/app/test/hn/hn.ts
rename to demos/hn/hn.ts
diff --git a/ionic/components/app/test/hn/index.ts b/demos/hn/index.ts
similarity index 100%
rename from ionic/components/app/test/hn/index.ts
rename to demos/hn/index.ts
diff --git a/ionic/components/app/test/hn/main.html b/demos/hn/main.html
similarity index 100%
rename from ionic/components/app/test/hn/main.html
rename to demos/hn/main.html
diff --git a/ionic/components/app/test/hn/pages/single.html b/demos/hn/pages/single.html
similarity index 100%
rename from ionic/components/app/test/hn/pages/single.html
rename to demos/hn/pages/single.html
diff --git a/ionic/components/app/test/hn/pages/single.ts b/demos/hn/pages/single.ts
similarity index 100%
rename from ionic/components/app/test/hn/pages/single.ts
rename to demos/hn/pages/single.ts
diff --git a/ionic/components/app/test/hn/pages/top.html b/demos/hn/pages/top.html
similarity index 100%
rename from ionic/components/app/test/hn/pages/top.html
rename to demos/hn/pages/top.html
diff --git a/ionic/components/app/test/material/index.ts b/demos/material/index.ts
similarity index 100%
rename from ionic/components/app/test/material/index.ts
rename to demos/material/index.ts
diff --git a/ionic/components/app/test/music/index.ts b/demos/music/index.ts
similarity index 100%
rename from ionic/components/app/test/music/index.ts
rename to demos/music/index.ts
diff --git a/ionic/components/app/test/music/main.html b/demos/music/main.html
similarity index 100%
rename from ionic/components/app/test/music/main.html
rename to demos/music/main.html
diff --git a/ionic/components/app/test/music/menu.jpg b/demos/music/menu.jpg
similarity index 100%
rename from ionic/components/app/test/music/menu.jpg
rename to demos/music/menu.jpg
diff --git a/ionic/components/app/test/music/menu.png b/demos/music/menu.png
similarity index 100%
rename from ionic/components/app/test/music/menu.png
rename to demos/music/menu.png
diff --git a/ionic/components/app/test/music/pages/app.html b/demos/music/pages/app.html
similarity index 100%
rename from ionic/components/app/test/music/pages/app.html
rename to demos/music/pages/app.html
diff --git a/demos/native/index.ts b/demos/native/index.ts
new file mode 100644
index 0000000000..e2bbea6418
--- /dev/null
+++ b/demos/native/index.ts
@@ -0,0 +1,33 @@
+import {Component} from 'angular2/angular2';
+import {Control, ControlGroup} from 'angular2/forms';
+
+import {App, Http} from 'ionic/ionic';
+
+import {Camera, Geolocation, Vibration, Battery, Device} from 'ionic/ionic';
+
+import {CameraPage} from 'pages/camera';
+import {BatteryPage} from 'pages/battery';
+import {ContactsPage} from 'pages/contacts';
+import {DevicePage} from 'pages/device';
+import {DeviceMotionPage} from 'pages/device-motion';
+import {GeolocationPage} from 'pages/geolocation';
+import {VibrationPage} from 'pages/vibration';
+
+@App({
+  templateUrl: 'main.html'
+})
+class IonicApp {
+  constructor() {
+    this.firstPage = CameraPage;
+    console.log('First page', CameraPage);
+    this.plugins = [
+      {title: 'Camera', page: CameraPage},
+      {title: 'Device', page: DevicePage},
+      {title: 'Device Motion', page: DeviceMotionPage},
+      {title: 'Geolocation', page: GeolocationPage},
+      {title: 'Contacts', page: ContactsPage},
+      {title: 'Battery', page: BatteryPage},
+      {title: 'Vibration', page: VibrationPage},
+    ]
+  }
+}
diff --git a/demos/native/main.html b/demos/native/main.html
new file mode 100644
index 0000000000..4543760755
--- /dev/null
+++ b/demos/native/main.html
@@ -0,0 +1,12 @@
+<ion-aside #aside [content]="content" id="mainMenu">
+  <ion-toolbar><ion-title>Plugins</ion-title></ion-toolbar>
+  <ion-content>
+    <ion-list>
+      <ion-item *ng-for="#p of plugins" (^click)="openPage(aside, p)">
+        <span>{{p.title}}</span>
+      </ion-item>
+    </ion-list>
+  </ion-content>
+</ion-aside>
+
+<ion-nav #content swipe-back-enabled="false" [root]="firstPage"></ion-nav>
diff --git a/ionic/components/app/test/native/pages/battery.ts b/demos/native/pages/battery.ts
similarity index 100%
rename from ionic/components/app/test/native/pages/battery.ts
rename to demos/native/pages/battery.ts
diff --git a/ionic/components/app/test/native/pages/camera.ts b/demos/native/pages/camera.ts
similarity index 100%
rename from ionic/components/app/test/native/pages/camera.ts
rename to demos/native/pages/camera.ts
diff --git a/ionic/components/app/test/native/pages/contacts.ts b/demos/native/pages/contacts.ts
similarity index 100%
rename from ionic/components/app/test/native/pages/contacts.ts
rename to demos/native/pages/contacts.ts
diff --git a/demos/native/pages/device-motion.ts b/demos/native/pages/device-motion.ts
new file mode 100644
index 0000000000..87ca4e2f95
--- /dev/null
+++ b/demos/native/pages/device-motion.ts
@@ -0,0 +1,18 @@
+import {IonicView} from 'ionic/ionic';
+
+
+@IonicView({
+  template: `
+  <ion-navbar *navbar>
+    <button aside-toggle>
+      <icon menu></icon>
+    </button>
+    <ion-title>Device Motion</ion-title>
+  </ion-navbar>
+  <ion-content class="padding">
+  </ion-content>
+  `
+})
+export class DeviceMotionPage {
+
+}
diff --git a/demos/native/pages/device.ts b/demos/native/pages/device.ts
new file mode 100644
index 0000000000..518f2f2b49
--- /dev/null
+++ b/demos/native/pages/device.ts
@@ -0,0 +1,26 @@
+import {IonicView} from 'ionic/ionic';
+
+
+@IonicView({
+  template: `
+  <ion-navbar *navbar>
+    <button aside-toggle>
+      <icon menu></icon>
+    </button>
+    <ion-title>Vibration</ion-title>
+  </ion-navbar>
+  <ion-content class="padding">
+    <h2>Device</h2>
+    <button primary outline (click)="doDevice()">Get Device</button>
+    <div>
+    </div>
+  </ion-content>
+  `
+})
+export class DevicePage {
+
+  doDevice() {
+    let device = Device.getDevice();
+    console.log('Got device', device);
+  }
+}
diff --git a/ionic/components/app/test/native/pages/geolocation.ts b/demos/native/pages/geolocation.ts
similarity index 100%
rename from ionic/components/app/test/native/pages/geolocation.ts
rename to demos/native/pages/geolocation.ts
diff --git a/ionic/components/app/test/native/pages/vibration.ts b/demos/native/pages/vibration.ts
similarity index 100%
rename from ionic/components/app/test/native/pages/vibration.ts
rename to demos/native/pages/vibration.ts
diff --git a/ionic/components/app/test/net/index.ts b/demos/net/index.ts
similarity index 100%
rename from ionic/components/app/test/net/index.ts
rename to demos/net/index.ts
diff --git a/ionic/components/app/test/net/main.html b/demos/net/main.html
similarity index 100%
rename from ionic/components/app/test/net/main.html
rename to demos/net/main.html
diff --git a/ionic/components/app/test/profile/index.ts b/demos/profile/index.ts
similarity index 100%
rename from ionic/components/app/test/profile/index.ts
rename to demos/profile/index.ts
diff --git a/ionic/components/app/test/profile/main.html b/demos/profile/main.html
similarity index 100%
rename from ionic/components/app/test/profile/main.html
rename to demos/profile/main.html
diff --git a/ionic/components/app/test/sink/card.jpg b/demos/sink/card.jpg
similarity index 100%
rename from ionic/components/app/test/sink/card.jpg
rename to demos/sink/card.jpg
diff --git a/ionic/components/app/test/sink/index.ts b/demos/sink/index.ts
similarity index 100%
rename from ionic/components/app/test/sink/index.ts
rename to demos/sink/index.ts
diff --git a/demos/sink/main.html b/demos/sink/main.html
new file mode 100644
index 0000000000..14bde37d3d
--- /dev/null
+++ b/demos/sink/main.html
@@ -0,0 +1,22 @@
+<ion-aside #aside [content]="content" id="mainMenu">
+  <ion-toolbar><ion-title>Ionic 2.0</ion-title></ion-toolbar>
+  <ion-content>
+    <ion-list>
+      <ion-item *ng-for="#c of components" (^click)="openPage(aside, c)">
+        <span>{{c.title}}</span>
+      </ion-item>
+    </ion-list>
+  </ion-content>
+</ion-aside>
+
+<ion-nav #content swipe-back-enabled="false"></ion-nav>
+
+<style>
+my-modal {
+  display: block;
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/ionic/components/app/test/sink/pages/action-menu.ts b/demos/sink/pages/action-menu.ts
similarity index 100%
rename from ionic/components/app/test/sink/pages/action-menu.ts
rename to demos/sink/pages/action-menu.ts
diff --git a/ionic/components/app/test/sink/pages/animation.ts b/demos/sink/pages/animation.ts
similarity index 100%
rename from ionic/components/app/test/sink/pages/animation.ts
rename to demos/sink/pages/animation.ts
diff --git a/ionic/components/app/test/sink/pages/aside.ts b/demos/sink/pages/aside.ts
similarity index 100%
rename from ionic/components/app/test/sink/pages/aside.ts
rename to demos/sink/pages/aside.ts
diff --git a/ionic/components/app/test/sink/pages/button.ts b/demos/sink/pages/button.ts
similarity index 100%
rename from ionic/components/app/test/sink/pages/button.ts
rename to demos/sink/pages/button.ts
diff --git a/ionic/components/app/test/sink/pages/card.ts b/demos/sink/pages/card.ts
similarity index 100%
rename from ionic/components/app/test/sink/pages/card.ts
rename to demos/sink/pages/card.ts
diff --git a/ionic/components/app/test/sink/pages/form.ts b/demos/sink/pages/form.ts
similarity index 100%
rename from ionic/components/app/test/sink/pages/form.ts
rename to demos/sink/pages/form.ts
diff --git a/ionic/components/app/test/sink/pages/ionicons.ts b/demos/sink/pages/ionicons.ts
similarity index 100%
rename from ionic/components/app/test/sink/pages/ionicons.ts
rename to demos/sink/pages/ionicons.ts
diff --git a/ionic/components/app/test/sink/pages/list-group.ts b/demos/sink/pages/list-group.ts
similarity index 100%
rename from ionic/components/app/test/sink/pages/list-group.ts
rename to demos/sink/pages/list-group.ts
diff --git a/ionic/components/app/test/sink/pages/list.ts b/demos/sink/pages/list.ts
similarity index 100%
rename from ionic/components/app/test/sink/pages/list.ts
rename to demos/sink/pages/list.ts
diff --git a/ionic/components/app/test/sink/pages/modal.ts b/demos/sink/pages/modal.ts
similarity index 100%
rename from ionic/components/app/test/sink/pages/modal.ts
rename to demos/sink/pages/modal.ts
diff --git a/ionic/components/app/test/sink/pages/nav.ts b/demos/sink/pages/nav.ts
similarity index 100%
rename from ionic/components/app/test/sink/pages/nav.ts
rename to demos/sink/pages/nav.ts
diff --git a/ionic/components/app/test/sink/pages/pull-to-refresh.ts b/demos/sink/pages/pull-to-refresh.ts
similarity index 100%
rename from ionic/components/app/test/sink/pages/pull-to-refresh.ts
rename to demos/sink/pages/pull-to-refresh.ts
diff --git a/ionic/components/app/test/sink/pages/search-bar.ts b/demos/sink/pages/search-bar.ts
similarity index 100%
rename from ionic/components/app/test/sink/pages/search-bar.ts
rename to demos/sink/pages/search-bar.ts
diff --git a/ionic/components/app/test/sink/pages/segment.ts b/demos/sink/pages/segment.ts
similarity index 100%
rename from ionic/components/app/test/sink/pages/segment.ts
rename to demos/sink/pages/segment.ts
diff --git a/ionic/components/app/test/sink/pages/slides.ts b/demos/sink/pages/slides.ts
similarity index 100%
rename from ionic/components/app/test/sink/pages/slides.ts
rename to demos/sink/pages/slides.ts
diff --git a/ionic/components/app/test/sink/pages/table-search.ts b/demos/sink/pages/table-search.ts
similarity index 100%
rename from ionic/components/app/test/sink/pages/table-search.ts
rename to demos/sink/pages/table-search.ts
diff --git a/ionic/components/app/test/sink/pages/tabs.ts b/demos/sink/pages/tabs.ts
similarity index 100%
rename from ionic/components/app/test/sink/pages/tabs.ts
rename to demos/sink/pages/tabs.ts
diff --git a/ionic/components/app/test/sink/sink-page.ts b/demos/sink/sink-page.ts
similarity index 100%
rename from ionic/components/app/test/sink/sink-page.ts
rename to demos/sink/sink-page.ts
diff --git a/ionic/components/app/test/snapcat/detail.html b/demos/snapcat/detail.html
similarity index 100%
rename from ionic/components/app/test/snapcat/detail.html
rename to demos/snapcat/detail.html
diff --git a/ionic/components/app/test/snapcat/feed.html b/demos/snapcat/feed.html
similarity index 100%
rename from ionic/components/app/test/snapcat/feed.html
rename to demos/snapcat/feed.html
diff --git a/ionic/components/app/test/snapcat/index.ts b/demos/snapcat/index.ts
similarity index 100%
rename from ionic/components/app/test/snapcat/index.ts
rename to demos/snapcat/index.ts
diff --git a/ionic/components/app/test/snapcat/main.html b/demos/snapcat/main.html
similarity index 100%
rename from ionic/components/app/test/snapcat/main.html
rename to demos/snapcat/main.html
diff --git a/ionic/components/app/test/snapcat/p.jpg b/demos/snapcat/p.jpg
similarity index 100%
rename from ionic/components/app/test/snapcat/p.jpg
rename to demos/snapcat/p.jpg
diff --git a/ionic/components/app/test/storage/index.ts b/demos/storage/index.ts
similarity index 100%
rename from ionic/components/app/test/storage/index.ts
rename to demos/storage/index.ts
diff --git a/ionic/components/app/test/storage/main.html b/demos/storage/main.html
similarity index 100%
rename from ionic/components/app/test/storage/main.html
rename to demos/storage/main.html
diff --git a/ionic/components/app/test/tap/index.ts b/demos/tap/index.ts
similarity index 100%
rename from ionic/components/app/test/tap/index.ts
rename to demos/tap/index.ts
diff --git a/ionic/components/app/test/tap/main.html b/demos/tap/main.html
similarity index 100%
rename from ionic/components/app/test/tap/main.html
rename to demos/tap/main.html
diff --git a/ionic/components/app/test/weather/current-weather.html b/demos/weather/current-weather.html
similarity index 100%
rename from ionic/components/app/test/weather/current-weather.html
rename to demos/weather/current-weather.html
diff --git a/ionic/components/app/test/weather/flickr.ts b/demos/weather/flickr.ts
similarity index 100%
rename from ionic/components/app/test/weather/flickr.ts
rename to demos/weather/flickr.ts
diff --git a/ionic/components/app/test/weather/geo.ts b/demos/weather/geo.ts
similarity index 100%
rename from ionic/components/app/test/weather/geo.ts
rename to demos/weather/geo.ts
diff --git a/ionic/components/app/test/weather/index.ts b/demos/weather/index.ts
similarity index 100%
rename from ionic/components/app/test/weather/index.ts
rename to demos/weather/index.ts
diff --git a/ionic/components/app/test/weather/main.html b/demos/weather/main.html
similarity index 100%
rename from ionic/components/app/test/weather/main.html
rename to demos/weather/main.html
diff --git a/ionic/components/app/test/weather/style.css b/demos/weather/style.css
similarity index 100%
rename from ionic/components/app/test/weather/style.css
rename to demos/weather/style.css
diff --git a/ionic/components/app/test/weather/weather.ts b/demos/weather/weather.ts
similarity index 100%
rename from ionic/components/app/test/weather/weather.ts
rename to demos/weather/weather.ts
diff --git a/ionic/components/app/test/yerk/index.ts b/demos/yerk/index.ts
similarity index 100%
rename from ionic/components/app/test/yerk/index.ts
rename to demos/yerk/index.ts
diff --git a/ionic/components/app/test/yerk/main.html b/demos/yerk/main.html
similarity index 100%
rename from ionic/components/app/test/yerk/main.html
rename to demos/yerk/main.html
diff --git a/ionic/components/app/test/yerk/tabs.html b/demos/yerk/tabs.html
similarity index 100%
rename from ionic/components/app/test/yerk/tabs.html
rename to demos/yerk/tabs.html