diff --git a/horizon/static/angular/action-list/action-list.js b/horizon/static/framework/action-list/action-list.js
similarity index 100%
rename from horizon/static/angular/action-list/action-list.js
rename to horizon/static/framework/action-list/action-list.js
diff --git a/horizon/static/angular/action-list/action-list.scss b/horizon/static/framework/action-list/action-list.scss
similarity index 100%
rename from horizon/static/angular/action-list/action-list.scss
rename to horizon/static/framework/action-list/action-list.scss
diff --git a/horizon/static/angular/action-list/action-list.spec.js b/horizon/static/framework/action-list/action-list.spec.js
similarity index 100%
rename from horizon/static/angular/action-list/action-list.spec.js
rename to horizon/static/framework/action-list/action-list.spec.js
diff --git a/horizon/static/angular/action-list/action.html b/horizon/static/framework/action-list/action.html
similarity index 100%
rename from horizon/static/angular/action-list/action.html
rename to horizon/static/framework/action-list/action.html
diff --git a/horizon/static/angular/action-list/button-tooltip.js b/horizon/static/framework/action-list/button-tooltip.js
similarity index 100%
rename from horizon/static/angular/action-list/button-tooltip.js
rename to horizon/static/framework/action-list/button-tooltip.js
diff --git a/horizon/static/angular/action-list/menu-item.html b/horizon/static/framework/action-list/menu-item.html
similarity index 100%
rename from horizon/static/angular/action-list/menu-item.html
rename to horizon/static/framework/action-list/menu-item.html
diff --git a/horizon/static/angular/action-list/menu.html b/horizon/static/framework/action-list/menu.html
similarity index 100%
rename from horizon/static/angular/action-list/menu.html
rename to horizon/static/framework/action-list/menu.html
diff --git a/horizon/static/angular/action-list/single-button.html b/horizon/static/framework/action-list/single-button.html
similarity index 100%
rename from horizon/static/angular/action-list/single-button.html
rename to horizon/static/framework/action-list/single-button.html
diff --git a/horizon/static/angular/action-list/split-button.html b/horizon/static/framework/action-list/split-button.html
similarity index 100%
rename from horizon/static/angular/action-list/split-button.html
rename to horizon/static/framework/action-list/split-button.html
diff --git a/horizon/static/angular/action-list/warning-tooltip.html b/horizon/static/framework/action-list/warning-tooltip.html
similarity index 100%
rename from horizon/static/angular/action-list/warning-tooltip.html
rename to horizon/static/framework/action-list/warning-tooltip.html
diff --git a/horizon/static/angular/bind-scope/bind-scope.js b/horizon/static/framework/bind-scope/bind-scope.js
similarity index 100%
rename from horizon/static/angular/bind-scope/bind-scope.js
rename to horizon/static/framework/bind-scope/bind-scope.js
diff --git a/horizon/static/angular/bind-scope/bind-scope.spec.js b/horizon/static/framework/bind-scope/bind-scope.spec.js
similarity index 100%
rename from horizon/static/angular/bind-scope/bind-scope.spec.js
rename to horizon/static/framework/bind-scope/bind-scope.spec.js
diff --git a/horizon/static/angular/charts/chart-tooltip.html b/horizon/static/framework/charts/chart-tooltip.html
similarity index 100%
rename from horizon/static/angular/charts/chart-tooltip.html
rename to horizon/static/framework/charts/chart-tooltip.html
diff --git a/horizon/static/angular/charts/chart-tooltip.js b/horizon/static/framework/charts/chart-tooltip.js
similarity index 100%
rename from horizon/static/angular/charts/chart-tooltip.js
rename to horizon/static/framework/charts/chart-tooltip.js
diff --git a/horizon/static/angular/charts/chart-tooltip.scss b/horizon/static/framework/charts/chart-tooltip.scss
similarity index 100%
rename from horizon/static/angular/charts/chart-tooltip.scss
rename to horizon/static/framework/charts/chart-tooltip.scss
diff --git a/horizon/static/angular/charts/charts.js b/horizon/static/framework/charts/charts.js
similarity index 100%
rename from horizon/static/angular/charts/charts.js
rename to horizon/static/framework/charts/charts.js
diff --git a/horizon/static/angular/charts/pie-chart.html b/horizon/static/framework/charts/pie-chart.html
similarity index 100%
rename from horizon/static/angular/charts/pie-chart.html
rename to horizon/static/framework/charts/pie-chart.html
diff --git a/horizon/static/angular/charts/pie-chart.js b/horizon/static/framework/charts/pie-chart.js
similarity index 100%
rename from horizon/static/angular/charts/pie-chart.js
rename to horizon/static/framework/charts/pie-chart.js
diff --git a/horizon/static/angular/charts/pie-chart.scss b/horizon/static/framework/charts/pie-chart.scss
similarity index 100%
rename from horizon/static/angular/charts/pie-chart.scss
rename to horizon/static/framework/charts/pie-chart.scss
diff --git a/horizon/static/angular/charts/pie-chart.spec.js b/horizon/static/framework/charts/pie-chart.spec.js
similarity index 100%
rename from horizon/static/angular/charts/pie-chart.spec.js
rename to horizon/static/framework/charts/pie-chart.spec.js
diff --git a/horizon/static/angular/form/form.js b/horizon/static/framework/form/form.js
similarity index 100%
rename from horizon/static/angular/form/form.js
rename to horizon/static/framework/form/form.js
diff --git a/horizon/static/angular/form/form.spec.js b/horizon/static/framework/form/form.spec.js
similarity index 100%
rename from horizon/static/angular/form/form.spec.js
rename to horizon/static/framework/form/form.spec.js
diff --git a/horizon/static/angular/help-panel/help-panel.html b/horizon/static/framework/help-panel/help-panel.html
similarity index 100%
rename from horizon/static/angular/help-panel/help-panel.html
rename to horizon/static/framework/help-panel/help-panel.html
diff --git a/horizon/static/angular/help-panel/help-panel.js b/horizon/static/framework/help-panel/help-panel.js
similarity index 100%
rename from horizon/static/angular/help-panel/help-panel.js
rename to horizon/static/framework/help-panel/help-panel.js
diff --git a/horizon/static/angular/help-panel/help-panel.scss b/horizon/static/framework/help-panel/help-panel.scss
similarity index 100%
rename from horizon/static/angular/help-panel/help-panel.scss
rename to horizon/static/framework/help-panel/help-panel.scss
diff --git a/horizon/static/angular/help-panel/help-panel.spec.js b/horizon/static/framework/help-panel/help-panel.spec.js
similarity index 100%
rename from horizon/static/angular/help-panel/help-panel.spec.js
rename to horizon/static/framework/help-panel/help-panel.spec.js
diff --git a/horizon/static/angular/i18n/i18n.js b/horizon/static/framework/i18n/i18n.js
similarity index 100%
rename from horizon/static/angular/i18n/i18n.js
rename to horizon/static/framework/i18n/i18n.js
diff --git a/horizon/static/angular/i18n/i18n.spec.js b/horizon/static/framework/i18n/i18n.spec.js
similarity index 100%
rename from horizon/static/angular/i18n/i18n.spec.js
rename to horizon/static/framework/i18n/i18n.spec.js
diff --git a/horizon/static/angular/login/login.js b/horizon/static/framework/login/login.js
similarity index 100%
rename from horizon/static/angular/login/login.js
rename to horizon/static/framework/login/login.js
diff --git a/horizon/static/angular/login/login.spec.js b/horizon/static/framework/login/login.spec.js
similarity index 100%
rename from horizon/static/angular/login/login.spec.js
rename to horizon/static/framework/login/login.spec.js
diff --git a/horizon/static/angular/magic-search/magic-search.html b/horizon/static/framework/magic-search/magic-search.html
similarity index 100%
rename from horizon/static/angular/magic-search/magic-search.html
rename to horizon/static/framework/magic-search/magic-search.html
diff --git a/horizon/static/angular/magic-search/magic-search.js b/horizon/static/framework/magic-search/magic-search.js
similarity index 100%
rename from horizon/static/angular/magic-search/magic-search.js
rename to horizon/static/framework/magic-search/magic-search.js
diff --git a/horizon/static/angular/magic-search/magic-search.scss b/horizon/static/framework/magic-search/magic-search.scss
similarity index 100%
rename from horizon/static/angular/magic-search/magic-search.scss
rename to horizon/static/framework/magic-search/magic-search.scss
diff --git a/horizon/static/angular/metadata-display/metadata-display.html b/horizon/static/framework/metadata-display/metadata-display.html
similarity index 100%
rename from horizon/static/angular/metadata-display/metadata-display.html
rename to horizon/static/framework/metadata-display/metadata-display.html
diff --git a/horizon/static/angular/metadata-display/metadata-display.js b/horizon/static/framework/metadata-display/metadata-display.js
similarity index 100%
rename from horizon/static/angular/metadata-display/metadata-display.js
rename to horizon/static/framework/metadata-display/metadata-display.js
diff --git a/horizon/static/angular/metadata-display/metadata-display.scss b/horizon/static/framework/metadata-display/metadata-display.scss
similarity index 100%
rename from horizon/static/angular/metadata-display/metadata-display.scss
rename to horizon/static/framework/metadata-display/metadata-display.scss
diff --git a/horizon/static/angular/metadata-display/metadata-display.spec.js b/horizon/static/framework/metadata-display/metadata-display.spec.js
similarity index 100%
rename from horizon/static/angular/metadata-display/metadata-display.spec.js
rename to horizon/static/framework/metadata-display/metadata-display.spec.js
diff --git a/horizon/static/angular/metadata-tree/metadata-tree-item.html b/horizon/static/framework/metadata-tree/metadata-tree-item.html
similarity index 100%
rename from horizon/static/angular/metadata-tree/metadata-tree-item.html
rename to horizon/static/framework/metadata-tree/metadata-tree-item.html
diff --git a/horizon/static/angular/metadata-tree/metadata-tree-service.js b/horizon/static/framework/metadata-tree/metadata-tree-service.js
similarity index 100%
rename from horizon/static/angular/metadata-tree/metadata-tree-service.js
rename to horizon/static/framework/metadata-tree/metadata-tree-service.js
diff --git a/horizon/static/angular/metadata-tree/metadata-tree.html b/horizon/static/framework/metadata-tree/metadata-tree.html
similarity index 100%
rename from horizon/static/angular/metadata-tree/metadata-tree.html
rename to horizon/static/framework/metadata-tree/metadata-tree.html
diff --git a/horizon/static/angular/metadata-tree/metadata-tree.js b/horizon/static/framework/metadata-tree/metadata-tree.js
similarity index 100%
rename from horizon/static/angular/metadata-tree/metadata-tree.js
rename to horizon/static/framework/metadata-tree/metadata-tree.js
diff --git a/horizon/static/angular/metadata-tree/metadata-tree.scss b/horizon/static/framework/metadata-tree/metadata-tree.scss
similarity index 100%
rename from horizon/static/angular/metadata-tree/metadata-tree.scss
rename to horizon/static/framework/metadata-tree/metadata-tree.scss
diff --git a/horizon/static/angular/metadata-tree/metadata-tree.spec.js b/horizon/static/framework/metadata-tree/metadata-tree.spec.js
similarity index 100%
rename from horizon/static/angular/metadata-tree/metadata-tree.spec.js
rename to horizon/static/framework/metadata-tree/metadata-tree.spec.js
diff --git a/horizon/static/angular/modal/modal-wait-spinner.js b/horizon/static/framework/modal/modal-wait-spinner.js
similarity index 100%
rename from horizon/static/angular/modal/modal-wait-spinner.js
rename to horizon/static/framework/modal/modal-wait-spinner.js
diff --git a/horizon/static/angular/modal/modal-wait-spinner.scss b/horizon/static/framework/modal/modal-wait-spinner.scss
similarity index 100%
rename from horizon/static/angular/modal/modal-wait-spinner.scss
rename to horizon/static/framework/modal/modal-wait-spinner.scss
diff --git a/horizon/static/angular/modal/modal-wait-spinner.spec.js b/horizon/static/framework/modal/modal-wait-spinner.spec.js
similarity index 100%
rename from horizon/static/angular/modal/modal-wait-spinner.spec.js
rename to horizon/static/framework/modal/modal-wait-spinner.spec.js
diff --git a/horizon/static/angular/modal/modal.js b/horizon/static/framework/modal/modal.js
similarity index 100%
rename from horizon/static/angular/modal/modal.js
rename to horizon/static/framework/modal/modal.js
diff --git a/horizon/static/angular/modal/modal.spec.js b/horizon/static/framework/modal/modal.spec.js
similarity index 100%
rename from horizon/static/angular/modal/modal.spec.js
rename to horizon/static/framework/modal/modal.spec.js
diff --git a/horizon/static/angular/modal/simple-modal.html b/horizon/static/framework/modal/simple-modal.html
similarity index 100%
rename from horizon/static/angular/modal/simple-modal.html
rename to horizon/static/framework/modal/simple-modal.html
diff --git a/horizon/static/angular/styles.scss b/horizon/static/framework/styles.scss
similarity index 100%
rename from horizon/static/angular/styles.scss
rename to horizon/static/framework/styles.scss
diff --git a/horizon/static/angular/table/basic-table.js b/horizon/static/framework/table/basic-table.js
similarity index 100%
rename from horizon/static/angular/table/basic-table.js
rename to horizon/static/framework/table/basic-table.js
diff --git a/horizon/static/angular/table/basic-table.spec.js b/horizon/static/framework/table/basic-table.spec.js
similarity index 100%
rename from horizon/static/angular/table/basic-table.spec.js
rename to horizon/static/framework/table/basic-table.spec.js
diff --git a/horizon/static/angular/table/search-bar.html b/horizon/static/framework/table/search-bar.html
similarity index 100%
rename from horizon/static/angular/table/search-bar.html
rename to horizon/static/framework/table/search-bar.html
diff --git a/horizon/static/angular/table/table.js b/horizon/static/framework/table/table.js
similarity index 100%
rename from horizon/static/angular/table/table.js
rename to horizon/static/framework/table/table.js
diff --git a/horizon/static/angular/table/table.scss b/horizon/static/framework/table/table.scss
similarity index 100%
rename from horizon/static/angular/table/table.scss
rename to horizon/static/framework/table/table.scss
diff --git a/horizon/static/angular/table/table.spec.js b/horizon/static/framework/table/table.spec.js
similarity index 100%
rename from horizon/static/angular/table/table.spec.js
rename to horizon/static/framework/table/table.spec.js
diff --git a/horizon/static/angular/toast/toast.html b/horizon/static/framework/toast/toast.html
similarity index 100%
rename from horizon/static/angular/toast/toast.html
rename to horizon/static/framework/toast/toast.html
diff --git a/horizon/static/angular/toast/toast.js b/horizon/static/framework/toast/toast.js
similarity index 100%
rename from horizon/static/angular/toast/toast.js
rename to horizon/static/framework/toast/toast.js
diff --git a/horizon/static/angular/toast/toast.spec.js b/horizon/static/framework/toast/toast.spec.js
similarity index 100%
rename from horizon/static/angular/toast/toast.spec.js
rename to horizon/static/framework/toast/toast.spec.js
diff --git a/horizon/static/angular/transfer-table/allocated.html.example b/horizon/static/framework/transfer-table/allocated.html.example
similarity index 100%
rename from horizon/static/angular/transfer-table/allocated.html.example
rename to horizon/static/framework/transfer-table/allocated.html.example
diff --git a/horizon/static/angular/transfer-table/available.html.example b/horizon/static/framework/transfer-table/available.html.example
similarity index 100%
rename from horizon/static/angular/transfer-table/available.html.example
rename to horizon/static/framework/transfer-table/available.html.example
diff --git a/horizon/static/angular/transfer-table/transfer-table.html b/horizon/static/framework/transfer-table/transfer-table.html
similarity index 100%
rename from horizon/static/angular/transfer-table/transfer-table.html
rename to horizon/static/framework/transfer-table/transfer-table.html
diff --git a/horizon/static/angular/transfer-table/transfer-table.js b/horizon/static/framework/transfer-table/transfer-table.js
similarity index 100%
rename from horizon/static/angular/transfer-table/transfer-table.js
rename to horizon/static/framework/transfer-table/transfer-table.js
diff --git a/horizon/static/angular/transfer-table/transfer-table.scss b/horizon/static/framework/transfer-table/transfer-table.scss
similarity index 100%
rename from horizon/static/angular/transfer-table/transfer-table.scss
rename to horizon/static/framework/transfer-table/transfer-table.scss
diff --git a/horizon/static/angular/transfer-table/transfer-table.spec.js b/horizon/static/framework/transfer-table/transfer-table.spec.js
similarity index 100%
rename from horizon/static/angular/transfer-table/transfer-table.spec.js
rename to horizon/static/framework/transfer-table/transfer-table.spec.js
diff --git a/horizon/static/angular/validators/validators.js b/horizon/static/framework/validators/validators.js
similarity index 100%
rename from horizon/static/angular/validators/validators.js
rename to horizon/static/framework/validators/validators.js
diff --git a/horizon/static/angular/validators/validators.spec.js b/horizon/static/framework/validators/validators.spec.js
similarity index 100%
rename from horizon/static/angular/validators/validators.spec.js
rename to horizon/static/framework/validators/validators.spec.js
diff --git a/horizon/static/angular/widget.module.js b/horizon/static/framework/widget.module.js
similarity index 90%
rename from horizon/static/angular/widget.module.js
rename to horizon/static/framework/widget.module.js
index 23bac7f3e0..6d016ac183 100644
--- a/horizon/static/angular/widget.module.js
+++ b/horizon/static/framework/widget.module.js
@@ -18,6 +18,6 @@
     'hz.framework.validators',
     'hz.widget.toast'
   ])
-    .constant('basePath', '/static/angular/');
+    .constant('basePath', '/static/framework/');
 
 })();
diff --git a/horizon/static/angular/wizard/wizard.html b/horizon/static/framework/wizard/wizard.html
similarity index 100%
rename from horizon/static/angular/wizard/wizard.html
rename to horizon/static/framework/wizard/wizard.html
diff --git a/horizon/static/angular/wizard/wizard.js b/horizon/static/framework/wizard/wizard.js
similarity index 100%
rename from horizon/static/angular/wizard/wizard.js
rename to horizon/static/framework/wizard/wizard.js
diff --git a/horizon/static/angular/wizard/wizard.scss b/horizon/static/framework/wizard/wizard.scss
similarity index 100%
rename from horizon/static/angular/wizard/wizard.scss
rename to horizon/static/framework/wizard/wizard.scss
diff --git a/horizon/static/angular/wizard/wizard.spec.js b/horizon/static/framework/wizard/wizard.spec.js
similarity index 100%
rename from horizon/static/angular/wizard/wizard.spec.js
rename to horizon/static/framework/wizard/wizard.spec.js
diff --git a/horizon/static/angular/workflow/workflow.js b/horizon/static/framework/workflow/workflow.js
similarity index 100%
rename from horizon/static/angular/workflow/workflow.js
rename to horizon/static/framework/workflow/workflow.js
diff --git a/horizon/static/angular/workflow/workflow.spec.js b/horizon/static/framework/workflow/workflow.spec.js
similarity index 100%
rename from horizon/static/angular/workflow/workflow.spec.js
rename to horizon/static/framework/workflow/workflow.spec.js
diff --git a/horizon/templates/horizon/_scripts.html b/horizon/templates/horizon/_scripts.html
index 7a997d0e3a..cc9b6ae3a9 100644
--- a/horizon/templates/horizon/_scripts.html
+++ b/horizon/templates/horizon/_scripts.html
@@ -35,30 +35,30 @@
 
 <script src="{{ STATIC_URL }}horizon/lib/d3.js"></script>
 
-<script src='{{ STATIC_URL }}angular/widget.module.js'></script>
-<script src='{{ STATIC_URL }}angular/form/form.js'></script>
-<script src='{{ STATIC_URL }}angular/help-panel/help-panel.js'></script>
-<script src='{{ STATIC_URL }}angular/i18n/i18n.js'></script>
-<script src='{{ STATIC_URL }}angular/wizard/wizard.js'></script>
-<script src='{{ STATIC_URL }}angular/action-list/action-list.js'></script>
-<script src='{{ STATIC_URL }}angular/action-list/button-tooltip.js'></script>
-<script src='{{ STATIC_URL }}angular/table/table.js'></script>
-<script src='{{ STATIC_URL }}angular/table/basic-table.js'></script>
-<script src="{{ STATIC_URL }}angular/login/login.js"></script>
-<script src='{{ STATIC_URL }}angular/modal/modal.js'></script>
-<script src='{{ STATIC_URL }}angular/modal/modal-wait-spinner.js'></script>
-<script src='{{ STATIC_URL }}angular/bind-scope/bind-scope.js'></script>
-<script src='{{ STATIC_URL }}angular/transfer-table/transfer-table.js'></script>
-<script src='{{ STATIC_URL }}angular/charts/charts.js'></script>
-<script src='{{ STATIC_URL }}angular/charts/chart-tooltip.js'></script>
-<script src='{{ STATIC_URL }}angular/charts/pie-chart.js'></script>
-<script src='{{ STATIC_URL }}angular/metadata-tree/metadata-tree.js'></script>
-<script src='{{ STATIC_URL }}angular/metadata-tree/metadata-tree-service.js'></script>
-<script src='{{ STATIC_URL }}angular/metadata-display/metadata-display.js'></script>
-<script src='{{ STATIC_URL }}angular/magic-search/magic-search.js'></script>
-<script src='{{ STATIC_URL }}angular/validators/validators.js'></script>
-<script src='{{ STATIC_URL }}angular/workflow/workflow.js'></script>
-<script src='{{ STATIC_URL }}angular/toast/toast.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/bind-scope/bind-scope.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/validators/validators.js'></script>
+<script src='{{ STATIC_URL }}framework/workflow/workflow.js'></script>
+<script src='{{ STATIC_URL }}framework/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 9d9c7c14f0..e3ff94dfd8 100644
--- a/horizon/test/jasmine/jasmine_tests.py
+++ b/horizon/test/jasmine/jasmine_tests.py
@@ -23,69 +23,69 @@ class ServicesTests(test.JasmineTests):
         'horizon/js/angular/hz.api.module.js',
         'horizon/js/angular/services/hz.api.service.js',
         'horizon/js/angular/services/hz.api.config.js',
-        'angular/widget.module.js',
-        'angular/action-list/action-list.js',
-        'angular/action-list/button-tooltip.js',
-        'angular/bind-scope/bind-scope.js',
-        'angular/charts/charts.js',
-        'angular/charts/chart-tooltip.js',
-        'angular/charts/pie-chart.js',
-        'angular/form/form.js',
-        'angular/help-panel/help-panel.js',
-        'angular/login/login.js',
-        'angular/metadata-tree/metadata-tree.js',
-        'angular/metadata-tree/metadata-tree-service.js',
-        'angular/modal/modal.js',
-        'angular/modal/modal-wait-spinner.js',
-        'angular/table/table.js',
-        'angular/table/basic-table.js',
-        'angular/transfer-table/transfer-table.js',
-        'angular/validators/validators.js',
-        'angular/wizard/wizard.js',
-        'angular/workflow/workflow.js',
-        'angular/metadata-display/metadata-display.js',
-        'angular/toast/toast.js',
-        'angular/i18n/i18n.js',
+        'framework/widget.module.js',
+        'framework/action-list/action-list.js',
+        'framework/action-list/button-tooltip.js',
+        'framework/bind-scope/bind-scope.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/validators/validators.js',
+        'framework/wizard/wizard.js',
+        'framework/workflow/workflow.js',
+        'framework/metadata-display/metadata-display.js',
+        'framework/toast/toast.js',
+        'framework/i18n/i18n.js',
         'horizon/js/angular/filters/filters.js',
     ]
     specs = [
         'horizon/js/angular/services/hz.api.service.spec.js',
         'horizon/js/angular/services/hz.api.config.spec.js',
         'horizon/tests/jasmine/utils.spec.js',
-        'angular/action-list/action-list.spec.js',
-        'angular/bind-scope/bind-scope.spec.js',
-        'angular/charts/pie-chart.spec.js',
-        'angular/form/form.spec.js',
-        'angular/help-panel/help-panel.spec.js',
-        'angular/login/login.spec.js',
-        'angular/modal/modal.spec.js',
-        'angular/modal/modal-wait-spinner.spec.js',
-        'angular/table/table.spec.js',
-        'angular/table/basic-table.spec.js',
-        'angular/transfer-table/transfer-table.spec.js',
-        'angular/wizard/wizard.spec.js',
-        'angular/validators/validators.spec.js',
-        'angular/workflow/workflow.spec.js',
-        'angular/metadata-tree/metadata-tree.spec.js',
-        'angular/metadata-display/metadata-display.spec.js',
-        'angular/toast/toast.spec.js',
-        'angular/i18n/i18n.spec.js',
+        'framework/action-list/action-list.spec.js',
+        'framework/bind-scope/bind-scope.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/validators/validators.spec.js',
+        'framework/workflow/workflow.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',
         'horizon/js/angular/filters/filters.spec.js',
     ]
     externalTemplates = [
-        'angular/action-list/action.html',
-        'angular/action-list/menu-item.html',
-        'angular/action-list/menu.html',
-        'angular/action-list/single-button.html',
-        'angular/action-list/split-button.html',
-        'angular/charts/chart-tooltip.html',
-        'angular/charts/pie-chart.html',
-        'angular/help-panel/help-panel.html',
-        'angular/table/search-bar.html',
-        'angular/transfer-table/transfer-table.html',
-        'angular/wizard/wizard.html',
-        'angular/metadata-tree/metadata-tree.html',
-        'angular/metadata-tree/metadata-tree-item.html',
-        'angular/metadata-display/metadata-display.html',
-        'angular/toast/toast.html',
+        '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',
     ]
diff --git a/openstack_dashboard/static/dashboard/scss/horizon.scss b/openstack_dashboard/static/dashboard/scss/horizon.scss
index d8328eab47..fe8b4dd59e 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 "/angular/styles";
+@import "/framework/styles";
 
 
 /* new clearfix */
diff --git a/run_tests.sh b/run_tests.sh
index 4a701b5a00..3180396f19 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -160,7 +160,7 @@ function run_jshint {
   echo "Running jshint ..."
   jshint horizon/static/horizon/js
   jshint horizon/static/horizon/tests
-  jshint horizon/static/angular/
+  jshint horizon/static/framework/
   jshint openstack_dashboard/static/dashboard/
 }
 
@@ -170,7 +170,7 @@ function run_jscs {
     echo "jscs is not present; please install, e.g. sudo npm install jscs -g"
   else
     jscs horizon/static/horizon/js horizon/static/horizon/tests \
-         horizon/static/angular/ openstack_dashboard/static/dashboard/
+         horizon/static/framework/ openstack_dashboard/static/dashboard/
   fi
 }