diff --git a/ui/.template-lintrc.js b/ui/.template-lintrc.js
index fffa24c4d..97849c4e4 100644
--- a/ui/.template-lintrc.js
+++ b/ui/.template-lintrc.js
@@ -19,6 +19,6 @@ module.exports = {
   },
   ignore: [
     'app/components/breadcrumbs/*', // using {{(modifier)}} syntax
-    'app/templates/components/list-pagination/list-pager', // using {{(modifier)}} syntax
+    'app/components/list-pagination/list-pager', // using {{(modifier)}} syntax
   ],
 };
diff --git a/ui/app/templates/components/administration-subnav.hbs b/ui/app/components/administration-subnav.hbs
similarity index 100%
rename from ui/app/templates/components/administration-subnav.hbs
rename to ui/app/components/administration-subnav.hbs
diff --git a/ui/app/templates/components/agent-monitor.hbs b/ui/app/components/agent-monitor.hbs
similarity index 100%
rename from ui/app/templates/components/agent-monitor.hbs
rename to ui/app/components/agent-monitor.hbs
diff --git a/ui/app/templates/components/allocation-row.hbs b/ui/app/components/allocation-row.hbs
similarity index 100%
rename from ui/app/templates/components/allocation-row.hbs
rename to ui/app/components/allocation-row.hbs
diff --git a/ui/app/templates/components/allocation-stat.hbs b/ui/app/components/allocation-stat.hbs
similarity index 100%
rename from ui/app/templates/components/allocation-stat.hbs
rename to ui/app/components/allocation-stat.hbs
diff --git a/ui/app/templates/components/allocation-subnav.hbs b/ui/app/components/allocation-subnav.hbs
similarity index 100%
rename from ui/app/templates/components/allocation-subnav.hbs
rename to ui/app/components/allocation-subnav.hbs
diff --git a/ui/app/templates/components/app-breadcrumbs.hbs b/ui/app/components/app-breadcrumbs.hbs
similarity index 100%
rename from ui/app/templates/components/app-breadcrumbs.hbs
rename to ui/app/components/app-breadcrumbs.hbs
diff --git a/ui/app/templates/components/attributes-section.hbs b/ui/app/components/attributes-section.hbs
similarity index 100%
rename from ui/app/templates/components/attributes-section.hbs
rename to ui/app/components/attributes-section.hbs
diff --git a/ui/app/templates/components/attributes-table.hbs b/ui/app/components/attributes-table.hbs
similarity index 100%
rename from ui/app/templates/components/attributes-table.hbs
rename to ui/app/components/attributes-table.hbs
diff --git a/ui/app/templates/components/client-node-row.hbs b/ui/app/components/client-node-row.hbs
similarity index 100%
rename from ui/app/templates/components/client-node-row.hbs
rename to ui/app/components/client-node-row.hbs
diff --git a/ui/app/templates/components/client-subnav.hbs b/ui/app/components/client-subnav.hbs
similarity index 100%
rename from ui/app/templates/components/client-subnav.hbs
rename to ui/app/components/client-subnav.hbs
diff --git a/ui/app/templates/components/copy-button.hbs b/ui/app/components/copy-button.hbs
similarity index 100%
rename from ui/app/templates/components/copy-button.hbs
rename to ui/app/components/copy-button.hbs
diff --git a/ui/app/templates/components/distribution-bar.hbs b/ui/app/components/distribution-bar.hbs
similarity index 100%
rename from ui/app/templates/components/distribution-bar.hbs
rename to ui/app/components/distribution-bar.hbs
diff --git a/ui/app/templates/components/drain-popover.hbs b/ui/app/components/drain-popover.hbs
similarity index 100%
rename from ui/app/templates/components/drain-popover.hbs
rename to ui/app/components/drain-popover.hbs
diff --git a/ui/app/templates/components/evaluation-sidebar/evaluation-actor.hbs b/ui/app/components/evaluation-sidebar/evaluation-actor.hbs
similarity index 100%
rename from ui/app/templates/components/evaluation-sidebar/evaluation-actor.hbs
rename to ui/app/components/evaluation-sidebar/evaluation-actor.hbs
diff --git a/ui/app/templates/components/exec-terminal.hbs b/ui/app/components/exec-terminal.hbs
similarity index 100%
rename from ui/app/templates/components/exec-terminal.hbs
rename to ui/app/components/exec-terminal.hbs
diff --git a/ui/app/templates/components/exec/open-button.hbs b/ui/app/components/exec/open-button.hbs
similarity index 100%
rename from ui/app/templates/components/exec/open-button.hbs
rename to ui/app/components/exec/open-button.hbs
diff --git a/ui/app/templates/components/exec/task-contents.hbs b/ui/app/components/exec/task-contents.hbs
similarity index 100%
rename from ui/app/templates/components/exec/task-contents.hbs
rename to ui/app/components/exec/task-contents.hbs
diff --git a/ui/app/templates/components/exec/task-group-parent.hbs b/ui/app/components/exec/task-group-parent.hbs
similarity index 100%
rename from ui/app/templates/components/exec/task-group-parent.hbs
rename to ui/app/components/exec/task-group-parent.hbs
diff --git a/ui/app/templates/components/flex-masonry.hbs b/ui/app/components/flex-masonry.hbs
similarity index 100%
rename from ui/app/templates/components/flex-masonry.hbs
rename to ui/app/components/flex-masonry.hbs
diff --git a/ui/app/templates/components/forbidden-message.hbs b/ui/app/components/forbidden-message.hbs
similarity index 100%
rename from ui/app/templates/components/forbidden-message.hbs
rename to ui/app/components/forbidden-message.hbs
diff --git a/ui/app/templates/components/fs/breadcrumbs.hbs b/ui/app/components/fs/breadcrumbs.hbs
similarity index 100%
rename from ui/app/templates/components/fs/breadcrumbs.hbs
rename to ui/app/components/fs/breadcrumbs.hbs
diff --git a/ui/app/templates/components/fs/browser.hbs b/ui/app/components/fs/browser.hbs
similarity index 100%
rename from ui/app/templates/components/fs/browser.hbs
rename to ui/app/components/fs/browser.hbs
diff --git a/ui/app/templates/components/fs/directory-entry.hbs b/ui/app/components/fs/directory-entry.hbs
similarity index 100%
rename from ui/app/templates/components/fs/directory-entry.hbs
rename to ui/app/components/fs/directory-entry.hbs
diff --git a/ui/app/templates/components/fs/file.hbs b/ui/app/components/fs/file.hbs
similarity index 100%
rename from ui/app/templates/components/fs/file.hbs
rename to ui/app/components/fs/file.hbs
diff --git a/ui/app/templates/components/fs/link.hbs b/ui/app/components/fs/link.hbs
similarity index 100%
rename from ui/app/templates/components/fs/link.hbs
rename to ui/app/components/fs/link.hbs
diff --git a/ui/app/templates/components/gauge-chart.hbs b/ui/app/components/gauge-chart.hbs
similarity index 100%
rename from ui/app/templates/components/gauge-chart.hbs
rename to ui/app/components/gauge-chart.hbs
diff --git a/ui/app/templates/components/global-header.hbs b/ui/app/components/global-header.hbs
similarity index 100%
rename from ui/app/templates/components/global-header.hbs
rename to ui/app/components/global-header.hbs
diff --git a/ui/app/templates/components/global-search/control.hbs b/ui/app/components/global-search/control.hbs
similarity index 100%
rename from ui/app/templates/components/global-search/control.hbs
rename to ui/app/components/global-search/control.hbs
diff --git a/ui/app/templates/components/global-search/message.hbs b/ui/app/components/global-search/message.hbs
similarity index 100%
rename from ui/app/templates/components/global-search/message.hbs
rename to ui/app/components/global-search/message.hbs
diff --git a/ui/app/templates/components/global-search/trigger.hbs b/ui/app/components/global-search/trigger.hbs
similarity index 100%
rename from ui/app/templates/components/global-search/trigger.hbs
rename to ui/app/components/global-search/trigger.hbs
diff --git a/ui/app/templates/components/gutter-menu.hbs b/ui/app/components/gutter-menu.hbs
similarity index 100%
rename from ui/app/templates/components/gutter-menu.hbs
rename to ui/app/components/gutter-menu.hbs
diff --git a/ui/app/templates/components/hamburger-menu.hbs b/ui/app/components/hamburger-menu.hbs
similarity index 100%
rename from ui/app/templates/components/hamburger-menu.hbs
rename to ui/app/components/hamburger-menu.hbs
diff --git a/ui/app/templates/components/image-file.hbs b/ui/app/components/image-file.hbs
similarity index 100%
rename from ui/app/templates/components/image-file.hbs
rename to ui/app/components/image-file.hbs
diff --git a/ui/app/templates/components/job-client-status-row.hbs b/ui/app/components/job-client-status-row.hbs
similarity index 100%
rename from ui/app/templates/components/job-client-status-row.hbs
rename to ui/app/components/job-client-status-row.hbs
diff --git a/ui/app/templates/components/job-deployment-details.hbs b/ui/app/components/job-deployment-details.hbs
similarity index 100%
rename from ui/app/templates/components/job-deployment-details.hbs
rename to ui/app/components/job-deployment-details.hbs
diff --git a/ui/app/templates/components/job-deployment.hbs b/ui/app/components/job-deployment.hbs
similarity index 100%
rename from ui/app/templates/components/job-deployment.hbs
rename to ui/app/components/job-deployment.hbs
diff --git a/ui/app/templates/components/job-deployment/deployment-allocations.hbs b/ui/app/components/job-deployment/deployment-allocations.hbs
similarity index 100%
rename from ui/app/templates/components/job-deployment/deployment-allocations.hbs
rename to ui/app/components/job-deployment/deployment-allocations.hbs
diff --git a/ui/app/templates/components/job-deployment/deployment-metrics.hbs b/ui/app/components/job-deployment/deployment-metrics.hbs
similarity index 100%
rename from ui/app/templates/components/job-deployment/deployment-metrics.hbs
rename to ui/app/components/job-deployment/deployment-metrics.hbs
diff --git a/ui/app/templates/components/job-deployment/task-groups.hbs b/ui/app/components/job-deployment/task-groups.hbs
similarity index 100%
rename from ui/app/templates/components/job-deployment/task-groups.hbs
rename to ui/app/components/job-deployment/task-groups.hbs
diff --git a/ui/app/templates/components/job-deployments-stream.hbs b/ui/app/components/job-deployments-stream.hbs
similarity index 100%
rename from ui/app/templates/components/job-deployments-stream.hbs
rename to ui/app/components/job-deployments-stream.hbs
diff --git a/ui/app/templates/components/job-diff-fields-and-objects.hbs b/ui/app/components/job-diff-fields-and-objects.hbs
similarity index 100%
rename from ui/app/templates/components/job-diff-fields-and-objects.hbs
rename to ui/app/components/job-diff-fields-and-objects.hbs
diff --git a/ui/app/templates/components/job-diff.hbs b/ui/app/components/job-diff.hbs
similarity index 100%
rename from ui/app/templates/components/job-diff.hbs
rename to ui/app/components/job-diff.hbs
diff --git a/ui/app/templates/components/job-dispatch.hbs b/ui/app/components/job-dispatch.hbs
similarity index 100%
rename from ui/app/templates/components/job-dispatch.hbs
rename to ui/app/components/job-dispatch.hbs
diff --git a/ui/app/templates/components/job-editor.hbs b/ui/app/components/job-editor.hbs
similarity index 100%
rename from ui/app/templates/components/job-editor.hbs
rename to ui/app/components/job-editor.hbs
diff --git a/ui/app/templates/components/job-editor/alert.hbs b/ui/app/components/job-editor/alert.hbs
similarity index 100%
rename from ui/app/templates/components/job-editor/alert.hbs
rename to ui/app/components/job-editor/alert.hbs
diff --git a/ui/app/templates/components/job-editor/edit.hbs b/ui/app/components/job-editor/edit.hbs
similarity index 100%
rename from ui/app/templates/components/job-editor/edit.hbs
rename to ui/app/components/job-editor/edit.hbs
diff --git a/ui/app/templates/components/job-editor/read.hbs b/ui/app/components/job-editor/read.hbs
similarity index 100%
rename from ui/app/templates/components/job-editor/read.hbs
rename to ui/app/components/job-editor/read.hbs
diff --git a/ui/app/templates/components/job-editor/review.hbs b/ui/app/components/job-editor/review.hbs
similarity index 100%
rename from ui/app/templates/components/job-editor/review.hbs
rename to ui/app/components/job-editor/review.hbs
diff --git a/ui/app/templates/components/job-page.hbs b/ui/app/components/job-page.hbs
similarity index 100%
rename from ui/app/templates/components/job-page.hbs
rename to ui/app/components/job-page.hbs
diff --git a/ui/app/templates/components/job-page/batch.hbs b/ui/app/components/job-page/batch.hbs
similarity index 100%
rename from ui/app/templates/components/job-page/batch.hbs
rename to ui/app/components/job-page/batch.hbs
diff --git a/ui/app/templates/components/job-page/parameterized-child.hbs b/ui/app/components/job-page/parameterized-child.hbs
similarity index 100%
rename from ui/app/templates/components/job-page/parameterized-child.hbs
rename to ui/app/components/job-page/parameterized-child.hbs
diff --git a/ui/app/templates/components/job-page/parameterized.hbs b/ui/app/components/job-page/parameterized.hbs
similarity index 100%
rename from ui/app/templates/components/job-page/parameterized.hbs
rename to ui/app/components/job-page/parameterized.hbs
diff --git a/ui/app/templates/components/job-page/parts/body.hbs b/ui/app/components/job-page/parts/body.hbs
similarity index 100%
rename from ui/app/templates/components/job-page/parts/body.hbs
rename to ui/app/components/job-page/parts/body.hbs
diff --git a/ui/app/templates/components/job-page/parts/children.hbs b/ui/app/components/job-page/parts/children.hbs
similarity index 100%
rename from ui/app/templates/components/job-page/parts/children.hbs
rename to ui/app/components/job-page/parts/children.hbs
diff --git a/ui/app/templates/components/job-page/parts/das-recommendations.hbs b/ui/app/components/job-page/parts/das-recommendations.hbs
similarity index 100%
rename from ui/app/templates/components/job-page/parts/das-recommendations.hbs
rename to ui/app/components/job-page/parts/das-recommendations.hbs
diff --git a/ui/app/templates/components/job-page/parts/error.hbs b/ui/app/components/job-page/parts/error.hbs
similarity index 100%
rename from ui/app/templates/components/job-page/parts/error.hbs
rename to ui/app/components/job-page/parts/error.hbs
diff --git a/ui/app/templates/components/job-page/parts/meta.hbs b/ui/app/components/job-page/parts/meta.hbs
similarity index 100%
rename from ui/app/templates/components/job-page/parts/meta.hbs
rename to ui/app/components/job-page/parts/meta.hbs
diff --git a/ui/app/templates/components/job-page/parts/placement-failures.hbs b/ui/app/components/job-page/parts/placement-failures.hbs
similarity index 100%
rename from ui/app/templates/components/job-page/parts/placement-failures.hbs
rename to ui/app/components/job-page/parts/placement-failures.hbs
diff --git a/ui/app/templates/components/job-page/parts/recent-allocations.hbs b/ui/app/components/job-page/parts/recent-allocations.hbs
similarity index 100%
rename from ui/app/templates/components/job-page/parts/recent-allocations.hbs
rename to ui/app/components/job-page/parts/recent-allocations.hbs
diff --git a/ui/app/templates/components/job-page/parts/stats-box.hbs b/ui/app/components/job-page/parts/stats-box.hbs
similarity index 100%
rename from ui/app/templates/components/job-page/parts/stats-box.hbs
rename to ui/app/components/job-page/parts/stats-box.hbs
diff --git a/ui/app/templates/components/job-page/parts/summary-chart.hbs b/ui/app/components/job-page/parts/summary-chart.hbs
similarity index 100%
rename from ui/app/templates/components/job-page/parts/summary-chart.hbs
rename to ui/app/components/job-page/parts/summary-chart.hbs
diff --git a/ui/app/templates/components/job-page/parts/summary-legend-item.hbs b/ui/app/components/job-page/parts/summary-legend-item.hbs
similarity index 100%
rename from ui/app/templates/components/job-page/parts/summary-legend-item.hbs
rename to ui/app/components/job-page/parts/summary-legend-item.hbs
diff --git a/ui/app/templates/components/job-page/parts/summary.hbs b/ui/app/components/job-page/parts/summary.hbs
similarity index 100%
rename from ui/app/templates/components/job-page/parts/summary.hbs
rename to ui/app/components/job-page/parts/summary.hbs
diff --git a/ui/app/templates/components/job-page/parts/task-groups.hbs b/ui/app/components/job-page/parts/task-groups.hbs
similarity index 100%
rename from ui/app/templates/components/job-page/parts/task-groups.hbs
rename to ui/app/components/job-page/parts/task-groups.hbs
diff --git a/ui/app/templates/components/job-page/parts/title.hbs b/ui/app/components/job-page/parts/title.hbs
similarity index 100%
rename from ui/app/templates/components/job-page/parts/title.hbs
rename to ui/app/components/job-page/parts/title.hbs
diff --git a/ui/app/templates/components/job-page/periodic-child.hbs b/ui/app/components/job-page/periodic-child.hbs
similarity index 100%
rename from ui/app/templates/components/job-page/periodic-child.hbs
rename to ui/app/components/job-page/periodic-child.hbs
diff --git a/ui/app/templates/components/job-page/periodic.hbs b/ui/app/components/job-page/periodic.hbs
similarity index 100%
rename from ui/app/templates/components/job-page/periodic.hbs
rename to ui/app/components/job-page/periodic.hbs
diff --git a/ui/app/templates/components/job-page/service.hbs b/ui/app/components/job-page/service.hbs
similarity index 100%
rename from ui/app/templates/components/job-page/service.hbs
rename to ui/app/components/job-page/service.hbs
diff --git a/ui/app/templates/components/job-page/sysbatch.hbs b/ui/app/components/job-page/sysbatch.hbs
similarity index 100%
rename from ui/app/templates/components/job-page/sysbatch.hbs
rename to ui/app/components/job-page/sysbatch.hbs
diff --git a/ui/app/templates/components/job-page/system.hbs b/ui/app/components/job-page/system.hbs
similarity index 100%
rename from ui/app/templates/components/job-page/system.hbs
rename to ui/app/components/job-page/system.hbs
diff --git a/ui/app/templates/components/job-row.hbs b/ui/app/components/job-row.hbs
similarity index 100%
rename from ui/app/templates/components/job-row.hbs
rename to ui/app/components/job-row.hbs
diff --git a/ui/app/templates/components/job-service-row.hbs b/ui/app/components/job-service-row.hbs
similarity index 100%
rename from ui/app/templates/components/job-service-row.hbs
rename to ui/app/components/job-service-row.hbs
diff --git a/ui/app/templates/components/job-subnav.hbs b/ui/app/components/job-subnav.hbs
similarity index 100%
rename from ui/app/templates/components/job-subnav.hbs
rename to ui/app/components/job-subnav.hbs
diff --git a/ui/app/templates/components/job-version.hbs b/ui/app/components/job-version.hbs
similarity index 100%
rename from ui/app/templates/components/job-version.hbs
rename to ui/app/components/job-version.hbs
diff --git a/ui/app/templates/components/job-versions-stream.hbs b/ui/app/components/job-versions-stream.hbs
similarity index 100%
rename from ui/app/templates/components/job-versions-stream.hbs
rename to ui/app/components/job-versions-stream.hbs
diff --git a/ui/app/templates/components/json-viewer.hbs b/ui/app/components/json-viewer.hbs
similarity index 100%
rename from ui/app/templates/components/json-viewer.hbs
rename to ui/app/components/json-viewer.hbs
diff --git a/ui/app/templates/components/lifecycle-chart-row.hbs b/ui/app/components/lifecycle-chart-row.hbs
similarity index 100%
rename from ui/app/templates/components/lifecycle-chart-row.hbs
rename to ui/app/components/lifecycle-chart-row.hbs
diff --git a/ui/app/templates/components/lifecycle-chart.hbs b/ui/app/components/lifecycle-chart.hbs
similarity index 100%
rename from ui/app/templates/components/lifecycle-chart.hbs
rename to ui/app/components/lifecycle-chart.hbs
diff --git a/ui/app/templates/components/line-chart.hbs b/ui/app/components/line-chart.hbs
similarity index 100%
rename from ui/app/templates/components/line-chart.hbs
rename to ui/app/components/line-chart.hbs
diff --git a/ui/app/templates/components/list-accordion.hbs b/ui/app/components/list-accordion.hbs
similarity index 100%
rename from ui/app/templates/components/list-accordion.hbs
rename to ui/app/components/list-accordion.hbs
diff --git a/ui/app/templates/components/list-accordion/accordion-body.hbs b/ui/app/components/list-accordion/accordion-body.hbs
similarity index 100%
rename from ui/app/templates/components/list-accordion/accordion-body.hbs
rename to ui/app/components/list-accordion/accordion-body.hbs
diff --git a/ui/app/templates/components/list-accordion/accordion-head.hbs b/ui/app/components/list-accordion/accordion-head.hbs
similarity index 100%
rename from ui/app/templates/components/list-accordion/accordion-head.hbs
rename to ui/app/components/list-accordion/accordion-head.hbs
diff --git a/ui/app/templates/components/list-pagination.hbs b/ui/app/components/list-pagination.hbs
similarity index 100%
rename from ui/app/templates/components/list-pagination.hbs
rename to ui/app/components/list-pagination.hbs
diff --git a/ui/app/templates/components/list-pagination/list-pager.hbs b/ui/app/components/list-pagination/list-pager.hbs
similarity index 71%
rename from ui/app/templates/components/list-pagination/list-pager.hbs
rename to ui/app/components/list-pagination/list-pager.hbs
index cab9f17e1..727b82783 100644
--- a/ui/app/templates/components/list-pagination/list-pager.hbs
+++ b/ui/app/components/list-pagination/list-pager.hbs
@@ -11,11 +11,11 @@
     aria-label={{this.label}}
     {{(modifier
       this.includeKeyboardNav
-      label=(if (eq this.label 'Next page') 'Next Page' 'Previous Page')
+      label=(if (eq this.label "Next page") "Next Page" "Previous Page")
       action=(action "gotoRoute")
-      pattern=(if (eq this.label 'Next page') (array "]" "]") (array "[" "["))
+      pattern=(if (eq this.label "Next page") (array "]" "]") (array "[" "["))
     )}}
   >
     {{yield}}
   </LinkTo>
-{{/if}}
+{{/if}}
\ No newline at end of file
diff --git a/ui/app/templates/components/list-table.hbs b/ui/app/components/list-table.hbs
similarity index 100%
rename from ui/app/templates/components/list-table.hbs
rename to ui/app/components/list-table.hbs
diff --git a/ui/app/templates/components/list-table/sort-by.hbs b/ui/app/components/list-table/sort-by.hbs
similarity index 100%
rename from ui/app/templates/components/list-table/sort-by.hbs
rename to ui/app/components/list-table/sort-by.hbs
diff --git a/ui/app/templates/components/list-table/table-body.hbs b/ui/app/components/list-table/table-body.hbs
similarity index 100%
rename from ui/app/templates/components/list-table/table-body.hbs
rename to ui/app/components/list-table/table-body.hbs
diff --git a/ui/app/templates/components/list-table/table-head.hbs b/ui/app/components/list-table/table-head.hbs
similarity index 100%
rename from ui/app/templates/components/list-table/table-head.hbs
rename to ui/app/components/list-table/table-head.hbs
diff --git a/ui/app/templates/components/loading-spinner.hbs b/ui/app/components/loading-spinner.hbs
similarity index 100%
rename from ui/app/templates/components/loading-spinner.hbs
rename to ui/app/components/loading-spinner.hbs
diff --git a/ui/app/templates/components/multi-select-dropdown.hbs b/ui/app/components/multi-select-dropdown.hbs
similarity index 100%
rename from ui/app/templates/components/multi-select-dropdown.hbs
rename to ui/app/components/multi-select-dropdown.hbs
diff --git a/ui/app/templates/components/nomad-logo.hbs b/ui/app/components/nomad-logo.hbs
similarity index 100%
rename from ui/app/templates/components/nomad-logo.hbs
rename to ui/app/components/nomad-logo.hbs
diff --git a/ui/app/templates/components/page-layout.hbs b/ui/app/components/page-layout.hbs
similarity index 100%
rename from ui/app/templates/components/page-layout.hbs
rename to ui/app/components/page-layout.hbs
diff --git a/ui/app/templates/components/page-size-select.hbs b/ui/app/components/page-size-select.hbs
similarity index 100%
rename from ui/app/templates/components/page-size-select.hbs
rename to ui/app/components/page-size-select.hbs
diff --git a/ui/app/templates/components/placement-failure.hbs b/ui/app/components/placement-failure.hbs
similarity index 100%
rename from ui/app/templates/components/placement-failure.hbs
rename to ui/app/components/placement-failure.hbs
diff --git a/ui/app/templates/components/plugin-allocation-row.hbs b/ui/app/components/plugin-allocation-row.hbs
similarity index 100%
rename from ui/app/templates/components/plugin-allocation-row.hbs
rename to ui/app/components/plugin-allocation-row.hbs
diff --git a/ui/app/templates/components/plugin-subnav.hbs b/ui/app/components/plugin-subnav.hbs
similarity index 100%
rename from ui/app/templates/components/plugin-subnav.hbs
rename to ui/app/components/plugin-subnav.hbs
diff --git a/ui/app/templates/components/popover-menu.hbs b/ui/app/components/popover-menu.hbs
similarity index 100%
rename from ui/app/templates/components/popover-menu.hbs
rename to ui/app/components/popover-menu.hbs
diff --git a/ui/app/templates/components/proxy-tag.hbs b/ui/app/components/proxy-tag.hbs
similarity index 100%
rename from ui/app/templates/components/proxy-tag.hbs
rename to ui/app/components/proxy-tag.hbs
diff --git a/ui/app/templates/components/region-switcher.hbs b/ui/app/components/region-switcher.hbs
similarity index 100%
rename from ui/app/templates/components/region-switcher.hbs
rename to ui/app/components/region-switcher.hbs
diff --git a/ui/app/templates/components/reschedule-event-row.hbs b/ui/app/components/reschedule-event-row.hbs
similarity index 100%
rename from ui/app/templates/components/reschedule-event-row.hbs
rename to ui/app/components/reschedule-event-row.hbs
diff --git a/ui/app/templates/components/reschedule-event-timeline.hbs b/ui/app/components/reschedule-event-timeline.hbs
similarity index 100%
rename from ui/app/templates/components/reschedule-event-timeline.hbs
rename to ui/app/components/reschedule-event-timeline.hbs
diff --git a/ui/app/templates/components/scale-events-accordion.hbs b/ui/app/components/scale-events-accordion.hbs
similarity index 100%
rename from ui/app/templates/components/scale-events-accordion.hbs
rename to ui/app/components/scale-events-accordion.hbs
diff --git a/ui/app/templates/components/scale-events-chart.hbs b/ui/app/components/scale-events-chart.hbs
similarity index 100%
rename from ui/app/templates/components/scale-events-chart.hbs
rename to ui/app/components/scale-events-chart.hbs
diff --git a/ui/app/templates/components/search-box.hbs b/ui/app/components/search-box.hbs
similarity index 100%
rename from ui/app/templates/components/search-box.hbs
rename to ui/app/components/search-box.hbs
diff --git a/ui/app/templates/components/server-agent-row.hbs b/ui/app/components/server-agent-row.hbs
similarity index 100%
rename from ui/app/templates/components/server-agent-row.hbs
rename to ui/app/components/server-agent-row.hbs
diff --git a/ui/app/templates/components/server-subnav.hbs b/ui/app/components/server-subnav.hbs
similarity index 100%
rename from ui/app/templates/components/server-subnav.hbs
rename to ui/app/components/server-subnav.hbs
diff --git a/ui/app/templates/components/stats-time-series.hbs b/ui/app/components/stats-time-series.hbs
similarity index 100%
rename from ui/app/templates/components/stats-time-series.hbs
rename to ui/app/components/stats-time-series.hbs
diff --git a/ui/app/templates/components/stepper-input.hbs b/ui/app/components/stepper-input.hbs
similarity index 100%
rename from ui/app/templates/components/stepper-input.hbs
rename to ui/app/components/stepper-input.hbs
diff --git a/ui/app/templates/components/storage-subnav.hbs b/ui/app/components/storage-subnav.hbs
similarity index 100%
rename from ui/app/templates/components/storage-subnav.hbs
rename to ui/app/components/storage-subnav.hbs
diff --git a/ui/app/templates/components/streaming-file.hbs b/ui/app/components/streaming-file.hbs
similarity index 100%
rename from ui/app/templates/components/streaming-file.hbs
rename to ui/app/components/streaming-file.hbs
diff --git a/ui/app/templates/components/svg-patterns.hbs b/ui/app/components/svg-patterns.hbs
similarity index 100%
rename from ui/app/templates/components/svg-patterns.hbs
rename to ui/app/components/svg-patterns.hbs
diff --git a/ui/app/templates/components/task-group-row.hbs b/ui/app/components/task-group-row.hbs
similarity index 100%
rename from ui/app/templates/components/task-group-row.hbs
rename to ui/app/components/task-group-row.hbs
diff --git a/ui/app/templates/components/task-log.hbs b/ui/app/components/task-log.hbs
similarity index 100%
rename from ui/app/templates/components/task-log.hbs
rename to ui/app/components/task-log.hbs
diff --git a/ui/app/templates/components/task-row.hbs b/ui/app/components/task-row.hbs
similarity index 100%
rename from ui/app/templates/components/task-row.hbs
rename to ui/app/components/task-row.hbs
diff --git a/ui/app/templates/components/task-subnav.hbs b/ui/app/components/task-subnav.hbs
similarity index 100%
rename from ui/app/templates/components/task-subnav.hbs
rename to ui/app/components/task-subnav.hbs
diff --git a/ui/app/templates/components/toggle.hbs b/ui/app/components/toggle.hbs
similarity index 100%
rename from ui/app/templates/components/toggle.hbs
rename to ui/app/components/toggle.hbs
diff --git a/ui/app/templates/components/tooltip.hbs b/ui/app/components/tooltip.hbs
similarity index 100%
rename from ui/app/templates/components/tooltip.hbs
rename to ui/app/components/tooltip.hbs
diff --git a/ui/app/templates/components/topo-viz.hbs b/ui/app/components/topo-viz.hbs
similarity index 100%
rename from ui/app/templates/components/topo-viz.hbs
rename to ui/app/components/topo-viz.hbs
diff --git a/ui/app/templates/components/topo-viz/datacenter.hbs b/ui/app/components/topo-viz/datacenter.hbs
similarity index 100%
rename from ui/app/templates/components/topo-viz/datacenter.hbs
rename to ui/app/components/topo-viz/datacenter.hbs
diff --git a/ui/app/templates/components/topo-viz/node.hbs b/ui/app/components/topo-viz/node.hbs
similarity index 100%
rename from ui/app/templates/components/topo-viz/node.hbs
rename to ui/app/components/topo-viz/node.hbs
diff --git a/ui/app/templates/components/two-step-button.hbs b/ui/app/components/two-step-button.hbs
similarity index 100%
rename from ui/app/templates/components/two-step-button.hbs
rename to ui/app/components/two-step-button.hbs