From c8c90572bca9ee7d628c49af81eca5e49c0a94f0 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@users.noreply.github.com>
Date: Thu, 19 Jan 2017 11:09:57 -0500
Subject: [PATCH] chore(scripts): update e2e prod build to work with
 ionic-app-scripts (#10083)

* chore(e2e): WIP to add files needed for app-scripts

* chore(e2e): WIP one e2e test building but with errors

* chore(e2e): move e2e.prod to working with app-scripts

move shared functions into util, add support for debug flag when
running e2e.prod / demos.prod which gets passed to app-scripts

* chore(build): fix app-scripts build for all e2e and demos

* chore(e2e): update ionic-angular import path

* chore(build): update dev paths to work with prod

* chore(e2e): get watch working with e2e prod

* docs(scripts): update README for running e2e and demos

closes #8411
closes #10023
---
 package.json                                  |   4 +-
 scripts/README.md                             |  18 +-
 scripts/demos/demos.template.dev.html         |   2 +-
 scripts/e2e/copy.config.js                    |   7 +
 scripts/e2e/e2e.template.dev.html             |   2 +-
 scripts/e2e/e2e.template.prod.html            |   8 +-
 scripts/e2e/entry.ts                          |   4 -
 scripts/e2e/main.ts                           |   5 +
 scripts/e2e/sass.config.js                    | 103 ++++++++++
 scripts/e2e/variables.scss                    |  79 ++++++++
 scripts/gulp/tasks/demos.prod.ts              |  66 ++-----
 scripts/gulp/tasks/e2e.prod.ts                | 187 ++++++++----------
 scripts/gulp/util.ts                          |  54 ++++-
 .../action-sheet/test/basic/app.module.ts     |   2 +-
 src/components/alert/test/basic/app.module.ts |   2 +-
 .../alert/test/dismiss/app.module.ts          |   2 +-
 .../app/test/animations/app.module.ts         |   2 +-
 src/components/app/test/cordova/app.module.ts |   2 +-
 .../app/test/gesture-collision/app.module.ts  |   2 +-
 .../app/test/gestures/app.module.ts           |   2 +-
 .../app/test/typography/app.module.ts         |   2 +-
 src/components/badge/test/basic/app.module.ts |   2 +-
 .../button/test/anchors/app.module.ts         |   2 +-
 .../button/test/attributes/app.module.ts      |   2 +-
 .../button/test/basic/app.module.ts           |   2 +-
 .../button/test/block/app.module.ts           |   2 +-
 .../button/test/clear/app.module.ts           |   2 +-
 .../button/test/decorator/app.module.ts       |   2 +-
 .../button/test/dynamic/app.module.ts         |   2 +-
 src/components/button/test/full/app.module.ts |   2 +-
 .../button/test/icons/app.module.ts           |   2 +-
 .../button/test/outline/app.module.ts         |   2 +-
 .../button/test/raised/app.module.ts          |   2 +-
 .../button/test/round/app.module.ts           |   2 +-
 .../button/test/sizes/app.module.ts           |   2 +-
 .../card/test/advanced/app.module.ts          |   2 +-
 src/components/card/test/basic/app.module.ts  |   2 +-
 src/components/card/test/colors/app.module.ts |   2 +-
 src/components/card/test/images/app.module.ts |   2 +-
 src/components/card/test/list/app.module.ts   |   2 +-
 src/components/card/test/map/app.module.ts    |   2 +-
 src/components/card/test/social/app.module.ts |   2 +-
 .../checkbox/test/basic/app.module.ts         |   2 +-
 src/components/chip/test/basic/app.module.ts  |   2 +-
 .../content/test/basic/app.module.ts          |   2 +-
 .../content/test/fullscreen/app.module.ts     |   2 +-
 .../content/test/header-scroll/app.module.ts  |   2 +-
 .../content/test/no-bounce/app.module.ts      |   2 +-
 .../datetime/test/basic/app.module.ts         |   2 +-
 .../datetime/test/form/app.module.ts          |   2 +-
 .../datetime/test/labels/app.module.ts        |   2 +-
 src/components/fab/test/basic/app.module.ts   |   2 +-
 .../grid/test/alignment/app.module.ts         |   2 +-
 src/components/grid/test/basic/app.module.ts  |   2 +-
 src/components/grid/test/full/app.module.ts   |   2 +-
 src/components/img/test/basic/app.module.ts   |   2 +-
 src/components/img/test/cards/app.module.ts   |   2 +-
 .../img/test/lazy-load/app.module.ts          |   2 +-
 src/components/img/test/list/app.module.ts    |   2 +-
 .../infinite-scroll/test/basic/app.module.ts  |   2 +-
 .../test/short-list/app.module.ts             |   2 +-
 .../input/test/clear-after-edit/app.module.ts |   2 +-
 .../input/test/clear-input/app.module.ts      |   2 +-
 .../input/test/events/app.module.ts           |   2 +-
 .../test/fixed-inline-labels/app.module.ts    |   2 +-
 .../input/test/floating-labels/app.module.ts  |   2 +-
 .../input/test/footer-inputs/app.module.ts    |   2 +-
 .../input/test/form-inputs/app.module.ts      |   2 +-
 .../input/test/highlight/app.module.ts        |   2 +-
 .../input/test/inline-labels/app.module.ts    |   2 +-
 .../input/test/input-focus/app.module.ts      |   2 +-
 .../input/test/inset-inputs/app.module.ts     |   2 +-
 .../test/placeholder-labels/app.module.ts     |   2 +-
 .../input/test/stacked-labels/app.module.ts   |   2 +-
 .../item/test/buttons/app.module.ts           |   2 +-
 src/components/item/test/colors/app.module.ts |   2 +-
 .../item/test/dividers/app.module.ts          |   2 +-
 src/components/item/test/groups/app.module.ts |   2 +-
 src/components/item/test/icons/app.module.ts  |   2 +-
 src/components/item/test/images/app.module.ts |   2 +-
 src/components/item/test/inputs/app.module.ts |   2 +-
 src/components/item/test/media/app.module.ts  |   2 +-
 .../item/test/reorder/app.module.ts           |   2 +-
 .../item/test/sliding/app.module.ts           |   2 +-
 src/components/item/test/text/app.module.ts   |   2 +-
 .../list/test/chat-list/app.module.ts         |   2 +-
 .../list/test/header-scenarios/app.module.ts  |   2 +-
 .../list/test/headers/app.module.ts           |   2 +-
 src/components/list/test/inset/app.module.ts  |   2 +-
 .../list/test/no-lines/app.module.ts          |   2 +-
 .../list/test/repeat-headers/app.module.ts    |   2 +-
 src/components/list/test/sticky/app.module.ts |   2 +-
 .../loading/test/basic/app.module.ts          |   2 +-
 .../loading/test/tabs/app.module.ts           |   2 +-
 src/components/menu/test/basic/app.module.ts  |   2 +-
 .../menu/test/disable-swipe/app.module.ts     |   2 +-
 .../menu/test/enable-disable/app.module.ts    |   2 +-
 .../menu/test/multiple/app.module.ts          |   2 +-
 .../menu/test/overlay/app.module.ts           |   2 +-
 src/components/menu/test/push/app.module.ts   |   2 +-
 src/components/menu/test/reveal/app.module.ts |   2 +-
 src/components/modal/test/basic/app.module.ts |   2 +-
 src/components/nav/test/basic/app.module.ts   |   2 +-
 .../nav/test/child-navs/app.module.ts         |   2 +-
 .../nav/test/init-async/app.module.ts         |   2 +-
 .../nav/test/insert-views/app.module.ts       |   2 +-
 src/components/nav/test/memory/app.module.ts  |   2 +-
 .../nav/test/nav-push-pop/app.module.ts       |   2 +-
 .../nav/test/worst-case/app.module.ts         |   2 +-
 .../picker/test/basic/app.module.ts           |   2 +-
 .../popover/test/basic/app.module.ts          |   2 +-
 src/components/radio/test/basic/app.module.ts |   2 +-
 src/components/range/test/basic/app.module.ts |   2 +-
 .../refresher/test/basic/app.module.ts        |   2 +-
 .../scroll/test/basic/app.module.ts           |   2 +-
 .../searchbar/test/basic/app.module.ts        |   2 +-
 .../searchbar/test/nav/app.module.ts          |   2 +-
 .../searchbar/test/toolbar/app.module.ts      |   2 +-
 .../segment/test/basic/app.module.ts          |   2 +-
 src/components/segment/test/nav/app.module.ts |   2 +-
 .../segment/test/swipe/app.module.ts          |   2 +-
 .../select/test/multiple-value/app.module.ts  |   2 +-
 .../select/test/single-value/app.module.ts    |   2 +-
 .../show-hide-when/test/basic/app.module.ts   |   2 +-
 .../slides/test/basic/app.module.ts           |   2 +-
 .../slides/test/control/app.module.ts         |   2 +-
 .../slides/test/controller/app.module.ts      |   2 +-
 .../slides/test/images/app.module.ts          |   2 +-
 .../slides/test/intro/app.module.ts           |   2 +-
 src/components/slides/test/loop/app.module.ts |   2 +-
 .../slides/test/options/app.module.ts         |   2 +-
 .../slides/test/scroll/app.module.ts          |   2 +-
 .../spinner/test/basic/app.module.ts          |   2 +-
 .../spinner/test/colors/app.module.ts         |   2 +-
 .../tabs/test/advanced/app.module.ts          |   2 +-
 src/components/tabs/test/badges/app.module.ts |   2 +-
 src/components/tabs/test/basic/app.module.ts  |   2 +-
 src/components/tabs/test/colors/app.module.ts |   2 +-
 src/components/tabs/test/events/app.module.ts |   2 +-
 src/components/tabs/test/ghost/app.module.ts  |   2 +-
 .../tabs/test/lifecyles/app.module.ts         |   2 +-
 .../tabs/test/tab-bar-scenarios/app.module.ts |   2 +-
 src/components/tabs/test/top/app.module.ts    |   2 +-
 src/components/toast/test/basic/app.module.ts |   2 +-
 .../toggle/test/basic/app.module.ts           |   2 +-
 .../toolbar/test/basic/app.module.ts          |   2 +-
 .../toolbar/test/colors/app.module.ts         |   2 +-
 .../toolbar/test/scenarios/app.module.ts      |   2 +-
 .../typography/test/basic/app.module.ts       |   2 +-
 .../virtual-scroll/test/basic/app.module.ts   |   2 +-
 .../virtual-scroll/test/cards/app.module.ts   |   2 +-
 .../test/image-gallery/app.module.ts          |   2 +-
 .../virtual-scroll/test/list/app.module.ts    |   2 +-
 .../virtual-scroll/test/media/app.module.ts   |   2 +-
 .../test/sliding-item/app.module.ts           |   2 +-
 .../test/variable-size/app.module.ts          |   2 +-
 156 files changed, 504 insertions(+), 321 deletions(-)
 create mode 100644 scripts/e2e/copy.config.js
 delete mode 100644 scripts/e2e/entry.ts
 create mode 100644 scripts/e2e/main.ts
 create mode 100644 scripts/e2e/sass.config.js
 create mode 100644 scripts/e2e/variables.scss

diff --git a/package.json b/package.json
index 8c5a7f45d6..72fd5953df 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "zone.js": "~0.6.26"
   },
   "devDependencies": {
-    "@ionic/app-scripts": "0.0.48-201612291559",
+    "@ionic/app-scripts": "1.0.0",
     "@ionic/commit-hooks": "1.0.3",
     "@types/connect": "3.4.30",
     "@types/del": "2.2.31",
@@ -138,4 +138,4 @@
   "pre-push#master": [
     "test"
   ]
-}
\ No newline at end of file
+}
diff --git a/scripts/README.md b/scripts/README.md
index afe189ddcc..835b7354ba 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -35,10 +35,15 @@ Run `gulp build` or `gulp watch` to watch for changes.
 
 The following commands take longer to run because they use AoT compilation. They should really only be used to validate that our components work with AoT, and fix them if not.
 
-1. Run `gulp e2e.prod` to bundle all e2e tests, or pass a folder for a specific test. For example, `gulp e2e.prod --f=alert/basic` will build the test in `src/components/alert/test/basic`.
-2. Run `gulp e2e.watchProd` with a folder passed to watch a test. For example, `gulp e2e.watchProd --f=select/single-value` will watch the test in `src/components/select/test/single-value`.
+1. Run `gulp e2e.prod` to bundle all e2e tests. Folder is optional, see the flags section below.
+2. Run `gulp e2e.watchProd` with a folder passed to watch a test. Folder is required, see the flags section below.
 3. Navigate to `http://localhost:8000/dist/e2e`
 
+##### Flags
+
+- `--f | -folder` will run the command with a test folder. For example, `gulp e2e.watchProd --f=select/single-value` will watch the test in `src/components/select/test/single-value`.
+- `--debug` will run the `ionic-app-scripts` command with debug output printed.
+
 
 ### Building & Running API Demos
 
@@ -51,10 +56,15 @@ The following commands take longer to run because they use AoT compilation. They
 
 The following commands take longer to run because they use AoT compilation. They should really only be used to validate that our components work with AoT, and fix them if not.
 
-1. Run `gulp demos.prod` to bundle all demos tests, or pass a folder for a specific test. For example, `gulp demos.prod --f=alert` will build the test in `demos/alert/`.
-2. Run `gulp demos.watchProd` with a folder passed to watch a test. For example, `gulp demos.watchProd --f=select` will watch the test in `demos/select/`.
+1. Run `gulp demos.prod` to bundle all demos tests. Folder is optional, see the flags section below.
+2. Run `gulp demos.watchProd` with a folder passed to watch a test. Folder is required, see the flags section below.
 3. Navigate to `http://localhost:8000/dist/demos`
 
+##### Flags
+
+- `--f | -folder` will run the command with a test folder. For example, `gulp demos.watchProd --f=alert` will build the test in `demos/alert/`.
+- `--debug` will run the `ionic-app-scripts` command with debug output printed.
+
 
 ### Building API Docs
 
diff --git a/scripts/demos/demos.template.dev.html b/scripts/demos/demos.template.dev.html
index d3e3acd1b0..78e5775974 100644
--- a/scripts/demos/demos.template.dev.html
+++ b/scripts/demos/demos.template.dev.html
@@ -22,7 +22,7 @@
         '@angular/http': '/node_modules/@angular/http/bundles/http.umd.js',
         '@angular/platform-browser': '/node_modules/@angular/platform-browser/bundles/platform-browser.umd.js',
         '@angular/platform-browser-dynamic': '/node_modules/@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
-        'ionic-angular': location.protocol + '//' + location.host,
+        'ionic-angular': location.protocol + '//' + location.host + '/dist/ionic-angular',
         'rxjs': '/node_modules/rxjs'
       },
       packages: {
diff --git a/scripts/e2e/copy.config.js b/scripts/e2e/copy.config.js
new file mode 100644
index 0000000000..769ba9d6ea
--- /dev/null
+++ b/scripts/e2e/copy.config.js
@@ -0,0 +1,7 @@
+// we don't want to run copy for the demos, so just override the config for now
+module.exports = {
+  copyAssets: { },
+  copyIndexContent: { },
+  copyFonts: { },
+  copyPolyfills: { }
+}
\ No newline at end of file
diff --git a/scripts/e2e/e2e.template.dev.html b/scripts/e2e/e2e.template.dev.html
index 49ab8419a3..321cf7acc5 100644
--- a/scripts/e2e/e2e.template.dev.html
+++ b/scripts/e2e/e2e.template.dev.html
@@ -48,7 +48,7 @@
         '@angular/http': '/node_modules/@angular/http/bundles/http.umd.js',
         '@angular/platform-browser': '/node_modules/@angular/platform-browser/bundles/platform-browser.umd.js',
         '@angular/platform-browser-dynamic': '/node_modules/@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
-        'ionic-angular': location.protocol + '//' + location.host,
+        'ionic-angular': location.protocol + '//' + location.host + '/ionic-angular',
         'rxjs': '/node_modules/rxjs'
       },
       packages: {
diff --git a/scripts/e2e/e2e.template.prod.html b/scripts/e2e/e2e.template.prod.html
index 1c5a9893f6..657bd5ee96 100644
--- a/scripts/e2e/e2e.template.prod.html
+++ b/scripts/e2e/e2e.template.prod.html
@@ -6,8 +6,8 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
   <meta name="apple-mobile-web-app-capable" content="yes">
 
-  <link id="ionicLink" href="../../../../css/ionic.css" rel="stylesheet">
-  <link href="../../../../css/e2e.shared.css" rel="stylesheet">
+  <link id="ionicLink" href="./build/main.css" rel="stylesheet">
+	<link href="../../../../css/e2e.shared.css" rel="stylesheet">
 
   <script>
     if (location.href.indexOf('snapshot=true') > -1) {
@@ -43,7 +43,7 @@
       document.body.classList.remove('rtl');
     }
   </script>
-  <script src="../../../../polyfills/polyfills.ng.js"></script>
-  <script src="./app.bundle.js"></script>
+  <script src="../../../../polyfills/polyfills.js"></script>
+  <script src="./build/main.js"></script>
 </body>
 </html>
diff --git a/scripts/e2e/entry.ts b/scripts/e2e/entry.ts
deleted file mode 100644
index 0860070d78..0000000000
--- a/scripts/e2e/entry.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { platformBrowser } from '@angular/platform-browser';
-import { AppModuleNgFactory } from './app.module.ngfactory';
-
-platformBrowser().bootstrapModuleFactory(AppModuleNgFactory);
diff --git a/scripts/e2e/main.ts b/scripts/e2e/main.ts
new file mode 100644
index 0000000000..6af7a5b2ae
--- /dev/null
+++ b/scripts/e2e/main.ts
@@ -0,0 +1,5 @@
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app.module';
+
+platformBrowserDynamic().bootstrapModule(AppModule);
diff --git a/scripts/e2e/sass.config.js b/scripts/e2e/sass.config.js
new file mode 100644
index 0000000000..6233449f07
--- /dev/null
+++ b/scripts/e2e/sass.config.js
@@ -0,0 +1,103 @@
+
+// https://www.npmjs.com/package/node-sass
+
+module.exports = {
+
+  /**
+   * outputFilename: The filename of the saved CSS file
+   * from the sass build. The directory which it is saved in
+   * is set within the "buildDir" config options.
+   */
+  outputFilename: process.env.IONIC_OUTPUT_CSS_FILE_NAME,
+
+  /**
+   * sourceMap: If source map should be built or not.
+   */
+  sourceMap: false,
+
+  /**
+   * outputStyle: How node-sass should output the css file.
+   */
+  outputStyle: 'expanded',
+
+  /**
+   * autoprefixer: The config options for autoprefixer.
+   * Excluding this config will skip applying autoprefixer.
+   * https://www.npmjs.com/package/autoprefixer
+   */
+  autoprefixer: {
+    browsers: [
+      'last 2 versions',
+      'iOS >= 8',
+      'Android >= 4.4',
+      'Explorer >= 11',
+      'ExplorerMobile >= 11'
+    ],
+    cascade: false
+  },
+
+  /**
+   * includePaths: Used by node-sass for additional
+   * paths to search for sass imports by just name.
+   */
+  includePaths: [
+    'src/themes',
+    'node_modules/ionicons/dist/scss',
+    'src/fonts'
+  ],
+
+  /**
+   * includeFiles: An array of regex patterns to search for
+   * sass files in the same directory as the component module.
+   * If a file matches both include and exclude patterns, then
+   * the file will be excluded.
+   */
+  includeFiles: [
+    /\.(s(c|a)ss)$/i
+  ],
+
+  /**
+   * excludeFiles: An array of regex patterns for files which
+   * should be excluded. If a file matches both include and exclude
+   * patterns, then the file will be excluded.
+   */
+  excludeFiles: [
+    /*  /\.(wp).(scss)$/i  */
+  ],
+
+  /**
+   * variableSassFiles: Lists out the files which include
+   * only sass variables. These variables are the first sass files
+   * to be imported so their values override default variables.
+   */
+  variableSassFiles: [
+    './scripts/e2e/variables.scss'
+  ],
+
+  /**
+   * directoryMaps: Compiled JS modules may be within a different
+   * directory than its source file and sibling component sass files.
+   * For example, NGC places it's files within the .tmp directory
+   * but doesn't copy over its sass files. This is useful so sass
+   * also checks the JavaScript's source directory for sass files.
+   */
+  directoryMaps: {
+    '{{TMP}}': '{{SRC}}'
+  },
+
+  /**
+   * excludeModules: Used just as a way to skip over
+   * modules which we know wouldn't have any sass to be
+   * bundled. "excludeModules" isn't necessary, but is a
+   * good way to speed up build times by skipping modules.
+   */
+  excludeModules: [
+    '@angular',
+    'commonjs-proxy',
+    'core-js',
+    'ionic-native',
+    'rxjs',
+    'zone.js'
+  ]
+
+};
\ No newline at end of file
diff --git a/scripts/e2e/variables.scss b/scripts/e2e/variables.scss
new file mode 100644
index 0000000000..d19f00dcd8
--- /dev/null
+++ b/scripts/e2e/variables.scss
@@ -0,0 +1,79 @@
+// Ionic Variables and Theming. For more info, please see:
+// http://ionicframework.com/docs/v2/theming/
+
+// Font path is used to include ionicons,
+// roboto, and noto sans fonts
+$font-path: "../../../../../fonts";
+
+@import "ionic.globals";
+
+
+// Shared Variables
+// --------------------------------------------------
+// To customize the look and feel of this app, you can override
+// the Sass variables found in Ionic's source scss files.
+// To view all the possible Ionic variables, see:
+// http://ionicframework.com/docs/v2/theming/overriding-ionic-variables/
+
+
+// Named Color Variables
+// --------------------------------------------------
+// Named colors makes it easy to reuse colors on various components.
+// It's highly recommended to change the default colors
+// to match your app's branding. Ionic uses a Sass map of
+// colors so you can add, rename and remove colors as needed.
+// The "primary" color is the only required color in the map.
+
+$colors: (
+  primary:    #387ef5,
+  secondary:  #32db64,
+  danger:     #f53d3d,
+  light:      #f4f4f4,
+  dark:       #222,
+  vibrant:    rebeccapurple,
+  bright:     #ffc125
+);
+
+
+// App iOS Variables
+// --------------------------------------------------
+// iOS only Sass variables can go here
+
+
+
+// App Material Design Variables
+// --------------------------------------------------
+// Material Design only Sass variables can go here
+
+
+// App Windows Variables
+// --------------------------------------------------
+// Windows only Sass variables can go here
+
+
+
+// App Theme
+// --------------------------------------------------
+// Ionic apps can have different themes applied, which can
+// then be future customized. This import comes last
+// so that the above variables are used and Ionic's
+// default are overridden.
+
+@import "ionic.theme.default";
+
+
+// Ionicons
+// --------------------------------------------------
+// The premium icon font for Ionic. For more info, please see:
+// http://ionicframework.com/docs/v2/ionicons/
+
+@import "ionicons";
+
+
+// Fonts
+// --------------------------------------------------
+// Roboto font is used by default for Material Design. Noto sans
+// is used by default for Windows.
+
+@import "roboto";
+@import "noto-sans";
\ No newline at end of file
diff --git a/scripts/gulp/tasks/demos.prod.ts b/scripts/gulp/tasks/demos.prod.ts
index 95aad27fe4..0f8ca91de8 100644
--- a/scripts/gulp/tasks/demos.prod.ts
+++ b/scripts/gulp/tasks/demos.prod.ts
@@ -1,5 +1,4 @@
-import { spawnSync } from 'child_process';
-import { accessSync, F_OK, readdirSync, readFileSync, stat, statSync } from 'fs';
+import { accessSync, F_OK, readFileSync, stat } from 'fs';
 import { dirname, join } from 'path';
 
 import { dest, src, start, task } from 'gulp';
@@ -10,7 +9,7 @@ import { obj } from 'through2';
 import * as VinylFile from 'vinyl';
 
 import { DEMOS_SRC_ROOT, DIST_DEMOS_ROOT, DIST_NAME, DEMOS_NAME, ES5, ES_2015, LOCAL_SERVER_PORT, SCRIPTS_ROOT } from '../constants';
-import { createTempTsConfig, getFolderInfo } from '../util';
+import { createTempTsConfig, getFolderInfo, getFolders, runAppScripts } from '../util';
 
 task('demos.prod', demosBuild);
 
@@ -68,18 +67,24 @@ task('demos.compileTests', (done: Function) => {
   let folderInfo = getFolderInfo();
 
   if (folderInfo.componentName && folderInfo.componentTest) {
-    buildTest(folderInfo.componentName);
+    buildTest(folderInfo);
   } else {
     buildAllTests(done);
   }
 });
 
-function buildTest(folderName: string) {
-  let includeGlob = [`./dist/demos/${folderName}/*.ts`];
-  let pathToWriteFile = `${DIST_DEMOS_ROOT}/${folderName}/tsconfig.json`;
+function buildTest(folderInfo: any) {
+  let includeGlob = [`./dist/demos/${folderInfo.componentName}/*.ts`];
+  let pathToWriteFile = `${DIST_DEMOS_ROOT}/${folderInfo.componentName}/tsconfig.json`;
 
   createTempTsConfig(includeGlob, ES5, ES_2015, `${DEMOS_SRC_ROOT}/tsconfig.json`, pathToWriteFile);
-  return runAppScripts(folderName);
+
+  let sassConfigPath = 'scripts/demos/sass.config.js';
+
+  let appEntryPoint = `dist/demos/${folderInfo.componentName}/main.ts`;
+  let distDir = `dist/demos/${folderInfo.componentName}/`;
+
+  return runAppScripts(folderInfo, sassConfigPath, appEntryPoint, distDir);
 }
 
 function buildAllTests(done: Function) {
@@ -89,7 +94,11 @@ function buildAllTests(done: Function) {
   folders.forEach(folder => {
     stat(`./dist/demos/${folder}/app.module.ts`, function(err, stat) {
       if (err == null) {
-        const promise = buildTest(folder);
+        let folderInfo = {
+          componentName: folder,
+          componentTest: 'basic'
+        };
+        const promise = buildTest(folderInfo);
         promises.push(promise);
       }
     });
@@ -102,45 +111,6 @@ function buildAllTests(done: Function) {
   });
 }
 
-function runAppScripts(folderName: string) {
-  console.log('Running app scripts with', folderName);
-
-  let sassConfigPath = 'scripts/demos/sass.config.js';
-
-  let appEntryPoint = `dist/demos/${folderName}/main.ts`;
-  let distDir = `dist/demos/${folderName}/`;
-
-  let tsConfig = distDir + 'tsconfig.json';
-
-  try {
-    const scriptsCmd = spawnSync('ionic-app-scripts',
-      ['build',
-      '--prod',
-      '--sass', sassConfigPath,
-      '--appEntryPoint', appEntryPoint,
-      '--srcDir', distDir,
-      '--wwwDir', distDir,
-      '--tsconfig', tsConfig
-      ]);
-
-    if (scriptsCmd.status !== 0) {
-      return Promise.reject(scriptsCmd.stderr.toString());
-    }
-
-    console.log(scriptsCmd.output.toString());
-    return Promise.resolve();
-  } catch (ex) {
-    return Promise.reject(ex);
-  }
-}
-
-function getFolders(dir) {
-  return readdirSync(dir)
-    .filter(function(file) {
-      return statSync(join(dir, file)).isDirectory();
-    });
-}
-
 task('demos.watchProd', (done: Function) => {
   const folderInfo = getFolderInfo();
   let demoTestPath = DEMOS_SRC_ROOT;
diff --git a/scripts/gulp/tasks/e2e.prod.ts b/scripts/gulp/tasks/e2e.prod.ts
index e98e822017..d15be7057f 100644
--- a/scripts/gulp/tasks/e2e.prod.ts
+++ b/scripts/gulp/tasks/e2e.prod.ts
@@ -1,36 +1,42 @@
-import { accessSync, F_OK, readFileSync, writeFileSync } from 'fs';
+import { accessSync, F_OK, readFileSync, stat } from 'fs';
 import { dirname, join } from 'path';
 
-import * as glob from 'glob';
 import { dest, src, start, task } from 'gulp';
 import * as gulpif from 'gulp-if';
 import * as watch from 'gulp-watch';
 import { template } from 'lodash';
-import * as rollup from 'rollup';
-import * as nodeResolve from 'rollup-plugin-node-resolve';
-import * as commonjs from 'rollup-plugin-commonjs';
 import * as runSequence from 'run-sequence';
 import { obj } from 'through2';
 import * as VinylFile from 'vinyl';
 
-import { DIST_E2E_COMPONENTS_ROOT, DIST_E2E_ROOT, DIST_NAME, E2E_NAME, ES5, ES_2015, LOCAL_SERVER_PORT, PROJECT_ROOT, SCRIPTS_ROOT, SRC_COMPONENTS_ROOT, SRC_ROOT } from '../constants';
-import { createTempTsConfig, deleteFiles, getFolderInfo, runNgc } from '../util';
+import { DIST_E2E_ROOT, DIST_NAME, E2E_NAME, ES5, ES_2015, LOCAL_SERVER_PORT, DEMOS_SRC_ROOT, SCRIPTS_ROOT, SRC_ROOT } from '../constants';
+import { createTempTsConfig, getFolderInfo, getFolders, runAppScripts} from '../util';
 
 task('e2e.prod', e2eBuild);
 
 function e2eBuild(done: (err: any) => void) {
   runSequence(
+    'e2e.copyIonic',
     'e2e.clean',
     'e2e.polyfill',
     'e2e.copySource',
-    'e2e.compileTests',
     'e2e.copyExternalDependencies',
     'e2e.sass',
     'e2e.fonts',
-    'e2e.bundleProd',
+    'e2e.compileTests',
     done);
 }
 
+task('e2e.copyIonic', (done: (err: any) => void) => {
+  runSequence(
+    'compile.release',
+    'release.compileSass',
+    'release.fonts',
+    'release.sass',
+    'release.createUmdBundle',
+    done);
+});
+
 task('e2e.copySource', (done: Function) => {
 
   const buildConfig = require('../../build/config');
@@ -44,7 +50,7 @@ task('e2e.copySource', (done: Function) => {
 
   function createIndexHTML() {
     const indexTemplate = readFileSync(`${SCRIPTS_ROOT}/${E2E_NAME}/e2e.template.prod.html`);
-    const indexTs = readFileSync(`${SCRIPTS_ROOT}/${E2E_NAME}/entry.ts`);
+    const indexTs = readFileSync(`${SCRIPTS_ROOT}/${E2E_NAME}/main.ts`);
 
     return obj(function (file, enc, next) {
       this.push(new VinylFile({
@@ -55,7 +61,7 @@ task('e2e.copySource', (done: Function) => {
       this.push(new VinylFile({
         base: file.base,
         contents: new Buffer(indexTs),
-        path: join(dirname(file.path), 'entry.ts'),
+        path: join(dirname(file.path), 'main.ts'),
       }));
       next(null, file);
     });
@@ -97,108 +103,64 @@ task('e2e.copySource', (done: Function) => {
 
 task('e2e.compileTests', (done: Function) => {
   let folderInfo = getFolderInfo();
-  buildE2ETests(folderInfo, done);
-});
 
-function buildE2ETests(folderInfo: any, done: Function) {
-  let includeGlob = ['./components/*/test/*/app.module.ts', './components/*/test/*/entry.ts'];
   if (folderInfo.componentName && folderInfo.componentTest) {
-    includeGlob = [
-      `./components/${folderInfo.componentName}/test/${folderInfo.componentTest}/app.module.ts`,
-      `./components/${folderInfo.componentName}/test/${folderInfo.componentTest}/entry.ts`,
-    ];
-  }
-  createTempTsConfig(includeGlob, ES5, ES_2015, `${PROJECT_ROOT}/tsconfig.json`, `${DIST_E2E_ROOT}/tsconfig.json`);
-  runNgc(`${DIST_E2E_ROOT}/tsconfig.json`, (err) => {
-    if (err) {
-      done(err);
-      return;
-    }
-    // clean up any .ts files that remain
-    deleteFiles([`${DIST_E2E_ROOT}/**/*.ts`, `!${DIST_E2E_ROOT}/**/*.ngfactory.ts`, `!${DIST_E2E_ROOT}/**/*.d.ts`], done);
-  });
-}
-
-task('e2e.bundleProd', (done) => {
-  let includeGlob = `${DIST_E2E_ROOT}/components/*/test/*/entry.js`;
-  let folderInfo = getFolderInfo();
-  if (folderInfo.componentName && folderInfo.componentTest) {
-    includeGlob = `${DIST_E2E_ROOT}/components/${folderInfo.componentName}/test/${folderInfo.componentTest}/entry.js`;
-  }
-  glob(includeGlob, {}, function (er, files) {
-    var directories = files.map(function (file) {
-      return dirname(file);
-    });
-
-    let indexFileContents = directories.map(function (dir) {
-      let testName = dir.replace(`${DIST_E2E_ROOT}/components/`, '');
-      let fileName = dir.replace(`${PROJECT_ROOT}`, '');
-      return `<p><a href="${fileName}/index.html">${testName}</a></p>`;
-    }, []);
-
-    writeFileSync(`${DIST_E2E_ROOT}/index.html`,
-      '<!DOCTYPE html><html lang="en"><head></head><body style="width: 500px; margin: 100px auto">\n' +
-      indexFileContents.join('\n') +
-      '</center></body></html>'
-    );
-
-    createBundles(files).then(() => {
-      done();
-    }).catch(err => {
-      done(err);
-    });
-  });
-});
-
-function createBundles(files: string[]) {
-  let start;
-  if (!files) {
-    return Promise.reject(new Error('list of files is null'));
-  } else if (files.length === 0) {
-    return Promise.resolve();
+    buildTest(folderInfo);
   } else {
-    const outputFileName = join(dirname(files[0]), 'app.bundle.js');
-    start = Date.now();
-    return bundle(files[0], outputFileName).then(() => {
-      const end = Date.now();
-      const seconds = (end - start) / 1000;
-      console.log(`Took ${seconds} seconds to process ${files[0]}`);
-      const remainingFiles = files.concat();
-      remainingFiles.shift();
-      return createBundles(remainingFiles);
-    }).catch(err => {
-      return Promise.reject(err);
-    });
+    buildAllTests(done);
   }
+});
+
+function buildTest(folderInfo: any) {
+  let includeGlob = [`./dist/e2e/components/${folderInfo.componentName}/test/${folderInfo.componentTest}/*.ts`];
+  let pathToWriteFile = `${DIST_E2E_ROOT}/components/${folderInfo.componentName}/test/${folderInfo.componentTest}/tsconfig.json`;
+
+  createTempTsConfig(includeGlob, ES5, ES_2015, `${DEMOS_SRC_ROOT}/tsconfig.json`, pathToWriteFile);
+
+  let sassConfigPath = 'scripts/e2e/sass.config.js';
+
+  let appEntryPoint = `dist/e2e/components/${folderInfo.componentName}/test/${folderInfo.componentTest}/main.ts`;
+  let distDir = `dist/e2e/components/${folderInfo.componentName}/test/${folderInfo.componentTest}/`;
+
+  return runAppScripts(folderInfo, sassConfigPath, appEntryPoint, distDir);
 }
 
-function bundle(inputFile: string, outputFile: string): Promise<any> {
-  console.log(`Starting rollup on ${inputFile} ... writing to ${outputFile}`);
-  return rollup.rollup({
-    entry: inputFile,
-    plugins: [
-      commonjs(),
-      nodeResolve({
-        module: true,
-        jsnext: true,
-        main: true,
-        extensions: ['.js']
-      })
-    ]
-  }).then(bundle => {
-    return bundle.write({
-      format: 'iife',
-      dest: outputFile,
+function buildAllTests(done: Function) {
+  let folders = getFolders('./dist/e2e/components');
+  let promises: Promise<any>[] = [];
+
+  folders.forEach(folder => {
+    console.log(folder);
+    stat(`./dist/e2e/components/${folder}/test`, function(err, stat) {
+      if (err == null) {
+        let testFolders = getFolders(`./dist/e2e/components/${folder}/test`);
+
+        testFolders.forEach(test => {
+          console.log('build test for ', folder, test);
+          let folderInfo = {
+            componentName: folder,
+            componentTest: test
+          };
+          const promise = buildTest(folderInfo);
+          promises.push(promise);
+        });
+      }
     });
   });
+
+  Promise.all(promises).then(() => {
+    done();
+  }).catch(err => {
+    done(err);
+  });
 }
 
-task('e2e.watchProd', ['e2e.copyExternalDependencies', 'e2e.sass', 'e2e.fonts'], (done: Function) => {
+task('e2e.watchProd', (done: Function) => {
   const folderInfo = getFolderInfo();
-  let e2eTestPath = SRC_COMPONENTS_ROOT;
+  let e2eTestPath = SRC_ROOT;
 
   if (folderInfo.componentName && folderInfo.componentTest) {
-    e2eTestPath = join(SRC_COMPONENTS_ROOT, folderInfo.componentName, 'test', folderInfo.componentTest, 'app.module.ts');
+    e2eTestPath = join(`${SRC_ROOT}/components/${folderInfo.componentName}/test/${folderInfo.componentTest}/app.module.ts`);
   }
 
   try {
@@ -208,13 +170,13 @@ task('e2e.watchProd', ['e2e.copyExternalDependencies', 'e2e.sass', 'e2e.fonts'],
     return;
   }
 
-  if (e2eComponentsExists()) {
+  if (e2eComponentsExists(folderInfo)) {
     // already generated the e2e directory
     e2eWatch(folderInfo.componentName, folderInfo.componentTest);
 
   } else {
     // generate the e2e directory
-    console.log('Generated e2e builds first...');
+    console.log('Generate e2e builds first...');
     e2eBuild(() => {
       e2eWatch(folderInfo.componentName, folderInfo.componentTest);
     });
@@ -224,7 +186,7 @@ task('e2e.watchProd', ['e2e.copyExternalDependencies', 'e2e.sass', 'e2e.fonts'],
 function e2eWatch(componentName: string, componentTest: string) {
   // If any tests change within components then run e2e.resources.
   watch([
-    'src/components/*/test/**/*'
+    'e2e/src/**/*'
   ],
     function (file) {
       console.log('start e2e.resources - ' + JSON.stringify(file.history, null, 2));
@@ -248,16 +210,27 @@ function e2eWatch(componentName: string, componentTest: string) {
     start('e2e.sass');
   });
 
-  console.log(`http://localhost:${LOCAL_SERVER_PORT}/${DIST_NAME}/${E2E_NAME}/components/${componentName}/test/${componentTest}/`);
+  let serverUrl = `http://localhost:${LOCAL_SERVER_PORT}/${DIST_NAME}/${E2E_NAME}`;
+  if (componentName) {
+    serverUrl += `/${componentName}`;
+  }
+
+  console.log(serverUrl);
 
   start('e2e.serve');
 }
 
-function e2eComponentsExists(): boolean {
+function e2eComponentsExists(folderInfo: any): boolean {
+  let componentPath = `${DIST_E2E_ROOT}/components`;
+
+  if (folderInfo.componentName && folderInfo.componentTest) {
+    componentPath += `/${folderInfo.componentName}/test/${folderInfo.componentTest}/build`;
+  }
+
   try {
-    accessSync(DIST_E2E_COMPONENTS_ROOT, F_OK);
+    accessSync(componentPath, F_OK);
   } catch (e) {
     return false;
   }
   return true;
-}
\ No newline at end of file
+}
diff --git a/scripts/gulp/util.ts b/scripts/gulp/util.ts
index 0e18b2a5bf..9ecfbdc9ef 100644
--- a/scripts/gulp/util.ts
+++ b/scripts/gulp/util.ts
@@ -1,7 +1,8 @@
-import { NODE_MODULES_ROOT, PROJECT_ROOT, SRC_ROOT } from './constants';
+import { spawnSync } from 'child_process';
+import { NODE_MODULES_ROOT, SRC_ROOT } from './constants';
 import { src, dest } from 'gulp';
 import { join } from 'path';
-import * as fs from 'fs';
+import { readdirSync, readFileSync, statSync, writeFileSync } from 'fs';
 import { rollup } from 'rollup';
 import { Replacer } from 'strip-function';
 import * as commonjs from 'rollup-plugin-commonjs';
@@ -32,7 +33,7 @@ export function mergeObjects(obj1: any, obj2: any ) {
 }
 
 function getRootTsConfig(pathToReadFile): any {
-  const json = fs.readFileSync(pathToReadFile);
+  const json = readFileSync(pathToReadFile);
 
   let tsConfig = JSON.parse(json.toString());
   return tsConfig;
@@ -53,7 +54,7 @@ export function createTempTsConfig(includeGlob: string[], target: string, module
   }
   config.include = includeGlob;
   let json = JSON.stringify(config, null, 2);
-  fs.writeFileSync(pathToWriteFile, json);
+  writeFileSync(pathToWriteFile, json);
 }
 
 function removeDebugStatements() {
@@ -133,12 +134,12 @@ export function compileSass(destinationPath: string) {
 }
 
 export function setSassIonicVersion(version: string) {
-  fs.writeFileSync(join(SRC_ROOT, 'themes/version.scss'), `$ionic-version: "${version}";`);
+  writeFileSync(join(SRC_ROOT, 'themes/version.scss'), `$ionic-version: "${version}";`);
 }
 
 export function copyFile(srcPath: string, destPath: string) {
-  const sourceData = fs.readFileSync(srcPath);
-  fs.writeFileSync(destPath, sourceData);
+  const sourceData = readFileSync(srcPath);
+  writeFileSync(destPath, sourceData);
 }
 
 export function runNgc(pathToConfigFile: string, done: Function) {
@@ -177,6 +178,38 @@ export function runWebpack(pathToWebpackConfig: string, done: Function) {
   });
 }
 
+export function runAppScripts(folderInfo: any, sassConfigPath: string, appEntryPoint: string, distDir: string) {
+  console.log('Running ionic-app-scripts build with', folderInfo.componentName, '/', folderInfo.componentTest);
+  let tsConfig = distDir + 'tsconfig.json';
+  let scriptArgs = [
+    'build',
+    '--prod',
+    '--sass', sassConfigPath,
+    '--appEntryPoint', appEntryPoint,
+    '--srcDir', distDir,
+    '--wwwDir', distDir,
+    '--tsconfig', tsConfig
+    ];
+
+  const debug: boolean = argv.debug;
+  if (debug) {
+    scriptArgs.push('--debug');
+  }
+
+  try {
+    const scriptsCmd = spawnSync('ionic-app-scripts', scriptArgs);
+
+    if (scriptsCmd.status !== 0) {
+      return Promise.reject(scriptsCmd.stderr.toString());
+    }
+
+    console.log(scriptsCmd.output.toString());
+    return Promise.resolve();
+  } catch (ex) {
+    return Promise.reject(ex);
+  }
+}
+
 /** Resolves the path for a node package executable. */
 export function getBinaryPath(packageName: string, executable = packageName): string {
   return resolveBin.sync(packageName, {executable});
@@ -288,3 +321,10 @@ export function getFolderInfo() {
     componentTest: componentTest
   };
 }
+
+export function getFolders(dir) {
+  return readdirSync(dir)
+    .filter(function(file) {
+      return statSync(join(dir, file)).isDirectory();
+    });
+}
diff --git a/src/components/action-sheet/test/basic/app.module.ts b/src/components/action-sheet/test/basic/app.module.ts
index 1e12793194..3ba7f53090 100644
--- a/src/components/action-sheet/test/basic/app.module.ts
+++ b/src/components/action-sheet/test/basic/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, ActionSheetController, AlertController, ModalController, ViewController, Platform } from '../../../..';
+import { IonicApp, IonicModule, ActionSheetController, AlertController, ModalController, ViewController, Platform } from '../../../../../ionic-angular';
 
 @Component({
   templateUrl: 'main.html'
diff --git a/src/components/alert/test/basic/app.module.ts b/src/components/alert/test/basic/app.module.ts
index 9282f4506c..cb932fb685 100644
--- a/src/components/alert/test/basic/app.module.ts
+++ b/src/components/alert/test/basic/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, AlertController, ModalController, ViewController } from '../../../..';
+import { IonicApp, IonicModule, AlertController, ModalController, ViewController } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/alert/test/dismiss/app.module.ts b/src/components/alert/test/dismiss/app.module.ts
index d0903db1c2..5d418ad9a1 100644
--- a/src/components/alert/test/dismiss/app.module.ts
+++ b/src/components/alert/test/dismiss/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, AlertController, LoadingController, NavController } from '../../../..';
+import { IonicApp, IonicModule, AlertController, LoadingController, NavController } from '../../../../../ionic-angular';
 import { FormBuilder, Validators } from '@angular/forms';
 
 
diff --git a/src/components/app/test/animations/app.module.ts b/src/components/app/test/animations/app.module.ts
index 5a5f8b7c7b..1e7da32411 100644
--- a/src/components/app/test/animations/app.module.ts
+++ b/src/components/app/test/animations/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { Animation, Config, IonicApp, IonicModule, Platform } from '../../../..';
+import { Animation, Config, IonicApp, IonicModule, Platform } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/app/test/cordova/app.module.ts b/src/components/app/test/cordova/app.module.ts
index d55f195c91..eea9b362dc 100644
--- a/src/components/app/test/cordova/app.module.ts
+++ b/src/components/app/test/cordova/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, NavController, ModalController, ViewController } from '../../../..';
+import { IonicApp, IonicModule, NavController, ModalController, ViewController } from '../../../../../ionic-angular';
 import { Injectable } from '@angular/core';
 
 
diff --git a/src/components/app/test/gesture-collision/app.module.ts b/src/components/app/test/gesture-collision/app.module.ts
index e24156c74d..968fef33de 100644
--- a/src/components/app/test/gesture-collision/app.module.ts
+++ b/src/components/app/test/gesture-collision/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, ViewChild, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, MenuController, NavController, AlertController, Nav, Refresher } from '../../../..';
+import { IonicApp, IonicModule, MenuController, NavController, AlertController, Nav, Refresher } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/app/test/gestures/app.module.ts b/src/components/app/test/gestures/app.module.ts
index 3e85659317..4ed76b17f0 100644
--- a/src/components/app/test/gestures/app.module.ts
+++ b/src/components/app/test/gestures/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/app/test/typography/app.module.ts b/src/components/app/test/typography/app.module.ts
index 889ca14aea..089dfd9241 100644
--- a/src/components/app/test/typography/app.module.ts
+++ b/src/components/app/test/typography/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, App } from '../../../..';
+import { IonicApp, IonicModule, App } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/badge/test/basic/app.module.ts b/src/components/badge/test/basic/app.module.ts
index 4624b8ebc3..98eb3a0f88 100644
--- a/src/components/badge/test/basic/app.module.ts
+++ b/src/components/badge/test/basic/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, Config } from '../../../..';
+import { IonicApp, IonicModule, Config } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/button/test/anchors/app.module.ts b/src/components/button/test/anchors/app.module.ts
index bd7e2c8fe3..352b6be500 100644
--- a/src/components/button/test/anchors/app.module.ts
+++ b/src/components/button/test/anchors/app.module.ts
@@ -1,5 +1,5 @@
 import { NgModule, Component } from '@angular/core';
-import { IonicApp, IonicModule, App } from '../../../..';
+import { IonicApp, IonicModule, App } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/button/test/attributes/app.module.ts b/src/components/button/test/attributes/app.module.ts
index c6c770065d..58ae61fa9f 100644
--- a/src/components/button/test/attributes/app.module.ts
+++ b/src/components/button/test/attributes/app.module.ts
@@ -1,5 +1,5 @@
 import { NgModule, Component } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/button/test/basic/app.module.ts b/src/components/button/test/basic/app.module.ts
index 7e7fdb0864..16803efbc4 100644
--- a/src/components/button/test/basic/app.module.ts
+++ b/src/components/button/test/basic/app.module.ts
@@ -1,5 +1,5 @@
 import { NgModule, Component } from '@angular/core';
-import { IonicApp, IonicModule, App } from '../../../..';
+import { IonicApp, IonicModule, App } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/button/test/block/app.module.ts b/src/components/button/test/block/app.module.ts
index c2c5e1381a..116da28ed9 100644
--- a/src/components/button/test/block/app.module.ts
+++ b/src/components/button/test/block/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/button/test/clear/app.module.ts b/src/components/button/test/clear/app.module.ts
index 174a81eacc..866d56886d 100644
--- a/src/components/button/test/clear/app.module.ts
+++ b/src/components/button/test/clear/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/button/test/decorator/app.module.ts b/src/components/button/test/decorator/app.module.ts
index 075a2068dd..8011313760 100644
--- a/src/components/button/test/decorator/app.module.ts
+++ b/src/components/button/test/decorator/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/button/test/dynamic/app.module.ts b/src/components/button/test/dynamic/app.module.ts
index ffb893a0a1..de03f7f27d 100644
--- a/src/components/button/test/dynamic/app.module.ts
+++ b/src/components/button/test/dynamic/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/button/test/full/app.module.ts b/src/components/button/test/full/app.module.ts
index 0bf1cc361b..bab981f203 100644
--- a/src/components/button/test/full/app.module.ts
+++ b/src/components/button/test/full/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/button/test/icons/app.module.ts b/src/components/button/test/icons/app.module.ts
index 0bf1cc361b..bab981f203 100644
--- a/src/components/button/test/icons/app.module.ts
+++ b/src/components/button/test/icons/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/button/test/outline/app.module.ts b/src/components/button/test/outline/app.module.ts
index 027f18e682..73255928f3 100644
--- a/src/components/button/test/outline/app.module.ts
+++ b/src/components/button/test/outline/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/button/test/raised/app.module.ts b/src/components/button/test/raised/app.module.ts
index 0bf1cc361b..bab981f203 100644
--- a/src/components/button/test/raised/app.module.ts
+++ b/src/components/button/test/raised/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/button/test/round/app.module.ts b/src/components/button/test/round/app.module.ts
index 3990ca9a8a..ab3faaac52 100644
--- a/src/components/button/test/round/app.module.ts
+++ b/src/components/button/test/round/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/button/test/sizes/app.module.ts b/src/components/button/test/sizes/app.module.ts
index 89068bf125..0be0bcd814 100644
--- a/src/components/button/test/sizes/app.module.ts
+++ b/src/components/button/test/sizes/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/card/test/advanced/app.module.ts b/src/components/card/test/advanced/app.module.ts
index 0bf1cc361b..bab981f203 100644
--- a/src/components/card/test/advanced/app.module.ts
+++ b/src/components/card/test/advanced/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/card/test/basic/app.module.ts b/src/components/card/test/basic/app.module.ts
index 0c7a8d2016..80bb084034 100644
--- a/src/components/card/test/basic/app.module.ts
+++ b/src/components/card/test/basic/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/card/test/colors/app.module.ts b/src/components/card/test/colors/app.module.ts
index 0bf1cc361b..bab981f203 100644
--- a/src/components/card/test/colors/app.module.ts
+++ b/src/components/card/test/colors/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/card/test/images/app.module.ts b/src/components/card/test/images/app.module.ts
index 0c7a8d2016..80bb084034 100644
--- a/src/components/card/test/images/app.module.ts
+++ b/src/components/card/test/images/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/card/test/list/app.module.ts b/src/components/card/test/list/app.module.ts
index 0bf1cc361b..bab981f203 100644
--- a/src/components/card/test/list/app.module.ts
+++ b/src/components/card/test/list/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/card/test/map/app.module.ts b/src/components/card/test/map/app.module.ts
index 0bf1cc361b..bab981f203 100644
--- a/src/components/card/test/map/app.module.ts
+++ b/src/components/card/test/map/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/card/test/social/app.module.ts b/src/components/card/test/social/app.module.ts
index 0bf1cc361b..bab981f203 100644
--- a/src/components/card/test/social/app.module.ts
+++ b/src/components/card/test/social/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/checkbox/test/basic/app.module.ts b/src/components/checkbox/test/basic/app.module.ts
index bcd214b028..cdf15e9cc5 100644
--- a/src/components/checkbox/test/basic/app.module.ts
+++ b/src/components/checkbox/test/basic/app.module.ts
@@ -1,6 +1,6 @@
 import { Component, NgModule } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
-import { IonicApp, IonicModule, Checkbox } from '../../../..';
+import { IonicApp, IonicModule, Checkbox } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/chip/test/basic/app.module.ts b/src/components/chip/test/basic/app.module.ts
index 94d8cdd600..f603acb51b 100644
--- a/src/components/chip/test/basic/app.module.ts
+++ b/src/components/chip/test/basic/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/content/test/basic/app.module.ts b/src/components/content/test/basic/app.module.ts
index 0902c1abdd..02855711e2 100644
--- a/src/components/content/test/basic/app.module.ts
+++ b/src/components/content/test/basic/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule, ViewChild } from '@angular/core';
-import { IonicApp, IonicModule, Content, ScrollEvent } from '../../../..';
+import { IonicApp, IonicModule, Content, ScrollEvent } from '../../../../../ionic-angular';
 
 @Component({
   templateUrl: 'tabs.html'
diff --git a/src/components/content/test/fullscreen/app.module.ts b/src/components/content/test/fullscreen/app.module.ts
index 44ae9041c5..62f08f963f 100644
--- a/src/components/content/test/fullscreen/app.module.ts
+++ b/src/components/content/test/fullscreen/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, ScrollEvent } from '../../../..';
+import { IonicApp, IonicModule, ScrollEvent } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/content/test/header-scroll/app.module.ts b/src/components/content/test/header-scroll/app.module.ts
index a7890e59a2..dfd57cfa32 100644
--- a/src/components/content/test/header-scroll/app.module.ts
+++ b/src/components/content/test/header-scroll/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, ScrollEvent } from '../../../..';
+import { IonicApp, IonicModule, ScrollEvent } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/content/test/no-bounce/app.module.ts b/src/components/content/test/no-bounce/app.module.ts
index 29ad7dc1b1..ce9f7a3be7 100644
--- a/src/components/content/test/no-bounce/app.module.ts
+++ b/src/components/content/test/no-bounce/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/datetime/test/basic/app.module.ts b/src/components/datetime/test/basic/app.module.ts
index 46ecddf11b..b39fe79dc6 100644
--- a/src/components/datetime/test/basic/app.module.ts
+++ b/src/components/datetime/test/basic/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 
diff --git a/src/components/datetime/test/form/app.module.ts b/src/components/datetime/test/form/app.module.ts
index a5a39c92e6..57864efa74 100644
--- a/src/components/datetime/test/form/app.module.ts
+++ b/src/components/datetime/test/form/app.module.ts
@@ -1,6 +1,6 @@
 import { Component, NgModule } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 
diff --git a/src/components/datetime/test/labels/app.module.ts b/src/components/datetime/test/labels/app.module.ts
index 02f511a4ec..60452e4014 100644
--- a/src/components/datetime/test/labels/app.module.ts
+++ b/src/components/datetime/test/labels/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 
diff --git a/src/components/fab/test/basic/app.module.ts b/src/components/fab/test/basic/app.module.ts
index c96cdc1163..465e27a574 100755
--- a/src/components/fab/test/basic/app.module.ts
+++ b/src/components/fab/test/basic/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, FabContainer } from '../../../..';
+import { IonicApp, IonicModule, FabContainer } from '../../../../../ionic-angular';
 
 @Component({
   templateUrl: 'main.html'
diff --git a/src/components/grid/test/alignment/app.module.ts b/src/components/grid/test/alignment/app.module.ts
index 585d1e6adb..8206363eef 100644
--- a/src/components/grid/test/alignment/app.module.ts
+++ b/src/components/grid/test/alignment/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/grid/test/basic/app.module.ts b/src/components/grid/test/basic/app.module.ts
index 0b1da1f6aa..4686ad4728 100644
--- a/src/components/grid/test/basic/app.module.ts
+++ b/src/components/grid/test/basic/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/grid/test/full/app.module.ts b/src/components/grid/test/full/app.module.ts
index 0b1da1f6aa..4686ad4728 100644
--- a/src/components/grid/test/full/app.module.ts
+++ b/src/components/grid/test/full/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/img/test/basic/app.module.ts b/src/components/img/test/basic/app.module.ts
index 9c348e43f1..b74f6c3f10 100644
--- a/src/components/img/test/basic/app.module.ts
+++ b/src/components/img/test/basic/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, Input, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/img/test/cards/app.module.ts b/src/components/img/test/cards/app.module.ts
index f57350ad6b..d2a9e507f3 100644
--- a/src/components/img/test/cards/app.module.ts
+++ b/src/components/img/test/cards/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 @Component({
   templateUrl: 'main.html'
diff --git a/src/components/img/test/lazy-load/app.module.ts b/src/components/img/test/lazy-load/app.module.ts
index 559813021d..12a5529ad5 100644
--- a/src/components/img/test/lazy-load/app.module.ts
+++ b/src/components/img/test/lazy-load/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/img/test/list/app.module.ts b/src/components/img/test/list/app.module.ts
index 7888131c82..e18f920af0 100644
--- a/src/components/img/test/list/app.module.ts
+++ b/src/components/img/test/list/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/infinite-scroll/test/basic/app.module.ts b/src/components/infinite-scroll/test/basic/app.module.ts
index 804057a61d..da67d0183f 100644
--- a/src/components/infinite-scroll/test/basic/app.module.ts
+++ b/src/components/infinite-scroll/test/basic/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, ViewChild, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, InfiniteScroll, NavController } from '../../../..';
+import { IonicApp, IonicModule, InfiniteScroll, NavController } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/infinite-scroll/test/short-list/app.module.ts b/src/components/infinite-scroll/test/short-list/app.module.ts
index d1520e66a0..913555c9fd 100644
--- a/src/components/infinite-scroll/test/short-list/app.module.ts
+++ b/src/components/infinite-scroll/test/short-list/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, InfiniteScroll } from '../../../..';
+import { IonicApp, IonicModule, InfiniteScroll } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/input/test/clear-after-edit/app.module.ts b/src/components/input/test/clear-after-edit/app.module.ts
index 4ca5dbb6bf..4aa005f47f 100644
--- a/src/components/input/test/clear-after-edit/app.module.ts
+++ b/src/components/input/test/clear-after-edit/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/input/test/clear-input/app.module.ts b/src/components/input/test/clear-input/app.module.ts
index 5a11625803..de0d17882c 100644
--- a/src/components/input/test/clear-input/app.module.ts
+++ b/src/components/input/test/clear-input/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/input/test/events/app.module.ts b/src/components/input/test/events/app.module.ts
index c768ec1988..9cf89cee86 100644
--- a/src/components/input/test/events/app.module.ts
+++ b/src/components/input/test/events/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, TextInput } from '../../../..';
+import { IonicApp, IonicModule, TextInput } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/input/test/fixed-inline-labels/app.module.ts b/src/components/input/test/fixed-inline-labels/app.module.ts
index cea93c0862..afbb4f9725 100644
--- a/src/components/input/test/fixed-inline-labels/app.module.ts
+++ b/src/components/input/test/fixed-inline-labels/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/input/test/floating-labels/app.module.ts b/src/components/input/test/floating-labels/app.module.ts
index 6c4470b8da..371b006a6d 100644
--- a/src/components/input/test/floating-labels/app.module.ts
+++ b/src/components/input/test/floating-labels/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/input/test/footer-inputs/app.module.ts b/src/components/input/test/footer-inputs/app.module.ts
index 131f0b73c2..e7f896dafc 100644
--- a/src/components/input/test/footer-inputs/app.module.ts
+++ b/src/components/input/test/footer-inputs/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/input/test/form-inputs/app.module.ts b/src/components/input/test/form-inputs/app.module.ts
index e69c4e4e51..75402e8970 100644
--- a/src/components/input/test/form-inputs/app.module.ts
+++ b/src/components/input/test/form-inputs/app.module.ts
@@ -1,6 +1,6 @@
 import { FormBuilder, Validators } from '@angular/forms';
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/input/test/highlight/app.module.ts b/src/components/input/test/highlight/app.module.ts
index 9b75b182d6..5863dba0ed 100644
--- a/src/components/input/test/highlight/app.module.ts
+++ b/src/components/input/test/highlight/app.module.ts
@@ -1,6 +1,6 @@
 import { FormBuilder, Validators } from '@angular/forms';
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/input/test/inline-labels/app.module.ts b/src/components/input/test/inline-labels/app.module.ts
index 9d80310226..5e4db4a4ed 100644
--- a/src/components/input/test/inline-labels/app.module.ts
+++ b/src/components/input/test/inline-labels/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/input/test/input-focus/app.module.ts b/src/components/input/test/input-focus/app.module.ts
index 383259b6fa..ba7bd386dd 100644
--- a/src/components/input/test/input-focus/app.module.ts
+++ b/src/components/input/test/input-focus/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/input/test/inset-inputs/app.module.ts b/src/components/input/test/inset-inputs/app.module.ts
index 1286436e7c..e04b1caf5a 100644
--- a/src/components/input/test/inset-inputs/app.module.ts
+++ b/src/components/input/test/inset-inputs/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/input/test/placeholder-labels/app.module.ts b/src/components/input/test/placeholder-labels/app.module.ts
index 1286436e7c..e04b1caf5a 100644
--- a/src/components/input/test/placeholder-labels/app.module.ts
+++ b/src/components/input/test/placeholder-labels/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/input/test/stacked-labels/app.module.ts b/src/components/input/test/stacked-labels/app.module.ts
index c9deb48eaa..7ec6666177 100644
--- a/src/components/input/test/stacked-labels/app.module.ts
+++ b/src/components/input/test/stacked-labels/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/item/test/buttons/app.module.ts b/src/components/item/test/buttons/app.module.ts
index ccd7717c59..88024e2bdd 100644
--- a/src/components/item/test/buttons/app.module.ts
+++ b/src/components/item/test/buttons/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/item/test/colors/app.module.ts b/src/components/item/test/colors/app.module.ts
index b27ac52c14..f586d01edb 100644
--- a/src/components/item/test/colors/app.module.ts
+++ b/src/components/item/test/colors/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/item/test/dividers/app.module.ts b/src/components/item/test/dividers/app.module.ts
index 1286436e7c..e04b1caf5a 100644
--- a/src/components/item/test/dividers/app.module.ts
+++ b/src/components/item/test/dividers/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/item/test/groups/app.module.ts b/src/components/item/test/groups/app.module.ts
index 0ac90d48ef..5baf25ab64 100644
--- a/src/components/item/test/groups/app.module.ts
+++ b/src/components/item/test/groups/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, NavController, NavParams } from '../../../..';
+import { IonicApp, IonicModule, NavController, NavParams } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/item/test/icons/app.module.ts b/src/components/item/test/icons/app.module.ts
index 1286436e7c..e04b1caf5a 100644
--- a/src/components/item/test/icons/app.module.ts
+++ b/src/components/item/test/icons/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/item/test/images/app.module.ts b/src/components/item/test/images/app.module.ts
index 1286436e7c..e04b1caf5a 100644
--- a/src/components/item/test/images/app.module.ts
+++ b/src/components/item/test/images/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/item/test/inputs/app.module.ts b/src/components/item/test/inputs/app.module.ts
index d21e7ec373..caf458edec 100644
--- a/src/components/item/test/inputs/app.module.ts
+++ b/src/components/item/test/inputs/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/item/test/media/app.module.ts b/src/components/item/test/media/app.module.ts
index 1286436e7c..e04b1caf5a 100644
--- a/src/components/item/test/media/app.module.ts
+++ b/src/components/item/test/media/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/item/test/reorder/app.module.ts b/src/components/item/test/reorder/app.module.ts
index d03c16be52..e0b49f1caa 100644
--- a/src/components/item/test/reorder/app.module.ts
+++ b/src/components/item/test/reorder/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, ChangeDetectorRef, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, reorderArray } from '../../../..';
+import { IonicApp, IonicModule, reorderArray } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/item/test/sliding/app.module.ts b/src/components/item/test/sliding/app.module.ts
index e9e54b51df..ca5639d08f 100644
--- a/src/components/item/test/sliding/app.module.ts
+++ b/src/components/item/test/sliding/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, ViewChild, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, AlertController, NavController, List, ItemSliding, ToastController } from '../../../..';
+import { IonicApp, IonicModule, AlertController, NavController, List, ItemSliding, ToastController } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/item/test/text/app.module.ts b/src/components/item/test/text/app.module.ts
index 1286436e7c..e04b1caf5a 100644
--- a/src/components/item/test/text/app.module.ts
+++ b/src/components/item/test/text/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/list/test/chat-list/app.module.ts b/src/components/list/test/chat-list/app.module.ts
index c77c785bdd..5d621a484b 100644
--- a/src/components/list/test/chat-list/app.module.ts
+++ b/src/components/list/test/chat-list/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/list/test/header-scenarios/app.module.ts b/src/components/list/test/header-scenarios/app.module.ts
index c77c785bdd..5d621a484b 100644
--- a/src/components/list/test/header-scenarios/app.module.ts
+++ b/src/components/list/test/header-scenarios/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/list/test/headers/app.module.ts b/src/components/list/test/headers/app.module.ts
index 1286436e7c..e04b1caf5a 100644
--- a/src/components/list/test/headers/app.module.ts
+++ b/src/components/list/test/headers/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/list/test/inset/app.module.ts b/src/components/list/test/inset/app.module.ts
index 1286436e7c..e04b1caf5a 100644
--- a/src/components/list/test/inset/app.module.ts
+++ b/src/components/list/test/inset/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/list/test/no-lines/app.module.ts b/src/components/list/test/no-lines/app.module.ts
index 1286436e7c..e04b1caf5a 100644
--- a/src/components/list/test/no-lines/app.module.ts
+++ b/src/components/list/test/no-lines/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/list/test/repeat-headers/app.module.ts b/src/components/list/test/repeat-headers/app.module.ts
index 25a84e2536..117fd06101 100644
--- a/src/components/list/test/repeat-headers/app.module.ts
+++ b/src/components/list/test/repeat-headers/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/list/test/sticky/app.module.ts b/src/components/list/test/sticky/app.module.ts
index ab8c90675c..ca320e0408 100644
--- a/src/components/list/test/sticky/app.module.ts
+++ b/src/components/list/test/sticky/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/loading/test/basic/app.module.ts b/src/components/loading/test/basic/app.module.ts
index d712a4a02c..f4e714156a 100644
--- a/src/components/loading/test/basic/app.module.ts
+++ b/src/components/loading/test/basic/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, ViewEncapsulation, NgModule } from '@angular/core';
-import { App, IonicApp, IonicModule, LoadingController, NavController } from '../../../..';
+import { App, IonicApp, IonicModule, LoadingController, NavController } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/loading/test/tabs/app.module.ts b/src/components/loading/test/tabs/app.module.ts
index 680bbf89d6..ba2d7711c2 100644
--- a/src/components/loading/test/tabs/app.module.ts
+++ b/src/components/loading/test/tabs/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, LoadingController, NavController } from '../../../..';
+import { IonicApp, IonicModule, LoadingController, NavController } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/menu/test/basic/app.module.ts b/src/components/menu/test/basic/app.module.ts
index c891c9fc49..9dd0758ac4 100644
--- a/src/components/menu/test/basic/app.module.ts
+++ b/src/components/menu/test/basic/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, ViewChild, NgModule } from '@angular/core';
-import { AlertController, IonicApp, IonicModule, MenuController, ModalController, NavController, Nav, ViewController } from '../../../..';
+import { AlertController, IonicApp, IonicModule, MenuController, ModalController, NavController, Nav, ViewController } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/menu/test/disable-swipe/app.module.ts b/src/components/menu/test/disable-swipe/app.module.ts
index 7fd8a225f0..02c016dbe7 100644
--- a/src/components/menu/test/disable-swipe/app.module.ts
+++ b/src/components/menu/test/disable-swipe/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, MenuController } from '../../../..';
+import { IonicApp, IonicModule, MenuController } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/menu/test/enable-disable/app.module.ts b/src/components/menu/test/enable-disable/app.module.ts
index 7233423ca4..116141b939 100644
--- a/src/components/menu/test/enable-disable/app.module.ts
+++ b/src/components/menu/test/enable-disable/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, ViewChild, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, App, MenuController, Nav } from '../../../..';
+import { IonicApp, IonicModule, App, MenuController, Nav } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/menu/test/multiple/app.module.ts b/src/components/menu/test/multiple/app.module.ts
index 486d0ce88c..1a8e3874e4 100644
--- a/src/components/menu/test/multiple/app.module.ts
+++ b/src/components/menu/test/multiple/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, MenuController } from '../../../..';
+import { IonicApp, IonicModule, MenuController } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/menu/test/overlay/app.module.ts b/src/components/menu/test/overlay/app.module.ts
index b1a1adaa3e..8a302d352b 100644
--- a/src/components/menu/test/overlay/app.module.ts
+++ b/src/components/menu/test/overlay/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, ViewChild, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, Nav, AlertController } from '../../../..';
+import { IonicApp, IonicModule, Nav, AlertController } from '../../../../../ionic-angular';
 
 
 @Component({templateUrl: 'page1.html'})
diff --git a/src/components/menu/test/push/app.module.ts b/src/components/menu/test/push/app.module.ts
index b1a1adaa3e..8a302d352b 100644
--- a/src/components/menu/test/push/app.module.ts
+++ b/src/components/menu/test/push/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, ViewChild, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, Nav, AlertController } from '../../../..';
+import { IonicApp, IonicModule, Nav, AlertController } from '../../../../../ionic-angular';
 
 
 @Component({templateUrl: 'page1.html'})
diff --git a/src/components/menu/test/reveal/app.module.ts b/src/components/menu/test/reveal/app.module.ts
index 3c955d2696..d6099c514e 100644
--- a/src/components/menu/test/reveal/app.module.ts
+++ b/src/components/menu/test/reveal/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, ViewChild, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, Nav } from '../../../..';
+import { IonicApp, IonicModule, Nav } from '../../../../../ionic-angular';
 
 
 @Component({templateUrl: 'page1.html'})
diff --git a/src/components/modal/test/basic/app.module.ts b/src/components/modal/test/basic/app.module.ts
index f895ccc670..16c5a279e4 100644
--- a/src/components/modal/test/basic/app.module.ts
+++ b/src/components/modal/test/basic/app.module.ts
@@ -2,7 +2,7 @@ import { Component, Injectable, NgModule } from '@angular/core';
 
 import { ActionSheetController, AlertController, App, Config,
   IonicApp, IonicModule, ModalController, NavController,
-  NavParams, Platform, ToastController, ViewController } from '../../../..';
+  NavParams, Platform, ToastController, ViewController } from '../../../../../ionic-angular';
 
 
 @Injectable()
diff --git a/src/components/nav/test/basic/app.module.ts b/src/components/nav/test/basic/app.module.ts
index e5573f3bb5..78506e7c87 100644
--- a/src/components/nav/test/basic/app.module.ts
+++ b/src/components/nav/test/basic/app.module.ts
@@ -1,5 +1,5 @@
 import { NgModule, Component, ViewChild } from '@angular/core';
-import { App, AlertController, Content, DeepLinkConfig, IonicApp, IonicModule, NavController, NavParams, Tabs, Tab, ModalController, ViewController } from '../../../..';
+import { App, AlertController, Content, DeepLinkConfig, IonicApp, IonicModule, NavController, NavParams, Tabs, Tab, ModalController, ViewController } from '../../../../../ionic-angular';
 
 @Component({
   selector: 'my-cmp2',
diff --git a/src/components/nav/test/child-navs/app.module.ts b/src/components/nav/test/child-navs/app.module.ts
index 2926d6f260..a56860609c 100644
--- a/src/components/nav/test/child-navs/app.module.ts
+++ b/src/components/nav/test/child-navs/app.module.ts
@@ -1,5 +1,5 @@
 import { NgModule, Component } from '@angular/core';
-import { IonicApp, IonicModule, NavController } from '../../../..';
+import { IonicApp, IonicModule, NavController } from '../../../../../ionic-angular';
 
 @Component({
   template: `<ion-nav [root]="root"></ion-nav>`,
diff --git a/src/components/nav/test/init-async/app.module.ts b/src/components/nav/test/init-async/app.module.ts
index 2bf06b07b8..30c4922d00 100644
--- a/src/components/nav/test/init-async/app.module.ts
+++ b/src/components/nav/test/init-async/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/nav/test/insert-views/app.module.ts b/src/components/nav/test/insert-views/app.module.ts
index 25d5819338..fbed04857e 100644
--- a/src/components/nav/test/insert-views/app.module.ts
+++ b/src/components/nav/test/insert-views/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, NavController, NavParams } from '../../../..';
+import { IonicApp, IonicModule, NavController, NavParams } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/nav/test/memory/app.module.ts b/src/components/nav/test/memory/app.module.ts
index 6401521b55..4ca9cd38a6 100644
--- a/src/components/nav/test/memory/app.module.ts
+++ b/src/components/nav/test/memory/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, NavController } from '../../../..';
+import { IonicApp, IonicModule, NavController } from '../../../../../ionic-angular';
 
 
 let delay = 100;
diff --git a/src/components/nav/test/nav-push-pop/app.module.ts b/src/components/nav/test/nav-push-pop/app.module.ts
index 337ee0f0b5..13c56c3c98 100644
--- a/src/components/nav/test/nav-push-pop/app.module.ts
+++ b/src/components/nav/test/nav-push-pop/app.module.ts
@@ -1,6 +1,6 @@
 import { Component, NgModule } from '@angular/core';
 
-import { IonicApp, IonicModule, NavParams } from '../../../..';
+import { IonicApp, IonicModule, NavParams } from '../../../../../ionic-angular';
 
 
 
diff --git a/src/components/nav/test/worst-case/app.module.ts b/src/components/nav/test/worst-case/app.module.ts
index 983c670567..dba429112b 100644
--- a/src/components/nav/test/worst-case/app.module.ts
+++ b/src/components/nav/test/worst-case/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, NavController, NavParams } from '../../../..';
+import { IonicApp, IonicModule, NavController, NavParams } from '../../../../../ionic-angular';
 import { DomSanitizer } from '@angular/platform-browser';
 
 
diff --git a/src/components/picker/test/basic/app.module.ts b/src/components/picker/test/basic/app.module.ts
index bccebf5e86..bef8b32fbd 100644
--- a/src/components/picker/test/basic/app.module.ts
+++ b/src/components/picker/test/basic/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, ViewEncapsulation, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, NavController, PickerController } from '../../../..';
+import { IonicApp, IonicModule, NavController, PickerController } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/popover/test/basic/app.module.ts b/src/components/popover/test/basic/app.module.ts
index b210b33936..b0a99271fb 100644
--- a/src/components/popover/test/basic/app.module.ts
+++ b/src/components/popover/test/basic/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, ViewChild, ElementRef, ViewEncapsulation, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, PopoverController, NavParams, ViewController } from '../../../..';
+import { IonicApp, IonicModule, PopoverController, NavParams, ViewController } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/radio/test/basic/app.module.ts b/src/components/radio/test/basic/app.module.ts
index 35fc3a17da..0cf6043719 100644
--- a/src/components/radio/test/basic/app.module.ts
+++ b/src/components/radio/test/basic/app.module.ts
@@ -1,6 +1,6 @@
 import { Component, NgModule } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
-import { IonicApp, IonicModule, RadioButton, RadioGroup } from '../../../..';
+import { IonicApp, IonicModule, RadioButton, RadioGroup } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/range/test/basic/app.module.ts b/src/components/range/test/basic/app.module.ts
index 364794dbb4..d73522ddbf 100644
--- a/src/components/range/test/basic/app.module.ts
+++ b/src/components/range/test/basic/app.module.ts
@@ -1,6 +1,6 @@
 import { Component, NgModule } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
-import { IonicApp, IonicModule, Range } from '../../../..';
+import { IonicApp, IonicModule, Range } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/refresher/test/basic/app.module.ts b/src/components/refresher/test/basic/app.module.ts
index 465ce17b5b..d124e974bf 100644
--- a/src/components/refresher/test/basic/app.module.ts
+++ b/src/components/refresher/test/basic/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, Refresher } from '../../../..';
+import { IonicApp, IonicModule, Refresher } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/scroll/test/basic/app.module.ts b/src/components/scroll/test/basic/app.module.ts
index 0874dff8da..81f0a64222 100644
--- a/src/components/scroll/test/basic/app.module.ts
+++ b/src/components/scroll/test/basic/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/searchbar/test/basic/app.module.ts b/src/components/searchbar/test/basic/app.module.ts
index b8a0858ea4..fb5fe9c6c3 100644
--- a/src/components/searchbar/test/basic/app.module.ts
+++ b/src/components/searchbar/test/basic/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, ChangeDetectorRef, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/searchbar/test/nav/app.module.ts b/src/components/searchbar/test/nav/app.module.ts
index 946da83676..dacfa242fc 100644
--- a/src/components/searchbar/test/nav/app.module.ts
+++ b/src/components/searchbar/test/nav/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, ModalController, NavController, NavParams, ViewController } from '../../../..';
+import { IonicApp, IonicModule, ModalController, NavController, NavParams, ViewController } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/searchbar/test/toolbar/app.module.ts b/src/components/searchbar/test/toolbar/app.module.ts
index 593ca4783c..8fc7b6bdea 100644
--- a/src/components/searchbar/test/toolbar/app.module.ts
+++ b/src/components/searchbar/test/toolbar/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/segment/test/basic/app.module.ts b/src/components/segment/test/basic/app.module.ts
index a7742dbfdd..662728ff00 100644
--- a/src/components/segment/test/basic/app.module.ts
+++ b/src/components/segment/test/basic/app.module.ts
@@ -1,6 +1,6 @@
 import { Component, NgModule } from '@angular/core';
 import { FormBuilder, Validators } from '@angular/forms';
-import { IonicApp, IonicModule, SegmentButton } from '../../../..';
+import { IonicApp, IonicModule, SegmentButton } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/segment/test/nav/app.module.ts b/src/components/segment/test/nav/app.module.ts
index 0ae102e83a..4ff045400b 100644
--- a/src/components/segment/test/nav/app.module.ts
+++ b/src/components/segment/test/nav/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, NavController } from '../../../..';
+import { IonicApp, IonicModule, NavController } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/segment/test/swipe/app.module.ts b/src/components/segment/test/swipe/app.module.ts
index 4e07162948..1134a11b69 100644
--- a/src/components/segment/test/swipe/app.module.ts
+++ b/src/components/segment/test/swipe/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, ViewChild, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, Slides, SegmentButton } from '../../../..';
+import { IonicApp, IonicModule, Slides, SegmentButton } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/select/test/multiple-value/app.module.ts b/src/components/select/test/multiple-value/app.module.ts
index 7490379e4a..19480094a7 100644
--- a/src/components/select/test/multiple-value/app.module.ts
+++ b/src/components/select/test/multiple-value/app.module.ts
@@ -1,6 +1,6 @@
 import { Component, NgModule } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/select/test/single-value/app.module.ts b/src/components/select/test/single-value/app.module.ts
index 6855007443..18999f8e85 100644
--- a/src/components/select/test/single-value/app.module.ts
+++ b/src/components/select/test/single-value/app.module.ts
@@ -1,6 +1,6 @@
 import { Component, NgModule } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 export interface Currency {
   symbol: string;
diff --git a/src/components/show-hide-when/test/basic/app.module.ts b/src/components/show-hide-when/test/basic/app.module.ts
index a906c2641b..04f9734f47 100644
--- a/src/components/show-hide-when/test/basic/app.module.ts
+++ b/src/components/show-hide-when/test/basic/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/slides/test/basic/app.module.ts b/src/components/slides/test/basic/app.module.ts
index affa8b0bc9..67b062a744 100644
--- a/src/components/slides/test/basic/app.module.ts
+++ b/src/components/slides/test/basic/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, ViewChild, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, Slides } from '../../../..';
+import { IonicApp, IonicModule, Slides } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/slides/test/control/app.module.ts b/src/components/slides/test/control/app.module.ts
index 0b6dd4a38a..a3c398c33a 100644
--- a/src/components/slides/test/control/app.module.ts
+++ b/src/components/slides/test/control/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, ViewChild, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, Slides } from '../../../..';
+import { IonicApp, IonicModule, Slides } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/slides/test/controller/app.module.ts b/src/components/slides/test/controller/app.module.ts
index 4cc820ced2..96325fa591 100644
--- a/src/components/slides/test/controller/app.module.ts
+++ b/src/components/slides/test/controller/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, ViewChild, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, Slides } from '../../../..';
+import { IonicApp, IonicModule, Slides } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/slides/test/images/app.module.ts b/src/components/slides/test/images/app.module.ts
index 7d55a56bb1..91acb72890 100644
--- a/src/components/slides/test/images/app.module.ts
+++ b/src/components/slides/test/images/app.module.ts
@@ -1,6 +1,6 @@
 import { Component, ViewChild, NgModule } from '@angular/core';
 import { Http } from '@angular/http';
-import { IonicApp, IonicModule, Slides } from '../../../..';
+import { IonicApp, IonicModule, Slides } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/slides/test/intro/app.module.ts b/src/components/slides/test/intro/app.module.ts
index c26066f47d..ab68205706 100644
--- a/src/components/slides/test/intro/app.module.ts
+++ b/src/components/slides/test/intro/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule, ViewChild } from '@angular/core';
-import { IonicApp, IonicModule, NavController, Slides } from '../../../..';
+import { IonicApp, IonicModule, NavController, Slides } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/slides/test/loop/app.module.ts b/src/components/slides/test/loop/app.module.ts
index 454d00a66c..01f93fb671 100644
--- a/src/components/slides/test/loop/app.module.ts
+++ b/src/components/slides/test/loop/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, ViewChild, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, Slides } from '../../../..';
+import { IonicApp, IonicModule, Slides } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/slides/test/options/app.module.ts b/src/components/slides/test/options/app.module.ts
index 3f9af77889..3d2c8ff837 100644
--- a/src/components/slides/test/options/app.module.ts
+++ b/src/components/slides/test/options/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, ViewChild, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, Slides } from '../../../..';
+import { IonicApp, IonicModule, Slides } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/slides/test/scroll/app.module.ts b/src/components/slides/test/scroll/app.module.ts
index 7fd2858a94..b9c379990b 100644
--- a/src/components/slides/test/scroll/app.module.ts
+++ b/src/components/slides/test/scroll/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/spinner/test/basic/app.module.ts b/src/components/spinner/test/basic/app.module.ts
index 857cb83ccd..af75c2d6c0 100644
--- a/src/components/spinner/test/basic/app.module.ts
+++ b/src/components/spinner/test/basic/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/spinner/test/colors/app.module.ts b/src/components/spinner/test/colors/app.module.ts
index 857cb83ccd..af75c2d6c0 100644
--- a/src/components/spinner/test/colors/app.module.ts
+++ b/src/components/spinner/test/colors/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/tabs/test/advanced/app.module.ts b/src/components/tabs/test/advanced/app.module.ts
index 89310fe0f8..f7bdf718ab 100644
--- a/src/components/tabs/test/advanced/app.module.ts
+++ b/src/components/tabs/test/advanced/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule, ViewChild } from '@angular/core';
-import { /*DeepLink,*/AlertController, DeepLinkConfig, IonicApp, IonicModule, App, NavController, NavParams, ModalController, ViewController, Tabs, Tab } from '../../../..';
+import { /*DeepLink,*/AlertController, DeepLinkConfig, IonicApp, IonicModule, App, NavController, NavParams, ModalController, ViewController, Tabs, Tab } from '../../../../../ionic-angular';
 
 
 // @DeepLink({ name: 'sign-in' })
diff --git a/src/components/tabs/test/badges/app.module.ts b/src/components/tabs/test/badges/app.module.ts
index ad2e87e5e3..0e37a54db5 100644
--- a/src/components/tabs/test/badges/app.module.ts
+++ b/src/components/tabs/test/badges/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, ViewEncapsulation, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 @Component({template: 'hi'})
 export class E2EPage {}
diff --git a/src/components/tabs/test/basic/app.module.ts b/src/components/tabs/test/basic/app.module.ts
index 6065542217..e0761ec2b3 100644
--- a/src/components/tabs/test/basic/app.module.ts
+++ b/src/components/tabs/test/basic/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { Config, IonicApp, IonicModule, App, AlertController, ModalController, ViewController, Tab, Tabs } from '../../../..';
+import { Config, IonicApp, IonicModule, App, AlertController, ModalController, ViewController, Tab, Tabs } from '../../../../../ionic-angular';
 
 //
 // Modal
diff --git a/src/components/tabs/test/colors/app.module.ts b/src/components/tabs/test/colors/app.module.ts
index f2790f3e51..4334b85916 100644
--- a/src/components/tabs/test/colors/app.module.ts
+++ b/src/components/tabs/test/colors/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, ViewEncapsulation, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({template: 'hi'})
diff --git a/src/components/tabs/test/events/app.module.ts b/src/components/tabs/test/events/app.module.ts
index 557589a3b7..a01dcedd30 100644
--- a/src/components/tabs/test/events/app.module.ts
+++ b/src/components/tabs/test/events/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, Events } from '../../../..';
+import { IonicApp, IonicModule, Events } from '../../../../../ionic-angular';
 
 //
 // Tab 1
diff --git a/src/components/tabs/test/ghost/app.module.ts b/src/components/tabs/test/ghost/app.module.ts
index 1a3bbc0132..0da3c4cf5d 100644
--- a/src/components/tabs/test/ghost/app.module.ts
+++ b/src/components/tabs/test/ghost/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, QueryList, ViewChildren, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, Tab } from '../../../..';
+import { IonicApp, IonicModule, Tab } from '../../../../../ionic-angular';
 
 
 //
diff --git a/src/components/tabs/test/lifecyles/app.module.ts b/src/components/tabs/test/lifecyles/app.module.ts
index 5934637cd7..85518828d1 100644
--- a/src/components/tabs/test/lifecyles/app.module.ts
+++ b/src/components/tabs/test/lifecyles/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, NavController, AlertController } from '../../../..';
+import { IonicApp, IonicModule, NavController, AlertController } from '../../../../../ionic-angular';
 
 //
 // Tab 1
diff --git a/src/components/tabs/test/tab-bar-scenarios/app.module.ts b/src/components/tabs/test/tab-bar-scenarios/app.module.ts
index 0a6a90564d..84ba0ee25b 100644
--- a/src/components/tabs/test/tab-bar-scenarios/app.module.ts
+++ b/src/components/tabs/test/tab-bar-scenarios/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, ViewEncapsulation, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({template: 'hi'})
diff --git a/src/components/tabs/test/top/app.module.ts b/src/components/tabs/test/top/app.module.ts
index faebe5a032..20291dd585 100644
--- a/src/components/tabs/test/top/app.module.ts
+++ b/src/components/tabs/test/top/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 //
 // Tab 1
diff --git a/src/components/toast/test/basic/app.module.ts b/src/components/toast/test/basic/app.module.ts
index f2904fde47..47ab701213 100644
--- a/src/components/toast/test/basic/app.module.ts
+++ b/src/components/toast/test/basic/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, Toast, ToastController, NavController } from '../../../..';
+import { IonicApp, IonicModule, Toast, ToastController, NavController } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/toggle/test/basic/app.module.ts b/src/components/toggle/test/basic/app.module.ts
index 0251a00dd7..451ec29526 100644
--- a/src/components/toggle/test/basic/app.module.ts
+++ b/src/components/toggle/test/basic/app.module.ts
@@ -1,6 +1,6 @@
 import { Component, NgModule } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
-import { IonicApp, IonicModule, Toggle } from '../../../..';
+import { IonicApp, IonicModule, Toggle } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/toolbar/test/basic/app.module.ts b/src/components/toolbar/test/basic/app.module.ts
index f6eebffd1f..44e2181a9c 100644
--- a/src/components/toolbar/test/basic/app.module.ts
+++ b/src/components/toolbar/test/basic/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/toolbar/test/colors/app.module.ts b/src/components/toolbar/test/colors/app.module.ts
index 325ef37c2a..cf65eab3db 100644
--- a/src/components/toolbar/test/colors/app.module.ts
+++ b/src/components/toolbar/test/colors/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/toolbar/test/scenarios/app.module.ts b/src/components/toolbar/test/scenarios/app.module.ts
index ef63fef867..f1156c2181 100644
--- a/src/components/toolbar/test/scenarios/app.module.ts
+++ b/src/components/toolbar/test/scenarios/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/typography/test/basic/app.module.ts b/src/components/typography/test/basic/app.module.ts
index 33f7340164..ffeb09dff1 100644
--- a/src/components/typography/test/basic/app.module.ts
+++ b/src/components/typography/test/basic/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/virtual-scroll/test/basic/app.module.ts b/src/components/virtual-scroll/test/basic/app.module.ts
index ba595e7a08..daebae3783 100644
--- a/src/components/virtual-scroll/test/basic/app.module.ts
+++ b/src/components/virtual-scroll/test/basic/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, NavController, Platform } from '../../../..';
+import { IonicApp, IonicModule, NavController, Platform } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/virtual-scroll/test/cards/app.module.ts b/src/components/virtual-scroll/test/cards/app.module.ts
index 2c3da2d636..52cc70d059 100644
--- a/src/components/virtual-scroll/test/cards/app.module.ts
+++ b/src/components/virtual-scroll/test/cards/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, ViewEncapsulation, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/virtual-scroll/test/image-gallery/app.module.ts b/src/components/virtual-scroll/test/image-gallery/app.module.ts
index 80497b6b6b..8cf9cc2d9a 100644
--- a/src/components/virtual-scroll/test/image-gallery/app.module.ts
+++ b/src/components/virtual-scroll/test/image-gallery/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, ViewEncapsulation, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/virtual-scroll/test/list/app.module.ts b/src/components/virtual-scroll/test/list/app.module.ts
index e3c5e93524..badafa479d 100644
--- a/src/components/virtual-scroll/test/list/app.module.ts
+++ b/src/components/virtual-scroll/test/list/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/virtual-scroll/test/media/app.module.ts b/src/components/virtual-scroll/test/media/app.module.ts
index b3ae00f69c..f67b81b228 100644
--- a/src/components/virtual-scroll/test/media/app.module.ts
+++ b/src/components/virtual-scroll/test/media/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, Platform } from '../../../..';
+import { IonicApp, IonicModule, Platform } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/virtual-scroll/test/sliding-item/app.module.ts b/src/components/virtual-scroll/test/sliding-item/app.module.ts
index 4387c9742c..04283453d4 100644
--- a/src/components/virtual-scroll/test/sliding-item/app.module.ts
+++ b/src/components/virtual-scroll/test/sliding-item/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, ViewChild, ElementRef, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, Platform } from '../../../..';
+import { IonicApp, IonicModule, Platform } from '../../../../../ionic-angular';
 
 
 @Component({
diff --git a/src/components/virtual-scroll/test/variable-size/app.module.ts b/src/components/virtual-scroll/test/variable-size/app.module.ts
index 00d10c52e6..e85d4cb5bd 100644
--- a/src/components/virtual-scroll/test/variable-size/app.module.ts
+++ b/src/components/virtual-scroll/test/variable-size/app.module.ts
@@ -1,5 +1,5 @@
 import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
+import { IonicApp, IonicModule } from '../../../../../ionic-angular';
 
 
 @Component({