diff --git a/src/app/view/console/console.html b/src/app/view/console/console.html
index 52825f773a..831d1a473d 100644
--- a/src/app/view/console/console.html
+++ b/src/app/view/console/console.html
@@ -1,3 +1,3 @@
 <header top-bar role="banner"></header>
-<main content role="main" ui-view></main>
+<main role="main" ui-view></main>
 <footer bottom-bar></footer>
diff --git a/src/app/view/console/content/content.directive.js b/src/app/view/console/content/content.directive.js
deleted file mode 100644
index 2f8ffde452..0000000000
--- a/src/app/view/console/content/content.directive.js
+++ /dev/null
@@ -1,18 +0,0 @@
-(function () {
-  'use strict';
-
-  angular
-    .module('app.view')
-    .directive('content', content);
-
-  content.$inject = [
-    'app.basePath'
-  ];
-
-  function content(path) {
-    return {
-      templateUrl: path + '/view/console/content/content.html'
-    };
-  }
-
-})();
diff --git a/src/app/view/console/content/content.html b/src/app/view/console/content/content.html
deleted file mode 100644
index 1dc221336a..0000000000
--- a/src/app/view/console/content/content.html
+++ /dev/null
@@ -1 +0,0 @@
-<section>Page content here</section>
diff --git a/src/app/view/console/top-bar/navigation/navigation.html b/src/app/view/console/top-bar/navigation/navigation.html
index 6b7751dca3..0d226a1762 100644
--- a/src/app/view/console/top-bar/navigation/navigation.html
+++ b/src/app/view/console/top-bar/navigation/navigation.html
@@ -1,6 +1,6 @@
 <ul>
   <li ng-repeat="menuitem in NavigationCtrl.menu">
-    <a ui-sref="menuitem.href">
+    <a ui-sref="{{ menuitem.href }}">
       {{ menuitem.text }}
     </a>
   </li>
diff --git a/src/plugins/ci/ci.scss b/src/plugins/ci/ci.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/plugins/cloud-fondry/view/view.module.js b/src/plugins/cloud-fondry/view/view.module.js
deleted file mode 100644
index 72b4270627..0000000000
--- a/src/plugins/cloud-fondry/view/view.module.js
+++ /dev/null
@@ -1,7 +0,0 @@
-(function () {
-  'use strict';
-
-  angular
-    .module('cloud-foundry.view', []);
-
-})();
diff --git a/src/plugins/cloud-fondry/api/api.module.js b/src/plugins/cloud-foundry/api/api.module.js
similarity index 100%
rename from src/plugins/cloud-fondry/api/api.module.js
rename to src/plugins/cloud-foundry/api/api.module.js
diff --git a/src/plugins/cloud-fondry/cloud-foundry.module.js b/src/plugins/cloud-foundry/cloud-foundry.module.js
similarity index 81%
rename from src/plugins/cloud-fondry/cloud-foundry.module.js
rename to src/plugins/cloud-foundry/cloud-foundry.module.js
index 5a6a5de005..caeae83788 100644
--- a/src/plugins/cloud-fondry/cloud-foundry.module.js
+++ b/src/plugins/cloud-foundry/cloud-foundry.module.js
@@ -8,7 +8,6 @@
       'cloud-foundry.model',
       'cloud-foundry.view'
     ])
-    .constant('cloud-foundry.basePath', env.plugins.cloudFoundry.basePath)
     .run(register);
 
   register.$inject = [
@@ -40,8 +39,8 @@
 
     registerNavigation: function () {
       this.modelManager.retrieve('app.model.navigation')
-        .addMenuItem('applications', 'applications', gettext('Applications'))
-        .addMenuItem('organizations', 'organizations', gettext('Organizations'));
+        .addMenuItem('cf.applications', 'cf.applications', gettext('Applications'))
+        .addMenuItem('cf.organizations', 'cf.organizations', gettext('Organizations'));
     }
   });
 
diff --git a/src/plugins/cloud-fondry/cloud-foundry.scss b/src/plugins/cloud-foundry/cloud-foundry.scss
similarity index 100%
rename from src/plugins/cloud-fondry/cloud-foundry.scss
rename to src/plugins/cloud-foundry/cloud-foundry.scss
diff --git a/src/plugins/cloud-fondry/event/event.module.js b/src/plugins/cloud-foundry/event/event.module.js
similarity index 100%
rename from src/plugins/cloud-fondry/event/event.module.js
rename to src/plugins/cloud-foundry/event/event.module.js
diff --git a/src/plugins/cloud-fondry/model/model.module.js b/src/plugins/cloud-foundry/model/model.module.js
similarity index 100%
rename from src/plugins/cloud-fondry/model/model.module.js
rename to src/plugins/cloud-foundry/model/model.module.js
diff --git a/src/plugins/cloud-foundry/view/applications/applications.html b/src/plugins/cloud-foundry/view/applications/applications.html
new file mode 100644
index 0000000000..4ee455ae7d
--- /dev/null
+++ b/src/plugins/cloud-foundry/view/applications/applications.html
@@ -0,0 +1 @@
+<h2>Applications</h2>
diff --git a/src/plugins/cloud-foundry/view/applications/applications.module.js b/src/plugins/cloud-foundry/view/applications/applications.module.js
new file mode 100644
index 0000000000..6f41b3b33d
--- /dev/null
+++ b/src/plugins/cloud-foundry/view/applications/applications.module.js
@@ -0,0 +1,22 @@
+(function () {
+  'use strict';
+
+  angular
+    .module('cloud-foundry.view.applications', [])
+    .constant('cloud-foundry.view.applications.basePath',
+              env.plugins.cloudFoundry.basePath + 'view/applications/')
+    .config(registerRoute);
+
+  registerRoute.$inject = [
+    '$stateProvider',
+    'cloud-foundry.view.applications.basePath'
+  ];
+
+  function registerRoute($stateProvider, basePath) {
+    $stateProvider.state('cf.applications', {
+      url: '/applications',
+      templateUrl: basePath + 'applications.html'
+    });
+  }
+
+})();
diff --git a/src/plugins/cloud-foundry/view/organizations/organizations.html b/src/plugins/cloud-foundry/view/organizations/organizations.html
new file mode 100644
index 0000000000..94502aaab7
--- /dev/null
+++ b/src/plugins/cloud-foundry/view/organizations/organizations.html
@@ -0,0 +1 @@
+<h2>Organizations</h2>
diff --git a/src/plugins/cloud-foundry/view/organizations/organizations.module.js b/src/plugins/cloud-foundry/view/organizations/organizations.module.js
new file mode 100644
index 0000000000..98cdeee93d
--- /dev/null
+++ b/src/plugins/cloud-foundry/view/organizations/organizations.module.js
@@ -0,0 +1,21 @@
+(function () {
+  'use strict';
+
+  angular
+    .module('cloud-foundry.view.organizations', [])
+    .constant('cloud-foundry.view.organizations.basePath',
+              env.plugins.cloudFoundry.basePath + 'view/organizations/')
+    .config(registerRoute);
+
+  registerRoute.$inject = [
+    '$stateProvider',
+    'cloud-foundry.view.organizations.basePath'
+  ];
+
+  function registerRoute($stateProvider, basePath) {
+    $stateProvider.state('cf.organizations', {
+      url: '/organizations',
+      templateUrl: basePath + 'organizations.html'
+    });
+  }
+})();
diff --git a/src/plugins/cloud-foundry/view/view.html b/src/plugins/cloud-foundry/view/view.html
new file mode 100644
index 0000000000..826f2676a2
--- /dev/null
+++ b/src/plugins/cloud-foundry/view/view.html
@@ -0,0 +1,2 @@
+<h1>Cloud Foundry</h1>
+<div ui-view></div>
diff --git a/src/plugins/cloud-foundry/view/view.module.js b/src/plugins/cloud-foundry/view/view.module.js
new file mode 100644
index 0000000000..afa6c50030
--- /dev/null
+++ b/src/plugins/cloud-foundry/view/view.module.js
@@ -0,0 +1,24 @@
+(function () {
+  'use strict';
+
+  angular
+    .module('cloud-foundry.view', [
+      'cloud-foundry.view.applications',
+      'cloud-foundry.view.organizations'
+    ])
+    .constant('cloud-foundry.view.basePath',
+              env.plugins.cloudFoundry.basePath + 'view/')
+    .config(registerRoute);
+
+  registerRoute.$inject = [
+    '$stateProvider',
+    'cloud-foundry.view.basePath'
+  ];
+
+  function registerRoute($stateProvider, basePath) {
+    $stateProvider.state('cf', {
+      url: 'cf',
+      templateUrl: basePath + 'view.html'
+    });
+  }
+})();
diff --git a/tools/gulp.config.js b/tools/gulp.config.js
index 29be27796f..b1e0b37546 100644
--- a/tools/gulp.config.js
+++ b/tools/gulp.config.js
@@ -32,6 +32,8 @@ module.exports = function () {
       paths.dist + 'index.module.js',
       paths.dist + 'app/**/*.module.js',
       paths.dist + 'app/**/*.js',
+      paths.dist + 'plugins/**/*.module.js',
+      paths.dist + 'plugins/**/*.js',
       '!' + paths.dist + '**/*.mock.js',
       '!' + paths.dist + '**/*.spec.js'
     ],
@@ -49,7 +51,8 @@ module.exports = function () {
     ],
 
     partials: [
-      paths.src + 'app/**/*.html'
+      paths.src + 'app/**/*.html',
+      paths.src + 'plugins/**/*.html'
     ]
   };