diff --git a/Gruntfile.js b/Gruntfile.js
index 04af4b649d..628f36dffc 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -9,32 +9,38 @@ module.exports = function(grunt) {
       },
       dist: {
         src: [
+
           'js/ionic.js',
           'js/platform.js',
           'js/utils.js',
           'js/events.js',
           'js/gestures.js',
           'js/animate.js',
+
           'js/viewController.js',
-          'js/views/navBar.js',
-          'js/views/headerBar.js',
-          'js/views/tabBar.js',
-          'js/views/sideMenu.js',
+
+          'js/views/navBarView.js',
+          'js/views/headerBarView.js',
+          'js/views/sideMenuView.js',
+          'js/views/tabBarView.js',
           'js/views/toggleView.js',
+
           'js/controllers/**/*.js',
+
           'js/tapPolyfill.js'
+
         ],
         dest: 'dist/<%= pkg.name %>.js'
       },
       distAngular: {
         src: [
-          'ext/angular/src/*.js'
+          'js/ext/angular/src/*.js'
         ],
         dest: 'dist/<%= pkg.name %>-angular.js'
       },
       distSimple: {
         src: [
-          'ext/simple/*.js'
+          'js/ext/simple/*.js'
         ],
         dest: 'dist/<%= pkg.name %>-simple.js'
       }
diff --git a/dist/ionic.js b/dist/ionic.js
index 3d2a2b7df0..d0aac8adb5 100644
--- a/dist/ionic.js
+++ b/dist/ionic.js
@@ -1712,7 +1712,8 @@ window.ionic = {
   };
 
 })(ionic);
-;(function(ionic) {
+;
+(function(ionic) {
 
   ionic.views.HeaderBar = function(opts) {
     this.el = opts.el;
@@ -1738,6 +1739,31 @@ window.ionic = {
     }
   };
 
+})(ionic);
+;
+(function(ionic) {
+
+  ionic.views.SideMenu = function(opts) {
+    this.el = opts.el;
+    this.width = opts.width;
+    this.isEnabled = opts.isEnabled || true;
+  };
+
+  ionic.views.SideMenu.prototype = {
+    getFullWidth: function() {
+      return this.width;
+    },
+    setIsEnabled: function(isEnabled) {
+      this.isEnabled = isEnabled;
+    },
+    bringUp: function() {
+      this.el.style.zIndex = 0;
+    },
+    pushDown: function() {
+      this.el.style.zIndex = -1;
+    }
+  };
+
 })(ionic);
 ;(function(ionic) {
 
@@ -1941,31 +1967,6 @@ ionic.views.TabBar.prototype = {
 
 })(window.ionic);
 ;
-(function(ionic) {
-
-  ionic.views.SideMenu = function(opts) {
-    this.el = opts.el;
-    this.width = opts.width;
-    this.isEnabled = opts.isEnabled || true;
-  };
-
-  ionic.views.SideMenu.prototype = {
-    getFullWidth: function() {
-      return this.width;
-    },
-    setIsEnabled: function(isEnabled) {
-      this.isEnabled = isEnabled;
-    },
-    bringUp: function() {
-      this.el.style.zIndex = 0;
-    },
-    pushDown: function() {
-      this.el.style.zIndex = -1;
-    }
-  };
-
-})(ionic);
-;
 (function(ionic) {
 
   ionic.views.Toggle = function(opts) {
diff --git a/js/views/headerBar.js b/js/views/headerBarView.js
similarity index 99%
rename from js/views/headerBar.js
rename to js/views/headerBarView.js
index 4b43c58bbe..636e1181ee 100644
--- a/js/views/headerBar.js
+++ b/js/views/headerBarView.js
@@ -1,3 +1,4 @@
+
 (function(ionic) {
 
   ionic.views.HeaderBar = function(opts) {
diff --git a/js/views/navBar.js b/js/views/navBarView.js
similarity index 100%
rename from js/views/navBar.js
rename to js/views/navBarView.js
diff --git a/js/views/sideMenu.js b/js/views/sideMenuView.js
similarity index 100%
rename from js/views/sideMenu.js
rename to js/views/sideMenuView.js
diff --git a/js/views/tabBar.js b/js/views/tabBarView.js
similarity index 100%
rename from js/views/tabBar.js
rename to js/views/tabBarView.js