diff --git a/heat_dashboard/dashboards/project/stacks/__init__.py b/heat_dashboard/__init__.py
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/__init__.py
rename to heat_dashboard/__init__.py
diff --git a/heat_dashboard/dashboards/project/stacks/resource_types/__init__.py b/heat_dashboard/content/__init__.py
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/resource_types/__init__.py
rename to heat_dashboard/content/__init__.py
diff --git a/heat_dashboard/dashboards/project/stacks/template_versions/__init__.py b/heat_dashboard/content/resource_types/__init__.py
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/template_versions/__init__.py
rename to heat_dashboard/content/resource_types/__init__.py
diff --git a/heat_dashboard/dashboards/project/stacks/resource_types/panel.py b/heat_dashboard/content/resource_types/panel.py
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/resource_types/panel.py
rename to heat_dashboard/content/resource_types/panel.py
diff --git a/heat_dashboard/dashboards/project/stacks/resource_types/tables.py b/heat_dashboard/content/resource_types/tables.py
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/resource_types/tables.py
rename to heat_dashboard/content/resource_types/tables.py
diff --git a/heat_dashboard/dashboards/project/stacks/resource_types/tabs.py b/heat_dashboard/content/resource_types/tabs.py
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/resource_types/tabs.py
rename to heat_dashboard/content/resource_types/tabs.py
diff --git a/heat_dashboard/dashboards/project/stacks/resource_types/templates/stacks.resource_types/_details.html b/heat_dashboard/content/resource_types/templates/stacks.resource_types/_details.html
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/resource_types/templates/stacks.resource_types/_details.html
rename to heat_dashboard/content/resource_types/templates/stacks.resource_types/_details.html
diff --git a/heat_dashboard/dashboards/project/stacks/resource_types/urls.py b/heat_dashboard/content/resource_types/urls.py
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/resource_types/urls.py
rename to heat_dashboard/content/resource_types/urls.py
diff --git a/heat_dashboard/dashboards/project/stacks/resource_types/views.py b/heat_dashboard/content/resource_types/views.py
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/resource_types/views.py
rename to heat_dashboard/content/resource_types/views.py
diff --git a/heat_dashboard/test/api_tests/__init__.py b/heat_dashboard/content/stacks/__init__.py
similarity index 100%
rename from heat_dashboard/test/api_tests/__init__.py
rename to heat_dashboard/content/stacks/__init__.py
diff --git a/heat_dashboard/dashboards/project/stacks/api.py b/heat_dashboard/content/stacks/api.py
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/api.py
rename to heat_dashboard/content/stacks/api.py
diff --git a/heat_dashboard/dashboards/project/stacks/forms.py b/heat_dashboard/content/stacks/forms.py
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/forms.py
rename to heat_dashboard/content/stacks/forms.py
diff --git a/heat_dashboard/dashboards/project/stacks/mappings.py b/heat_dashboard/content/stacks/mappings.py
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/mappings.py
rename to heat_dashboard/content/stacks/mappings.py
diff --git a/heat_dashboard/dashboards/project/stacks/panel.py b/heat_dashboard/content/stacks/panel.py
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/panel.py
rename to heat_dashboard/content/stacks/panel.py
diff --git a/heat_dashboard/dashboards/project/stacks/sro.py b/heat_dashboard/content/stacks/sro.py
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/sro.py
rename to heat_dashboard/content/stacks/sro.py
diff --git a/heat_dashboard/dashboards/project/stacks/tables.py b/heat_dashboard/content/stacks/tables.py
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/tables.py
rename to heat_dashboard/content/stacks/tables.py
diff --git a/heat_dashboard/dashboards/project/stacks/tabs.py b/heat_dashboard/content/stacks/tabs.py
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/tabs.py
rename to heat_dashboard/content/stacks/tabs.py
diff --git a/heat_dashboard/dashboards/project/stacks/templates/stacks/_change_template.html b/heat_dashboard/content/stacks/templates/stacks/_change_template.html
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/templates/stacks/_change_template.html
rename to heat_dashboard/content/stacks/templates/stacks/_change_template.html
diff --git a/heat_dashboard/dashboards/project/stacks/templates/stacks/_create.html b/heat_dashboard/content/stacks/templates/stacks/_create.html
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/templates/stacks/_create.html
rename to heat_dashboard/content/stacks/templates/stacks/_create.html
diff --git a/heat_dashboard/dashboards/project/stacks/templates/stacks/_detail_events.html b/heat_dashboard/content/stacks/templates/stacks/_detail_events.html
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/templates/stacks/_detail_events.html
rename to heat_dashboard/content/stacks/templates/stacks/_detail_events.html
diff --git a/heat_dashboard/dashboards/project/stacks/templates/stacks/_detail_overview.html b/heat_dashboard/content/stacks/templates/stacks/_detail_overview.html
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/templates/stacks/_detail_overview.html
rename to heat_dashboard/content/stacks/templates/stacks/_detail_overview.html
diff --git a/heat_dashboard/dashboards/project/stacks/templates/stacks/_detail_resources.html b/heat_dashboard/content/stacks/templates/stacks/_detail_resources.html
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/templates/stacks/_detail_resources.html
rename to heat_dashboard/content/stacks/templates/stacks/_detail_resources.html
diff --git a/heat_dashboard/dashboards/project/stacks/templates/stacks/_detail_topology.html b/heat_dashboard/content/stacks/templates/stacks/_detail_topology.html
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/templates/stacks/_detail_topology.html
rename to heat_dashboard/content/stacks/templates/stacks/_detail_topology.html
diff --git a/heat_dashboard/dashboards/project/stacks/templates/stacks/_preview.html b/heat_dashboard/content/stacks/templates/stacks/_preview.html
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/templates/stacks/_preview.html
rename to heat_dashboard/content/stacks/templates/stacks/_preview.html
diff --git a/heat_dashboard/dashboards/project/stacks/templates/stacks/_preview_details.html b/heat_dashboard/content/stacks/templates/stacks/_preview_details.html
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/templates/stacks/_preview_details.html
rename to heat_dashboard/content/stacks/templates/stacks/_preview_details.html
diff --git a/heat_dashboard/dashboards/project/stacks/templates/stacks/_preview_template.html b/heat_dashboard/content/stacks/templates/stacks/_preview_template.html
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/templates/stacks/_preview_template.html
rename to heat_dashboard/content/stacks/templates/stacks/_preview_template.html
diff --git a/heat_dashboard/dashboards/project/stacks/templates/stacks/_resource_info.html b/heat_dashboard/content/stacks/templates/stacks/_resource_info.html
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/templates/stacks/_resource_info.html
rename to heat_dashboard/content/stacks/templates/stacks/_resource_info.html
diff --git a/heat_dashboard/dashboards/project/stacks/templates/stacks/_resource_overview.html b/heat_dashboard/content/stacks/templates/stacks/_resource_overview.html
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/templates/stacks/_resource_overview.html
rename to heat_dashboard/content/stacks/templates/stacks/_resource_overview.html
diff --git a/heat_dashboard/dashboards/project/stacks/templates/stacks/_select_template.html b/heat_dashboard/content/stacks/templates/stacks/_select_template.html
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/templates/stacks/_select_template.html
rename to heat_dashboard/content/stacks/templates/stacks/_select_template.html
diff --git a/heat_dashboard/dashboards/project/stacks/templates/stacks/_stack_info.html b/heat_dashboard/content/stacks/templates/stacks/_stack_info.html
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/templates/stacks/_stack_info.html
rename to heat_dashboard/content/stacks/templates/stacks/_stack_info.html
diff --git a/heat_dashboard/dashboards/project/stacks/templates/stacks/_stack_template.html b/heat_dashboard/content/stacks/templates/stacks/_stack_template.html
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/templates/stacks/_stack_template.html
rename to heat_dashboard/content/stacks/templates/stacks/_stack_template.html
diff --git a/heat_dashboard/dashboards/project/stacks/templates/stacks/_update.html b/heat_dashboard/content/stacks/templates/stacks/_update.html
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/templates/stacks/_update.html
rename to heat_dashboard/content/stacks/templates/stacks/_update.html
diff --git a/heat_dashboard/dashboards/project/stacks/templates/stacks/change_template.html b/heat_dashboard/content/stacks/templates/stacks/change_template.html
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/templates/stacks/change_template.html
rename to heat_dashboard/content/stacks/templates/stacks/change_template.html
diff --git a/heat_dashboard/dashboards/project/stacks/templates/stacks/create.html b/heat_dashboard/content/stacks/templates/stacks/create.html
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/templates/stacks/create.html
rename to heat_dashboard/content/stacks/templates/stacks/create.html
diff --git a/heat_dashboard/dashboards/project/stacks/templates/stacks/preview.html b/heat_dashboard/content/stacks/templates/stacks/preview.html
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/templates/stacks/preview.html
rename to heat_dashboard/content/stacks/templates/stacks/preview.html
diff --git a/heat_dashboard/dashboards/project/stacks/templates/stacks/preview_details.html b/heat_dashboard/content/stacks/templates/stacks/preview_details.html
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/templates/stacks/preview_details.html
rename to heat_dashboard/content/stacks/templates/stacks/preview_details.html
diff --git a/heat_dashboard/dashboards/project/stacks/templates/stacks/preview_template.html b/heat_dashboard/content/stacks/templates/stacks/preview_template.html
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/templates/stacks/preview_template.html
rename to heat_dashboard/content/stacks/templates/stacks/preview_template.html
diff --git a/heat_dashboard/dashboards/project/stacks/templates/stacks/select_template.html b/heat_dashboard/content/stacks/templates/stacks/select_template.html
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/templates/stacks/select_template.html
rename to heat_dashboard/content/stacks/templates/stacks/select_template.html
diff --git a/heat_dashboard/dashboards/project/stacks/templates/stacks/update.html b/heat_dashboard/content/stacks/templates/stacks/update.html
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/templates/stacks/update.html
rename to heat_dashboard/content/stacks/templates/stacks/update.html
diff --git a/heat_dashboard/dashboards/project/stacks/urls.py b/heat_dashboard/content/stacks/urls.py
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/urls.py
rename to heat_dashboard/content/stacks/urls.py
diff --git a/heat_dashboard/dashboards/project/stacks/views.py b/heat_dashboard/content/stacks/views.py
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/views.py
rename to heat_dashboard/content/stacks/views.py
diff --git a/heat_dashboard/content/template_versions/__init__.py b/heat_dashboard/content/template_versions/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/heat_dashboard/dashboards/project/stacks/template_versions/panel.py b/heat_dashboard/content/template_versions/panel.py
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/template_versions/panel.py
rename to heat_dashboard/content/template_versions/panel.py
diff --git a/heat_dashboard/dashboards/project/stacks/template_versions/tables.py b/heat_dashboard/content/template_versions/tables.py
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/template_versions/tables.py
rename to heat_dashboard/content/template_versions/tables.py
diff --git a/heat_dashboard/dashboards/project/stacks/template_versions/tabs.py b/heat_dashboard/content/template_versions/tabs.py
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/template_versions/tabs.py
rename to heat_dashboard/content/template_versions/tabs.py
diff --git a/heat_dashboard/dashboards/project/stacks/template_versions/templates/stacks.template_versions/_details.html b/heat_dashboard/content/template_versions/templates/stacks.template_versions/_details.html
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/template_versions/templates/stacks.template_versions/_details.html
rename to heat_dashboard/content/template_versions/templates/stacks.template_versions/_details.html
diff --git a/heat_dashboard/dashboards/project/stacks/template_versions/templates/stacks.template_versions/index.html b/heat_dashboard/content/template_versions/templates/stacks.template_versions/index.html
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/template_versions/templates/stacks.template_versions/index.html
rename to heat_dashboard/content/template_versions/templates/stacks.template_versions/index.html
diff --git a/heat_dashboard/dashboards/project/stacks/template_versions/urls.py b/heat_dashboard/content/template_versions/urls.py
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/template_versions/urls.py
rename to heat_dashboard/content/template_versions/urls.py
diff --git a/heat_dashboard/dashboards/project/stacks/template_versions/views.py b/heat_dashboard/content/template_versions/views.py
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/template_versions/views.py
rename to heat_dashboard/content/template_versions/views.py
diff --git a/heat_dashboard/test/api_tests/heat_rest_tests.py b/heat_dashboard/test/tests/api/heat_rest_tests.py
similarity index 100%
rename from heat_dashboard/test/api_tests/heat_rest_tests.py
rename to heat_dashboard/test/tests/api/heat_rest_tests.py
diff --git a/heat_dashboard/test/api_tests/heat_tests.py b/heat_dashboard/test/tests/api/heat_tests.py
similarity index 100%
rename from heat_dashboard/test/api_tests/heat_tests.py
rename to heat_dashboard/test/tests/api/heat_tests.py
diff --git a/heat_dashboard/test/tests/content/__init__.py b/heat_dashboard/test/tests/content/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/heat_dashboard/dashboards/project/stacks/resource_types/tests.py b/heat_dashboard/test/tests/content/test_resource_types.py
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/resource_types/tests.py
rename to heat_dashboard/test/tests/content/test_resource_types.py
diff --git a/heat_dashboard/dashboards/project/stacks/tests.py b/heat_dashboard/test/tests/content/test_stacks.py
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/tests.py
rename to heat_dashboard/test/tests/content/test_stacks.py
diff --git a/heat_dashboard/dashboards/project/stacks/template_versions/tests.py b/heat_dashboard/test/tests/content/test_template_versions.py
similarity index 100%
rename from heat_dashboard/dashboards/project/stacks/template_versions/tests.py
rename to heat_dashboard/test/tests/content/test_template_versions.py