From 0bf43d1913aec31c2977279f8b8cd747aeda6e08 Mon Sep 17 00:00:00 2001
From: Shaoquan Chen <sean.chen2@hp.com>
Date: Thu, 14 Jan 2016 15:23:58 -0800
Subject: [PATCH 01/10] Adding route for cf-application and cf-organization

---
 .../top-bar/navigation/navigation.html        |  2 +-
 src/plugins/ci/ci.scss                        |  0
 .../api/api.module.js                         |  0
 .../cloud-foundry.module.js                   |  4 ++--
 .../cloud-foundry/cloud-foundry.route.js      | 20 +++++++++++++++++++
 .../cloud-foundry.scss                        |  0
 .../event/event.module.js                     |  0
 .../model/model.module.js                     |  0
 .../view/applications/application.route.js    | 20 +++++++++++++++++++
 .../view/applications/applications.html       |  1 +
 src/plugins/cloud-foundry/view/index.html     |  1 +
 .../view/organizations/organizations.html     |  1 +
 .../view/organizations/organizations.route.js | 20 +++++++++++++++++++
 .../view/view.module.js                       |  0
 14 files changed, 66 insertions(+), 3 deletions(-)
 delete mode 100644 src/plugins/ci/ci.scss
 rename src/plugins/{cloud-fondry => cloud-foundry}/api/api.module.js (100%)
 rename src/plugins/{cloud-fondry => cloud-foundry}/cloud-foundry.module.js (86%)
 create mode 100644 src/plugins/cloud-foundry/cloud-foundry.route.js
 rename src/plugins/{cloud-fondry => cloud-foundry}/cloud-foundry.scss (100%)
 rename src/plugins/{cloud-fondry => cloud-foundry}/event/event.module.js (100%)
 rename src/plugins/{cloud-fondry => cloud-foundry}/model/model.module.js (100%)
 create mode 100644 src/plugins/cloud-foundry/view/applications/application.route.js
 create mode 100644 src/plugins/cloud-foundry/view/applications/applications.html
 create mode 100644 src/plugins/cloud-foundry/view/index.html
 create mode 100644 src/plugins/cloud-foundry/view/organizations/organizations.html
 create mode 100644 src/plugins/cloud-foundry/view/organizations/organizations.route.js
 rename src/plugins/{cloud-fondry => cloud-foundry}/view/view.module.js (100%)

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/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 86%
rename from src/plugins/cloud-fondry/cloud-foundry.module.js
rename to src/plugins/cloud-foundry/cloud-foundry.module.js
index 5a6a5de005..1da3b5969e 100644
--- a/src/plugins/cloud-fondry/cloud-foundry.module.js
+++ b/src/plugins/cloud-foundry/cloud-foundry.module.js
@@ -40,8 +40,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-foundry/cloud-foundry.route.js b/src/plugins/cloud-foundry/cloud-foundry.route.js
new file mode 100644
index 0000000000..9744923a92
--- /dev/null
+++ b/src/plugins/cloud-foundry/cloud-foundry.route.js
@@ -0,0 +1,20 @@
+(function () {
+  'use strict';
+
+  angular
+    .module('cloud-foundry')
+    .config(registerRoute);
+
+  registerRoute.$inject = [
+    '$stateProvider',
+    'cloud-foundry.basePath'
+  ];
+
+  function registerRoute($stateProvider, basePath) {
+    $stateProvider.state('cf', {
+      url: '/cf/',
+      templateUrl: basePath + 'view/index.html'
+    });
+  }
+
+})();
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/application.route.js b/src/plugins/cloud-foundry/view/applications/application.route.js
new file mode 100644
index 0000000000..b5935edb9e
--- /dev/null
+++ b/src/plugins/cloud-foundry/view/applications/application.route.js
@@ -0,0 +1,20 @@
+(function () {
+  'use strict';
+
+  angular
+    .module('cloud-foundry')
+    .config(registerRoute);
+
+  registerRoute.$inject = [
+    '$stateProvider',
+    'cloud-foundry.basePath'
+  ];
+
+  function registerRoute($stateProvider, basePath) {
+    $stateProvider.state('cf.applications', {
+      url: 'applications/',
+      templateUrl: basePath + 'view/applications/applications.html'
+    });
+  }
+
+})();
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..3adae53bd8
--- /dev/null
+++ b/src/plugins/cloud-foundry/view/applications/applications.html
@@ -0,0 +1 @@
+<h1>Applications</h1>
diff --git a/src/plugins/cloud-foundry/view/index.html b/src/plugins/cloud-foundry/view/index.html
new file mode 100644
index 0000000000..cc16039b23
--- /dev/null
+++ b/src/plugins/cloud-foundry/view/index.html
@@ -0,0 +1 @@
+<h1>Cloud Foundry</h1>
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..36071796be
--- /dev/null
+++ b/src/plugins/cloud-foundry/view/organizations/organizations.html
@@ -0,0 +1 @@
+<h1>Organizations</h1>
diff --git a/src/plugins/cloud-foundry/view/organizations/organizations.route.js b/src/plugins/cloud-foundry/view/organizations/organizations.route.js
new file mode 100644
index 0000000000..e88aa876c2
--- /dev/null
+++ b/src/plugins/cloud-foundry/view/organizations/organizations.route.js
@@ -0,0 +1,20 @@
+(function () {
+  'use strict';
+
+  angular
+    .module('cloud-foundry')
+    .config(registerRoute);
+
+  registerRoute.$inject = [
+    '$stateProvider',
+    'cloud-foundry.basePath'
+  ];
+
+  function registerRoute($stateProvider, basePath) {
+    $stateProvider.state('cf.organizations', {
+      url: 'organizations/',
+      templateUrl: basePath + 'view/organizations/organizations.html'
+    });
+  }
+
+})();
diff --git a/src/plugins/cloud-fondry/view/view.module.js b/src/plugins/cloud-foundry/view/view.module.js
similarity index 100%
rename from src/plugins/cloud-fondry/view/view.module.js
rename to src/plugins/cloud-foundry/view/view.module.js

From ac0120b06625071e2b6b5e400a51d5e441a3a156 Mon Sep 17 00:00:00 2001
From: Shaoquan Chen <sean.chen2@hp.com>
Date: Thu, 14 Jan 2016 15:23:58 -0800
Subject: [PATCH 02/10] Adding route for cf-application and cf-organization

---
 src/app/view/console/console.html             |  2 +-
 .../view/console/content/content.directive.js | 18 -----------------
 src/app/view/console/content/content.html     |  1 -
 .../top-bar/navigation/navigation.html        |  2 +-
 src/plugins/ci/ci.scss                        |  0
 .../api/api.module.js                         |  0
 .../cloud-foundry.module.js                   |  4 ++--
 .../cloud-foundry/cloud-foundry.route.js      | 20 +++++++++++++++++++
 .../cloud-foundry.scss                        |  0
 .../event/event.module.js                     |  0
 .../model/model.module.js                     |  0
 .../view/applications/applications.html       |  1 +
 .../view/applications/applications.route.js   | 20 +++++++++++++++++++
 src/plugins/cloud-foundry/view/index.html     |  2 ++
 .../view/organizations/organizations.html     |  1 +
 .../view/organizations/organizations.route.js | 20 +++++++++++++++++++
 .../view/view.module.js                       |  0
 17 files changed, 68 insertions(+), 23 deletions(-)
 delete mode 100644 src/app/view/console/content/content.directive.js
 delete mode 100644 src/app/view/console/content/content.html
 delete mode 100644 src/plugins/ci/ci.scss
 rename src/plugins/{cloud-fondry => cloud-foundry}/api/api.module.js (100%)
 rename src/plugins/{cloud-fondry => cloud-foundry}/cloud-foundry.module.js (86%)
 create mode 100644 src/plugins/cloud-foundry/cloud-foundry.route.js
 rename src/plugins/{cloud-fondry => cloud-foundry}/cloud-foundry.scss (100%)
 rename src/plugins/{cloud-fondry => cloud-foundry}/event/event.module.js (100%)
 rename src/plugins/{cloud-fondry => cloud-foundry}/model/model.module.js (100%)
 create mode 100644 src/plugins/cloud-foundry/view/applications/applications.html
 create mode 100644 src/plugins/cloud-foundry/view/applications/applications.route.js
 create mode 100644 src/plugins/cloud-foundry/view/index.html
 create mode 100644 src/plugins/cloud-foundry/view/organizations/organizations.html
 create mode 100644 src/plugins/cloud-foundry/view/organizations/organizations.route.js
 rename src/plugins/{cloud-fondry => cloud-foundry}/view/view.module.js (100%)

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/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 86%
rename from src/plugins/cloud-fondry/cloud-foundry.module.js
rename to src/plugins/cloud-foundry/cloud-foundry.module.js
index 5a6a5de005..1da3b5969e 100644
--- a/src/plugins/cloud-fondry/cloud-foundry.module.js
+++ b/src/plugins/cloud-foundry/cloud-foundry.module.js
@@ -40,8 +40,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-foundry/cloud-foundry.route.js b/src/plugins/cloud-foundry/cloud-foundry.route.js
new file mode 100644
index 0000000000..e3032a929e
--- /dev/null
+++ b/src/plugins/cloud-foundry/cloud-foundry.route.js
@@ -0,0 +1,20 @@
+(function () {
+  'use strict';
+
+  angular
+    .module('cloud-foundry')
+    .config(registerRoute);
+
+  registerRoute.$inject = [
+    '$stateProvider',
+    'cloud-foundry.basePath'
+  ];
+
+  function registerRoute($stateProvider, basePath) {
+    $stateProvider.state('cf', {
+      url: '/cf',
+      templateUrl: basePath + 'view/index.html'
+    });
+  }
+
+})();
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.route.js b/src/plugins/cloud-foundry/view/applications/applications.route.js
new file mode 100644
index 0000000000..d8fbf82401
--- /dev/null
+++ b/src/plugins/cloud-foundry/view/applications/applications.route.js
@@ -0,0 +1,20 @@
+(function () {
+  'use strict';
+
+  angular
+    .module('cloud-foundry')
+    .config(registerRoute);
+
+  registerRoute.$inject = [
+    '$stateProvider',
+    'cloud-foundry.basePath'
+  ];
+
+  function registerRoute($stateProvider, basePath) {
+    $stateProvider.state('cf.applications', {
+      url: '/applications',
+      templateUrl: basePath + 'view/applications/applications.html'
+    });
+  }
+
+})();
diff --git a/src/plugins/cloud-foundry/view/index.html b/src/plugins/cloud-foundry/view/index.html
new file mode 100644
index 0000000000..826f2676a2
--- /dev/null
+++ b/src/plugins/cloud-foundry/view/index.html
@@ -0,0 +1,2 @@
+<h1>Cloud Foundry</h1>
+<div ui-view></div>
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.route.js b/src/plugins/cloud-foundry/view/organizations/organizations.route.js
new file mode 100644
index 0000000000..29f943a16c
--- /dev/null
+++ b/src/plugins/cloud-foundry/view/organizations/organizations.route.js
@@ -0,0 +1,20 @@
+(function () {
+  'use strict';
+
+  angular
+    .module('cloud-foundry')
+    .config(registerRoute);
+
+  registerRoute.$inject = [
+    '$stateProvider',
+    'cloud-foundry.basePath'
+  ];
+
+  function registerRoute($stateProvider, basePath) {
+    $stateProvider.state('cf.organizations', {
+      url: '/organizations',
+      templateUrl: basePath + 'view/organizations/organizations.html'
+    });
+  }
+
+})();
diff --git a/src/plugins/cloud-fondry/view/view.module.js b/src/plugins/cloud-foundry/view/view.module.js
similarity index 100%
rename from src/plugins/cloud-fondry/view/view.module.js
rename to src/plugins/cloud-foundry/view/view.module.js

From 8a477354a9746189084bf29c18f8e6e2209c3151 Mon Sep 17 00:00:00 2001
From: Shaoquan Chen <sean.chen2@hp.com>
Date: Thu, 14 Jan 2016 15:23:58 -0800
Subject: [PATCH 03/10] Adding route for cf-application and cf-organization

---
 .../top-bar/navigation/navigation.html        |  2 +-
 src/plugins/ci/ci.scss                        |  0
 .../api/api.module.js                         |  0
 .../cloud-foundry.module.js                   |  4 ++--
 .../cloud-foundry/cloud-foundry.route.js      | 20 +++++++++++++++++++
 .../cloud-foundry.scss                        |  0
 .../event/event.module.js                     |  0
 .../model/model.module.js                     |  0
 .../view/applications/application.route.js    | 20 +++++++++++++++++++
 .../view/applications/applications.html       |  1 +
 src/plugins/cloud-foundry/view/index.html     |  1 +
 .../view/organizations/organizations.html     |  1 +
 .../view/organizations/organizations.route.js | 20 +++++++++++++++++++
 .../view/view.module.js                       |  0
 14 files changed, 66 insertions(+), 3 deletions(-)
 delete mode 100644 src/plugins/ci/ci.scss
 rename src/plugins/{cloud-fondry => cloud-foundry}/api/api.module.js (100%)
 rename src/plugins/{cloud-fondry => cloud-foundry}/cloud-foundry.module.js (86%)
 create mode 100644 src/plugins/cloud-foundry/cloud-foundry.route.js
 rename src/plugins/{cloud-fondry => cloud-foundry}/cloud-foundry.scss (100%)
 rename src/plugins/{cloud-fondry => cloud-foundry}/event/event.module.js (100%)
 rename src/plugins/{cloud-fondry => cloud-foundry}/model/model.module.js (100%)
 create mode 100644 src/plugins/cloud-foundry/view/applications/application.route.js
 create mode 100644 src/plugins/cloud-foundry/view/applications/applications.html
 create mode 100644 src/plugins/cloud-foundry/view/index.html
 create mode 100644 src/plugins/cloud-foundry/view/organizations/organizations.html
 create mode 100644 src/plugins/cloud-foundry/view/organizations/organizations.route.js
 rename src/plugins/{cloud-fondry => cloud-foundry}/view/view.module.js (100%)

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/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 86%
rename from src/plugins/cloud-fondry/cloud-foundry.module.js
rename to src/plugins/cloud-foundry/cloud-foundry.module.js
index 5a6a5de005..1da3b5969e 100644
--- a/src/plugins/cloud-fondry/cloud-foundry.module.js
+++ b/src/plugins/cloud-foundry/cloud-foundry.module.js
@@ -40,8 +40,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-foundry/cloud-foundry.route.js b/src/plugins/cloud-foundry/cloud-foundry.route.js
new file mode 100644
index 0000000000..9744923a92
--- /dev/null
+++ b/src/plugins/cloud-foundry/cloud-foundry.route.js
@@ -0,0 +1,20 @@
+(function () {
+  'use strict';
+
+  angular
+    .module('cloud-foundry')
+    .config(registerRoute);
+
+  registerRoute.$inject = [
+    '$stateProvider',
+    'cloud-foundry.basePath'
+  ];
+
+  function registerRoute($stateProvider, basePath) {
+    $stateProvider.state('cf', {
+      url: '/cf/',
+      templateUrl: basePath + 'view/index.html'
+    });
+  }
+
+})();
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/application.route.js b/src/plugins/cloud-foundry/view/applications/application.route.js
new file mode 100644
index 0000000000..b5935edb9e
--- /dev/null
+++ b/src/plugins/cloud-foundry/view/applications/application.route.js
@@ -0,0 +1,20 @@
+(function () {
+  'use strict';
+
+  angular
+    .module('cloud-foundry')
+    .config(registerRoute);
+
+  registerRoute.$inject = [
+    '$stateProvider',
+    'cloud-foundry.basePath'
+  ];
+
+  function registerRoute($stateProvider, basePath) {
+    $stateProvider.state('cf.applications', {
+      url: 'applications/',
+      templateUrl: basePath + 'view/applications/applications.html'
+    });
+  }
+
+})();
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..3adae53bd8
--- /dev/null
+++ b/src/plugins/cloud-foundry/view/applications/applications.html
@@ -0,0 +1 @@
+<h1>Applications</h1>
diff --git a/src/plugins/cloud-foundry/view/index.html b/src/plugins/cloud-foundry/view/index.html
new file mode 100644
index 0000000000..cc16039b23
--- /dev/null
+++ b/src/plugins/cloud-foundry/view/index.html
@@ -0,0 +1 @@
+<h1>Cloud Foundry</h1>
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..36071796be
--- /dev/null
+++ b/src/plugins/cloud-foundry/view/organizations/organizations.html
@@ -0,0 +1 @@
+<h1>Organizations</h1>
diff --git a/src/plugins/cloud-foundry/view/organizations/organizations.route.js b/src/plugins/cloud-foundry/view/organizations/organizations.route.js
new file mode 100644
index 0000000000..e88aa876c2
--- /dev/null
+++ b/src/plugins/cloud-foundry/view/organizations/organizations.route.js
@@ -0,0 +1,20 @@
+(function () {
+  'use strict';
+
+  angular
+    .module('cloud-foundry')
+    .config(registerRoute);
+
+  registerRoute.$inject = [
+    '$stateProvider',
+    'cloud-foundry.basePath'
+  ];
+
+  function registerRoute($stateProvider, basePath) {
+    $stateProvider.state('cf.organizations', {
+      url: 'organizations/',
+      templateUrl: basePath + 'view/organizations/organizations.html'
+    });
+  }
+
+})();
diff --git a/src/plugins/cloud-fondry/view/view.module.js b/src/plugins/cloud-foundry/view/view.module.js
similarity index 100%
rename from src/plugins/cloud-fondry/view/view.module.js
rename to src/plugins/cloud-foundry/view/view.module.js

From 4e791536eff102390c9ea9bb1854591f1478a0f9 Mon Sep 17 00:00:00 2001
From: Shaoquan Chen <sean.chen2@hp.com>
Date: Thu, 14 Jan 2016 15:23:58 -0800
Subject: [PATCH 04/10] Adding route for cf-application and cf-organization

---
 src/app/view/console/console.html              |  2 +-
 .../view/console/content/content.directive.js  | 18 ------------------
 src/app/view/console/content/content.html      |  1 -
 .../view/applications/applications.html        |  2 +-
 ...lication.route.js => applications.route.js} |  2 +-
 src/plugins/cloud-foundry/view/index.html      |  1 +
 .../view/organizations/organizations.html      |  2 +-
 .../view/organizations/organizations.route.js  |  2 +-
 8 files changed, 6 insertions(+), 24 deletions(-)
 delete mode 100644 src/app/view/console/content/content.directive.js
 delete mode 100644 src/app/view/console/content/content.html
 rename src/plugins/cloud-foundry/view/applications/{application.route.js => applications.route.js} (92%)

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/plugins/cloud-foundry/view/applications/applications.html b/src/plugins/cloud-foundry/view/applications/applications.html
index 3adae53bd8..4ee455ae7d 100644
--- a/src/plugins/cloud-foundry/view/applications/applications.html
+++ b/src/plugins/cloud-foundry/view/applications/applications.html
@@ -1 +1 @@
-<h1>Applications</h1>
+<h2>Applications</h2>
diff --git a/src/plugins/cloud-foundry/view/applications/application.route.js b/src/plugins/cloud-foundry/view/applications/applications.route.js
similarity index 92%
rename from src/plugins/cloud-foundry/view/applications/application.route.js
rename to src/plugins/cloud-foundry/view/applications/applications.route.js
index b5935edb9e..d8fbf82401 100644
--- a/src/plugins/cloud-foundry/view/applications/application.route.js
+++ b/src/plugins/cloud-foundry/view/applications/applications.route.js
@@ -12,7 +12,7 @@
 
   function registerRoute($stateProvider, basePath) {
     $stateProvider.state('cf.applications', {
-      url: 'applications/',
+      url: '/applications',
       templateUrl: basePath + 'view/applications/applications.html'
     });
   }
diff --git a/src/plugins/cloud-foundry/view/index.html b/src/plugins/cloud-foundry/view/index.html
index cc16039b23..826f2676a2 100644
--- a/src/plugins/cloud-foundry/view/index.html
+++ b/src/plugins/cloud-foundry/view/index.html
@@ -1 +1,2 @@
 <h1>Cloud Foundry</h1>
+<div ui-view></div>
diff --git a/src/plugins/cloud-foundry/view/organizations/organizations.html b/src/plugins/cloud-foundry/view/organizations/organizations.html
index 36071796be..94502aaab7 100644
--- a/src/plugins/cloud-foundry/view/organizations/organizations.html
+++ b/src/plugins/cloud-foundry/view/organizations/organizations.html
@@ -1 +1 @@
-<h1>Organizations</h1>
+<h2>Organizations</h2>
diff --git a/src/plugins/cloud-foundry/view/organizations/organizations.route.js b/src/plugins/cloud-foundry/view/organizations/organizations.route.js
index e88aa876c2..29f943a16c 100644
--- a/src/plugins/cloud-foundry/view/organizations/organizations.route.js
+++ b/src/plugins/cloud-foundry/view/organizations/organizations.route.js
@@ -12,7 +12,7 @@
 
   function registerRoute($stateProvider, basePath) {
     $stateProvider.state('cf.organizations', {
-      url: 'organizations/',
+      url: '/organizations',
       templateUrl: basePath + 'view/organizations/organizations.html'
     });
   }

From bcb2b1106b7e2203b7153da8ff100b4fcbf8f3d9 Mon Sep 17 00:00:00 2001
From: Shaoquan Chen <sean.chen2@hp.com>
Date: Thu, 14 Jan 2016 18:46:32 -0800
Subject: [PATCH 05/10] refectory route

---
 .../cloud-foundry/cloud-foundry.route.js      | 20 -------------------
 .../view/applications/application.route.js    | 20 -------------------
 .../view/applications/applications.module.js  |  0
 .../view/applications/applications.route.js   | 20 -------------------
 .../organizations/organizations.module.js     |  0
 .../view/organizations/organizations.route.js | 20 -------------------
 .../view/{index.html => view.html}            |  0
 src/plugins/cloud-foundry/view/view.module.js | 19 +++++++++++++++++-
 8 files changed, 18 insertions(+), 81 deletions(-)
 delete mode 100644 src/plugins/cloud-foundry/cloud-foundry.route.js
 delete mode 100644 src/plugins/cloud-foundry/view/applications/application.route.js
 create mode 100644 src/plugins/cloud-foundry/view/applications/applications.module.js
 delete mode 100644 src/plugins/cloud-foundry/view/applications/applications.route.js
 create mode 100644 src/plugins/cloud-foundry/view/organizations/organizations.module.js
 delete mode 100644 src/plugins/cloud-foundry/view/organizations/organizations.route.js
 rename src/plugins/cloud-foundry/view/{index.html => view.html} (100%)

diff --git a/src/plugins/cloud-foundry/cloud-foundry.route.js b/src/plugins/cloud-foundry/cloud-foundry.route.js
deleted file mode 100644
index e3032a929e..0000000000
--- a/src/plugins/cloud-foundry/cloud-foundry.route.js
+++ /dev/null
@@ -1,20 +0,0 @@
-(function () {
-  'use strict';
-
-  angular
-    .module('cloud-foundry')
-    .config(registerRoute);
-
-  registerRoute.$inject = [
-    '$stateProvider',
-    'cloud-foundry.basePath'
-  ];
-
-  function registerRoute($stateProvider, basePath) {
-    $stateProvider.state('cf', {
-      url: '/cf',
-      templateUrl: basePath + 'view/index.html'
-    });
-  }
-
-})();
diff --git a/src/plugins/cloud-foundry/view/applications/application.route.js b/src/plugins/cloud-foundry/view/applications/application.route.js
deleted file mode 100644
index b5935edb9e..0000000000
--- a/src/plugins/cloud-foundry/view/applications/application.route.js
+++ /dev/null
@@ -1,20 +0,0 @@
-(function () {
-  'use strict';
-
-  angular
-    .module('cloud-foundry')
-    .config(registerRoute);
-
-  registerRoute.$inject = [
-    '$stateProvider',
-    'cloud-foundry.basePath'
-  ];
-
-  function registerRoute($stateProvider, basePath) {
-    $stateProvider.state('cf.applications', {
-      url: 'applications/',
-      templateUrl: basePath + 'view/applications/applications.html'
-    });
-  }
-
-})();
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..e69de29bb2
diff --git a/src/plugins/cloud-foundry/view/applications/applications.route.js b/src/plugins/cloud-foundry/view/applications/applications.route.js
deleted file mode 100644
index d8fbf82401..0000000000
--- a/src/plugins/cloud-foundry/view/applications/applications.route.js
+++ /dev/null
@@ -1,20 +0,0 @@
-(function () {
-  'use strict';
-
-  angular
-    .module('cloud-foundry')
-    .config(registerRoute);
-
-  registerRoute.$inject = [
-    '$stateProvider',
-    'cloud-foundry.basePath'
-  ];
-
-  function registerRoute($stateProvider, basePath) {
-    $stateProvider.state('cf.applications', {
-      url: '/applications',
-      templateUrl: basePath + 'view/applications/applications.html'
-    });
-  }
-
-})();
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..e69de29bb2
diff --git a/src/plugins/cloud-foundry/view/organizations/organizations.route.js b/src/plugins/cloud-foundry/view/organizations/organizations.route.js
deleted file mode 100644
index 29f943a16c..0000000000
--- a/src/plugins/cloud-foundry/view/organizations/organizations.route.js
+++ /dev/null
@@ -1,20 +0,0 @@
-(function () {
-  'use strict';
-
-  angular
-    .module('cloud-foundry')
-    .config(registerRoute);
-
-  registerRoute.$inject = [
-    '$stateProvider',
-    'cloud-foundry.basePath'
-  ];
-
-  function registerRoute($stateProvider, basePath) {
-    $stateProvider.state('cf.organizations', {
-      url: '/organizations',
-      templateUrl: basePath + 'view/organizations/organizations.html'
-    });
-  }
-
-})();
diff --git a/src/plugins/cloud-foundry/view/index.html b/src/plugins/cloud-foundry/view/view.html
similarity index 100%
rename from src/plugins/cloud-foundry/view/index.html
rename to src/plugins/cloud-foundry/view/view.html
diff --git a/src/plugins/cloud-foundry/view/view.module.js b/src/plugins/cloud-foundry/view/view.module.js
index 72b4270627..09f8269b56 100644
--- a/src/plugins/cloud-foundry/view/view.module.js
+++ b/src/plugins/cloud-foundry/view/view.module.js
@@ -2,6 +2,23 @@
   'use strict';
 
   angular
-    .module('cloud-foundry.view', []);
+    .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'
+    });
+  }
 })();

From 614c9ec64c2f69a769143bc6f2adb5104085de9c Mon Sep 17 00:00:00 2001
From: Shaoquan Chen <sean.chen2@hp.com>
Date: Thu, 14 Jan 2016 18:46:32 -0800
Subject: [PATCH 06/10] refectory route

---
 .../cloud-foundry/cloud-foundry.module.js     |  1 -
 .../cloud-foundry/cloud-foundry.route.js      | 20 -----------------
 .../view/applications/application.route.js    | 20 -----------------
 .../view/applications/applications.module.js  | 22 +++++++++++++++++++
 .../view/applications/applications.route.js   | 20 -----------------
 .../organizations/organizations.module.js     | 21 ++++++++++++++++++
 .../view/organizations/organizations.route.js | 20 -----------------
 .../view/{index.html => view.html}            |  0
 src/plugins/cloud-foundry/view/view.module.js | 19 +++++++++++++++-
 9 files changed, 61 insertions(+), 82 deletions(-)
 delete mode 100644 src/plugins/cloud-foundry/cloud-foundry.route.js
 delete mode 100644 src/plugins/cloud-foundry/view/applications/application.route.js
 create mode 100644 src/plugins/cloud-foundry/view/applications/applications.module.js
 delete mode 100644 src/plugins/cloud-foundry/view/applications/applications.route.js
 create mode 100644 src/plugins/cloud-foundry/view/organizations/organizations.module.js
 delete mode 100644 src/plugins/cloud-foundry/view/organizations/organizations.route.js
 rename src/plugins/cloud-foundry/view/{index.html => view.html} (100%)

diff --git a/src/plugins/cloud-foundry/cloud-foundry.module.js b/src/plugins/cloud-foundry/cloud-foundry.module.js
index 1da3b5969e..caeae83788 100644
--- a/src/plugins/cloud-foundry/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 = [
diff --git a/src/plugins/cloud-foundry/cloud-foundry.route.js b/src/plugins/cloud-foundry/cloud-foundry.route.js
deleted file mode 100644
index e3032a929e..0000000000
--- a/src/plugins/cloud-foundry/cloud-foundry.route.js
+++ /dev/null
@@ -1,20 +0,0 @@
-(function () {
-  'use strict';
-
-  angular
-    .module('cloud-foundry')
-    .config(registerRoute);
-
-  registerRoute.$inject = [
-    '$stateProvider',
-    'cloud-foundry.basePath'
-  ];
-
-  function registerRoute($stateProvider, basePath) {
-    $stateProvider.state('cf', {
-      url: '/cf',
-      templateUrl: basePath + 'view/index.html'
-    });
-  }
-
-})();
diff --git a/src/plugins/cloud-foundry/view/applications/application.route.js b/src/plugins/cloud-foundry/view/applications/application.route.js
deleted file mode 100644
index b5935edb9e..0000000000
--- a/src/plugins/cloud-foundry/view/applications/application.route.js
+++ /dev/null
@@ -1,20 +0,0 @@
-(function () {
-  'use strict';
-
-  angular
-    .module('cloud-foundry')
-    .config(registerRoute);
-
-  registerRoute.$inject = [
-    '$stateProvider',
-    'cloud-foundry.basePath'
-  ];
-
-  function registerRoute($stateProvider, basePath) {
-    $stateProvider.state('cf.applications', {
-      url: 'applications/',
-      templateUrl: basePath + 'view/applications/applications.html'
-    });
-  }
-
-})();
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..6a5c896d09
--- /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/applications/applications.route.js b/src/plugins/cloud-foundry/view/applications/applications.route.js
deleted file mode 100644
index d8fbf82401..0000000000
--- a/src/plugins/cloud-foundry/view/applications/applications.route.js
+++ /dev/null
@@ -1,20 +0,0 @@
-(function () {
-  'use strict';
-
-  angular
-    .module('cloud-foundry')
-    .config(registerRoute);
-
-  registerRoute.$inject = [
-    '$stateProvider',
-    'cloud-foundry.basePath'
-  ];
-
-  function registerRoute($stateProvider, basePath) {
-    $stateProvider.state('cf.applications', {
-      url: '/applications',
-      templateUrl: basePath + 'view/applications/applications.html'
-    });
-  }
-
-})();
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/organizations/organizations.route.js b/src/plugins/cloud-foundry/view/organizations/organizations.route.js
deleted file mode 100644
index 29f943a16c..0000000000
--- a/src/plugins/cloud-foundry/view/organizations/organizations.route.js
+++ /dev/null
@@ -1,20 +0,0 @@
-(function () {
-  'use strict';
-
-  angular
-    .module('cloud-foundry')
-    .config(registerRoute);
-
-  registerRoute.$inject = [
-    '$stateProvider',
-    'cloud-foundry.basePath'
-  ];
-
-  function registerRoute($stateProvider, basePath) {
-    $stateProvider.state('cf.organizations', {
-      url: '/organizations',
-      templateUrl: basePath + 'view/organizations/organizations.html'
-    });
-  }
-
-})();
diff --git a/src/plugins/cloud-foundry/view/index.html b/src/plugins/cloud-foundry/view/view.html
similarity index 100%
rename from src/plugins/cloud-foundry/view/index.html
rename to src/plugins/cloud-foundry/view/view.html
diff --git a/src/plugins/cloud-foundry/view/view.module.js b/src/plugins/cloud-foundry/view/view.module.js
index 72b4270627..09f8269b56 100644
--- a/src/plugins/cloud-foundry/view/view.module.js
+++ b/src/plugins/cloud-foundry/view/view.module.js
@@ -2,6 +2,23 @@
   'use strict';
 
   angular
-    .module('cloud-foundry.view', []);
+    .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'
+    });
+  }
 })();

From 0e338618eb5a280bee68d21240e2e5972db0081a Mon Sep 17 00:00:00 2001
From: Shaoquan Chen <sean.chen2@hp.com>
Date: Thu, 14 Jan 2016 15:23:58 -0800
Subject: [PATCH 07/10] Adding route for cf-application and cf-organization

---
 .../top-bar/navigation/navigation.html        |  2 +-
 .../api/api.module.js                         |  0
 .../cloud-foundry.module.js                   |  4 ++--
 .../cloud-foundry/cloud-foundry.route.js      | 20 +++++++++++++++++++
 .../cloud-foundry.scss                        |  0
 .../event/event.module.js                     |  0
 .../model/model.module.js                     |  0
 .../view/applications/application.route.js    | 20 +++++++++++++++++++
 .../view/applications/applications.html       |  1 +
 src/plugins/cloud-foundry/view/index.html     |  1 +
 .../view/organizations/organizations.html     |  1 +
 .../view/organizations/organizations.route.js | 20 +++++++++++++++++++
 .../view/view.module.js                       |  0
 13 files changed, 66 insertions(+), 3 deletions(-)
 rename src/plugins/{cloud-fondry => cloud-foundry}/api/api.module.js (100%)
 rename src/plugins/{cloud-fondry => cloud-foundry}/cloud-foundry.module.js (86%)
 create mode 100644 src/plugins/cloud-foundry/cloud-foundry.route.js
 rename src/plugins/{cloud-fondry => cloud-foundry}/cloud-foundry.scss (100%)
 rename src/plugins/{cloud-fondry => cloud-foundry}/event/event.module.js (100%)
 rename src/plugins/{cloud-fondry => cloud-foundry}/model/model.module.js (100%)
 create mode 100644 src/plugins/cloud-foundry/view/applications/application.route.js
 create mode 100644 src/plugins/cloud-foundry/view/applications/applications.html
 create mode 100644 src/plugins/cloud-foundry/view/index.html
 create mode 100644 src/plugins/cloud-foundry/view/organizations/organizations.html
 create mode 100644 src/plugins/cloud-foundry/view/organizations/organizations.route.js
 rename src/plugins/{cloud-fondry => cloud-foundry}/view/view.module.js (100%)

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/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 86%
rename from src/plugins/cloud-fondry/cloud-foundry.module.js
rename to src/plugins/cloud-foundry/cloud-foundry.module.js
index 5a6a5de005..1da3b5969e 100644
--- a/src/plugins/cloud-fondry/cloud-foundry.module.js
+++ b/src/plugins/cloud-foundry/cloud-foundry.module.js
@@ -40,8 +40,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-foundry/cloud-foundry.route.js b/src/plugins/cloud-foundry/cloud-foundry.route.js
new file mode 100644
index 0000000000..9744923a92
--- /dev/null
+++ b/src/plugins/cloud-foundry/cloud-foundry.route.js
@@ -0,0 +1,20 @@
+(function () {
+  'use strict';
+
+  angular
+    .module('cloud-foundry')
+    .config(registerRoute);
+
+  registerRoute.$inject = [
+    '$stateProvider',
+    'cloud-foundry.basePath'
+  ];
+
+  function registerRoute($stateProvider, basePath) {
+    $stateProvider.state('cf', {
+      url: '/cf/',
+      templateUrl: basePath + 'view/index.html'
+    });
+  }
+
+})();
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/application.route.js b/src/plugins/cloud-foundry/view/applications/application.route.js
new file mode 100644
index 0000000000..b5935edb9e
--- /dev/null
+++ b/src/plugins/cloud-foundry/view/applications/application.route.js
@@ -0,0 +1,20 @@
+(function () {
+  'use strict';
+
+  angular
+    .module('cloud-foundry')
+    .config(registerRoute);
+
+  registerRoute.$inject = [
+    '$stateProvider',
+    'cloud-foundry.basePath'
+  ];
+
+  function registerRoute($stateProvider, basePath) {
+    $stateProvider.state('cf.applications', {
+      url: 'applications/',
+      templateUrl: basePath + 'view/applications/applications.html'
+    });
+  }
+
+})();
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..3adae53bd8
--- /dev/null
+++ b/src/plugins/cloud-foundry/view/applications/applications.html
@@ -0,0 +1 @@
+<h1>Applications</h1>
diff --git a/src/plugins/cloud-foundry/view/index.html b/src/plugins/cloud-foundry/view/index.html
new file mode 100644
index 0000000000..cc16039b23
--- /dev/null
+++ b/src/plugins/cloud-foundry/view/index.html
@@ -0,0 +1 @@
+<h1>Cloud Foundry</h1>
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..36071796be
--- /dev/null
+++ b/src/plugins/cloud-foundry/view/organizations/organizations.html
@@ -0,0 +1 @@
+<h1>Organizations</h1>
diff --git a/src/plugins/cloud-foundry/view/organizations/organizations.route.js b/src/plugins/cloud-foundry/view/organizations/organizations.route.js
new file mode 100644
index 0000000000..e88aa876c2
--- /dev/null
+++ b/src/plugins/cloud-foundry/view/organizations/organizations.route.js
@@ -0,0 +1,20 @@
+(function () {
+  'use strict';
+
+  angular
+    .module('cloud-foundry')
+    .config(registerRoute);
+
+  registerRoute.$inject = [
+    '$stateProvider',
+    'cloud-foundry.basePath'
+  ];
+
+  function registerRoute($stateProvider, basePath) {
+    $stateProvider.state('cf.organizations', {
+      url: 'organizations/',
+      templateUrl: basePath + 'view/organizations/organizations.html'
+    });
+  }
+
+})();
diff --git a/src/plugins/cloud-fondry/view/view.module.js b/src/plugins/cloud-foundry/view/view.module.js
similarity index 100%
rename from src/plugins/cloud-fondry/view/view.module.js
rename to src/plugins/cloud-foundry/view/view.module.js

From 2b3d822d6e1fb8539e2a19857f5b1f8e3557f2d3 Mon Sep 17 00:00:00 2001
From: Shaoquan Chen <sean.chen2@hp.com>
Date: Thu, 14 Jan 2016 15:23:58 -0800
Subject: [PATCH 08/10] Adding route for cf-application and cf-organization

---
 src/app/view/console/console.html             |  2 +-
 .../view/console/content/content.directive.js | 18 -----------------
 src/app/view/console/content/content.html     |  1 -
 .../view/applications/applications.html       |  2 +-
 .../view/applications/applications.route.js   | 20 +++++++++++++++++++
 .../view/organizations/organizations.html     |  2 +-
 6 files changed, 23 insertions(+), 22 deletions(-)
 delete mode 100644 src/app/view/console/content/content.directive.js
 delete mode 100644 src/app/view/console/content/content.html
 create mode 100644 src/plugins/cloud-foundry/view/applications/applications.route.js

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/plugins/cloud-foundry/view/applications/applications.html b/src/plugins/cloud-foundry/view/applications/applications.html
index 3adae53bd8..4ee455ae7d 100644
--- a/src/plugins/cloud-foundry/view/applications/applications.html
+++ b/src/plugins/cloud-foundry/view/applications/applications.html
@@ -1 +1 @@
-<h1>Applications</h1>
+<h2>Applications</h2>
diff --git a/src/plugins/cloud-foundry/view/applications/applications.route.js b/src/plugins/cloud-foundry/view/applications/applications.route.js
new file mode 100644
index 0000000000..d8fbf82401
--- /dev/null
+++ b/src/plugins/cloud-foundry/view/applications/applications.route.js
@@ -0,0 +1,20 @@
+(function () {
+  'use strict';
+
+  angular
+    .module('cloud-foundry')
+    .config(registerRoute);
+
+  registerRoute.$inject = [
+    '$stateProvider',
+    'cloud-foundry.basePath'
+  ];
+
+  function registerRoute($stateProvider, basePath) {
+    $stateProvider.state('cf.applications', {
+      url: '/applications',
+      templateUrl: basePath + 'view/applications/applications.html'
+    });
+  }
+
+})();
diff --git a/src/plugins/cloud-foundry/view/organizations/organizations.html b/src/plugins/cloud-foundry/view/organizations/organizations.html
index 36071796be..94502aaab7 100644
--- a/src/plugins/cloud-foundry/view/organizations/organizations.html
+++ b/src/plugins/cloud-foundry/view/organizations/organizations.html
@@ -1 +1 @@
-<h1>Organizations</h1>
+<h2>Organizations</h2>

From 8aade8bf44fb3645c46cf930bb53afb608eb53f6 Mon Sep 17 00:00:00 2001
From: Shaoquan Chen <sean.chen2@hp.com>
Date: Thu, 14 Jan 2016 15:23:58 -0800
Subject: [PATCH 09/10] Adding route for cf-application and cf-organization

---
 .../view/applications/application.route.js    | 20 -------------------
 src/plugins/cloud-foundry/view/index.html     |  1 +
 .../view/organizations/organizations.route.js |  2 +-
 3 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100644 src/plugins/cloud-foundry/view/applications/application.route.js

diff --git a/src/plugins/cloud-foundry/view/applications/application.route.js b/src/plugins/cloud-foundry/view/applications/application.route.js
deleted file mode 100644
index b5935edb9e..0000000000
--- a/src/plugins/cloud-foundry/view/applications/application.route.js
+++ /dev/null
@@ -1,20 +0,0 @@
-(function () {
-  'use strict';
-
-  angular
-    .module('cloud-foundry')
-    .config(registerRoute);
-
-  registerRoute.$inject = [
-    '$stateProvider',
-    'cloud-foundry.basePath'
-  ];
-
-  function registerRoute($stateProvider, basePath) {
-    $stateProvider.state('cf.applications', {
-      url: 'applications/',
-      templateUrl: basePath + 'view/applications/applications.html'
-    });
-  }
-
-})();
diff --git a/src/plugins/cloud-foundry/view/index.html b/src/plugins/cloud-foundry/view/index.html
index cc16039b23..826f2676a2 100644
--- a/src/plugins/cloud-foundry/view/index.html
+++ b/src/plugins/cloud-foundry/view/index.html
@@ -1 +1,2 @@
 <h1>Cloud Foundry</h1>
+<div ui-view></div>
diff --git a/src/plugins/cloud-foundry/view/organizations/organizations.route.js b/src/plugins/cloud-foundry/view/organizations/organizations.route.js
index e88aa876c2..29f943a16c 100644
--- a/src/plugins/cloud-foundry/view/organizations/organizations.route.js
+++ b/src/plugins/cloud-foundry/view/organizations/organizations.route.js
@@ -12,7 +12,7 @@
 
   function registerRoute($stateProvider, basePath) {
     $stateProvider.state('cf.organizations', {
-      url: 'organizations/',
+      url: '/organizations',
       templateUrl: basePath + 'view/organizations/organizations.html'
     });
   }

From 623c7b6aeaaacf897e7b5a9c470ac077dbe9801b Mon Sep 17 00:00:00 2001
From: Shaoquan Chen <sean.chen2@hp.com>
Date: Thu, 14 Jan 2016 18:46:32 -0800
Subject: [PATCH 10/10] refectory route

---
 .../cloud-foundry/cloud-foundry.module.js     |  1 -
 .../view/applications/applications.module.js  | 22 +++++++++++++++++++
 .../view/applications/applications.route.js   | 20 -----------------
 .../organizations/organizations.module.js     | 21 ++++++++++++++++++
 .../view/organizations/organizations.route.js | 20 -----------------
 .../view/{index.html => view.html}            |  0
 src/plugins/cloud-foundry/view/view.module.js | 19 +++++++++++++++-
 7 files changed, 61 insertions(+), 42 deletions(-)
 create mode 100644 src/plugins/cloud-foundry/view/applications/applications.module.js
 delete mode 100644 src/plugins/cloud-foundry/view/applications/applications.route.js
 create mode 100644 src/plugins/cloud-foundry/view/organizations/organizations.module.js
 delete mode 100644 src/plugins/cloud-foundry/view/organizations/organizations.route.js
 rename src/plugins/cloud-foundry/view/{index.html => view.html} (100%)

diff --git a/src/plugins/cloud-foundry/cloud-foundry.module.js b/src/plugins/cloud-foundry/cloud-foundry.module.js
index 1da3b5969e..caeae83788 100644
--- a/src/plugins/cloud-foundry/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 = [
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..6a5c896d09
--- /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/applications/applications.route.js b/src/plugins/cloud-foundry/view/applications/applications.route.js
deleted file mode 100644
index d8fbf82401..0000000000
--- a/src/plugins/cloud-foundry/view/applications/applications.route.js
+++ /dev/null
@@ -1,20 +0,0 @@
-(function () {
-  'use strict';
-
-  angular
-    .module('cloud-foundry')
-    .config(registerRoute);
-
-  registerRoute.$inject = [
-    '$stateProvider',
-    'cloud-foundry.basePath'
-  ];
-
-  function registerRoute($stateProvider, basePath) {
-    $stateProvider.state('cf.applications', {
-      url: '/applications',
-      templateUrl: basePath + 'view/applications/applications.html'
-    });
-  }
-
-})();
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/organizations/organizations.route.js b/src/plugins/cloud-foundry/view/organizations/organizations.route.js
deleted file mode 100644
index 29f943a16c..0000000000
--- a/src/plugins/cloud-foundry/view/organizations/organizations.route.js
+++ /dev/null
@@ -1,20 +0,0 @@
-(function () {
-  'use strict';
-
-  angular
-    .module('cloud-foundry')
-    .config(registerRoute);
-
-  registerRoute.$inject = [
-    '$stateProvider',
-    'cloud-foundry.basePath'
-  ];
-
-  function registerRoute($stateProvider, basePath) {
-    $stateProvider.state('cf.organizations', {
-      url: '/organizations',
-      templateUrl: basePath + 'view/organizations/organizations.html'
-    });
-  }
-
-})();
diff --git a/src/plugins/cloud-foundry/view/index.html b/src/plugins/cloud-foundry/view/view.html
similarity index 100%
rename from src/plugins/cloud-foundry/view/index.html
rename to src/plugins/cloud-foundry/view/view.html
diff --git a/src/plugins/cloud-foundry/view/view.module.js b/src/plugins/cloud-foundry/view/view.module.js
index 72b4270627..09f8269b56 100644
--- a/src/plugins/cloud-foundry/view/view.module.js
+++ b/src/plugins/cloud-foundry/view/view.module.js
@@ -2,6 +2,23 @@
   'use strict';
 
   angular
-    .module('cloud-foundry.view', []);
+    .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'
+    });
+  }
 })();