From 34b9ea94d125a92448f5bcca6f86d485217a98bf Mon Sep 17 00:00:00 2001
From: John Cowen <johncowen@users.noreply.github.com>
Date: Wed, 14 Oct 2020 09:03:39 +0100
Subject: [PATCH] ui: Move to a nested folder structure for Consul prefixed
 components (#8937)

* ui: Move all consul-* components to nested consul/* components

* Move tomography-graph

* Remove old basic rendering tests
---
 .../consul-exposed-path-list/index.hbs        | 69 -----------------
 .../consul-instance-checks/index.hbs          | 32 --------
 .../consul-upstream-instance-list/index.js    |  5 --
 .../consul-upstream-search-bar/index.js       |  5 --
 .../consul/exposed-path/list/index.hbs        | 76 +++++++++++++++++++
 .../exposed-path/list}/index.js               |  0
 .../consul/exposed-path/list/index.scss       |  8 ++
 .../external-source}/index.hbs                | 14 ++--
 .../consul/external-source/index.scss         |  3 +
 .../consul/instance-checks/index.hbs          | 32 ++++++++
 .../instance-checks}/index.js                 | 14 ++--
 .../intention/form}/fieldsets/index.hbs       |  6 +-
 .../intention/form}/fieldsets/index.js        |  0
 .../intention/form}/fieldsets/index.scss      |  0
 .../intention/form}/fieldsets/layout.scss     |  0
 .../intention/form}/fieldsets/skin.scss       |  0
 .../intention/form}/index.hbs                 |  4 +-
 .../intention/form}/index.js                  |  0
 .../consul/intention/list/table/index.hbs     |  2 +-
 .../intention/permission/form}/index.hbs      |  8 +-
 .../intention/permission/form}/index.js       |  0
 .../intention/permission/form}/index.scss     |  0
 .../intention/permission/form}/layout.scss    |  0
 .../intention/permission/form}/skin.scss      |  0
 .../permission/header/form}/index.hbs         |  0
 .../permission/header/form}/index.js          |  0
 .../permission/header/list}/index.hbs         |  0
 .../permission/header/list}/index.js          |  0
 .../permission/header/list}/index.scss        |  0
 .../permission/header/list}/layout.scss       |  0
 .../permission/header/list}/skin.scss         |  0
 .../intention/permission/list}/index.hbs      |  0
 .../intention/permission/list}/index.js       |  0
 .../intention/permission/list}/index.scss     |  0
 .../intention/permission/list}/layout.scss    |  0
 .../intention/permission/list}/skin.scss      |  0
 .../intention/search-bar}/index.hbs           |  0
 .../intention/search-bar}/index.js            |  0
 .../intention/view}/index.hbs                 |  2 +-
 .../intention/view}/index.js                  |  0
 .../{consul-kind => consul/kind}/index.hbs    |  0
 .../kind}/index.js                            |  0
 ui-v2/app/components/consul/kind/index.scss   |  6 ++
 .../kv/form}/index.hbs                        |  0
 .../kv/form}/index.js                         |  0
 .../kv/list}/index.hbs                        |  0
 .../kv/list}/index.js                         |  0
 .../kv/list}/pageobject.js                    |  0
 .../loader}/README.mdx                        |  6 +-
 .../loader}/index.hbs                         |  5 +-
 .../lock-session/form}/index.hbs              |  0
 .../lock-session/form}/index.js               |  0
 .../lock-session/list}/README.mdx             |  0
 .../lock-session/list}/index.hbs              |  0
 .../lock-session/list}/index.js               |  0
 .../metadata/list}/README.mdx                 |  0
 .../metadata/list}/index.hbs                  |  0
 .../metadata/list}/index.js                   |  0
 .../node/list}/index.hbs                      |  0
 .../node/list}/index.js                       |  0
 .../node/search-bar}/index.hbs                |  0
 .../node/search-bar}/index.js                 |  0
 .../nspace/list}/README.mdx                   |  0
 .../nspace/list}/index.hbs                    |  2 +-
 .../nspace/list}/index.js                     |  0
 .../nspace/list}/pageobject.js                |  0
 .../nspace/search-bar}/index.hbs              |  0
 .../nspace/search-bar}/index.js               |  0
 .../policy/list}/README.mdx                   |  0
 .../policy/list}/index.hbs                    |  0
 .../policy/list}/index.js                     |  0
 .../policy/list}/pageobject.js                |  0
 .../policy/search-bar}/index.hbs              |  0
 .../policy/search-bar}/index.js               |  0
 .../role/list}/README.mdx                     |  0
 .../role/list}/index.hbs                      |  2 +-
 .../role/list}/index.js                       |  0
 .../role/list}/pageobject.js                  |  0
 .../role/search-bar}/index.hbs                |  0
 .../role/search-bar}/index.js                 |  0
 .../service-instance/list}/index.hbs          | 10 +--
 .../service-instance/list}/index.js           |  0
 .../service-instance/search-bar}/index.hbs    |  0
 .../service-instance/search-bar}/index.js     |  0
 .../service/list}/index.hbs                   |  4 +-
 .../service/list}/index.js                    |  0
 .../service/search-bar}/index.hbs             |  0
 .../service/search-bar}/index.js              |  0
 .../token/list}/README.mdx                    |  0
 .../token/list}/index.hbs                     |  2 +-
 .../token/list}/index.js                      |  0
 .../token/list}/pageobject.js                 |  0
 .../token/ruleset/list}/README.mdx            |  0
 .../token/ruleset/list}/index.hbs             |  0
 .../token/ruleset/list}/index.js              |  0
 .../token/search-bar}/index.hbs               |  0
 .../token/search-bar}/index.js                |  0
 .../tomography/graph}/index.hbs               |  0
 .../tomography/graph}/index.js                |  0
 .../upstream-instance/list}/index.hbs         |  0
 .../upstream-instance/list}/index.js          |  0
 .../upstream/list}/index.hbs                  |  0
 .../upstream/list}/index.js                   |  0
 .../upstream/search-bar}/index.hbs            |  0
 .../upstream/search-bar}/index.js             |  0
 ui-v2/app/components/data-loader/index.hbs    |  2 +-
 ui-v2/app/styles/components.scss              | 11 ++-
 .../app/styles/components/composite-row.scss  |  2 -
 ui-v2/app/styles/components/pill.scss         |  5 --
 ui-v2/app/templates/application.hbs           |  2 +-
 .../app/templates/dc/acls/policies/index.hbs  |  4 +-
 ui-v2/app/templates/dc/acls/roles/index.hbs   |  4 +-
 ui-v2/app/templates/dc/acls/tokens/index.hbs  |  4 +-
 ui-v2/app/templates/dc/intentions/edit.hbs    |  2 +-
 ui-v2/app/templates/dc/intentions/index.hbs   |  2 +-
 ui-v2/app/templates/dc/kv/edit.hbs            |  4 +-
 ui-v2/app/templates/dc/kv/index.hbs           |  4 +-
 ui-v2/app/templates/dc/nodes/index.hbs        |  4 +-
 .../app/templates/dc/nodes/show/metadata.hbs  |  2 +-
 ui-v2/app/templates/dc/nodes/show/rtt.hbs     |  2 +-
 .../app/templates/dc/nodes/show/services.hbs  |  2 +-
 .../app/templates/dc/nodes/show/sessions.hbs  |  2 +-
 ui-v2/app/templates/dc/nspaces/index.hbs      |  6 +-
 ui-v2/app/templates/dc/services/index.hbs     |  4 +-
 ui-v2/app/templates/dc/services/instance.hbs  |  4 +-
 .../dc/services/instance/metadata.hbs         |  2 +-
 .../templates/dc/services/instance/proxy.hbs  |  4 +-
 ui-v2/app/templates/dc/services/show.hbs      |  4 +-
 .../templates/dc/services/show/instances.hbs  |  4 +-
 .../dc/services/show/intentions/edit.hbs      |  2 +-
 .../dc/services/show/intentions/index.hbs     |  2 +-
 .../templates/dc/services/show/services.hbs   |  4 +-
 .../templates/dc/services/show/upstreams.hbs  |  4 +-
 .../components/consul-external-source-test.js | 26 -------
 .../components/consul-instance-checks-test.js | 25 ------
 .../consul-lock-session-list-test.js          | 26 -------
 .../components/consul-node-list-test.js       | 26 -------
 .../consul-service-instance-list-test.js      | 26 -------
 .../components/consul-service-list-test.js    | 24 ------
 .../components/tomography-graph-test.js       | 32 --------
 ui-v2/tests/pages.js                          | 10 +--
 141 files changed, 220 insertions(+), 390 deletions(-)
 delete mode 100644 ui-v2/app/components/consul-exposed-path-list/index.hbs
 delete mode 100644 ui-v2/app/components/consul-instance-checks/index.hbs
 delete mode 100644 ui-v2/app/components/consul-upstream-instance-list/index.js
 delete mode 100644 ui-v2/app/components/consul-upstream-search-bar/index.js
 create mode 100644 ui-v2/app/components/consul/exposed-path/list/index.hbs
 rename ui-v2/app/components/{consul-exposed-path-list => consul/exposed-path/list}/index.js (100%)
 create mode 100644 ui-v2/app/components/consul/exposed-path/list/index.scss
 rename ui-v2/app/components/{consul-external-source => consul/external-source}/index.hbs (52%)
 create mode 100644 ui-v2/app/components/consul/external-source/index.scss
 create mode 100644 ui-v2/app/components/consul/instance-checks/index.hbs
 rename ui-v2/app/components/{consul-instance-checks => consul/instance-checks}/index.js (80%)
 rename ui-v2/app/components/{consul-intention-form => consul/intention/form}/fieldsets/index.hbs (98%)
 rename ui-v2/app/components/{consul-intention-form => consul/intention/form}/fieldsets/index.js (100%)
 rename ui-v2/app/components/{consul-intention-form => consul/intention/form}/fieldsets/index.scss (100%)
 rename ui-v2/app/components/{consul-intention-form => consul/intention/form}/fieldsets/layout.scss (100%)
 rename ui-v2/app/components/{consul-intention-form => consul/intention/form}/fieldsets/skin.scss (100%)
 rename ui-v2/app/components/{consul-intention-form => consul/intention/form}/index.hbs (97%)
 rename ui-v2/app/components/{consul-intention-form => consul/intention/form}/index.js (100%)
 rename ui-v2/app/components/{consul-intention-permission-form => consul/intention/permission/form}/index.hbs (94%)
 rename ui-v2/app/components/{consul-intention-permission-form => consul/intention/permission/form}/index.js (100%)
 rename ui-v2/app/components/{consul-intention-permission-form => consul/intention/permission/form}/index.scss (100%)
 rename ui-v2/app/components/{consul-intention-permission-form => consul/intention/permission/form}/layout.scss (100%)
 rename ui-v2/app/components/{consul-intention-permission-form => consul/intention/permission/form}/skin.scss (100%)
 rename ui-v2/app/components/{consul-intention-permission-header-form => consul/intention/permission/header/form}/index.hbs (100%)
 rename ui-v2/app/components/{consul-intention-permission-header-form => consul/intention/permission/header/form}/index.js (100%)
 rename ui-v2/app/components/{consul-intention-permission-header-list => consul/intention/permission/header/list}/index.hbs (100%)
 rename ui-v2/app/components/{consul-external-source => consul/intention/permission/header/list}/index.js (100%)
 rename ui-v2/app/components/{consul-intention-permission-header-list => consul/intention/permission/header/list}/index.scss (100%)
 rename ui-v2/app/components/{consul-intention-permission-header-list => consul/intention/permission/header/list}/layout.scss (100%)
 rename ui-v2/app/components/{consul-intention-permission-header-list => consul/intention/permission/header/list}/skin.scss (100%)
 rename ui-v2/app/components/{consul-intention-permission-list => consul/intention/permission/list}/index.hbs (100%)
 rename ui-v2/app/components/{consul-intention-permission-header-list => consul/intention/permission/list}/index.js (100%)
 rename ui-v2/app/components/{consul-intention-permission-list => consul/intention/permission/list}/index.scss (100%)
 rename ui-v2/app/components/{consul-intention-permission-list => consul/intention/permission/list}/layout.scss (100%)
 rename ui-v2/app/components/{consul-intention-permission-list => consul/intention/permission/list}/skin.scss (100%)
 rename ui-v2/app/components/{consul-intention-search-bar => consul/intention/search-bar}/index.hbs (100%)
 rename ui-v2/app/components/{consul-intention-permission-list => consul/intention/search-bar}/index.js (100%)
 rename ui-v2/app/components/{consul-intention-view => consul/intention/view}/index.hbs (96%)
 rename ui-v2/app/components/{consul-intention-search-bar => consul/intention/view}/index.js (100%)
 rename ui-v2/app/components/{consul-kind => consul/kind}/index.hbs (100%)
 rename ui-v2/app/components/{consul-intention-view => consul/kind}/index.js (100%)
 create mode 100644 ui-v2/app/components/consul/kind/index.scss
 rename ui-v2/app/components/{consul-kv-form => consul/kv/form}/index.hbs (100%)
 rename ui-v2/app/components/{consul-kv-form => consul/kv/form}/index.js (100%)
 rename ui-v2/app/components/{consul-kv-list => consul/kv/list}/index.hbs (100%)
 rename ui-v2/app/components/{consul-kv-list => consul/kv/list}/index.js (100%)
 rename ui-v2/app/components/{consul-kv-list => consul/kv/list}/pageobject.js (100%)
 rename ui-v2/app/components/{consul-loader => consul/loader}/README.mdx (56%)
 rename ui-v2/app/components/{consul-loader => consul/loader}/index.hbs (98%)
 rename ui-v2/app/components/{consul-session-form => consul/lock-session/form}/index.hbs (100%)
 rename ui-v2/app/components/{consul-policy-search-bar => consul/lock-session/form}/index.js (100%)
 rename ui-v2/app/components/{consul-lock-session-list => consul/lock-session/list}/README.mdx (100%)
 rename ui-v2/app/components/{consul-lock-session-list => consul/lock-session/list}/index.hbs (100%)
 rename ui-v2/app/components/{consul-kind => consul/lock-session/list}/index.js (100%)
 rename ui-v2/app/components/{consul-metadata-list => consul/metadata/list}/README.mdx (100%)
 rename ui-v2/app/components/{consul-metadata-list => consul/metadata/list}/index.hbs (100%)
 rename ui-v2/app/components/{consul-loader => consul/metadata/list}/index.js (100%)
 rename ui-v2/app/components/{consul-node-list => consul/node/list}/index.hbs (100%)
 rename ui-v2/app/components/{consul-lock-session-list => consul/node/list}/index.js (100%)
 rename ui-v2/app/components/{consul-node-search-bar => consul/node/search-bar}/index.hbs (100%)
 rename ui-v2/app/components/{consul-metadata-list => consul/node/search-bar}/index.js (100%)
 rename ui-v2/app/components/{consul-nspace-list => consul/nspace/list}/README.mdx (100%)
 rename ui-v2/app/components/{consul-nspace-list => consul/nspace/list}/index.hbs (96%)
 rename ui-v2/app/components/{consul-nspace-list => consul/nspace/list}/index.js (100%)
 rename ui-v2/app/components/{consul-nspace-list => consul/nspace/list}/pageobject.js (100%)
 rename ui-v2/app/components/{consul-nspace-search-bar => consul/nspace/search-bar}/index.hbs (100%)
 rename ui-v2/app/components/{consul-node-list => consul/nspace/search-bar}/index.js (100%)
 rename ui-v2/app/components/{consul-policy-list => consul/policy/list}/README.mdx (100%)
 rename ui-v2/app/components/{consul-policy-list => consul/policy/list}/index.hbs (100%)
 rename ui-v2/app/components/{consul-node-search-bar => consul/policy/list}/index.js (100%)
 rename ui-v2/app/components/{consul-policy-list => consul/policy/list}/pageobject.js (100%)
 rename ui-v2/app/components/{consul-policy-search-bar => consul/policy/search-bar}/index.hbs (100%)
 rename ui-v2/app/components/{consul-role-search-bar => consul/policy/search-bar}/index.js (100%)
 rename ui-v2/app/components/{consul-role-list => consul/role/list}/README.mdx (100%)
 rename ui-v2/app/components/{consul-role-list => consul/role/list}/index.hbs (96%)
 rename ui-v2/app/components/{consul-nspace-search-bar => consul/role/list}/index.js (100%)
 rename ui-v2/app/components/{consul-role-list => consul/role/list}/pageobject.js (100%)
 rename ui-v2/app/components/{consul-role-search-bar => consul/role/search-bar}/index.hbs (100%)
 rename ui-v2/app/components/{consul-session-form => consul/role/search-bar}/index.js (100%)
 rename ui-v2/app/components/{consul-service-instance-list => consul/service-instance/list}/index.hbs (84%)
 rename ui-v2/app/components/{consul-policy-list => consul/service-instance/list}/index.js (100%)
 rename ui-v2/app/components/{consul-service-instance-search-bar => consul/service-instance/search-bar}/index.hbs (100%)
 rename ui-v2/app/components/{consul-role-list => consul/service-instance/search-bar}/index.js (100%)
 rename ui-v2/app/components/{consul-service-list => consul/service/list}/index.hbs (96%)
 rename ui-v2/app/components/{consul-service-list => consul/service/list}/index.js (100%)
 rename ui-v2/app/components/{consul-service-search-bar => consul/service/search-bar}/index.hbs (100%)
 rename ui-v2/app/components/{consul-service-instance-list => consul/service/search-bar}/index.js (100%)
 rename ui-v2/app/components/{consul-token-list => consul/token/list}/README.mdx (100%)
 rename ui-v2/app/components/{consul-token-list => consul/token/list}/index.hbs (98%)
 rename ui-v2/app/components/{consul-service-instance-search-bar => consul/token/list}/index.js (100%)
 rename ui-v2/app/components/{consul-token-list => consul/token/list}/pageobject.js (100%)
 rename ui-v2/app/components/{consul-token-ruleset-list => consul/token/ruleset/list}/README.mdx (100%)
 rename ui-v2/app/components/{consul-token-ruleset-list => consul/token/ruleset/list}/index.hbs (100%)
 rename ui-v2/app/components/{consul-service-search-bar => consul/token/ruleset/list}/index.js (100%)
 rename ui-v2/app/components/{consul-token-search-bar => consul/token/search-bar}/index.hbs (100%)
 rename ui-v2/app/components/{consul-token-search-bar => consul/token/search-bar}/index.js (100%)
 rename ui-v2/app/components/{tomography-graph => consul/tomography/graph}/index.hbs (100%)
 rename ui-v2/app/components/{tomography-graph => consul/tomography/graph}/index.js (100%)
 rename ui-v2/app/components/{consul-upstream-instance-list => consul/upstream-instance/list}/index.hbs (100%)
 rename ui-v2/app/components/{consul-token-list => consul/upstream-instance/list}/index.js (100%)
 rename ui-v2/app/components/{consul-upstream-list => consul/upstream/list}/index.hbs (100%)
 rename ui-v2/app/components/{consul-upstream-list => consul/upstream/list}/index.js (100%)
 rename ui-v2/app/components/{consul-upstream-search-bar => consul/upstream/search-bar}/index.hbs (100%)
 rename ui-v2/app/components/{consul-token-ruleset-list => consul/upstream/search-bar}/index.js (100%)
 delete mode 100644 ui-v2/tests/integration/components/consul-external-source-test.js
 delete mode 100644 ui-v2/tests/integration/components/consul-instance-checks-test.js
 delete mode 100644 ui-v2/tests/integration/components/consul-lock-session-list-test.js
 delete mode 100644 ui-v2/tests/integration/components/consul-node-list-test.js
 delete mode 100644 ui-v2/tests/integration/components/consul-service-instance-list-test.js
 delete mode 100644 ui-v2/tests/integration/components/consul-service-list-test.js
 delete mode 100644 ui-v2/tests/integration/components/tomography-graph-test.js

diff --git a/ui-v2/app/components/consul-exposed-path-list/index.hbs b/ui-v2/app/components/consul-exposed-path-list/index.hbs
deleted file mode 100644
index 19c102e87..000000000
--- a/ui-v2/app/components/consul-exposed-path-list/index.hbs
+++ /dev/null
@@ -1,69 +0,0 @@
-<ul data-test-proxy-exposed-paths>
-{{#each items as |path|}}
-  <li>
-    <div class="header">
-    {{#let (concat address ':' path.Path) as |combinedAddress|}}
-      <p class="combined-address">
-        <span>
-          {{combinedAddress}}
-        </span>
-        <CopyButton
-          @value={{combinedAddress}}
-          @name="Address"
-        />
-      </p>
-    {{/let}}
-    </div>
-    <div class="detail">
-    {{#if path.Protocol}}
-      <dl class="protocol">
-        <dt>
-          <Tooltip>
-              Protocol
-          </Tooltip>
-        </dt>
-        <dd>
-          {{path.Protocol}}
-        </dd>
-      </dl>
-    {{/if}}
-    {{#if path.ListenerPort}}
-      <dl class="port">
-        <dt>
-          <Tooltip>
-              Port
-          </Tooltip>
-        </dt>
-        <dd>
-          listening on :{{path.ListenerPort}}
-        </dd>
-      </dl>
-    {{/if}}
-    {{#if path.LocalPathPort}}
-      <dl class="port">
-        <dt>
-          <Tooltip>
-              Port
-          </Tooltip>
-        </dt>
-        <dd>
-          local port :{{path.LocalPathPort}}
-        </dd>
-      </dl>
-    {{/if}}
-    {{#if path.Path}}
-      <dl class="path">
-        <dt>
-          <Tooltip>
-              Path
-          </Tooltip>
-        </dt>
-        <dd>
-          {{path.Path}}
-        </dd>
-      </dl>
-    {{/if}}
-    </div>
-  </li>
-{{/each}}
-</ul>
diff --git a/ui-v2/app/components/consul-instance-checks/index.hbs b/ui-v2/app/components/consul-instance-checks/index.hbs
deleted file mode 100644
index 937b2942d..000000000
--- a/ui-v2/app/components/consul-instance-checks/index.hbs
+++ /dev/null
@@ -1,32 +0,0 @@
-{{#if (gt items.length 0)}}
-  {{#if (eq healthCheck.check 'empty') }}
-    <dl class={{healthCheck.check}}>
-      <dt>
-        <Tooltip>
-          {{capitalize type}} Checks
-        </Tooltip>
-      </dt>
-      <dd>No {{type}} checks</dd>
-    </dl>
-  {{else}}
-    {{#if (eq healthCheck.count items.length)}}
-    <dl class={{healthCheck.check}}>
-      <dt>
-        <Tooltip>
-          {{capitalize type}} Checks
-        </Tooltip>
-      </dt>
-      <dd>All {{type}} checks {{healthCheck.status}}</dd>
-    </dl>
-    {{else}}
-    <dl class={{healthCheck.check}}>
-      <dt>
-        <Tooltip>
-          {{capitalize type}} Checks
-        </Tooltip>
-      </dt>
-      <dd>{{healthCheck.count}}/{{items.length}} {{type}} checks {{healthCheck.status}}</dd>
-    </dl>
-    {{/if}}
-  {{/if}}
-{{/if}}
\ No newline at end of file
diff --git a/ui-v2/app/components/consul-upstream-instance-list/index.js b/ui-v2/app/components/consul-upstream-instance-list/index.js
deleted file mode 100644
index 479865264..000000000
--- a/ui-v2/app/components/consul-upstream-instance-list/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import Component from '@ember/component';
-
-export default Component.extend({
-  tagName: '',
-});
diff --git a/ui-v2/app/components/consul-upstream-search-bar/index.js b/ui-v2/app/components/consul-upstream-search-bar/index.js
deleted file mode 100644
index 479865264..000000000
--- a/ui-v2/app/components/consul-upstream-search-bar/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import Component from '@ember/component';
-
-export default Component.extend({
-  tagName: '',
-});
diff --git a/ui-v2/app/components/consul/exposed-path/list/index.hbs b/ui-v2/app/components/consul/exposed-path/list/index.hbs
new file mode 100644
index 000000000..14fdf352b
--- /dev/null
+++ b/ui-v2/app/components/consul/exposed-path/list/index.hbs
@@ -0,0 +1,76 @@
+<div
+  class="consul-exposed-path-list"
+  ...attributes
+>
+  <ul
+    data-test-proxy-exposed-paths
+  >
+  {{#each @items as |path|}}
+    <li>
+      <div class="header">
+      {{#let (concat address ':' path.Path) as |combinedAddress|}}
+        <p class="combined-address">
+          <span>
+            {{combinedAddress}}
+          </span>
+          <CopyButton
+            @value={{combinedAddress}}
+            @name="Address"
+          />
+        </p>
+      {{/let}}
+      </div>
+      <div class="detail">
+      {{#if path.Protocol}}
+        <dl class="protocol">
+          <dt>
+            <Tooltip>
+                Protocol
+            </Tooltip>
+          </dt>
+          <dd>
+            {{path.Protocol}}
+          </dd>
+        </dl>
+      {{/if}}
+      {{#if path.ListenerPort}}
+        <dl class="port">
+          <dt>
+            <Tooltip>
+                Port
+            </Tooltip>
+          </dt>
+          <dd>
+            listening on :{{path.ListenerPort}}
+          </dd>
+        </dl>
+      {{/if}}
+      {{#if path.LocalPathPort}}
+        <dl class="port">
+          <dt>
+            <Tooltip>
+                Port
+            </Tooltip>
+          </dt>
+          <dd>
+            local port :{{path.LocalPathPort}}
+          </dd>
+        </dl>
+      {{/if}}
+      {{#if path.Path}}
+        <dl class="path">
+          <dt>
+            <Tooltip>
+                Path
+            </Tooltip>
+          </dt>
+          <dd>
+            {{path.Path}}
+          </dd>
+        </dl>
+      {{/if}}
+      </div>
+    </li>
+  {{/each}}
+  </ul>
+</div>
diff --git a/ui-v2/app/components/consul-exposed-path-list/index.js b/ui-v2/app/components/consul/exposed-path/list/index.js
similarity index 100%
rename from ui-v2/app/components/consul-exposed-path-list/index.js
rename to ui-v2/app/components/consul/exposed-path/list/index.js
diff --git a/ui-v2/app/components/consul/exposed-path/list/index.scss b/ui-v2/app/components/consul/exposed-path/list/index.scss
new file mode 100644
index 000000000..23cae5bca
--- /dev/null
+++ b/ui-v2/app/components/consul/exposed-path/list/index.scss
@@ -0,0 +1,8 @@
+.consul-exposed-path-list {
+  > ul {
+    border-top: 1px solid $gray-200;
+  }
+  > ul > li {
+    @extend %composite-row;
+  }
+}
diff --git a/ui-v2/app/components/consul-external-source/index.hbs b/ui-v2/app/components/consul/external-source/index.hbs
similarity index 52%
rename from ui-v2/app/components/consul-external-source/index.hbs
rename to ui-v2/app/components/consul/external-source/index.hbs
index bb1a46f18..38f446386 100644
--- a/ui-v2/app/components/consul-external-source/index.hbs
+++ b/ui-v2/app/components/consul/external-source/index.hbs
@@ -1,9 +1,13 @@
-{{#if item}}
-  {{#let (service/external-source item) as |externalSource|}}
+{{#if @item}}
+  {{#let (service/external-source @item) as |externalSource|}}
     {{#if externalSource}}
-      <span data-test-external-source={{externalSource}} class="consul-external-source {{externalSource}}">
-        {{#if label}}
-          {{label}}
+      <span
+        data-test-external-source={{externalSource}}
+        class="consul-external-source {{externalSource}}"
+        ...attributes
+      >
+        {{#if @label}}
+          {{@label}}
         {{else}}
           {{#if (eq externalSource 'aws')}}
             Registered via {{uppercase externalSource}}
diff --git a/ui-v2/app/components/consul/external-source/index.scss b/ui-v2/app/components/consul/external-source/index.scss
new file mode 100644
index 000000000..c74f871a9
--- /dev/null
+++ b/ui-v2/app/components/consul/external-source/index.scss
@@ -0,0 +1,3 @@
+.consul-external-source {
+  @extend %pill-200, %frame-gray-600;
+}
diff --git a/ui-v2/app/components/consul/instance-checks/index.hbs b/ui-v2/app/components/consul/instance-checks/index.hbs
new file mode 100644
index 000000000..d6b06eb21
--- /dev/null
+++ b/ui-v2/app/components/consul/instance-checks/index.hbs
@@ -0,0 +1,32 @@
+{{#if (gt @items.length 0)}}
+  {{#if (eq this.healthCheck.check 'empty') }}
+    <dl class={{this.healthCheck.check}}>
+      <dt>
+        <Tooltip>
+          {{capitalize @type}} Checks
+        </Tooltip>
+      </dt>
+      <dd>No {{@type}} checks</dd>
+    </dl>
+  {{else}}
+    {{#if (eq this.healthCheck.count @items.length)}}
+    <dl class={{this.healthCheck.check}}>
+      <dt>
+        <Tooltip>
+          {{capitalize @type}} Checks
+        </Tooltip>
+      </dt>
+      <dd>All {{@type}} checks {{this.healthCheck.status}}</dd>
+    </dl>
+    {{else}}
+    <dl class={{this.healthCheck.check}}>
+      <dt>
+        <Tooltip>
+          {{capitalize @type}} Checks
+        </Tooltip>
+      </dt>
+      <dd>{{this.healthCheck.count}}/{{@items.length}} {{@type}} checks {{this.healthCheck.status}}</dd>
+    </dl>
+    {{/if}}
+  {{/if}}
+{{/if}}
\ No newline at end of file
diff --git a/ui-v2/app/components/consul-instance-checks/index.js b/ui-v2/app/components/consul/instance-checks/index.js
similarity index 80%
rename from ui-v2/app/components/consul-instance-checks/index.js
rename to ui-v2/app/components/consul/instance-checks/index.js
index da5c60aa0..2c78a553f 100644
--- a/ui-v2/app/components/consul-instance-checks/index.js
+++ b/ui-v2/app/components/consul/instance-checks/index.js
@@ -1,14 +1,12 @@
-import Component from '@ember/component';
-import { computed } from '@ember/object';
+import Component from '@glimmer/component';
 
-export default Component.extend({
-  tagName: '',
-  healthCheck: computed('items.[]', function() {
+export default class ConsulInstanceChecks extends Component {
+  get healthCheck() {
     let ChecksCritical = 0;
     let ChecksWarning = 0;
     let ChecksPassing = 0;
 
-    this.items.forEach(item => {
+    this.args.items.forEach(item => {
       switch (item.Status) {
         case 'critical':
           ChecksCritical += 1;
@@ -48,5 +46,5 @@ export default Component.extend({
           check: 'empty',
         };
     }
-  }),
-});
+  }
+}
diff --git a/ui-v2/app/components/consul-intention-form/fieldsets/index.hbs b/ui-v2/app/components/consul/intention/form/fieldsets/index.hbs
similarity index 98%
rename from ui-v2/app/components/consul-intention-form/fieldsets/index.hbs
rename to ui-v2/app/components/consul/intention/form/fieldsets/index.hbs
index 89f3f6414..be1570673 100644
--- a/ui-v2/app/components/consul-intention-form/fieldsets/index.hbs
+++ b/ui-v2/app/components/consul/intention/form/fieldsets/index.hbs
@@ -155,7 +155,7 @@
         <a href="{{env 'CONSUL_DOCS_URL'}}/guides/acl-migrate-tokens.html" target="_blank" rel="noopener noreferrer">documentation</a>
       </p>
     </div>
-    <ConsulIntentionPermissionList
+    <Consul::Intention::Permission::List
       @items={{item.Permissions}}
       @onclick={{queue (action (mut permission)) (action (mut shouldShowPermissionForm) true)}}
       @ondelete={{action 'delete' 'Permissions' item}}
@@ -200,12 +200,12 @@
       <h3>Edit Permission</h3>
     </BlockSlot>
     <BlockSlot @name="body">
-      <ConsulIntentionPermissionForm
+      <Consul::Intention::Permission::Form
         @item={{permission}}
         @onsubmit={{action 'add' 'Permissions' item}}
       as |permissionForm|>
         <Ref @target={{this}} @name="permissionForm" @value={{permissionForm}} />
-      </ConsulIntentionPermissionForm>
+      </Consul::Intention::Permission::Form>
     </BlockSlot>
     <BlockSlot @name="actions">
       <button
diff --git a/ui-v2/app/components/consul-intention-form/fieldsets/index.js b/ui-v2/app/components/consul/intention/form/fieldsets/index.js
similarity index 100%
rename from ui-v2/app/components/consul-intention-form/fieldsets/index.js
rename to ui-v2/app/components/consul/intention/form/fieldsets/index.js
diff --git a/ui-v2/app/components/consul-intention-form/fieldsets/index.scss b/ui-v2/app/components/consul/intention/form/fieldsets/index.scss
similarity index 100%
rename from ui-v2/app/components/consul-intention-form/fieldsets/index.scss
rename to ui-v2/app/components/consul/intention/form/fieldsets/index.scss
diff --git a/ui-v2/app/components/consul-intention-form/fieldsets/layout.scss b/ui-v2/app/components/consul/intention/form/fieldsets/layout.scss
similarity index 100%
rename from ui-v2/app/components/consul-intention-form/fieldsets/layout.scss
rename to ui-v2/app/components/consul/intention/form/fieldsets/layout.scss
diff --git a/ui-v2/app/components/consul-intention-form/fieldsets/skin.scss b/ui-v2/app/components/consul/intention/form/fieldsets/skin.scss
similarity index 100%
rename from ui-v2/app/components/consul-intention-form/fieldsets/skin.scss
rename to ui-v2/app/components/consul/intention/form/fieldsets/skin.scss
diff --git a/ui-v2/app/components/consul-intention-form/index.hbs b/ui-v2/app/components/consul/intention/form/index.hbs
similarity index 97%
rename from ui-v2/app/components/consul-intention-form/index.hbs
rename to ui-v2/app/components/consul/intention/form/index.hbs
index 32d5a6b77..f6fffd22f 100644
--- a/ui-v2/app/components/consul-intention-form/index.hbs
+++ b/ui-v2/app/components/consul/intention/form/index.hbs
@@ -41,7 +41,7 @@
         />
       {{/if}}
       <form onsubmit={{action api.submit}}>
-        <ConsulIntentionForm::Fieldsets
+        <Consul::Intention::Form::Fieldsets
           @nspaces={{nspaces}}
           @services={{services}}
           @SourceName={{SourceName}}
@@ -71,7 +71,7 @@
         </div>
       </form>
   {{else}}
-      <ConsulIntentionView
+      <Consul::Intention::View
         @item={{item}}
       />
   {{/if}}
diff --git a/ui-v2/app/components/consul-intention-form/index.js b/ui-v2/app/components/consul/intention/form/index.js
similarity index 100%
rename from ui-v2/app/components/consul-intention-form/index.js
rename to ui-v2/app/components/consul/intention/form/index.js
diff --git a/ui-v2/app/components/consul/intention/list/table/index.hbs b/ui-v2/app/components/consul/intention/list/table/index.hbs
index f379c7a5b..89ab400d2 100644
--- a/ui-v2/app/components/consul/intention/list/table/index.hbs
+++ b/ui-v2/app/components/consul/intention/list/table/index.hbs
@@ -51,7 +51,7 @@ as |item index|>
         </td>
         <td class="meta">
         {{#if item.IsManagedByCRD}}
-          <ConsulExternalSource @item={{item}} @label="Managed by CRD" />
+          <Consul::ExternalSource @item={{item}} @label="Managed by CRD" />
         {{/if}}
         </td>
     </BlockSlot>
diff --git a/ui-v2/app/components/consul-intention-permission-form/index.hbs b/ui-v2/app/components/consul/intention/permission/form/index.hbs
similarity index 94%
rename from ui-v2/app/components/consul-intention-permission-form/index.hbs
rename to ui-v2/app/components/consul/intention/permission/form/index.hbs
index e78744a50..9eaf24762 100644
--- a/ui-v2/app/components/consul-intention-permission-form/index.hbs
+++ b/ui-v2/app/components/consul/intention/permission/form/index.hbs
@@ -119,18 +119,18 @@ as |group|>
   <fieldset>
     <h2>Headers</h2>
 
-    <ConsulIntentionPermissionHeaderList
+    <Consul::Intention::Permission::Header::List
       @items={{changeset-get changeset 'HTTP.Header'}}
       @ondelete={{action 'delete' 'HTTP.Header' changeset}}
     as |headerList|>
 
-    </ConsulIntentionPermissionHeaderList>
+    </Consul::Intention::Permission::Header::List>
 
-    <ConsulIntentionPermissionHeaderForm
+    <Consul::Intention::Permission::Header::Form
       @onsubmit={{action 'add' 'HTTP.Header' changeset}}
     as |headerForm|>
       <Ref @target={{this}} @name="headerForm" @value={{headerForm}} />
-    </ConsulIntentionPermissionHeaderForm>
+    </Consul::Intention::Permission::Header::Form>
 
     <button
       type="button"
diff --git a/ui-v2/app/components/consul-intention-permission-form/index.js b/ui-v2/app/components/consul/intention/permission/form/index.js
similarity index 100%
rename from ui-v2/app/components/consul-intention-permission-form/index.js
rename to ui-v2/app/components/consul/intention/permission/form/index.js
diff --git a/ui-v2/app/components/consul-intention-permission-form/index.scss b/ui-v2/app/components/consul/intention/permission/form/index.scss
similarity index 100%
rename from ui-v2/app/components/consul-intention-permission-form/index.scss
rename to ui-v2/app/components/consul/intention/permission/form/index.scss
diff --git a/ui-v2/app/components/consul-intention-permission-form/layout.scss b/ui-v2/app/components/consul/intention/permission/form/layout.scss
similarity index 100%
rename from ui-v2/app/components/consul-intention-permission-form/layout.scss
rename to ui-v2/app/components/consul/intention/permission/form/layout.scss
diff --git a/ui-v2/app/components/consul-intention-permission-form/skin.scss b/ui-v2/app/components/consul/intention/permission/form/skin.scss
similarity index 100%
rename from ui-v2/app/components/consul-intention-permission-form/skin.scss
rename to ui-v2/app/components/consul/intention/permission/form/skin.scss
diff --git a/ui-v2/app/components/consul-intention-permission-header-form/index.hbs b/ui-v2/app/components/consul/intention/permission/header/form/index.hbs
similarity index 100%
rename from ui-v2/app/components/consul-intention-permission-header-form/index.hbs
rename to ui-v2/app/components/consul/intention/permission/header/form/index.hbs
diff --git a/ui-v2/app/components/consul-intention-permission-header-form/index.js b/ui-v2/app/components/consul/intention/permission/header/form/index.js
similarity index 100%
rename from ui-v2/app/components/consul-intention-permission-header-form/index.js
rename to ui-v2/app/components/consul/intention/permission/header/form/index.js
diff --git a/ui-v2/app/components/consul-intention-permission-header-list/index.hbs b/ui-v2/app/components/consul/intention/permission/header/list/index.hbs
similarity index 100%
rename from ui-v2/app/components/consul-intention-permission-header-list/index.hbs
rename to ui-v2/app/components/consul/intention/permission/header/list/index.hbs
diff --git a/ui-v2/app/components/consul-external-source/index.js b/ui-v2/app/components/consul/intention/permission/header/list/index.js
similarity index 100%
rename from ui-v2/app/components/consul-external-source/index.js
rename to ui-v2/app/components/consul/intention/permission/header/list/index.js
diff --git a/ui-v2/app/components/consul-intention-permission-header-list/index.scss b/ui-v2/app/components/consul/intention/permission/header/list/index.scss
similarity index 100%
rename from ui-v2/app/components/consul-intention-permission-header-list/index.scss
rename to ui-v2/app/components/consul/intention/permission/header/list/index.scss
diff --git a/ui-v2/app/components/consul-intention-permission-header-list/layout.scss b/ui-v2/app/components/consul/intention/permission/header/list/layout.scss
similarity index 100%
rename from ui-v2/app/components/consul-intention-permission-header-list/layout.scss
rename to ui-v2/app/components/consul/intention/permission/header/list/layout.scss
diff --git a/ui-v2/app/components/consul-intention-permission-header-list/skin.scss b/ui-v2/app/components/consul/intention/permission/header/list/skin.scss
similarity index 100%
rename from ui-v2/app/components/consul-intention-permission-header-list/skin.scss
rename to ui-v2/app/components/consul/intention/permission/header/list/skin.scss
diff --git a/ui-v2/app/components/consul-intention-permission-list/index.hbs b/ui-v2/app/components/consul/intention/permission/list/index.hbs
similarity index 100%
rename from ui-v2/app/components/consul-intention-permission-list/index.hbs
rename to ui-v2/app/components/consul/intention/permission/list/index.hbs
diff --git a/ui-v2/app/components/consul-intention-permission-header-list/index.js b/ui-v2/app/components/consul/intention/permission/list/index.js
similarity index 100%
rename from ui-v2/app/components/consul-intention-permission-header-list/index.js
rename to ui-v2/app/components/consul/intention/permission/list/index.js
diff --git a/ui-v2/app/components/consul-intention-permission-list/index.scss b/ui-v2/app/components/consul/intention/permission/list/index.scss
similarity index 100%
rename from ui-v2/app/components/consul-intention-permission-list/index.scss
rename to ui-v2/app/components/consul/intention/permission/list/index.scss
diff --git a/ui-v2/app/components/consul-intention-permission-list/layout.scss b/ui-v2/app/components/consul/intention/permission/list/layout.scss
similarity index 100%
rename from ui-v2/app/components/consul-intention-permission-list/layout.scss
rename to ui-v2/app/components/consul/intention/permission/list/layout.scss
diff --git a/ui-v2/app/components/consul-intention-permission-list/skin.scss b/ui-v2/app/components/consul/intention/permission/list/skin.scss
similarity index 100%
rename from ui-v2/app/components/consul-intention-permission-list/skin.scss
rename to ui-v2/app/components/consul/intention/permission/list/skin.scss
diff --git a/ui-v2/app/components/consul-intention-search-bar/index.hbs b/ui-v2/app/components/consul/intention/search-bar/index.hbs
similarity index 100%
rename from ui-v2/app/components/consul-intention-search-bar/index.hbs
rename to ui-v2/app/components/consul/intention/search-bar/index.hbs
diff --git a/ui-v2/app/components/consul-intention-permission-list/index.js b/ui-v2/app/components/consul/intention/search-bar/index.js
similarity index 100%
rename from ui-v2/app/components/consul-intention-permission-list/index.js
rename to ui-v2/app/components/consul/intention/search-bar/index.js
diff --git a/ui-v2/app/components/consul-intention-view/index.hbs b/ui-v2/app/components/consul/intention/view/index.hbs
similarity index 96%
rename from ui-v2/app/components/consul-intention-view/index.hbs
rename to ui-v2/app/components/consul/intention/view/index.hbs
index e5772a7d1..bad52c24a 100644
--- a/ui-v2/app/components/consul-intention-view/index.hbs
+++ b/ui-v2/app/components/consul/intention/view/index.hbs
@@ -34,7 +34,7 @@
     </p>
   </div>
 
-  <ConsulIntentionPermissionList
+  <Consul::Intention::Permission::List
     @items={{item.Permissions}}
   />
 {{/if}}
diff --git a/ui-v2/app/components/consul-intention-search-bar/index.js b/ui-v2/app/components/consul/intention/view/index.js
similarity index 100%
rename from ui-v2/app/components/consul-intention-search-bar/index.js
rename to ui-v2/app/components/consul/intention/view/index.js
diff --git a/ui-v2/app/components/consul-kind/index.hbs b/ui-v2/app/components/consul/kind/index.hbs
similarity index 100%
rename from ui-v2/app/components/consul-kind/index.hbs
rename to ui-v2/app/components/consul/kind/index.hbs
diff --git a/ui-v2/app/components/consul-intention-view/index.js b/ui-v2/app/components/consul/kind/index.js
similarity index 100%
rename from ui-v2/app/components/consul-intention-view/index.js
rename to ui-v2/app/components/consul/kind/index.js
diff --git a/ui-v2/app/components/consul/kind/index.scss b/ui-v2/app/components/consul/kind/index.scss
new file mode 100644
index 000000000..f9bde2cc3
--- /dev/null
+++ b/ui-v2/app/components/consul/kind/index.scss
@@ -0,0 +1,6 @@
+.consul-kind {
+  @extend %pill-200, %frame-gray-600;
+}
+.consul-kind::before {
+  @extend %with-gateway-mask, %as-pseudo;
+}
diff --git a/ui-v2/app/components/consul-kv-form/index.hbs b/ui-v2/app/components/consul/kv/form/index.hbs
similarity index 100%
rename from ui-v2/app/components/consul-kv-form/index.hbs
rename to ui-v2/app/components/consul/kv/form/index.hbs
diff --git a/ui-v2/app/components/consul-kv-form/index.js b/ui-v2/app/components/consul/kv/form/index.js
similarity index 100%
rename from ui-v2/app/components/consul-kv-form/index.js
rename to ui-v2/app/components/consul/kv/form/index.js
diff --git a/ui-v2/app/components/consul-kv-list/index.hbs b/ui-v2/app/components/consul/kv/list/index.hbs
similarity index 100%
rename from ui-v2/app/components/consul-kv-list/index.hbs
rename to ui-v2/app/components/consul/kv/list/index.hbs
diff --git a/ui-v2/app/components/consul-kv-list/index.js b/ui-v2/app/components/consul/kv/list/index.js
similarity index 100%
rename from ui-v2/app/components/consul-kv-list/index.js
rename to ui-v2/app/components/consul/kv/list/index.js
diff --git a/ui-v2/app/components/consul-kv-list/pageobject.js b/ui-v2/app/components/consul/kv/list/pageobject.js
similarity index 100%
rename from ui-v2/app/components/consul-kv-list/pageobject.js
rename to ui-v2/app/components/consul/kv/list/pageobject.js
diff --git a/ui-v2/app/components/consul-loader/README.mdx b/ui-v2/app/components/consul/loader/README.mdx
similarity index 56%
rename from ui-v2/app/components/consul-loader/README.mdx
rename to ui-v2/app/components/consul/loader/README.mdx
index b65305eeb..273d3f9fa 100644
--- a/ui-v2/app/components/consul-loader/README.mdx
+++ b/ui-v2/app/components/consul/loader/README.mdx
@@ -1,8 +1,8 @@
-## ConsulLoader
+## Consul::Loader
 
-`<ConsulLoader />`
+`<Consul::Loader />`
 
-Simple template-only component to show the circulr animated Consul loader animation.
+Simple template-only component to show the circular animated Consul loader animation.
 
 | Argument | Type | Default | Description |
 | --- | --- | --- | --- |
diff --git a/ui-v2/app/components/consul-loader/index.hbs b/ui-v2/app/components/consul/loader/index.hbs
similarity index 98%
rename from ui-v2/app/components/consul-loader/index.hbs
rename to ui-v2/app/components/consul/loader/index.hbs
index 435613c5e..80b7b3818 100644
--- a/ui-v2/app/components/consul-loader/index.hbs
+++ b/ui-v2/app/components/consul/loader/index.hbs
@@ -1,4 +1,7 @@
-<div class="consul-loader" ...attributes>
+<div
+  class="consul-loader"
+  ...attributes
+>
   <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="44px" height="44px" viewBox="0 0 44 44" version="1.1">
       <g>
           <circle r="1" cx="27" cy="2" style="transform-origin: 27px 2px" />
diff --git a/ui-v2/app/components/consul-session-form/index.hbs b/ui-v2/app/components/consul/lock-session/form/index.hbs
similarity index 100%
rename from ui-v2/app/components/consul-session-form/index.hbs
rename to ui-v2/app/components/consul/lock-session/form/index.hbs
diff --git a/ui-v2/app/components/consul-policy-search-bar/index.js b/ui-v2/app/components/consul/lock-session/form/index.js
similarity index 100%
rename from ui-v2/app/components/consul-policy-search-bar/index.js
rename to ui-v2/app/components/consul/lock-session/form/index.js
diff --git a/ui-v2/app/components/consul-lock-session-list/README.mdx b/ui-v2/app/components/consul/lock-session/list/README.mdx
similarity index 100%
rename from ui-v2/app/components/consul-lock-session-list/README.mdx
rename to ui-v2/app/components/consul/lock-session/list/README.mdx
diff --git a/ui-v2/app/components/consul-lock-session-list/index.hbs b/ui-v2/app/components/consul/lock-session/list/index.hbs
similarity index 100%
rename from ui-v2/app/components/consul-lock-session-list/index.hbs
rename to ui-v2/app/components/consul/lock-session/list/index.hbs
diff --git a/ui-v2/app/components/consul-kind/index.js b/ui-v2/app/components/consul/lock-session/list/index.js
similarity index 100%
rename from ui-v2/app/components/consul-kind/index.js
rename to ui-v2/app/components/consul/lock-session/list/index.js
diff --git a/ui-v2/app/components/consul-metadata-list/README.mdx b/ui-v2/app/components/consul/metadata/list/README.mdx
similarity index 100%
rename from ui-v2/app/components/consul-metadata-list/README.mdx
rename to ui-v2/app/components/consul/metadata/list/README.mdx
diff --git a/ui-v2/app/components/consul-metadata-list/index.hbs b/ui-v2/app/components/consul/metadata/list/index.hbs
similarity index 100%
rename from ui-v2/app/components/consul-metadata-list/index.hbs
rename to ui-v2/app/components/consul/metadata/list/index.hbs
diff --git a/ui-v2/app/components/consul-loader/index.js b/ui-v2/app/components/consul/metadata/list/index.js
similarity index 100%
rename from ui-v2/app/components/consul-loader/index.js
rename to ui-v2/app/components/consul/metadata/list/index.js
diff --git a/ui-v2/app/components/consul-node-list/index.hbs b/ui-v2/app/components/consul/node/list/index.hbs
similarity index 100%
rename from ui-v2/app/components/consul-node-list/index.hbs
rename to ui-v2/app/components/consul/node/list/index.hbs
diff --git a/ui-v2/app/components/consul-lock-session-list/index.js b/ui-v2/app/components/consul/node/list/index.js
similarity index 100%
rename from ui-v2/app/components/consul-lock-session-list/index.js
rename to ui-v2/app/components/consul/node/list/index.js
diff --git a/ui-v2/app/components/consul-node-search-bar/index.hbs b/ui-v2/app/components/consul/node/search-bar/index.hbs
similarity index 100%
rename from ui-v2/app/components/consul-node-search-bar/index.hbs
rename to ui-v2/app/components/consul/node/search-bar/index.hbs
diff --git a/ui-v2/app/components/consul-metadata-list/index.js b/ui-v2/app/components/consul/node/search-bar/index.js
similarity index 100%
rename from ui-v2/app/components/consul-metadata-list/index.js
rename to ui-v2/app/components/consul/node/search-bar/index.js
diff --git a/ui-v2/app/components/consul-nspace-list/README.mdx b/ui-v2/app/components/consul/nspace/list/README.mdx
similarity index 100%
rename from ui-v2/app/components/consul-nspace-list/README.mdx
rename to ui-v2/app/components/consul/nspace/list/README.mdx
diff --git a/ui-v2/app/components/consul-nspace-list/index.hbs b/ui-v2/app/components/consul/nspace/list/index.hbs
similarity index 96%
rename from ui-v2/app/components/consul-nspace-list/index.hbs
rename to ui-v2/app/components/consul/nspace/list/index.hbs
index a156fb072..ad7e9b238 100644
--- a/ui-v2/app/components/consul-nspace-list/index.hbs
+++ b/ui-v2/app/components/consul/nspace/list/index.hbs
@@ -17,7 +17,7 @@
         </dd>
       </dl>
   {{#if (env 'CONSUL_ACLS_ENABLED')}}
-      <ConsulTokenRulesetList @item={{item}} />
+      <Consul::Token::Ruleset::List @item={{item}} />
   {{/if}}
     </BlockSlot>
     <BlockSlot @name="actions" as |Actions|>
diff --git a/ui-v2/app/components/consul-nspace-list/index.js b/ui-v2/app/components/consul/nspace/list/index.js
similarity index 100%
rename from ui-v2/app/components/consul-nspace-list/index.js
rename to ui-v2/app/components/consul/nspace/list/index.js
diff --git a/ui-v2/app/components/consul-nspace-list/pageobject.js b/ui-v2/app/components/consul/nspace/list/pageobject.js
similarity index 100%
rename from ui-v2/app/components/consul-nspace-list/pageobject.js
rename to ui-v2/app/components/consul/nspace/list/pageobject.js
diff --git a/ui-v2/app/components/consul-nspace-search-bar/index.hbs b/ui-v2/app/components/consul/nspace/search-bar/index.hbs
similarity index 100%
rename from ui-v2/app/components/consul-nspace-search-bar/index.hbs
rename to ui-v2/app/components/consul/nspace/search-bar/index.hbs
diff --git a/ui-v2/app/components/consul-node-list/index.js b/ui-v2/app/components/consul/nspace/search-bar/index.js
similarity index 100%
rename from ui-v2/app/components/consul-node-list/index.js
rename to ui-v2/app/components/consul/nspace/search-bar/index.js
diff --git a/ui-v2/app/components/consul-policy-list/README.mdx b/ui-v2/app/components/consul/policy/list/README.mdx
similarity index 100%
rename from ui-v2/app/components/consul-policy-list/README.mdx
rename to ui-v2/app/components/consul/policy/list/README.mdx
diff --git a/ui-v2/app/components/consul-policy-list/index.hbs b/ui-v2/app/components/consul/policy/list/index.hbs
similarity index 100%
rename from ui-v2/app/components/consul-policy-list/index.hbs
rename to ui-v2/app/components/consul/policy/list/index.hbs
diff --git a/ui-v2/app/components/consul-node-search-bar/index.js b/ui-v2/app/components/consul/policy/list/index.js
similarity index 100%
rename from ui-v2/app/components/consul-node-search-bar/index.js
rename to ui-v2/app/components/consul/policy/list/index.js
diff --git a/ui-v2/app/components/consul-policy-list/pageobject.js b/ui-v2/app/components/consul/policy/list/pageobject.js
similarity index 100%
rename from ui-v2/app/components/consul-policy-list/pageobject.js
rename to ui-v2/app/components/consul/policy/list/pageobject.js
diff --git a/ui-v2/app/components/consul-policy-search-bar/index.hbs b/ui-v2/app/components/consul/policy/search-bar/index.hbs
similarity index 100%
rename from ui-v2/app/components/consul-policy-search-bar/index.hbs
rename to ui-v2/app/components/consul/policy/search-bar/index.hbs
diff --git a/ui-v2/app/components/consul-role-search-bar/index.js b/ui-v2/app/components/consul/policy/search-bar/index.js
similarity index 100%
rename from ui-v2/app/components/consul-role-search-bar/index.js
rename to ui-v2/app/components/consul/policy/search-bar/index.js
diff --git a/ui-v2/app/components/consul-role-list/README.mdx b/ui-v2/app/components/consul/role/list/README.mdx
similarity index 100%
rename from ui-v2/app/components/consul-role-list/README.mdx
rename to ui-v2/app/components/consul/role/list/README.mdx
diff --git a/ui-v2/app/components/consul-role-list/index.hbs b/ui-v2/app/components/consul/role/list/index.hbs
similarity index 96%
rename from ui-v2/app/components/consul-role-list/index.hbs
rename to ui-v2/app/components/consul/role/list/index.hbs
index ac3d734c8..d45d4398f 100644
--- a/ui-v2/app/components/consul-role-list/index.hbs
+++ b/ui-v2/app/components/consul/role/list/index.hbs
@@ -4,7 +4,7 @@
       <a data-test-role={{item.Name}} href={{href-to 'dc.acls.roles.edit' item.ID}}>{{item.Name}}</a>
     </BlockSlot>
     <BlockSlot @name="details">
-      <ConsulTokenRulesetList @item={{item}} />
+      <Consul::Token::Ruleset::List @item={{item}} />
       <dl>
         <dt>Description</dt>
         <dd data-test-description>
diff --git a/ui-v2/app/components/consul-nspace-search-bar/index.js b/ui-v2/app/components/consul/role/list/index.js
similarity index 100%
rename from ui-v2/app/components/consul-nspace-search-bar/index.js
rename to ui-v2/app/components/consul/role/list/index.js
diff --git a/ui-v2/app/components/consul-role-list/pageobject.js b/ui-v2/app/components/consul/role/list/pageobject.js
similarity index 100%
rename from ui-v2/app/components/consul-role-list/pageobject.js
rename to ui-v2/app/components/consul/role/list/pageobject.js
diff --git a/ui-v2/app/components/consul-role-search-bar/index.hbs b/ui-v2/app/components/consul/role/search-bar/index.hbs
similarity index 100%
rename from ui-v2/app/components/consul-role-search-bar/index.hbs
rename to ui-v2/app/components/consul/role/search-bar/index.hbs
diff --git a/ui-v2/app/components/consul-session-form/index.js b/ui-v2/app/components/consul/role/search-bar/index.js
similarity index 100%
rename from ui-v2/app/components/consul-session-form/index.js
rename to ui-v2/app/components/consul/role/search-bar/index.js
diff --git a/ui-v2/app/components/consul-service-instance-list/index.hbs b/ui-v2/app/components/consul/service-instance/list/index.hbs
similarity index 84%
rename from ui-v2/app/components/consul-service-instance-list/index.hbs
rename to ui-v2/app/components/consul/service-instance/list/index.hbs
index 55b0ee364..e305b9035 100644
--- a/ui-v2/app/components/consul-service-instance-list/index.hbs
+++ b/ui-v2/app/components/consul/service-instance/list/index.hbs
@@ -13,12 +13,12 @@
     </BlockSlot>
     <BlockSlot @name="details">
     {{#if checks}}
-      <ConsulExternalSource @item={{item}} />
-      <ConsulInstanceChecks @type="service" @items={{get checks item.Service}} />
+      <Consul::ExternalSource @item={{item}} />
+      <Consul::InstanceChecks @type="service" @items={{get checks item.Service}} />
     {{else}}
-      <ConsulExternalSource @item={{item.Service}} />
-      <ConsulInstanceChecks @type="service" @items={{filter-by 'ServiceID' '' item.Checks}} />
-      <ConsulInstanceChecks @type="node" @items={{reject-by 'ServiceID' '' item.Checks}} />
+      <Consul::ExternalSource @item={{item.Service}} />
+      <Consul::InstanceChecks @type="service" @items={{filter-by 'ServiceID' '' item.Checks}} />
+      <Consul::InstanceChecks @type="node" @items={{reject-by 'ServiceID' '' item.Checks}} />
     {{/if}}
 {{#if item.ProxyInstance}}
       <dl class="mesh">
diff --git a/ui-v2/app/components/consul-policy-list/index.js b/ui-v2/app/components/consul/service-instance/list/index.js
similarity index 100%
rename from ui-v2/app/components/consul-policy-list/index.js
rename to ui-v2/app/components/consul/service-instance/list/index.js
diff --git a/ui-v2/app/components/consul-service-instance-search-bar/index.hbs b/ui-v2/app/components/consul/service-instance/search-bar/index.hbs
similarity index 100%
rename from ui-v2/app/components/consul-service-instance-search-bar/index.hbs
rename to ui-v2/app/components/consul/service-instance/search-bar/index.hbs
diff --git a/ui-v2/app/components/consul-role-list/index.js b/ui-v2/app/components/consul/service-instance/search-bar/index.js
similarity index 100%
rename from ui-v2/app/components/consul-role-list/index.js
rename to ui-v2/app/components/consul/service-instance/search-bar/index.js
diff --git a/ui-v2/app/components/consul-service-list/index.hbs b/ui-v2/app/components/consul/service/list/index.hbs
similarity index 96%
rename from ui-v2/app/components/consul-service-list/index.hbs
rename to ui-v2/app/components/consul/service/list/index.hbs
index a0fb3305c..4d29021fd 100644
--- a/ui-v2/app/components/consul-service-list/index.hbs
+++ b/ui-v2/app/components/consul/service/list/index.hbs
@@ -44,8 +44,8 @@
     </dl>
   {{/if}}
 {{/if}}
-    <ConsulKind @item={{item}} />
-    <ConsulExternalSource @item={{item}} />
+    <Consul::Kind @item={{item}} />
+    <Consul::ExternalSource @item={{item}} />
   {{#if (and (not-eq item.InstanceCount 0) (and (not-eq item.Kind 'terminating-gateway') (not-eq item.Kind 'ingress-gateway'))) }}
     <span>
       {{format-number item.InstanceCount}} {{pluralize item.InstanceCount 'Instance' without-count=true}}
diff --git a/ui-v2/app/components/consul-service-list/index.js b/ui-v2/app/components/consul/service/list/index.js
similarity index 100%
rename from ui-v2/app/components/consul-service-list/index.js
rename to ui-v2/app/components/consul/service/list/index.js
diff --git a/ui-v2/app/components/consul-service-search-bar/index.hbs b/ui-v2/app/components/consul/service/search-bar/index.hbs
similarity index 100%
rename from ui-v2/app/components/consul-service-search-bar/index.hbs
rename to ui-v2/app/components/consul/service/search-bar/index.hbs
diff --git a/ui-v2/app/components/consul-service-instance-list/index.js b/ui-v2/app/components/consul/service/search-bar/index.js
similarity index 100%
rename from ui-v2/app/components/consul-service-instance-list/index.js
rename to ui-v2/app/components/consul/service/search-bar/index.js
diff --git a/ui-v2/app/components/consul-token-list/README.mdx b/ui-v2/app/components/consul/token/list/README.mdx
similarity index 100%
rename from ui-v2/app/components/consul-token-list/README.mdx
rename to ui-v2/app/components/consul/token/list/README.mdx
diff --git a/ui-v2/app/components/consul-token-list/index.hbs b/ui-v2/app/components/consul/token/list/index.hbs
similarity index 98%
rename from ui-v2/app/components/consul-token-list/index.hbs
rename to ui-v2/app/components/consul/token/list/index.hbs
index 40160cca7..c3a35933c 100644
--- a/ui-v2/app/components/consul-token-list/index.hbs
+++ b/ui-v2/app/components/consul/token/list/index.hbs
@@ -19,7 +19,7 @@
               {{if item.Local 'local' 'global' }}
           </dd>
         </dl>
-        <ConsulTokenRulesetList @item={{item}} />
+        <Consul::Token::Ruleset::List @item={{item}} />
         <dl>
           <dt>Description</dt>
           <dd data-test-description>
diff --git a/ui-v2/app/components/consul-service-instance-search-bar/index.js b/ui-v2/app/components/consul/token/list/index.js
similarity index 100%
rename from ui-v2/app/components/consul-service-instance-search-bar/index.js
rename to ui-v2/app/components/consul/token/list/index.js
diff --git a/ui-v2/app/components/consul-token-list/pageobject.js b/ui-v2/app/components/consul/token/list/pageobject.js
similarity index 100%
rename from ui-v2/app/components/consul-token-list/pageobject.js
rename to ui-v2/app/components/consul/token/list/pageobject.js
diff --git a/ui-v2/app/components/consul-token-ruleset-list/README.mdx b/ui-v2/app/components/consul/token/ruleset/list/README.mdx
similarity index 100%
rename from ui-v2/app/components/consul-token-ruleset-list/README.mdx
rename to ui-v2/app/components/consul/token/ruleset/list/README.mdx
diff --git a/ui-v2/app/components/consul-token-ruleset-list/index.hbs b/ui-v2/app/components/consul/token/ruleset/list/index.hbs
similarity index 100%
rename from ui-v2/app/components/consul-token-ruleset-list/index.hbs
rename to ui-v2/app/components/consul/token/ruleset/list/index.hbs
diff --git a/ui-v2/app/components/consul-service-search-bar/index.js b/ui-v2/app/components/consul/token/ruleset/list/index.js
similarity index 100%
rename from ui-v2/app/components/consul-service-search-bar/index.js
rename to ui-v2/app/components/consul/token/ruleset/list/index.js
diff --git a/ui-v2/app/components/consul-token-search-bar/index.hbs b/ui-v2/app/components/consul/token/search-bar/index.hbs
similarity index 100%
rename from ui-v2/app/components/consul-token-search-bar/index.hbs
rename to ui-v2/app/components/consul/token/search-bar/index.hbs
diff --git a/ui-v2/app/components/consul-token-search-bar/index.js b/ui-v2/app/components/consul/token/search-bar/index.js
similarity index 100%
rename from ui-v2/app/components/consul-token-search-bar/index.js
rename to ui-v2/app/components/consul/token/search-bar/index.js
diff --git a/ui-v2/app/components/tomography-graph/index.hbs b/ui-v2/app/components/consul/tomography/graph/index.hbs
similarity index 100%
rename from ui-v2/app/components/tomography-graph/index.hbs
rename to ui-v2/app/components/consul/tomography/graph/index.hbs
diff --git a/ui-v2/app/components/tomography-graph/index.js b/ui-v2/app/components/consul/tomography/graph/index.js
similarity index 100%
rename from ui-v2/app/components/tomography-graph/index.js
rename to ui-v2/app/components/consul/tomography/graph/index.js
diff --git a/ui-v2/app/components/consul-upstream-instance-list/index.hbs b/ui-v2/app/components/consul/upstream-instance/list/index.hbs
similarity index 100%
rename from ui-v2/app/components/consul-upstream-instance-list/index.hbs
rename to ui-v2/app/components/consul/upstream-instance/list/index.hbs
diff --git a/ui-v2/app/components/consul-token-list/index.js b/ui-v2/app/components/consul/upstream-instance/list/index.js
similarity index 100%
rename from ui-v2/app/components/consul-token-list/index.js
rename to ui-v2/app/components/consul/upstream-instance/list/index.js
diff --git a/ui-v2/app/components/consul-upstream-list/index.hbs b/ui-v2/app/components/consul/upstream/list/index.hbs
similarity index 100%
rename from ui-v2/app/components/consul-upstream-list/index.hbs
rename to ui-v2/app/components/consul/upstream/list/index.hbs
diff --git a/ui-v2/app/components/consul-upstream-list/index.js b/ui-v2/app/components/consul/upstream/list/index.js
similarity index 100%
rename from ui-v2/app/components/consul-upstream-list/index.js
rename to ui-v2/app/components/consul/upstream/list/index.js
diff --git a/ui-v2/app/components/consul-upstream-search-bar/index.hbs b/ui-v2/app/components/consul/upstream/search-bar/index.hbs
similarity index 100%
rename from ui-v2/app/components/consul-upstream-search-bar/index.hbs
rename to ui-v2/app/components/consul/upstream/search-bar/index.hbs
diff --git a/ui-v2/app/components/consul-token-ruleset-list/index.js b/ui-v2/app/components/consul/upstream/search-bar/index.js
similarity index 100%
rename from ui-v2/app/components/consul-token-ruleset-list/index.js
rename to ui-v2/app/components/consul/upstream/search-bar/index.js
diff --git a/ui-v2/app/components/data-loader/index.hbs b/ui-v2/app/components/data-loader/index.hbs
index 2c55d9ee2..00db04484 100644
--- a/ui-v2/app/components/data-loader/index.hbs
+++ b/ui-v2/app/components/data-loader/index.hbs
@@ -36,7 +36,7 @@
     {{#yield-slot name="loading"}}
       {{yield api}}
     {{else}}
-      <ConsulLoader />
+      <Consul::Loader />
     {{/yield-slot}}
   </State>
 
diff --git a/ui-v2/app/styles/components.scss b/ui-v2/app/styles/components.scss
index dc9599fcf..5bcb175de 100644
--- a/ui-v2/app/styles/components.scss
+++ b/ui-v2/app/styles/components.scss
@@ -61,11 +61,14 @@
  * when convienient
  **/
 
+@import 'consul-ui/components/consul/exposed-path/list';
+@import 'consul-ui/components/consul/external-source';
+@import 'consul-ui/components/consul/kind';
 @import 'consul-ui/components/consul/intention/list';
-@import 'consul-ui/components/consul-intention-form/fieldsets';
-@import 'consul-ui/components/consul-intention-permission-list';
-@import 'consul-ui/components/consul-intention-permission-form';
-@import 'consul-ui/components/consul-intention-permission-header-list';
+@import 'consul-ui/components/consul/intention/form/fieldsets';
+@import 'consul-ui/components/consul/intention/permission/list';
+@import 'consul-ui/components/consul/intention/permission/form';
+@import 'consul-ui/components/consul/intention/permission/header/list';
 @import 'consul-ui/components/role-selector';
 @import 'consul-ui/components/topology-metrics';
 @import 'consul-ui/components/topology-metrics/series';
diff --git a/ui-v2/app/styles/components/composite-row.scss b/ui-v2/app/styles/components/composite-row.scss
index bed4365d9..115571cad 100644
--- a/ui-v2/app/styles/components/composite-row.scss
+++ b/ui-v2/app/styles/components/composite-row.scss
@@ -1,7 +1,6 @@
 @import './composite-row/index';
 
 .proxy-upstreams > ul > li,
-.proxy-exposed-paths > ul > li,
 .list-collection > ul > li:not(:first-child) {
   @extend %composite-row;
 }
@@ -35,7 +34,6 @@
   overflow-x: visible !important;
 }
 .consul-intention-permission-list > ul,
-.proxy-exposed-paths > ul,
 .proxy-upstreams > ul {
   border-top: 1px solid $gray-200;
 }
diff --git a/ui-v2/app/styles/components/pill.scss b/ui-v2/app/styles/components/pill.scss
index d103eb89e..8b2cbacc5 100644
--- a/ui-v2/app/styles/components/pill.scss
+++ b/ui-v2/app/styles/components/pill.scss
@@ -1,7 +1,5 @@
 span.policy-service-identity,
 span.policy-node-identity,
-.consul-external-source,
-.consul-kind,
 .leader {
   @extend %pill-200, %frame-gray-600;
 }
@@ -32,9 +30,6 @@ span.policy-service-identity::before {
 %pill.aws::before {
   @extend %with-logo-aws-color-icon, %as-pseudo;
 }
-%pill.consul-kind::before {
-  @extend %with-gateway-mask, %as-pseudo;
-}
 %pill.leader::before {
   @extend %with-star-outline-mask, %as-pseudo;
 }
diff --git a/ui-v2/app/templates/application.hbs b/ui-v2/app/templates/application.hbs
index 5b4719d5e..24ff2b9ad 100644
--- a/ui-v2/app/templates/application.hbs
+++ b/ui-v2/app/templates/application.hbs
@@ -15,6 +15,6 @@
   as |o|>
     {{outlet}}
   </Outlet>
-    <ConsulLoader class="view-loader" />
+    <Consul::Loader class="view-loader" />
   </HashicorpConsul>
 {{/if}}
diff --git a/ui-v2/app/templates/dc/acls/policies/index.hbs b/ui-v2/app/templates/dc/acls/policies/index.hbs
index 6d222d43a..49813c0b1 100644
--- a/ui-v2/app/templates/dc/acls/policies/index.hbs
+++ b/ui-v2/app/templates/dc/acls/policies/index.hbs
@@ -30,7 +30,7 @@
       </BlockSlot>
       <BlockSlot @name="toolbar">
       {{#if (gt items.length 0) }}
-        <ConsulPolicySearchBar
+        <Consul::Policy::SearchBar
           @search={{search}}
           @onsearch={{action (mut search) value="target.value"}}
 
@@ -50,7 +50,7 @@
   {{#let (sort-by (comparator 'policy' sort) filtered) as |sorted|}}
         <ChangeableSet @dispatcher={{searchable 'policy' sorted}} @terms={{search}}>
           <BlockSlot @name="set" as |searched|>
-            <ConsulPolicyList
+            <Consul::Policy::List
               @items={{searched}}
               @ondelete={{action send 'delete'}}
             />
diff --git a/ui-v2/app/templates/dc/acls/roles/index.hbs b/ui-v2/app/templates/dc/acls/roles/index.hbs
index e6b374fe6..46d0a1698 100644
--- a/ui-v2/app/templates/dc/acls/roles/index.hbs
+++ b/ui-v2/app/templates/dc/acls/roles/index.hbs
@@ -27,7 +27,7 @@
   </BlockSlot>
   <BlockSlot @name="toolbar">
   {{#if (gt items.length 0) }}
-    <ConsulRoleSearchBar
+    <Consul::Role::SearchBar
       @search={{search}}
       @onsearch={{action (mut search) value="target.value"}}
 
@@ -40,7 +40,7 @@
   {{#let (sort-by (comparator 'role' sort) items) as |sorted|}}
     <ChangeableSet @dispatcher={{searchable 'role' sorted}} @terms={{search}}>
       <BlockSlot @name="set" as |filtered|>
-        <ConsulRoleList
+        <Consul::Role::List
           @items={{filtered}}
           @ondelete={{action send 'delete'}}
         />
diff --git a/ui-v2/app/templates/dc/acls/tokens/index.hbs b/ui-v2/app/templates/dc/acls/tokens/index.hbs
index 5968c9e9f..8a251e451 100644
--- a/ui-v2/app/templates/dc/acls/tokens/index.hbs
+++ b/ui-v2/app/templates/dc/acls/tokens/index.hbs
@@ -30,7 +30,7 @@
       </BlockSlot>
       <BlockSlot @name="toolbar">
     {{#if (gt items.length 0)}}
-        <ConsulTokenSearchBar
+        <Consul::Token::SearchBar
           @search={{search}}
           @onsearch={{action (mut search) value="target.value"}}
 
@@ -52,7 +52,7 @@
       {{#let (sort-by (comparator 'token' sort) filtered) as |sorted|}}
         <ChangeableSet @dispatcher={{searchable 'token' sorted}} @terms={{search}}>
           <BlockSlot @name="set" as |searched|>
-            <ConsulTokenList
+            <Consul::Token::List
               @items={{searched}}
               @token={{token}}
               @onuse={{action send 'use'}}
diff --git a/ui-v2/app/templates/dc/intentions/edit.hbs b/ui-v2/app/templates/dc/intentions/edit.hbs
index 3180d600a..d837c857d 100644
--- a/ui-v2/app/templates/dc/intentions/edit.hbs
+++ b/ui-v2/app/templates/dc/intentions/edit.hbs
@@ -23,7 +23,7 @@
         </h1>
     </BlockSlot>
     <BlockSlot @name="content">
-      <ConsulIntentionForm
+      <Consul::Intention::Form
         @item={{item}}
         @dc={{dc}}
         @nspace={{nspace}}
diff --git a/ui-v2/app/templates/dc/intentions/index.hbs b/ui-v2/app/templates/dc/intentions/index.hbs
index 7f109a5f9..fefd58c64 100644
--- a/ui-v2/app/templates/dc/intentions/index.hbs
+++ b/ui-v2/app/templates/dc/intentions/index.hbs
@@ -23,7 +23,7 @@
         </BlockSlot>
         <BlockSlot @name="toolbar">
   {{#if (gt items.length 0) }}
-          <ConsulIntentionSearchBar
+          <Consul::Intention::SearchBar
             @search={{search}}
             @onsearch={{action (mut search) value="target.value"}}
 
diff --git a/ui-v2/app/templates/dc/kv/edit.hbs b/ui-v2/app/templates/dc/kv/edit.hbs
index 894921ad8..5311dbc35 100644
--- a/ui-v2/app/templates/dc/kv/edit.hbs
+++ b/ui-v2/app/templates/dc/kv/edit.hbs
@@ -29,7 +29,7 @@
       <strong>Warning.</strong> This KV has a lock session. You can edit KV's with lock sessions, but we recommend doing so with care, or not doing so at all. It may negatively impact the active node it's associated with. See below for more details on the Lock Session and see <a href="{{env 'CONSUL_DOCS_URL'}}/internals/sessions.html" target="_blank" rel="noopener noreferrer">our documentation</a> for more information.
     </p>
   {{/if}}
-    <ConsulKvForm
+    <Consul::Kv::Form
       @item={{item}}
       @dc={{dc}}
       @nspace={{nspace}}
@@ -37,7 +37,7 @@
       @parent={{parent}}
     />
   {{#if session}}
-    <ConsulSessionForm
+    <Consul::LockSession::Form
       @item={{session}}
       @dc={{dc}}
       @nspace={{nspace}}
diff --git a/ui-v2/app/templates/dc/kv/index.hbs b/ui-v2/app/templates/dc/kv/index.hbs
index c6b056067..f42a1f59a 100644
--- a/ui-v2/app/templates/dc/kv/index.hbs
+++ b/ui-v2/app/templates/dc/kv/index.hbs
@@ -78,7 +78,7 @@
     {{#let (sort-by (comparator 'kv' sort) items) as |sorted|}}
       <ChangeableSet @dispatcher={{searchable 'kv' sorted}} @terms={{search}}>
         <BlockSlot @name="content" as |filtered|>
-          <ConsulKvList
+          <Consul::Kv::List
             @items={{filtered}}
             @parent={{parent}}
             @ondelete={{refresh-route}}
@@ -111,7 +111,7 @@
                 </li>
               </BlockSlot>
             </EmptyState>
-          </ConsulKvList>
+          </Consul::Kv::List>
         </BlockSlot>
       </ChangeableSet>
       {{/let}}
diff --git a/ui-v2/app/templates/dc/nodes/index.hbs b/ui-v2/app/templates/dc/nodes/index.hbs
index f35ac3bf7..ccff471e3 100644
--- a/ui-v2/app/templates/dc/nodes/index.hbs
+++ b/ui-v2/app/templates/dc/nodes/index.hbs
@@ -14,7 +14,7 @@
     </BlockSlot>
     <BlockSlot @name="toolbar">
     {{#if (gt items.length 0) }}
-        <ConsulNodeSearchBar
+        <Consul::Node::SearchBar
           @search={{search}}
           @onsearch={{action (mut search) value="target.value"}}
 
@@ -33,7 +33,7 @@
   {{#let (sort-by (comparator 'node' sort) filtered) as |sorted|}}
       <ChangeableSet @dispatcher={{searchable 'node' sorted}} @terms={{search}}>
         <BlockSlot @name="set" as |searched|>
-          <ConsulNodeList @items={{searched}} @leader={{leader}} />
+          <Consul::Node::List @items={{searched}} @leader={{leader}} />
         </BlockSlot>
         <BlockSlot @name="empty">
           <EmptyState>
diff --git a/ui-v2/app/templates/dc/nodes/show/metadata.hbs b/ui-v2/app/templates/dc/nodes/show/metadata.hbs
index 5f985d9e4..2ada7ced8 100644
--- a/ui-v2/app/templates/dc/nodes/show/metadata.hbs
+++ b/ui-v2/app/templates/dc/nodes/show/metadata.hbs
@@ -1,7 +1,7 @@
 <div id="metadata" class="tab-section">
   <div role="tabpanel">
 {{#if item.Meta}}
-  <ConsulMetadataList @items={{object-entries item.Meta}} />
+  <Consul::Metadata::List @items={{object-entries item.Meta}} />
 {{else}}
   <EmptyState>
     <BlockSlot @name="body">
diff --git a/ui-v2/app/templates/dc/nodes/show/rtt.hbs b/ui-v2/app/templates/dc/nodes/show/rtt.hbs
index b1ed184d5..f6715fbd7 100644
--- a/ui-v2/app/templates/dc/nodes/show/rtt.hbs
+++ b/ui-v2/app/templates/dc/nodes/show/rtt.hbs
@@ -22,7 +22,7 @@
           </dd>
       </dl>
     </div>
-    <TomographyGraph @tomography={{tomography}} />
+    <Consul::Tomography::Graph @tomography={{tomography}} />
   </div>
 </div>
 
diff --git a/ui-v2/app/templates/dc/nodes/show/services.hbs b/ui-v2/app/templates/dc/nodes/show/services.hbs
index 178b12228..76c563841 100644
--- a/ui-v2/app/templates/dc/nodes/show/services.hbs
+++ b/ui-v2/app/templates/dc/nodes/show/services.hbs
@@ -11,7 +11,7 @@
   {{/if}}
      <ChangeableSet @dispatcher={{searchable 'nodeservice' items}} @terms={{search}}>
       <BlockSlot @name="set" as |filtered|>
-        <ConsulServiceInstanceList @routeName="dc.services.show" @items={{filtered}} @checks={{checks}}/>
+        <Consul::ServiceInstance::List @routeName="dc.services.show" @items={{filtered}} @checks={{checks}}/>
       </BlockSlot>
       <BlockSlot @name="empty">
         <EmptyState>
diff --git a/ui-v2/app/templates/dc/nodes/show/sessions.hbs b/ui-v2/app/templates/dc/nodes/show/sessions.hbs
index f0aad75d2..ba4b0498c 100644
--- a/ui-v2/app/templates/dc/nodes/show/sessions.hbs
+++ b/ui-v2/app/templates/dc/nodes/show/sessions.hbs
@@ -2,7 +2,7 @@
 <div id="lock-sessions" class="tab-section">
   <div role="tabpanel">
 {{#if (gt sessions.length 0)}}
-    <ConsulLockSessionList @items={{sessions}} @onInvalidate={{action send 'invalidateSession'}}/>
+    <Consul::LockSession::List @items={{sessions}} @onInvalidate={{action send 'invalidateSession'}}/>
 {{else}}
     <EmptyState>
       <BlockSlot @name="body">
diff --git a/ui-v2/app/templates/dc/nspaces/index.hbs b/ui-v2/app/templates/dc/nspaces/index.hbs
index 25fb43c91..4f4bd4277 100644
--- a/ui-v2/app/templates/dc/nspaces/index.hbs
+++ b/ui-v2/app/templates/dc/nspaces/index.hbs
@@ -15,7 +15,7 @@
   </BlockSlot>
   <BlockSlot @name="toolbar">
   {{#if (gt items.length 0)}}
-        <ConsulNspaceSearchBar
+        <Consul::Nspace::SearchBar
           @search={{search}}
           @onsearch={{action (mut search) value="target.value"}}
 
@@ -29,7 +29,7 @@
   {{#let (sort-by (comparator 'nspace' sort) items) as |sorted|}}
     <ChangeableSet @dispatcher={{searchable 'nspace' sorted}} @terms={{search}}>
       <BlockSlot @name="set" as |filtered|>
-        <ConsulNspaceList
+        <Consul::Nspace::List
           @items={{filtered}}
           @ondelete={{queue (action send 'delete')}}
         >
@@ -61,7 +61,7 @@
               </li>
             </BlockSlot>
           </EmptyState>
-        </ConsulNspaceList>
+        </Consul::Nspace::List>
       </BlockSlot>
     </ChangeableSet>
   {{/let}}
diff --git a/ui-v2/app/templates/dc/services/index.hbs b/ui-v2/app/templates/dc/services/index.hbs
index 1365e8780..19d044b9a 100644
--- a/ui-v2/app/templates/dc/services/index.hbs
+++ b/ui-v2/app/templates/dc/services/index.hbs
@@ -18,7 +18,7 @@
       </BlockSlot>
       <BlockSlot @name="toolbar">
         {{#if (gt services.length 0) }}
-          <ConsulServiceSearchBar
+          <Consul::Service::SearchBar
             @sources={{externalSources}}
             @search={{search}}
             @onsearch={{action (mut search) value="target.value"}}
@@ -40,7 +40,7 @@
   {{#let (sort-by (comparator 'service' sort) filtered) as |sorted|}}
         <ChangeableSet @dispatcher={{searchable 'service' sorted}} @terms={{search}}>
           <BlockSlot @name="set" as |searched|>
-            <ConsulServiceList @items={{searched}} />
+            <Consul::Service::List @items={{searched}} />
           </BlockSlot>
           <BlockSlot @name="empty">
             <EmptyState @allowLogin={{true}}>
diff --git a/ui-v2/app/templates/dc/services/instance.hbs b/ui-v2/app/templates/dc/services/instance.hbs
index d9db2a658..cd9a1ac93 100644
--- a/ui-v2/app/templates/dc/services/instance.hbs
+++ b/ui-v2/app/templates/dc/services/instance.hbs
@@ -16,8 +16,8 @@
       <h1>
         {{ item.Service.ID }}
       </h1>
-      <ConsulExternalSource @item={{item}} />
-      <ConsulKind @item={{item}} @withInfo={{true}} />
+      <Consul::ExternalSource @item={{item}} />
+      <Consul::Kind @item={{item}} @withInfo={{true}} />
     </BlockSlot>
     <BlockSlot @name="nav">
       <dl>
diff --git a/ui-v2/app/templates/dc/services/instance/metadata.hbs b/ui-v2/app/templates/dc/services/instance/metadata.hbs
index 7d19fd080..98f5ba995 100644
--- a/ui-v2/app/templates/dc/services/instance/metadata.hbs
+++ b/ui-v2/app/templates/dc/services/instance/metadata.hbs
@@ -17,7 +17,7 @@
     <section class="metadata">
       <h3>Meta</h3>
     {{#if item.Meta}}
-      <ConsulMetadataList @items={{object-entries item.Meta}} />
+      <Consul::Metadata::List @items={{object-entries item.Meta}} />
     {{else}}
       <EmptyState>
         <BlockSlot @name="body">
diff --git a/ui-v2/app/templates/dc/services/instance/proxy.hbs b/ui-v2/app/templates/dc/services/instance/proxy.hbs
index 2680494b0..aab014b37 100644
--- a/ui-v2/app/templates/dc/services/instance/proxy.hbs
+++ b/ui-v2/app/templates/dc/services/instance/proxy.hbs
@@ -3,7 +3,7 @@
   {{#if (gt proxy.Service.Proxy.Upstreams.length 0)}}
     <section class="proxy-upstreams">
       <h3>Upstreams</h3>
-      <ConsulUpstreamInstanceList @items={{proxy.Service.Proxy.Upstreams}} @dc={{dc}} @nspace={{nspace}} />
+      <Consul::UpstreamInstance::List @items={{proxy.Service.Proxy.Upstreams}} @dc={{dc}} @nspace={{nspace}} />
     </section>
   {{/if}}
   {{#if (gt proxy.Service.Proxy.Expose.Paths.length 0)}}
@@ -12,7 +12,7 @@
       <p>
         The following list shows individual HTTP paths exposed through Envoy for external services like Prometheus. Read more about this in our documentation.
       </p>
-      <ConsulExposedPathList @items={{proxy.Service.Proxy.Expose.Paths}} @address={{item.Address}} />
+      <Consul::ExposedPath::List @items={{proxy.Service.Proxy.Expose.Paths}} @address={{item.Address}} />
     </section>
   {{/if}}
   {{#if (or (gt proxy.ServiceChecks.length 0) (gt proxy.NodeChecks.length 0))}}
diff --git a/ui-v2/app/templates/dc/services/show.hbs b/ui-v2/app/templates/dc/services/show.hbs
index 8dea73a23..7692eaa0b 100644
--- a/ui-v2/app/templates/dc/services/show.hbs
+++ b/ui-v2/app/templates/dc/services/show.hbs
@@ -18,8 +18,8 @@
       <h1>
         {{item.Service.Service}}
       </h1>
-      <ConsulExternalSource @item={{item.Service}} />
-      <ConsulKind @item={{item.Service}} @withInfo={{true}} />
+      <Consul::ExternalSource @item={{item.Service}} />
+      <Consul::Kind @item={{item.Service}} @withInfo={{true}} />
   </BlockSlot>
   <BlockSlot @name="nav">
   {{#if (not-eq item.Service.Kind 'mesh-gateway')}}
diff --git a/ui-v2/app/templates/dc/services/show/instances.hbs b/ui-v2/app/templates/dc/services/show/instances.hbs
index 369420aa3..c061ec030 100644
--- a/ui-v2/app/templates/dc/services/show/instances.hbs
+++ b/ui-v2/app/templates/dc/services/show/instances.hbs
@@ -7,7 +7,7 @@
   {{#let (or sortBy "Name:asc") as |sort|}}
     {{#if (gt items.length 0) }}
     <input type="checkbox" id="toolbar-toggle" />
-    <ConsulServiceInstanceSearchBar
+    <Consul::ServiceInstance::SearchBar
       @sources={{externalSources}}
       @search={{search}}
       @onsearch={{action (mut search) value="target.value"}}
@@ -26,7 +26,7 @@
   {{#let (sort-by (comparator 'serviceInstance' sort) filtered) as |sorted|}}
     <ChangeableSet @dispatcher={{searchable 'serviceInstance' sorted}} @terms={{search}}>
       <BlockSlot @name="set" as |searched|>
-        <ConsulServiceInstanceList @routeName="dc.services.instance" @items={{searched}}/>
+        <Consul::ServiceInstance::List @routeName="dc.services.instance" @items={{searched}}/>
       </BlockSlot>
       <BlockSlot @name="empty">
         <EmptyState>
diff --git a/ui-v2/app/templates/dc/services/show/intentions/edit.hbs b/ui-v2/app/templates/dc/services/show/intentions/edit.hbs
index 5821db590..e92ea2c22 100644
--- a/ui-v2/app/templates/dc/services/show/intentions/edit.hbs
+++ b/ui-v2/app/templates/dc/services/show/intentions/edit.hbs
@@ -1,4 +1,4 @@
-<ConsulIntentionForm
+<Consul::Intention::Form
   @nspace={{nspace}}
   @dc={{dc}}
   @src={{src}}
diff --git a/ui-v2/app/templates/dc/services/show/intentions/index.hbs b/ui-v2/app/templates/dc/services/show/intentions/index.hbs
index adc278db9..ff3e2fcce 100644
--- a/ui-v2/app/templates/dc/services/show/intentions/index.hbs
+++ b/ui-v2/app/templates/dc/services/show/intentions/index.hbs
@@ -14,7 +14,7 @@
               <a data-test-create href={{href-to 'dc.services.show.intentions.create'}} class="type-create">Create</a>
             </Portal>
 {{#if (gt items.length 0) }}
-            <ConsulIntentionSearchBar
+            <Consul::Intention::SearchBar
               @search={{search}}
               @onsearch={{action (mut search) value="target.value"}}
 
diff --git a/ui-v2/app/templates/dc/services/show/services.hbs b/ui-v2/app/templates/dc/services/show/services.hbs
index 7d1164fe6..3f87be6a5 100644
--- a/ui-v2/app/templates/dc/services/show/services.hbs
+++ b/ui-v2/app/templates/dc/services/show/services.hbs
@@ -7,7 +7,7 @@
   {{#let (or sortBy "Name:asc") as |sort|}}
 {{#if (gt gatewayServices.length 0)}}
     <input type="checkbox" id="toolbar-toggle" />
-    <ConsulUpstreamSearchBar
+    <Consul::Upstream::SearchBar
       @search={{search}}
       @onsearch={{action (mut search) value="target.value"}}
 
@@ -28,7 +28,7 @@
   {{#let (sort-by (comparator 'service' sort) filtered) as |sorted|}}
       <ChangeableSet @dispatcher={{searchable 'service' sorted}} @terms={{search}}>
         <BlockSlot @name="set" as |searched|>
-          <ConsulServiceList
+          <Consul::Service::List
             @items={{searched}}
             @nspace={{nspace}}
           />
diff --git a/ui-v2/app/templates/dc/services/show/upstreams.hbs b/ui-v2/app/templates/dc/services/show/upstreams.hbs
index 5590ffe71..16c9eb802 100644
--- a/ui-v2/app/templates/dc/services/show/upstreams.hbs
+++ b/ui-v2/app/templates/dc/services/show/upstreams.hbs
@@ -7,7 +7,7 @@
   {{#let (or sortBy "Name:asc") as |sort|}}
 {{#if (gt gatewayServices.length 0)}}
     <input type="checkbox" id="toolbar-toggle" />
-    <ConsulUpstreamSearchBar
+    <Consul::Upstream::SearchBar
       @search={{search}}
       @onsearch={{action (mut search) value="target.value"}}
 
@@ -27,7 +27,7 @@
   {{#let (sort-by (comparator 'service' sort) filtered) as |sorted|}}
       <ChangeableSet @dispatcher={{searchable 'service' sorted}} @terms={{search}}>
         <BlockSlot @name="set" as |searched|>
-          <ConsulUpstreamList
+          <Consul::Upstream::List
             @items={{searched}}
             @dc={{dc}}
             @nspace={{nspace}}
diff --git a/ui-v2/tests/integration/components/consul-external-source-test.js b/ui-v2/tests/integration/components/consul-external-source-test.js
deleted file mode 100644
index 3364e8ee7..000000000
--- a/ui-v2/tests/integration/components/consul-external-source-test.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { module, skip } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-
-module('Integration | Component | consul-external-source', function(hooks) {
-  setupRenderingTest(hooks);
-
-  skip('it renders', async function(assert) {
-    // Set any properties with this.set('myProperty', 'value');
-    // Handle any actions with this.set('myAction', function(val) { ... });
-
-    await render(hbs`<ConsulExternalSource />`);
-
-    assert.equal(this.element.textContent.trim(), '');
-
-    // Template block usage:
-    await render(hbs`
-      <ConsulExternalSource>
-        template block text
-      </ConsulExternalSource>
-    `);
-
-    assert.equal(this.element.textContent.trim(), 'template block text');
-  });
-});
diff --git a/ui-v2/tests/integration/components/consul-instance-checks-test.js b/ui-v2/tests/integration/components/consul-instance-checks-test.js
deleted file mode 100644
index efd334c0f..000000000
--- a/ui-v2/tests/integration/components/consul-instance-checks-test.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-
-module('Integration | Component | consul-instance-checks', function(hooks) {
-  setupRenderingTest(hooks);
-
-  test('it renders', async function(assert) {
-    // Set any properties with this.set('myProperty', 'value');
-    // Handle any actions with this.set('myAction', function(val) { ... });
-
-    await render(hbs`<ConsulInstanceChecks />`);
-
-    assert.equal(this.element.textContent.trim(), '');
-
-    // Template block usage:
-    await render(hbs`
-      <ConsulInstanceChecks>
-      </ConsulInstanceChecks>
-    `);
-
-    assert.equal(this.element.textContent.trim(), '');
-  });
-});
diff --git a/ui-v2/tests/integration/components/consul-lock-session-list-test.js b/ui-v2/tests/integration/components/consul-lock-session-list-test.js
deleted file mode 100644
index ddc5057eb..000000000
--- a/ui-v2/tests/integration/components/consul-lock-session-list-test.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { module, skip } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-
-module('Integration | Component | consul-lock-session-list', function(hooks) {
-  setupRenderingTest(hooks);
-
-  skip('it renders', async function(assert) {
-    // Set any properties with this.set('myProperty', 'value');
-    // Handle any actions with this.set('myAction', function(val) { ... });
-
-    await render(hbs`<ConsulLockSessionList />`);
-
-    assert.equal(this.element.textContent.trim(), '');
-
-    // Template block usage:
-    await render(hbs`
-      <ConsulLockSessionList>
-        template block text
-      </ConsulLockSessionList>
-    `);
-
-    assert.equal(this.element.textContent.trim(), 'template block text');
-  });
-});
diff --git a/ui-v2/tests/integration/components/consul-node-list-test.js b/ui-v2/tests/integration/components/consul-node-list-test.js
deleted file mode 100644
index 6ad53b10d..000000000
--- a/ui-v2/tests/integration/components/consul-node-list-test.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { module, skip } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-
-module('Integration | Component | consul-node-list', function(hooks) {
-  setupRenderingTest(hooks);
-
-  skip('it renders', async function(assert) {
-    // Set any properties with this.set('myProperty', 'value');
-    // Handle any actions with this.set('myAction', function(val) { ... });
-
-    await render(hbs`<ConsulNodeList />`);
-
-    assert.equal(this.element.textContent.trim(), '');
-
-    // Template block usage:
-    await render(hbs`
-      <ConsulNodeList>
-        template block text
-      </ConsulNodeList>
-    `);
-
-    assert.equal(this.element.textContent.trim(), 'template block text');
-  });
-});
diff --git a/ui-v2/tests/integration/components/consul-service-instance-list-test.js b/ui-v2/tests/integration/components/consul-service-instance-list-test.js
deleted file mode 100644
index 19f7666f6..000000000
--- a/ui-v2/tests/integration/components/consul-service-instance-list-test.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { module, skip } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-
-module('Integration | Component | consul-service-instance-list', function(hooks) {
-  setupRenderingTest(hooks);
-
-  skip('it renders', async function(assert) {
-    // Set any properties with this.set('myProperty', 'value');
-    // Handle any actions with this.set('myAction', function(val) { ... });
-
-    await render(hbs`<ConsulServiceInstanceList />`);
-
-    assert.equal(this.element.textContent.trim(), '');
-
-    // Template block usage:
-    await render(hbs`
-      <ConsulServiceInstanceList>
-        template block text
-      </ConsulServiceInstanceList>
-    `);
-
-    assert.equal(this.element.textContent.trim(), 'template block text');
-  });
-});
diff --git a/ui-v2/tests/integration/components/consul-service-list-test.js b/ui-v2/tests/integration/components/consul-service-list-test.js
deleted file mode 100644
index dec98c392..000000000
--- a/ui-v2/tests/integration/components/consul-service-list-test.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
-
-module('Integration | Component | consul-service-list', function(hooks) {
-  setupRenderingTest(hooks);
-
-  test('it renders', async function(assert) {
-    // Set any properties with this.set('myProperty', 'value');
-    // Handle any actions with this.set('myAction', function(val) { ... });
-
-    await render(hbs`{{consul-service-list}}`);
-
-    assert.equal(this.element.textContent.trim(), '');
-
-    // Template block usage:
-    await render(hbs`
-      {{#consul-service-list}}{{/consul-service-list}}
-    `);
-
-    assert.equal(this.element.textContent.trim(), '');
-  });
-});
diff --git a/ui-v2/tests/integration/components/tomography-graph-test.js b/ui-v2/tests/integration/components/tomography-graph-test.js
deleted file mode 100644
index d221203bb..000000000
--- a/ui-v2/tests/integration/components/tomography-graph-test.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render, find } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
-
-module('Integration | Component | tomography graph', function(hooks) {
-  setupRenderingTest(hooks);
-
-  test('it renders', async function(assert) {
-    // Set any properties with this.set('myProperty', 'value');
-    // Handle any actions with this.on('myAction', function(val) { ... });
-
-    await render(hbs`{{tomography-graph}}`);
-
-    assert.ok(
-      find('*')
-        .textContent.trim()
-        .indexOf('ms') !== -1
-    );
-
-    // Template block usage:
-    await render(hbs`
-      {{#tomography-graph}}{{/tomography-graph}}
-    `);
-
-    assert.ok(
-      find('*')
-        .textContent.trim()
-        .indexOf('ms') !== -1
-    );
-  });
-});
diff --git a/ui-v2/tests/pages.js b/ui-v2/tests/pages.js
index 68e16cf3a..bc4632d7e 100644
--- a/ui-v2/tests/pages.js
+++ b/ui-v2/tests/pages.js
@@ -38,12 +38,12 @@ import popoverSelectFactory from 'consul-ui/components/popover-select/pageobject
 import morePopoverMenuFactory from 'consul-ui/components/more-popover-menu/pageobject';
 
 import tokenListFactory from 'consul-ui/components/token-list/pageobject';
-import consulTokenListFactory from 'consul-ui/components/consul-token-list/pageobject';
-import consulRoleListFactory from 'consul-ui/components/consul-role-list/pageobject';
-import consulPolicyListFactory from 'consul-ui/components/consul-policy-list/pageobject';
+import consulTokenListFactory from 'consul-ui/components/consul/token/list/pageobject';
+import consulRoleListFactory from 'consul-ui/components/consul/role/list/pageobject';
+import consulPolicyListFactory from 'consul-ui/components/consul/policy/list/pageobject';
 import consulIntentionListFactory from 'consul-ui/components/consul/intention/list/pageobject';
-import consulNspaceListFactory from 'consul-ui/components/consul-nspace-list/pageobject';
-import consulKvListFactory from 'consul-ui/components/consul-kv-list/pageobject';
+import consulNspaceListFactory from 'consul-ui/components/consul/nspace/list/pageobject';
+import consulKvListFactory from 'consul-ui/components/consul/kv/list/pageobject';
 
 // pages
 import index from 'consul-ui/tests/pages/index';