diff --git a/ionic/components.ts b/ionic/components.ts
index 13fdaab7f3..e71d6090b3 100644
--- a/ionic/components.ts
+++ b/ionic/components.ts
@@ -1,39 +1,39 @@
-
-export * from 'ionic/components/app/app'
-export * from 'ionic/components/app/id'
-export * from 'ionic/components/action-sheet/action-sheet'
-export * from 'ionic/components/blur/blur'
-export * from 'ionic/components/button/button'
-export * from 'ionic/components/checkbox/checkbox'
-export * from 'ionic/components/content/content'
-export * from 'ionic/components/icon/icon'
-export * from 'ionic/components/item/item'
-export * from 'ionic/components/item/item-sliding'
-export * from 'ionic/components/menu/menu'
-export * from 'ionic/components/menu/menu-types'
-export * from 'ionic/components/menu/menu-toggle'
-export * from 'ionic/components/menu/menu-close'
-export * from 'ionic/components/text-input/text-input'
-export * from 'ionic/components/text-input/label'
-export * from 'ionic/components/list/list'
-export * from 'ionic/components/show-hide-when/show-hide-when'
-export * from 'ionic/components/modal/modal'
-export * from 'ionic/components/nav/nav'
-export * from 'ionic/components/nav/nav-controller'
-export * from 'ionic/components/nav/view-controller'
-export * from 'ionic/components/nav/nav-push'
-export * from 'ionic/components/nav/nav-router'
-export * from 'ionic/components/navbar/navbar'
-export * from 'ionic/components/overlay/overlay'
-export * from 'ionic/components/popup/popup'
-export * from 'ionic/components/slides/slides'
-export * from 'ionic/components/radio/radio'
-export * from 'ionic/components/scroll/scroll'
-export * from 'ionic/components/scroll/pull-to-refresh'
-export * from 'ionic/components/searchbar/searchbar'
-export * from 'ionic/components/segment/segment'
-export * from 'ionic/components/tabs/tabs'
-export * from 'ionic/components/tabs/tab'
-export * from 'ionic/components/tap-click/tap-click'
-export * from 'ionic/components/toggle/toggle'
-export * from 'ionic/components/toolbar/toolbar'
+export * from './components/app/app'
+export * from './components/app/id'
+export * from './components/action-sheet/action-sheet'
+export * from './components/blur/blur'
+export * from './components/button/button'
+export * from './components/checkbox/checkbox'
+export * from './components/content/content'
+export * from './components/icon/icon'
+export * from './components/item/item'
+export * from './components/item/item-sliding'
+export * from './components/menu/menu'
+export * from './components/menu/menu-types'
+export * from './components/menu/menu-toggle'
+export * from './components/menu/menu-close'
+export * from './components/text-input/text-input'
+export * from './components/text-input/label'
+export * from './components/list/list'
+export * from './components/show-hide-when/show-hide-when'
+export * from './components/modal/modal'
+export * from './components/nav/nav'
+export * from './components/nav/nav-controller'
+export * from './components/nav/view-controller'
+export * from './components/nav/nav-push'
+export * from './components/nav/nav-router'
+export * from './components/navbar/navbar'
+export * from './components/overlay/overlay'
+export * from './components/popup/popup'
+export * from './components/slides/slides'
+export * from './components/radio/radio'
+export * from './components/scroll/scroll'
+export * from './components/scroll/pull-to-refresh'
+export * from './components/searchbar/searchbar'
+export * from './components/segment/segment'
+export * from './components/switch/switch'
+export * from './components/tabs/tabs'
+export * from './components/tabs/tab'
+export * from './components/tap-click/tap-click'
+export * from './components/toggle/toggle'
+export * from './components/toolbar/toolbar'
diff --git a/ionic/components/ion.ts b/ionic/components/ion.ts
index fc67620d11..6dfb852a89 100644
--- a/ionic/components/ion.ts
+++ b/ionic/components/ion.ts
@@ -1,6 +1,7 @@
+import {ElementRef} from 'angular2/angular2';
 import {Config} from '../config/config';
-import {isArray} from 'ionic/util';
-import * as dom from 'ionic/util/dom';
+import {isArray} from '../util';
+import * as dom from '../util/dom';
 
 
 /**
diff --git a/ionic/components/item/item-sliding-gesture.ts b/ionic/components/item/item-sliding-gesture.ts
index 06abc5aefa..502038fe0c 100644
--- a/ionic/components/item/item-sliding-gesture.ts
+++ b/ionic/components/item/item-sliding-gesture.ts
@@ -1,8 +1,8 @@
-import {Hammer} from 'ionic/gestures/hammer';
-import {DragGesture} from 'ionic/gestures/drag-gesture';
+import {Hammer} from '../../gestures/hammer';
+import {DragGesture} from '../../gestures/drag-gesture';
 import {List} from '../list/list';
 
-import {CSS, raf, closest} from 'ionic/util/dom';
+import {CSS, raf, closest} from '../../util/dom';
 
 
 export class ItemSlidingGesture extends DragGesture {
diff --git a/ionic/components/list/list.ts b/ionic/components/list/list.ts
index 9168239397..f6707fc6d3 100644
--- a/ionic/components/list/list.ts
+++ b/ionic/components/list/list.ts
@@ -4,7 +4,7 @@ import {Ion} from '../ion';
 import {Config} from '../../config/config';
 import {ListVirtualScroll} from './virtual';
 import {ItemSlidingGesture} from '../item/item-sliding-gesture';
-import * as util from 'ionic/util';
+import * as util from '../../util';
 
 /**
  * The List is a widely used interface element in almost any mobile app, and can include
diff --git a/ionic/components/menu/menu-gestures.ts b/ionic/components/menu/menu-gestures.ts
index ea4f7bb0ff..851fd38274 100644
--- a/ionic/components/menu/menu-gestures.ts
+++ b/ionic/components/menu/menu-gestures.ts
@@ -1,9 +1,9 @@
 import {Menu} from './menu';
 import {SlideEdgeGesture} from '../../gestures/slide-edge-gesture';
 
-import * as util from 'ionic/util';
+import * as util from '../../util';
 
-class MenuContentGesture extends SlideEdgeGesture {
+export class MenuContentGesture extends SlideEdgeGesture {
   constructor(menu: Menu, targetEl: Element, options = {}) {
 
     super(targetEl, util.extend({
diff --git a/ionic/components/menu/menu-types.ts b/ionic/components/menu/menu-types.ts
index 6396604c32..1393cbe4c1 100644
--- a/ionic/components/menu/menu-types.ts
+++ b/ionic/components/menu/menu-types.ts
@@ -1,5 +1,5 @@
 import {Menu} from './menu';
-import {Animation} from 'ionic/animations/animation';
+import {Animation} from '../../animations/animation';
 
 
 /**
diff --git a/ionic/components/modal/modal.ts b/ionic/components/modal/modal.ts
index 83f611447f..a2a4cfb6ad 100644
--- a/ionic/components/modal/modal.ts
+++ b/ionic/components/modal/modal.ts
@@ -1,9 +1,9 @@
-import {Injectable} from 'angular2/angular2';
+import {Injectable, Type} from 'angular2/angular2';
 
 import {OverlayController} from '../overlay/overlay-controller';
 import {Config} from '../../config/config';
 import {Animation} from '../../animations/animation';
-import {extend} from 'ionic/util';
+import {extend} from '../../util';
 
 /**
  * The Modal is a content pane that can go over the user's current page.
diff --git a/ionic/components/nav/swipe-back.ts b/ionic/components/nav/swipe-back.ts
index 96b59168cd..3f1b29c15b 100644
--- a/ionic/components/nav/swipe-back.ts
+++ b/ionic/components/nav/swipe-back.ts
@@ -1,4 +1,4 @@
-import {SlideEdgeGesture} from 'ionic/gestures/slide-edge-gesture';
+import {SlideEdgeGesture} from '../../gestures/slide-edge-gesture';
 
 
 export class SwipeBackGesture extends SlideEdgeGesture {
diff --git a/ionic/components/overlay/overlay-controller.ts b/ionic/components/overlay/overlay-controller.ts
index d38b150911..4435381af8 100644
--- a/ionic/components/overlay/overlay-controller.ts
+++ b/ionic/components/overlay/overlay-controller.ts
@@ -1,5 +1,5 @@
 import {Animation} from '../../animations/animation';
-import {extend} from 'ionic/util';
+import {extend} from '../../util';
 
 
 /**
diff --git a/ionic/components/scroll/pull-to-refresh.ts b/ionic/components/scroll/pull-to-refresh.ts
index 2dc200cb01..eaefd66354 100644
--- a/ionic/components/scroll/pull-to-refresh.ts
+++ b/ionic/components/scroll/pull-to-refresh.ts
@@ -1,8 +1,8 @@
 import {Component, NgIf, NgClass, ElementRef, EventEmitter, Host} from 'angular2/angular2'
 
 import {Content} from '../content/content';
-import * as util from 'ionic/util';
-import {raf, ready, CSS} from 'ionic/util/dom';
+import * as util from '../../util';
+import {raf, ready, CSS} from '../../util/dom';
 
 
 /**
diff --git a/ionic/components/scroll/scroll.ts b/ionic/components/scroll/scroll.ts
index a6bcc1ae6d..3735d5a37b 100644
--- a/ionic/components/scroll/scroll.ts
+++ b/ionic/components/scroll/scroll.ts
@@ -6,7 +6,7 @@ import {Gesture} from '../../gestures/gesture';
 import {CSS} from '../../util/dom';
 import {Animation} from '../../animations/animation';
 
-import * as util from 'ionic/util';
+import * as util from '../../util';
 
 /**
  * @name Scroll
diff --git a/ionic/components/show-hide-when/show-hide-when.ts b/ionic/components/show-hide-when/show-hide-when.ts
index 3c150bdf25..5920838001 100644
--- a/ionic/components/show-hide-when/show-hide-when.ts
+++ b/ionic/components/show-hide-when/show-hide-when.ts
@@ -3,7 +3,7 @@ import {Directive, Attribute, NgZone} from 'angular2/angular2'
 import {Platform} from '../../platform/platform';
 
 
-class DisplayWhen {
+export class DisplayWhen {
 
   constructor(conditions, platform, ngZone) {
     this.isMatch = false;
diff --git a/ionic/components/slides/slides.ts b/ionic/components/slides/slides.ts
index 5ec9763846..c56c5b8aec 100644
--- a/ionic/components/slides/slides.ts
+++ b/ionic/components/slides/slides.ts
@@ -1,13 +1,13 @@
 import {Directive, Component, ElementRef, Host, NgClass, EventEmitter} from 'angular2/angular2';
 
 import {Ion} from '../ion';
-import {Animation} from 'ionic/animations/animation';
-import {Gesture} from 'ionic/gestures/gesture';
-import {DragGesture} from 'ionic/gestures/drag-gesture';
+import {Animation} from '../../animations/animation';
+import {Gesture} from '../../gestures/gesture';
+import {DragGesture} from '../../gestures/drag-gesture';
 import {Config} from '../../config/config';
-import {dom} from 'ionic/util';
+import {dom} from '../../util';
 import {CSS} from '../../util/dom';
-import * as util from 'ionic/util';
+import * as util from '../../util';
 
 import {Swiper} from './swiper-widget';
 import {Scroll} from '../scroll/scroll';
diff --git a/ionic/config/bootstrap.ts b/ionic/config/bootstrap.ts
index 94bd377a13..b70329f416 100644
--- a/ionic/config/bootstrap.ts
+++ b/ionic/config/bootstrap.ts
@@ -1,4 +1,4 @@
-import {bootstrap, provide} from 'angular2/angular2';
+import {bootstrap, provide, Provider} from 'angular2/angular2';
 import {ROUTER_PROVIDERS, LocationStrategy, HashLocationStrategy} from 'angular2/router';
 import {HTTP_PROVIDERS} from 'angular2/http';
 
diff --git a/ionic/config/directives.ts b/ionic/config/directives.ts
index d6d2733dc1..22e38db52e 100644
--- a/ionic/config/directives.ts
+++ b/ionic/config/directives.ts
@@ -1,4 +1,4 @@
-import {CORE_DIRECTIVES, FORM_DIRECTIVES, forwardRef} from 'angular2/angular2'
+import {CORE_DIRECTIVES, FORM_DIRECTIVES, forwardRef, Type} from 'angular2/angular2'
 
 import {OverlayNav} from '../components/overlay/overlay';
 import {Menu} from '../components/menu/menu';
diff --git a/ionic/config/modes.ts b/ionic/config/modes.ts
index 78b01a75a9..440ab7e5bf 100644
--- a/ionic/config/modes.ts
+++ b/ionic/config/modes.ts
@@ -1,6 +1,7 @@
 
 import {Config} from './config';
 
+export {}
 
 // iOS Mode Settings
 Config.setModeConfig('ios', {
diff --git a/ionic/gestures/drag-gesture.ts b/ionic/gestures/drag-gesture.ts
index e62502fe03..40ab5957ac 100644
--- a/ionic/gestures/drag-gesture.ts
+++ b/ionic/gestures/drag-gesture.ts
@@ -1,5 +1,5 @@
-import {Gesture} from 'ionic/gestures/gesture';
-import * as util from 'ionic/util';
+import {Gesture} from './gesture';
+import * as util from '../util';
 
 
 export class DragGesture extends Gesture {
diff --git a/ionic/gestures/gesture.ts b/ionic/gestures/gesture.ts
index dee0186f8f..49397cc817 100644
--- a/ionic/gestures/gesture.ts
+++ b/ionic/gestures/gesture.ts
@@ -1,5 +1,5 @@
-import * as util from 'ionic/util';
-import {Hammer} from 'ionic/gestures/hammer';
+import * as util from '../util';
+import {Hammer} from './hammer';
 
 /**
  * A gesture recognizer class.
diff --git a/ionic/gestures/slide-edge-gesture.ts b/ionic/gestures/slide-edge-gesture.ts
index 60f8571d8b..e8ce058c33 100644
--- a/ionic/gestures/slide-edge-gesture.ts
+++ b/ionic/gestures/slide-edge-gesture.ts
@@ -1,4 +1,4 @@
-import {SlideGesture} from 'ionic/gestures/slide-gesture';
+import {SlideGesture} from './slide-gesture';
 import {defaults} from '../util/util';
 import {windowDimensions} from '../util/dom';
 
diff --git a/ionic/gestures/slide-gesture.ts b/ionic/gestures/slide-gesture.ts
index 4e4ff5d40f..b8ffea98a3 100644
--- a/ionic/gestures/slide-gesture.ts
+++ b/ionic/gestures/slide-gesture.ts
@@ -1,5 +1,5 @@
-import {DragGesture} from 'ionic/gestures/drag-gesture';
-import * as util from 'ionic/util';
+import {DragGesture} from './drag-gesture';
+import * as util from '../util';
 
 export class SlideGesture extends DragGesture {
   constructor(element, opts = {}) {
diff --git a/ionic/ionic.ts b/ionic/ionic.ts
index a50cc8f8c3..8b2f658203 100644
--- a/ionic/ionic.ts
+++ b/ionic/ionic.ts
@@ -1,14 +1,12 @@
 
 export * from './config/bootstrap'
 export * from './config/config'
-export * from './config/modes'
 export * from './config/decorators'
 export * from './config/directives'
 
 export * from './components'
 
 export * from './platform/platform'
-export * from './platform/registry'
 export * from './platform/storage'
 
 export * from './util/click-block'
@@ -16,9 +14,15 @@ export * from './util/events'
 export * from './util/keyboard'
 
 export * from './animations/animation'
-export * from './animations/builtins'
-export * from './animations/ios-transition'
-export * from './animations/md-transition'
+
 
 export * from './translation/translate'
 export * from './translation/translate_pipe'
+
+// these modules don't export anything
+import './config/modes'
+import './platform/registry'
+import './animations/builtins'
+import './animations/ios-transition'
+import './animations/md-transition'
+
diff --git a/ionic/platform/storage/sql.ts b/ionic/platform/storage/sql.ts
index 15d1397498..ddad20f2bf 100644
--- a/ionic/platform/storage/sql.ts
+++ b/ionic/platform/storage/sql.ts
@@ -1,6 +1,6 @@
 import {StorageEngine} from './storage';
 
-import * as util from 'ionic/util';
+import * as util from '../util';
 
 const DB_NAME = '__ionicstorage';
 
diff --git a/ionic/util.ts b/ionic/util.ts
index 52c9a82307..5139b33d3d 100644
--- a/ionic/util.ts
+++ b/ionic/util.ts
@@ -1,4 +1,4 @@
-import * as domUtil from 'ionic/util/dom'
+import * as domUtil from './util/dom'
 export const dom = domUtil
 
-export * from 'ionic/util/util'
+export * from './util/util'