diff --git a/horizon/static/framework/framework.module.js b/horizon/static/framework/framework.module.js
new file mode 100644
index 0000000000..90d6a54b46
--- /dev/null
+++ b/horizon/static/framework/framework.module.js
@@ -0,0 +1,10 @@
+(function () {
+ 'use strict';
+
+  angular.module('horizon.framework', [
+    'horizon.framework.util',
+    'horizon.framework.widgets'
+  ])
+    .constant('horizon.framework.basePath', '/static/framework/');
+
+})();
diff --git a/horizon/static/framework/framework.scss b/horizon/static/framework/framework.scss
new file mode 100644
index 0000000000..53d621c5e5
--- /dev/null
+++ b/horizon/static/framework/framework.scss
@@ -0,0 +1 @@
+@import "widgets/widgets";
diff --git a/horizon/static/framework/util/bind-scope/bind-scope.spec.js b/horizon/static/framework/util/bind-scope/bind-scope.spec.js
index 51efecb4ef..13c166fbc6 100644
--- a/horizon/static/framework/util/bind-scope/bind-scope.spec.js
+++ b/horizon/static/framework/util/bind-scope/bind-scope.spec.js
@@ -12,7 +12,7 @@
     var $scope, $element;
 
     beforeEach(module('hz'));
-    beforeEach(module('hz.widgets'));
+    beforeEach(module('horizon.framework.widgets'));
     beforeEach(module('hz.framework.bind-scope'));
 
     beforeEach(module('hz.framework.bind-scope', function($compileProvider) {
diff --git a/horizon/static/framework/util/validators/validators.spec.js b/horizon/static/framework/util/validators/validators.spec.js
index 661ba78b1a..760b6a024d 100644
--- a/horizon/static/framework/util/validators/validators.spec.js
+++ b/horizon/static/framework/util/validators/validators.spec.js
@@ -10,7 +10,7 @@
   describe('validators directive', function() {
 
     beforeEach(module('hz'));
-    beforeEach(module('hz.widgets'));
+    beforeEach(module('horizon.framework.widgets'));
     beforeEach(module('hz.framework.validators'));
 
     describe('validateNumberMax directive', function() {
diff --git a/horizon/static/framework/action-list/action-list.js b/horizon/static/framework/widgets/action-list/action-list.js
similarity index 96%
rename from horizon/static/framework/action-list/action-list.js
rename to horizon/static/framework/widgets/action-list/action-list.js
index 698c8aab36..2e91ef4700 100644
--- a/horizon/static/framework/action-list/action-list.js
+++ b/horizon/static/framework/widgets/action-list/action-list.js
@@ -80,7 +80,7 @@
    * </action-list>
    * ```
    */
-  .directive('actionList', [ 'basePath', function() {
+  .directive('actionList', [ 'horizon.framework.widgets.basePath', function() {
       return {
         restrict: 'E',
         link: function (scope, element) {
@@ -116,7 +116,7 @@
    * </menu>
    * ```
    */
-  .directive('menu', [ 'basePath', function(path) {
+  .directive('menu', [ 'horizon.framework.widgets.basePath', function(path) {
     return {
       restrict: 'E',
       templateUrl: path + 'action-list/menu.html',
@@ -179,7 +179,7 @@
    * </action>
    * ```
    */
-  .directive('action', [ 'basePath', function(path) {
+  .directive('action', [ 'horizon.framework.widgets.basePath', function(path) {
       return {
         restrict: 'E',
         scope: {
diff --git a/horizon/static/framework/action-list/action-list.scss b/horizon/static/framework/widgets/action-list/action-list.scss
similarity index 100%
rename from horizon/static/framework/action-list/action-list.scss
rename to horizon/static/framework/widgets/action-list/action-list.scss
diff --git a/horizon/static/framework/action-list/action-list.spec.js b/horizon/static/framework/widgets/action-list/action-list.spec.js
similarity index 99%
rename from horizon/static/framework/action-list/action-list.spec.js
rename to horizon/static/framework/widgets/action-list/action-list.spec.js
index 277744125d..55921cc41e 100644
--- a/horizon/static/framework/action-list/action-list.spec.js
+++ b/horizon/static/framework/widgets/action-list/action-list.spec.js
@@ -11,7 +11,7 @@
 
     beforeEach(module('templates'));
     beforeEach(module('hz'));
-    beforeEach(module('hz.widgets'));
+    beforeEach(module('horizon.framework.widgets'));
     beforeEach(module('hz.widget.action-list'));
 
     describe('single button dropdown', function() {
diff --git a/horizon/static/framework/action-list/action.html b/horizon/static/framework/widgets/action-list/action.html
similarity index 100%
rename from horizon/static/framework/action-list/action.html
rename to horizon/static/framework/widgets/action-list/action.html
diff --git a/horizon/static/framework/action-list/button-tooltip.js b/horizon/static/framework/widgets/action-list/button-tooltip.js
similarity index 97%
rename from horizon/static/framework/action-list/button-tooltip.js
rename to horizon/static/framework/widgets/action-list/button-tooltip.js
index 622a6c56a9..8e6112c8d1 100644
--- a/horizon/static/framework/action-list/button-tooltip.js
+++ b/horizon/static/framework/widgets/action-list/button-tooltip.js
@@ -55,7 +55,7 @@
    * ```
    */
   .directive('buttonTooltip',
-    [ 'basePath', '$compile', '$http', '$templateCache', 'tooltipConfig',
+    [ 'horizon.framework.widgets.basePath', '$compile', '$http', '$templateCache', 'tooltipConfig',
     function(path, $compile, $http, $templateCache, tooltipConfig) {
       return {
         restrict: 'A',
diff --git a/horizon/static/framework/action-list/menu-item.html b/horizon/static/framework/widgets/action-list/menu-item.html
similarity index 100%
rename from horizon/static/framework/action-list/menu-item.html
rename to horizon/static/framework/widgets/action-list/menu-item.html
diff --git a/horizon/static/framework/action-list/menu.html b/horizon/static/framework/widgets/action-list/menu.html
similarity index 100%
rename from horizon/static/framework/action-list/menu.html
rename to horizon/static/framework/widgets/action-list/menu.html
diff --git a/horizon/static/framework/action-list/single-button.html b/horizon/static/framework/widgets/action-list/single-button.html
similarity index 100%
rename from horizon/static/framework/action-list/single-button.html
rename to horizon/static/framework/widgets/action-list/single-button.html
diff --git a/horizon/static/framework/action-list/split-button.html b/horizon/static/framework/widgets/action-list/split-button.html
similarity index 100%
rename from horizon/static/framework/action-list/split-button.html
rename to horizon/static/framework/widgets/action-list/split-button.html
diff --git a/horizon/static/framework/action-list/warning-tooltip.html b/horizon/static/framework/widgets/action-list/warning-tooltip.html
similarity index 100%
rename from horizon/static/framework/action-list/warning-tooltip.html
rename to horizon/static/framework/widgets/action-list/warning-tooltip.html
diff --git a/horizon/static/framework/charts/chart-tooltip.html b/horizon/static/framework/widgets/charts/chart-tooltip.html
similarity index 100%
rename from horizon/static/framework/charts/chart-tooltip.html
rename to horizon/static/framework/widgets/charts/chart-tooltip.html
diff --git a/horizon/static/framework/charts/chart-tooltip.js b/horizon/static/framework/widgets/charts/chart-tooltip.js
similarity index 91%
rename from horizon/static/framework/charts/chart-tooltip.js
rename to horizon/static/framework/widgets/charts/chart-tooltip.js
index 94ef156cef..c1641152b4 100644
--- a/horizon/static/framework/charts/chart-tooltip.js
+++ b/horizon/static/framework/widgets/charts/chart-tooltip.js
@@ -34,7 +34,7 @@
      * ```
      *
      */
-    .directive('chartTooltip', [ 'basePath', function (path) {
+    .directive('chartTooltip', [ 'horizon.framework.widgets.basePath', function (path) {
       return {
         restrict: 'E',
         scope: {
diff --git a/horizon/static/framework/charts/chart-tooltip.scss b/horizon/static/framework/widgets/charts/chart-tooltip.scss
similarity index 100%
rename from horizon/static/framework/charts/chart-tooltip.scss
rename to horizon/static/framework/widgets/charts/chart-tooltip.scss
diff --git a/horizon/static/framework/charts/charts.js b/horizon/static/framework/widgets/charts/charts.js
similarity index 100%
rename from horizon/static/framework/charts/charts.js
rename to horizon/static/framework/widgets/charts/charts.js
diff --git a/horizon/static/framework/charts/pie-chart.html b/horizon/static/framework/widgets/charts/pie-chart.html
similarity index 100%
rename from horizon/static/framework/charts/pie-chart.html
rename to horizon/static/framework/widgets/charts/pie-chart.html
diff --git a/horizon/static/framework/charts/pie-chart.js b/horizon/static/framework/widgets/charts/pie-chart.js
similarity index 98%
rename from horizon/static/framework/charts/pie-chart.js
rename to horizon/static/framework/widgets/charts/pie-chart.js
index dea3b5f3f2..06d5910d9f 100644
--- a/horizon/static/framework/charts/pie-chart.js
+++ b/horizon/static/framework/widgets/charts/pie-chart.js
@@ -74,7 +74,7 @@
      * ```
      *
      */
-    .directive('pieChart', [ 'basePath', 'donutChartSettings', function (path, donutChartSettings) {
+    .directive('pieChart', [ 'horizon.framework.widgets.basePath', 'donutChartSettings', function (path, donutChartSettings) {
       return {
         restrict: 'E',
         scope: {
diff --git a/horizon/static/framework/charts/pie-chart.scss b/horizon/static/framework/widgets/charts/pie-chart.scss
similarity index 100%
rename from horizon/static/framework/charts/pie-chart.scss
rename to horizon/static/framework/widgets/charts/pie-chart.scss
diff --git a/horizon/static/framework/charts/pie-chart.spec.js b/horizon/static/framework/widgets/charts/pie-chart.spec.js
similarity index 99%
rename from horizon/static/framework/charts/pie-chart.spec.js
rename to horizon/static/framework/widgets/charts/pie-chart.spec.js
index b6e5ad9b78..e04e832e28 100644
--- a/horizon/static/framework/charts/pie-chart.spec.js
+++ b/horizon/static/framework/widgets/charts/pie-chart.spec.js
@@ -15,7 +15,7 @@
 
     beforeEach(module('templates'));
     beforeEach(module('hz'));
-    beforeEach(module('hz.widgets'));
+    beforeEach(module('horizon.framework.widgets'));
     beforeEach(module('hz.widget.charts'));
 
     beforeEach(inject(function($injector) {
diff --git a/horizon/static/framework/form/form.js b/horizon/static/framework/widgets/form/form.js
similarity index 100%
rename from horizon/static/framework/form/form.js
rename to horizon/static/framework/widgets/form/form.js
diff --git a/horizon/static/framework/form/form.spec.js b/horizon/static/framework/widgets/form/form.spec.js
similarity index 98%
rename from horizon/static/framework/form/form.spec.js
rename to horizon/static/framework/widgets/form/form.spec.js
index 62c8bab01a..4ef8683b25 100644
--- a/horizon/static/framework/form/form.spec.js
+++ b/horizon/static/framework/widgets/form/form.spec.js
@@ -9,7 +9,7 @@
 
   describe('form directives', function() {
     beforeEach(module('hz'));
-    beforeEach(module('hz.widgets'));
+    beforeEach(module('horizon.framework.widgets'));
     beforeEach(module('hz.widget.form'));
 
     describe('hzPasswordMatch directive', function() {
diff --git a/horizon/static/framework/help-panel/help-panel.html b/horizon/static/framework/widgets/help-panel/help-panel.html
similarity index 100%
rename from horizon/static/framework/help-panel/help-panel.html
rename to horizon/static/framework/widgets/help-panel/help-panel.html
diff --git a/horizon/static/framework/help-panel/help-panel.js b/horizon/static/framework/widgets/help-panel/help-panel.js
similarity index 78%
rename from horizon/static/framework/help-panel/help-panel.js
rename to horizon/static/framework/widgets/help-panel/help-panel.js
index a05da231e5..e24ede6256 100644
--- a/horizon/static/framework/help-panel/help-panel.js
+++ b/horizon/static/framework/widgets/help-panel/help-panel.js
@@ -2,7 +2,7 @@
   'use strict';
 
   angular.module('hz.widget.help-panel', [])
-    .directive('helpPanel', ['basePath',
+    .directive('helpPanel', ['horizon.framework.widgets.basePath',
       function (path) {
         return {
           templateUrl: path + 'help-panel/help-panel.html',
diff --git a/horizon/static/framework/help-panel/help-panel.scss b/horizon/static/framework/widgets/help-panel/help-panel.scss
similarity index 100%
rename from horizon/static/framework/help-panel/help-panel.scss
rename to horizon/static/framework/widgets/help-panel/help-panel.scss
diff --git a/horizon/static/framework/help-panel/help-panel.spec.js b/horizon/static/framework/widgets/help-panel/help-panel.spec.js
similarity index 96%
rename from horizon/static/framework/help-panel/help-panel.spec.js
rename to horizon/static/framework/widgets/help-panel/help-panel.spec.js
index 66727e711c..cbfe4005f5 100644
--- a/horizon/static/framework/help-panel/help-panel.spec.js
+++ b/horizon/static/framework/widgets/help-panel/help-panel.spec.js
@@ -14,7 +14,7 @@
 
     beforeEach(module('templates'));
     beforeEach(module('hz'));
-    beforeEach(module('hz.widgets'));
+    beforeEach(module('horizon.framework.widgets'));
     beforeEach(module('hz.widget.help-panel'));
     beforeEach(inject(function ($injector) {
       $scope = $injector.get('$rootScope').$new();
diff --git a/horizon/static/framework/i18n/i18n.js b/horizon/static/framework/widgets/i18n/i18n.js
similarity index 100%
rename from horizon/static/framework/i18n/i18n.js
rename to horizon/static/framework/widgets/i18n/i18n.js
diff --git a/horizon/static/framework/i18n/i18n.spec.js b/horizon/static/framework/widgets/i18n/i18n.spec.js
similarity index 100%
rename from horizon/static/framework/i18n/i18n.spec.js
rename to horizon/static/framework/widgets/i18n/i18n.spec.js
diff --git a/horizon/static/framework/login/login.js b/horizon/static/framework/widgets/login/login.js
similarity index 100%
rename from horizon/static/framework/login/login.js
rename to horizon/static/framework/widgets/login/login.js
diff --git a/horizon/static/framework/login/login.spec.js b/horizon/static/framework/widgets/login/login.spec.js
similarity index 100%
rename from horizon/static/framework/login/login.spec.js
rename to horizon/static/framework/widgets/login/login.spec.js
diff --git a/horizon/static/framework/magic-search/magic-search.html b/horizon/static/framework/widgets/magic-search/magic-search.html
similarity index 100%
rename from horizon/static/framework/magic-search/magic-search.html
rename to horizon/static/framework/widgets/magic-search/magic-search.html
diff --git a/horizon/static/framework/magic-search/magic-search.js b/horizon/static/framework/widgets/magic-search/magic-search.js
similarity index 100%
rename from horizon/static/framework/magic-search/magic-search.js
rename to horizon/static/framework/widgets/magic-search/magic-search.js
diff --git a/horizon/static/framework/magic-search/magic-search.scss b/horizon/static/framework/widgets/magic-search/magic-search.scss
similarity index 100%
rename from horizon/static/framework/magic-search/magic-search.scss
rename to horizon/static/framework/widgets/magic-search/magic-search.scss
diff --git a/horizon/static/framework/metadata-display/metadata-display.html b/horizon/static/framework/widgets/metadata-display/metadata-display.html
similarity index 100%
rename from horizon/static/framework/metadata-display/metadata-display.html
rename to horizon/static/framework/widgets/metadata-display/metadata-display.html
diff --git a/horizon/static/framework/metadata-display/metadata-display.js b/horizon/static/framework/widgets/metadata-display/metadata-display.js
similarity index 97%
rename from horizon/static/framework/metadata-display/metadata-display.js
rename to horizon/static/framework/widgets/metadata-display/metadata-display.js
index 615c59ee85..f1d18901fc 100644
--- a/horizon/static/framework/metadata-display/metadata-display.js
+++ b/horizon/static/framework/widgets/metadata-display/metadata-display.js
@@ -46,7 +46,7 @@
    * @param {object} existing Key-value pairs with existing properties
    * @param {object=} text Text override
    */
-  .directive('hzMetadataDisplay', ['basePath',
+  .directive('hzMetadataDisplay', ['horizon.framework.widgets.basePath',
     function (path) {
       return {
         scope: {
diff --git a/horizon/static/framework/metadata-display/metadata-display.scss b/horizon/static/framework/widgets/metadata-display/metadata-display.scss
similarity index 100%
rename from horizon/static/framework/metadata-display/metadata-display.scss
rename to horizon/static/framework/widgets/metadata-display/metadata-display.scss
diff --git a/horizon/static/framework/metadata-display/metadata-display.spec.js b/horizon/static/framework/widgets/metadata-display/metadata-display.spec.js
similarity index 98%
rename from horizon/static/framework/metadata-display/metadata-display.spec.js
rename to horizon/static/framework/widgets/metadata-display/metadata-display.spec.js
index 79dcac3583..ee82ef8894 100644
--- a/horizon/static/framework/metadata-display/metadata-display.spec.js
+++ b/horizon/static/framework/widgets/metadata-display/metadata-display.spec.js
@@ -94,7 +94,7 @@
 
       beforeEach(module('templates'));
       beforeEach(module('hz'));
-      beforeEach(module('hz.widgets'));
+      beforeEach(module('horizon.framework.widgets'));
       beforeEach(module('hz.widget.metadata-tree'));
       beforeEach(module('hz.widget.metadata-display'));
       beforeEach(inject(function ($injector) {
diff --git a/horizon/static/framework/metadata-tree/metadata-tree-item.html b/horizon/static/framework/widgets/metadata-tree/metadata-tree-item.html
similarity index 100%
rename from horizon/static/framework/metadata-tree/metadata-tree-item.html
rename to horizon/static/framework/widgets/metadata-tree/metadata-tree-item.html
diff --git a/horizon/static/framework/metadata-tree/metadata-tree-service.js b/horizon/static/framework/widgets/metadata-tree/metadata-tree-service.js
similarity index 100%
rename from horizon/static/framework/metadata-tree/metadata-tree-service.js
rename to horizon/static/framework/widgets/metadata-tree/metadata-tree-service.js
diff --git a/horizon/static/framework/metadata-tree/metadata-tree.html b/horizon/static/framework/widgets/metadata-tree/metadata-tree.html
similarity index 100%
rename from horizon/static/framework/metadata-tree/metadata-tree.html
rename to horizon/static/framework/widgets/metadata-tree/metadata-tree.html
diff --git a/horizon/static/framework/metadata-tree/metadata-tree.js b/horizon/static/framework/widgets/metadata-tree/metadata-tree.js
similarity index 98%
rename from horizon/static/framework/metadata-tree/metadata-tree.js
rename to horizon/static/framework/widgets/metadata-tree/metadata-tree.js
index da1efc7195..37712a31b8 100644
--- a/horizon/static/framework/metadata-tree/metadata-tree.js
+++ b/horizon/static/framework/widgets/metadata-tree/metadata-tree.js
@@ -65,7 +65,7 @@
    * @param {object=} existing Key-value pairs with existing properties
    * @param {object=} text Text override
    */
-  .directive('hzMetadataTree', ['basePath',
+  .directive('hzMetadataTree', ['horizon.framework.widgets.basePath',
     function (path) {
       return {
         scope: {
@@ -93,7 +93,7 @@
    * @param {Item} item Item to display
    * @param {object} text Text override
    */
-  .directive('hzMetadataTreeItem', ['basePath',
+  .directive('hzMetadataTreeItem', ['horizon.framework.widgets.basePath',
     function (path) {
       return {
         scope: {
diff --git a/horizon/static/framework/metadata-tree/metadata-tree.scss b/horizon/static/framework/widgets/metadata-tree/metadata-tree.scss
similarity index 100%
rename from horizon/static/framework/metadata-tree/metadata-tree.scss
rename to horizon/static/framework/widgets/metadata-tree/metadata-tree.scss
diff --git a/horizon/static/framework/metadata-tree/metadata-tree.spec.js b/horizon/static/framework/widgets/metadata-tree/metadata-tree.spec.js
similarity index 99%
rename from horizon/static/framework/metadata-tree/metadata-tree.spec.js
rename to horizon/static/framework/widgets/metadata-tree/metadata-tree.spec.js
index ddd16754a8..45d4f0aa00 100644
--- a/horizon/static/framework/metadata-tree/metadata-tree.spec.js
+++ b/horizon/static/framework/widgets/metadata-tree/metadata-tree.spec.js
@@ -88,7 +88,7 @@
 
       beforeEach(module('templates'));
       beforeEach(module('hz'));
-      beforeEach(module('hz.widgets'));
+      beforeEach(module('horizon.framework.widgets'));
       beforeEach(module('hz.widget.metadata-tree'));
 
       describe('hzMetadataTree directive', function() {
diff --git a/horizon/static/framework/modal/modal-wait-spinner.js b/horizon/static/framework/widgets/modal/modal-wait-spinner.js
similarity index 100%
rename from horizon/static/framework/modal/modal-wait-spinner.js
rename to horizon/static/framework/widgets/modal/modal-wait-spinner.js
diff --git a/horizon/static/framework/modal/modal-wait-spinner.scss b/horizon/static/framework/widgets/modal/modal-wait-spinner.scss
similarity index 100%
rename from horizon/static/framework/modal/modal-wait-spinner.scss
rename to horizon/static/framework/widgets/modal/modal-wait-spinner.scss
diff --git a/horizon/static/framework/modal/modal-wait-spinner.spec.js b/horizon/static/framework/widgets/modal/modal-wait-spinner.spec.js
similarity index 100%
rename from horizon/static/framework/modal/modal-wait-spinner.spec.js
rename to horizon/static/framework/widgets/modal/modal-wait-spinner.spec.js
diff --git a/horizon/static/framework/modal/modal.js b/horizon/static/framework/widgets/modal/modal.js
similarity index 96%
rename from horizon/static/framework/modal/modal.js
rename to horizon/static/framework/widgets/modal/modal.js
index 5e4c6d4bc2..e7a29499a1 100644
--- a/horizon/static/framework/modal/modal.js
+++ b/horizon/static/framework/widgets/modal/modal.js
@@ -68,7 +68,7 @@
      *    }
      *  ]);
      */
-    .factory('simpleModalService', ['$modal', 'basePath', 'hz.i18n.gettext',
+    .factory('simpleModalService', ['$modal', 'horizon.framework.widgets.basePath', 'hz.i18n.gettext',
       function($modal, path, gettext) {
         return function(params) {
           if (params && params.title && params.body){
diff --git a/horizon/static/framework/modal/modal.spec.js b/horizon/static/framework/widgets/modal/modal.spec.js
similarity index 98%
rename from horizon/static/framework/modal/modal.spec.js
rename to horizon/static/framework/widgets/modal/modal.spec.js
index 7f40c4a010..9984ca2824 100644
--- a/horizon/static/framework/modal/modal.spec.js
+++ b/horizon/static/framework/widgets/modal/modal.spec.js
@@ -70,7 +70,7 @@
 
       beforeEach(module(function($provide) {
         modal = { open: function() {return 'val';} };
-        $provide.value('basePath', '/this/path/');
+        $provide.value('horizon.framework.widgets.basePath', '/this/path/');
         $provide.value('$modal', modal);
       }));
 
diff --git a/horizon/static/framework/modal/simple-modal.html b/horizon/static/framework/widgets/modal/simple-modal.html
similarity index 100%
rename from horizon/static/framework/modal/simple-modal.html
rename to horizon/static/framework/widgets/modal/simple-modal.html
diff --git a/horizon/static/framework/table/basic-table.js b/horizon/static/framework/widgets/table/basic-table.js
similarity index 95%
rename from horizon/static/framework/table/basic-table.js
rename to horizon/static/framework/widgets/table/basic-table.js
index 0bf41a2f98..cdb5f827bf 100644
--- a/horizon/static/framework/table/basic-table.js
+++ b/horizon/static/framework/widgets/table/basic-table.js
@@ -30,7 +30,7 @@
      * </search-bar>
      * ```
      */
-    .directive('searchBar', [ 'FILTER_PLACEHOLDER_TEXT', 'basePath',
+    .directive('searchBar', [ 'FILTER_PLACEHOLDER_TEXT', 'horizon.framework.widgets.basePath',
       function(FILTER_PLACEHOLDER_TEXT, path) {
       return {
         restrict: 'E',
diff --git a/horizon/static/framework/table/basic-table.spec.js b/horizon/static/framework/widgets/table/basic-table.spec.js
similarity index 96%
rename from horizon/static/framework/table/basic-table.spec.js
rename to horizon/static/framework/widgets/table/basic-table.spec.js
index 0cbab6b35d..1d6f55bb4b 100644
--- a/horizon/static/framework/table/basic-table.spec.js
+++ b/horizon/static/framework/widgets/table/basic-table.spec.js
@@ -8,7 +8,7 @@
     beforeEach(module('templates'));
     beforeEach(module('smart-table'));
     beforeEach(module('hz'));
-    beforeEach(module('hz.widgets'));
+    beforeEach(module('horizon.framework.widgets'));
     beforeEach(module('hz.widget.table'));
 
     describe('search bar', function() {
diff --git a/horizon/static/framework/table/search-bar.html b/horizon/static/framework/widgets/table/search-bar.html
similarity index 100%
rename from horizon/static/framework/table/search-bar.html
rename to horizon/static/framework/widgets/table/search-bar.html
diff --git a/horizon/static/framework/table/table.js b/horizon/static/framework/widgets/table/table.js
similarity index 100%
rename from horizon/static/framework/table/table.js
rename to horizon/static/framework/widgets/table/table.js
diff --git a/horizon/static/framework/table/table.scss b/horizon/static/framework/widgets/table/table.scss
similarity index 100%
rename from horizon/static/framework/table/table.scss
rename to horizon/static/framework/widgets/table/table.scss
diff --git a/horizon/static/framework/table/table.spec.js b/horizon/static/framework/widgets/table/table.spec.js
similarity index 99%
rename from horizon/static/framework/table/table.spec.js
rename to horizon/static/framework/widgets/table/table.spec.js
index 61afb4d601..a8c47f3258 100644
--- a/horizon/static/framework/table/table.spec.js
+++ b/horizon/static/framework/widgets/table/table.spec.js
@@ -14,7 +14,7 @@
 
     beforeEach(module('smart-table'));
     beforeEach(module('hz'));
-    beforeEach(module('hz.widgets'));
+    beforeEach(module('horizon.framework.widgets'));
     beforeEach(module('hz.widget.table'));
 
     beforeEach(inject(function($injector) {
diff --git a/horizon/static/framework/toast/toast.html b/horizon/static/framework/widgets/toast/toast.html
similarity index 100%
rename from horizon/static/framework/toast/toast.html
rename to horizon/static/framework/widgets/toast/toast.html
diff --git a/horizon/static/framework/toast/toast.js b/horizon/static/framework/widgets/toast/toast.js
similarity index 97%
rename from horizon/static/framework/toast/toast.js
rename to horizon/static/framework/widgets/toast/toast.js
index 0396d38cc6..d51d0226fe 100644
--- a/horizon/static/framework/toast/toast.js
+++ b/horizon/static/framework/widgets/toast/toast.js
@@ -147,7 +147,7 @@
      * @scope true
      *
      */
-    .directive('toast', ['toastService', 'basePath', function(toastService, path) {
+    .directive('toast', ['toastService', 'horizon.framework.widgets.basePath', function(toastService, path) {
       return {
         restrict: 'EA',
         templateUrl: path + 'toast/toast.html',
diff --git a/horizon/static/framework/toast/toast.spec.js b/horizon/static/framework/widgets/toast/toast.spec.js
similarity index 97%
rename from horizon/static/framework/toast/toast.spec.js
rename to horizon/static/framework/widgets/toast/toast.spec.js
index 1f008247e5..9af791dffd 100644
--- a/horizon/static/framework/toast/toast.spec.js
+++ b/horizon/static/framework/widgets/toast/toast.spec.js
@@ -34,7 +34,7 @@
 
     beforeEach(module('templates'));
     beforeEach(module('hz'));
-    beforeEach(module('hz.widgets'));
+    beforeEach(module('horizon.framework.widgets'));
     beforeEach(module('hz.widget.toast'));
     beforeEach(inject(function ($injector, toastService) {
       service = toastService;
@@ -109,7 +109,7 @@
 
     beforeEach(module('templates'));
     beforeEach(module('hz'));
-    beforeEach(module('hz.widgets'));
+    beforeEach(module('horizon.framework.widgets'));
     beforeEach(module('hz.widget.toast'));
     beforeEach(inject(function ($injector, toastService) {
       $scope = $injector.get('$rootScope').$new();
diff --git a/horizon/static/framework/transfer-table/allocated.html.example b/horizon/static/framework/widgets/transfer-table/allocated.html.example
similarity index 100%
rename from horizon/static/framework/transfer-table/allocated.html.example
rename to horizon/static/framework/widgets/transfer-table/allocated.html.example
diff --git a/horizon/static/framework/transfer-table/available.html.example b/horizon/static/framework/widgets/transfer-table/available.html.example
similarity index 100%
rename from horizon/static/framework/transfer-table/available.html.example
rename to horizon/static/framework/widgets/transfer-table/available.html.example
diff --git a/horizon/static/framework/transfer-table/transfer-table.html b/horizon/static/framework/widgets/transfer-table/transfer-table.html
similarity index 100%
rename from horizon/static/framework/transfer-table/transfer-table.html
rename to horizon/static/framework/widgets/transfer-table/transfer-table.html
diff --git a/horizon/static/framework/transfer-table/transfer-table.js b/horizon/static/framework/widgets/transfer-table/transfer-table.js
similarity index 98%
rename from horizon/static/framework/transfer-table/transfer-table.js
rename to horizon/static/framework/widgets/transfer-table/transfer-table.js
index 98d445b5e4..d4f94fc6a7 100644
--- a/horizon/static/framework/transfer-table/transfer-table.js
+++ b/horizon/static/framework/widgets/transfer-table/transfer-table.js
@@ -143,7 +143,7 @@
      *
      */
     .controller('transferTableCtrl',
-      [ 'basePath', '$scope', '$timeout', '$parse', '$attrs', '$log', 'helpText', 'limits',
+      [ 'horizon.framework.widgets.basePath', '$scope', '$timeout', '$parse', '$attrs', '$log', 'helpText', 'limits',
       function(path, $scope, $timeout, $parse, $attrs, $log, helpText, limits) {
         var trModel = $parse($attrs.trModel)($scope);
         var trHelpText = $parse($attrs.helpText)($scope);
@@ -385,7 +385,7 @@
      * </transfer-table>
      * ```
      */
-    .directive('transferTable', [ 'basePath',
+    .directive('transferTable', [ 'horizon.framework.widgets.basePath',
       function(path) {
         return {
           controller: 'transferTableCtrl',
diff --git a/horizon/static/framework/transfer-table/transfer-table.scss b/horizon/static/framework/widgets/transfer-table/transfer-table.scss
similarity index 100%
rename from horizon/static/framework/transfer-table/transfer-table.scss
rename to horizon/static/framework/widgets/transfer-table/transfer-table.scss
diff --git a/horizon/static/framework/transfer-table/transfer-table.spec.js b/horizon/static/framework/widgets/transfer-table/transfer-table.spec.js
similarity index 99%
rename from horizon/static/framework/transfer-table/transfer-table.spec.js
rename to horizon/static/framework/widgets/transfer-table/transfer-table.spec.js
index 854106a682..762ce01f8f 100644
--- a/horizon/static/framework/transfer-table/transfer-table.spec.js
+++ b/horizon/static/framework/widgets/transfer-table/transfer-table.spec.js
@@ -87,7 +87,7 @@
     beforeEach(module('templates'));
     beforeEach(module('smart-table'));
     beforeEach(module('hz'));
-    beforeEach(module('hz.widgets'));
+    beforeEach(module('horizon.framework.widgets'));
     beforeEach(module('hz.widget.action-list'));
     beforeEach(module('hz.widget.table'));
     beforeEach(module('hz.widget.transfer-table'));
diff --git a/horizon/static/framework/widget.module.js b/horizon/static/framework/widgets/widgets.module.js
similarity index 73%
rename from horizon/static/framework/widget.module.js
rename to horizon/static/framework/widgets/widgets.module.js
index ac87545d17..899861721e 100644
--- a/horizon/static/framework/widget.module.js
+++ b/horizon/static/framework/widgets/widgets.module.js
@@ -1,8 +1,7 @@
 (function () {
  'use strict';
 
-  angular.module('hz.widgets', [
-    'horizon.framework.util',
+  angular.module('horizon.framework.widgets', [
     'hz.widget.form',
     'hz.widget.help-panel',
     'hz.widget.wizard',
@@ -16,6 +15,6 @@
     'hz.widget.metadata-display',
     'hz.widget.toast'
   ])
-    .constant('basePath', '/static/framework/');
+    .constant('horizon.framework.widgets.basePath', '/static/framework/widgets/');
 
 })();
diff --git a/horizon/static/framework/styles.scss b/horizon/static/framework/widgets/widgets.scss
similarity index 88%
rename from horizon/static/framework/styles.scss
rename to horizon/static/framework/widgets/widgets.scss
index e074878d4e..8a672957ae 100644
--- a/horizon/static/framework/styles.scss
+++ b/horizon/static/framework/widgets/widgets.scss
@@ -8,4 +8,4 @@
 @import "modal/modal-wait-spinner";
 @import "metadata-tree/metadata-tree";
 @import "metadata-display/metadata-display";
-@import "magic-search/magic-search.scss";
+@import "magic-search/magic-search";
diff --git a/horizon/static/framework/wizard/wizard.html b/horizon/static/framework/widgets/wizard/wizard.html
similarity index 100%
rename from horizon/static/framework/wizard/wizard.html
rename to horizon/static/framework/widgets/wizard/wizard.html
diff --git a/horizon/static/framework/wizard/wizard.js b/horizon/static/framework/widgets/wizard/wizard.js
similarity index 98%
rename from horizon/static/framework/wizard/wizard.js
rename to horizon/static/framework/widgets/wizard/wizard.js
index b6c5584363..a4fa5cbd0d 100644
--- a/horizon/static/framework/wizard/wizard.js
+++ b/horizon/static/framework/widgets/wizard/wizard.js
@@ -21,7 +21,7 @@
       AFTER_SUBMIT: 'AFTER_SUBMIT'
     })
 
-    .directive('wizard', ['basePath', function (path) {
+    .directive('wizard', ['horizon.framework.widgets.basePath', function (path) {
       return {
         controller: ['$scope', '$q', 'wizardLabels', 'wizardEvents',
           function ($scope, $q, wizardLabels, wizardEvents) {
diff --git a/horizon/static/framework/wizard/wizard.scss b/horizon/static/framework/widgets/wizard/wizard.scss
similarity index 100%
rename from horizon/static/framework/wizard/wizard.scss
rename to horizon/static/framework/widgets/wizard/wizard.scss
diff --git a/horizon/static/framework/wizard/wizard.spec.js b/horizon/static/framework/widgets/wizard/wizard.spec.js
similarity index 99%
rename from horizon/static/framework/wizard/wizard.spec.js
rename to horizon/static/framework/widgets/wizard/wizard.spec.js
index e55e281c50..517391fe93 100644
--- a/horizon/static/framework/wizard/wizard.spec.js
+++ b/horizon/static/framework/widgets/wizard/wizard.spec.js
@@ -14,7 +14,7 @@
 
     beforeEach(module('templates'));
     beforeEach(module('hz'));
-    beforeEach(module('hz.widgets'));
+    beforeEach(module('horizon.framework.widgets'));
     beforeEach(module('hz.widget.wizard'));
     beforeEach(inject(function ($injector) {
       $scope = $injector.get('$rootScope').$new();
diff --git a/horizon/static/horizon/js/angular/horizon.js b/horizon/static/horizon/js/angular/horizon.js
index 95eb3d9652..912afe9f7b 100644
--- a/horizon/static/horizon/js/angular/horizon.js
+++ b/horizon/static/horizon/js/angular/horizon.js
@@ -2,7 +2,7 @@
 (function () {
   'use strict';
 
-  var horizon_dependencies = ['hz.conf', 'hz.utils', 'hz.api', 'ngCookies', 'hz.widgets', 'hz.filters'];
+  var horizon_dependencies = ['hz.conf', 'hz.utils', 'hz.api', 'ngCookies', 'horizon.framework', 'hz.filters'];
   var dependencies = horizon_dependencies.concat(angularModuleExtension);
   angular.module('hz', dependencies)
     .config(['$interpolateProvider', '$httpProvider',
diff --git a/horizon/templates/horizon/_scripts.html b/horizon/templates/horizon/_scripts.html
index 6767c24054..439d4e0544 100644
--- a/horizon/templates/horizon/_scripts.html
+++ b/horizon/templates/horizon/_scripts.html
@@ -35,32 +35,34 @@
 
 <script src="{{ STATIC_URL }}horizon/lib/d3.js"></script>
 
+<script src='{{ STATIC_URL }}framework/framework.module.js'></script>
+
 <script src='{{ STATIC_URL }}framework/util/util.module.js'></script>
 <script src='{{ STATIC_URL }}framework/util/bind-scope/bind-scope.js'></script>
 <script src='{{ STATIC_URL }}framework/util/validators/validators.js'></script>
 <script src='{{ STATIC_URL }}framework/util/workflow/workflow.js'></script>
 
-<script src='{{ STATIC_URL }}framework/widget.module.js'></script>
-<script src='{{ STATIC_URL }}framework/form/form.js'></script>
-<script src='{{ STATIC_URL }}framework/help-panel/help-panel.js'></script>
-<script src='{{ STATIC_URL }}framework/i18n/i18n.js'></script>
-<script src='{{ STATIC_URL }}framework/wizard/wizard.js'></script>
-<script src='{{ STATIC_URL }}framework/action-list/action-list.js'></script>
-<script src='{{ STATIC_URL }}framework/action-list/button-tooltip.js'></script>
-<script src='{{ STATIC_URL }}framework/table/table.js'></script>
-<script src='{{ STATIC_URL }}framework/table/basic-table.js'></script>
-<script src="{{ STATIC_URL }}framework/login/login.js"></script>
-<script src='{{ STATIC_URL }}framework/modal/modal.js'></script>
-<script src='{{ STATIC_URL }}framework/modal/modal-wait-spinner.js'></script>
-<script src='{{ STATIC_URL }}framework/transfer-table/transfer-table.js'></script>
-<script src='{{ STATIC_URL }}framework/charts/charts.js'></script>
-<script src='{{ STATIC_URL }}framework/charts/chart-tooltip.js'></script>
-<script src='{{ STATIC_URL }}framework/charts/pie-chart.js'></script>
-<script src='{{ STATIC_URL }}framework/metadata-tree/metadata-tree.js'></script>
-<script src='{{ STATIC_URL }}framework/metadata-tree/metadata-tree-service.js'></script>
-<script src='{{ STATIC_URL }}framework/metadata-display/metadata-display.js'></script>
-<script src='{{ STATIC_URL }}framework/magic-search/magic-search.js'></script>
-<script src='{{ STATIC_URL }}framework/toast/toast.js'></script>
+<script src='{{ STATIC_URL }}framework/widgets/widgets.module.js'></script>
+<script src='{{ STATIC_URL }}framework/widgets/form/form.js'></script>
+<script src='{{ STATIC_URL }}framework/widgets/help-panel/help-panel.js'></script>
+<script src='{{ STATIC_URL }}framework/widgets/i18n/i18n.js'></script>
+<script src='{{ STATIC_URL }}framework/widgets/wizard/wizard.js'></script>
+<script src='{{ STATIC_URL }}framework/widgets/action-list/action-list.js'></script>
+<script src='{{ STATIC_URL }}framework/widgets/action-list/button-tooltip.js'></script>
+<script src='{{ STATIC_URL }}framework/widgets/table/table.js'></script>
+<script src='{{ STATIC_URL }}framework/widgets/table/basic-table.js'></script>
+<script src="{{ STATIC_URL }}framework/widgets/login/login.js"></script>
+<script src='{{ STATIC_URL }}framework/widgets/modal/modal.js'></script>
+<script src='{{ STATIC_URL }}framework/widgets/modal/modal-wait-spinner.js'></script>
+<script src='{{ STATIC_URL }}framework/widgets/transfer-table/transfer-table.js'></script>
+<script src='{{ STATIC_URL }}framework/widgets/charts/charts.js'></script>
+<script src='{{ STATIC_URL }}framework/widgets/charts/chart-tooltip.js'></script>
+<script src='{{ STATIC_URL }}framework/widgets/charts/pie-chart.js'></script>
+<script src='{{ STATIC_URL }}framework/widgets/metadata-tree/metadata-tree.js'></script>
+<script src='{{ STATIC_URL }}framework/widgets/metadata-tree/metadata-tree-service.js'></script>
+<script src='{{ STATIC_URL }}framework/widgets/metadata-display/metadata-display.js'></script>
+<script src='{{ STATIC_URL }}framework/widgets/magic-search/magic-search.js'></script>
+<script src='{{ STATIC_URL }}framework/widgets/toast/toast.js'></script>
 
 <script src='{{ STATIC_URL }}horizon/lib/jquery/jquery.quicksearch.js'></script>
 <script src="{{ STATIC_URL }}horizon/lib/jquery/jquery.tablesorter.js"></script>
diff --git a/horizon/test/jasmine/jasmine_tests.py b/horizon/test/jasmine/jasmine_tests.py
index 44f8064465..3f6bd06c95 100644
--- a/horizon/test/jasmine/jasmine_tests.py
+++ b/horizon/test/jasmine/jasmine_tests.py
@@ -24,32 +24,33 @@ class ServicesTests(test.JasmineTests):
         'horizon/js/angular/services/hz.api.service.js',
         'horizon/js/angular/services/hz.api.config.js',
 
+        'framework/framework.module.js',
+
         'framework/util/util.module.js',
         'framework/util/bind-scope/bind-scope.js',
         'framework/util/validators/validators.js',
         'framework/util/workflow/workflow.js',
 
-        'framework/widget.module.js',
-        'framework/action-list/action-list.js',
-        'framework/action-list/button-tooltip.js',
-
-        'framework/charts/charts.js',
-        'framework/charts/chart-tooltip.js',
-        'framework/charts/pie-chart.js',
-        'framework/form/form.js',
-        'framework/help-panel/help-panel.js',
-        'framework/login/login.js',
-        'framework/metadata-tree/metadata-tree.js',
-        'framework/metadata-tree/metadata-tree-service.js',
-        'framework/modal/modal.js',
-        'framework/modal/modal-wait-spinner.js',
-        'framework/table/table.js',
-        'framework/table/basic-table.js',
-        'framework/transfer-table/transfer-table.js',
-        'framework/wizard/wizard.js',
-        'framework/metadata-display/metadata-display.js',
-        'framework/toast/toast.js',
-        'framework/i18n/i18n.js',
+        'framework/widgets/widgets.module.js',
+        'framework/widgets/action-list/action-list.js',
+        'framework/widgets/action-list/button-tooltip.js',
+        'framework/widgets/charts/charts.js',
+        'framework/widgets/charts/chart-tooltip.js',
+        'framework/widgets/charts/pie-chart.js',
+        'framework/widgets/form/form.js',
+        'framework/widgets/help-panel/help-panel.js',
+        'framework/widgets/login/login.js',
+        'framework/widgets/metadata-tree/metadata-tree.js',
+        'framework/widgets/metadata-tree/metadata-tree-service.js',
+        'framework/widgets/modal/modal.js',
+        'framework/widgets/modal/modal-wait-spinner.js',
+        'framework/widgets/table/table.js',
+        'framework/widgets/table/basic-table.js',
+        'framework/widgets/transfer-table/transfer-table.js',
+        'framework/widgets/wizard/wizard.js',
+        'framework/widgets/metadata-display/metadata-display.js',
+        'framework/widgets/toast/toast.js',
+        'framework/widgets/i18n/i18n.js',
         'horizon/js/angular/filters/filters.js',
     ]
     specs = [
@@ -61,37 +62,37 @@ class ServicesTests(test.JasmineTests):
         'framework/util/validators/validators.spec.js',
         'framework/util/workflow/workflow.spec.js',
 
-        'framework/action-list/action-list.spec.js',
-        'framework/charts/pie-chart.spec.js',
-        'framework/form/form.spec.js',
-        'framework/help-panel/help-panel.spec.js',
-        'framework/login/login.spec.js',
-        'framework/modal/modal.spec.js',
-        'framework/modal/modal-wait-spinner.spec.js',
-        'framework/table/table.spec.js',
-        'framework/table/basic-table.spec.js',
-        'framework/transfer-table/transfer-table.spec.js',
-        'framework/wizard/wizard.spec.js',
-        'framework/metadata-tree/metadata-tree.spec.js',
-        'framework/metadata-display/metadata-display.spec.js',
-        'framework/toast/toast.spec.js',
-        'framework/i18n/i18n.spec.js',
+        'framework/widgets/action-list/action-list.spec.js',
+        'framework/widgets/charts/pie-chart.spec.js',
+        'framework/widgets/form/form.spec.js',
+        'framework/widgets/help-panel/help-panel.spec.js',
+        'framework/widgets/login/login.spec.js',
+        'framework/widgets/modal/modal.spec.js',
+        'framework/widgets/modal/modal-wait-spinner.spec.js',
+        'framework/widgets/table/table.spec.js',
+        'framework/widgets/table/basic-table.spec.js',
+        'framework/widgets/transfer-table/transfer-table.spec.js',
+        'framework/widgets/wizard/wizard.spec.js',
+        'framework/widgets/metadata-tree/metadata-tree.spec.js',
+        'framework/widgets/metadata-display/metadata-display.spec.js',
+        'framework/widgets/toast/toast.spec.js',
+        'framework/widgets/i18n/i18n.spec.js',
         'horizon/js/angular/filters/filters.spec.js',
     ]
     externalTemplates = [
-        'framework/action-list/action.html',
-        'framework/action-list/menu-item.html',
-        'framework/action-list/menu.html',
-        'framework/action-list/single-button.html',
-        'framework/action-list/split-button.html',
-        'framework/charts/chart-tooltip.html',
-        'framework/charts/pie-chart.html',
-        'framework/help-panel/help-panel.html',
-        'framework/table/search-bar.html',
-        'framework/transfer-table/transfer-table.html',
-        'framework/wizard/wizard.html',
-        'framework/metadata-tree/metadata-tree.html',
-        'framework/metadata-tree/metadata-tree-item.html',
-        'framework/metadata-display/metadata-display.html',
-        'framework/toast/toast.html',
+        'framework/widgets/action-list/action.html',
+        'framework/widgets/action-list/menu-item.html',
+        'framework/widgets/action-list/menu.html',
+        'framework/widgets/action-list/single-button.html',
+        'framework/widgets/action-list/split-button.html',
+        'framework/widgets/charts/chart-tooltip.html',
+        'framework/widgets/charts/pie-chart.html',
+        'framework/widgets/help-panel/help-panel.html',
+        'framework/widgets/table/search-bar.html',
+        'framework/widgets/transfer-table/transfer-table.html',
+        'framework/widgets/wizard/wizard.html',
+        'framework/widgets/metadata-tree/metadata-tree.html',
+        'framework/widgets/metadata-tree/metadata-tree-item.html',
+        'framework/widgets/metadata-display/metadata-display.html',
+        'framework/widgets/toast/toast.html',
     ]
diff --git a/openstack_dashboard/static/dashboard/scss/horizon.scss b/openstack_dashboard/static/dashboard/scss/horizon.scss
index fe8b4dd59e..0182e193d7 100644
--- a/openstack_dashboard/static/dashboard/scss/horizon.scss
+++ b/openstack_dashboard/static/dashboard/scss/horizon.scss
@@ -25,7 +25,7 @@
 @import "components/charts";
 @import "components/workflow";
 @import "components/network_topology";
-@import "/framework/styles";
+@import "/framework/framework";
 
 
 /* new clearfix */