diff --git a/ui/lib/core/addon/templates/components/form-error.hbs b/ui/lib/core/addon/components/form-error.hbs
similarity index 100%
rename from ui/lib/core/addon/templates/components/form-error.hbs
rename to ui/lib/core/addon/components/form-error.hbs
diff --git a/ui/lib/core/addon/components/form-error.js b/ui/lib/core/addon/components/form-error.js
deleted file mode 100644
index 29adae7de876..000000000000
--- a/ui/lib/core/addon/components/form-error.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-/**
- * @module FormError
- * FormError components are used to show an error on a form field that is more compact than the
- * normal MessageError component. This component adds an icon and styling to the content of the
- * component, so additionally styling (bold, italic) and links are allowed.
- *
- * @example
- * ```js
- * <FormError>Oh no <em>something bad</em>! <a href="#">Do something</a></FormError>
- * ```
- */
-
-import Component from '@ember/component';
-import layout from '../templates/components/form-error';
-
-export default Component.extend({
-  layout,
-});
diff --git a/ui/lib/core/addon/templates/components/layout-loading.hbs b/ui/lib/core/addon/components/layout-loading.hbs
similarity index 100%
rename from ui/lib/core/addon/templates/components/layout-loading.hbs
rename to ui/lib/core/addon/components/layout-loading.hbs
diff --git a/ui/lib/core/addon/components/layout-loading.js b/ui/lib/core/addon/components/layout-loading.js
deleted file mode 100644
index 6e1e82c5225a..000000000000
--- a/ui/lib/core/addon/components/layout-loading.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@ember/component';
-import layout from '../templates/components/layout-loading';
-
-/**
- * @module LayoutLoading
- * `LayoutLoading` displays the `VaultLogoSpinner` component in a centered full-page layout.
- *
- * @example
- * ```js
- * <LayoutLoading />
- * ```
- */
-
-export default Component.extend({
-  layout,
-  tagName: '',
-});
diff --git a/ui/lib/core/addon/components/menu-loader.hbs b/ui/lib/core/addon/components/menu-loader.hbs
new file mode 100644
index 000000000000..f9e3dad6754f
--- /dev/null
+++ b/ui/lib/core/addon/components/menu-loader.hbs
@@ -0,0 +1,9 @@
+<li class="action">
+  {{#if @loadingParam}}
+    <button disabled type="button" class="link button is-loading is-transparent">
+      loading
+    </button>
+  {{else}}
+    {{yield}}
+  {{/if}}
+</li>
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/menu-loader.js b/ui/lib/core/addon/components/menu-loader.js
deleted file mode 100644
index b8e7cfa50fc0..000000000000
--- a/ui/lib/core/addon/components/menu-loader.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-/**
- * @module MenuLoader
- * MenuLoader components are used to show a loading state when fetching data is triggered by opening a
- * popup menu.
- *
- * @example
- * ```js
- * <MenuLoader @loadingParam={model.updatePath.isPending} />
- * ```
- *
- * @param loadingParam {Boolean} - If the value of this param is true, the loading state will be rendered,
- * else the component will yield.
- */
-import Component from '@ember/component';
-import layout from '../templates/components/menu-loader';
-
-export default Component.extend({
-  tagName: 'li',
-  classNames: 'action',
-  layout,
-  loadingParam: null,
-});
diff --git a/ui/lib/core/addon/components/popup-menu.hbs b/ui/lib/core/addon/components/popup-menu.hbs
new file mode 100644
index 000000000000..7dee271b477c
--- /dev/null
+++ b/ui/lib/core/addon/components/popup-menu.hbs
@@ -0,0 +1,16 @@
+<span>
+  <BasicDropdown class="popup-menu" horizontalPosition="auto-right" verticalPosition="below" onOpen={{@onOpen}} as |d|>
+    <d.Trigger
+      @htmlTag="button"
+      class={{concat "popup-menu-trigger button is-ghost" (if d.isOpen " is-active")}}
+      data-test-popup-menu-trigger
+    >
+      <Icon @name="more-horizontal" class="has-text-black auto-width" aria-label="More options" />
+    </d.Trigger>
+    <d.Content @defaultClass={{concat "popup-menu-content " @contentClass}}>
+      <div class="box">
+        {{yield}}
+      </div>
+    </d.Content>
+  </BasicDropdown>
+</span>
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/popup-menu.js b/ui/lib/core/addon/components/popup-menu.js
deleted file mode 100644
index 921425888b28..000000000000
--- a/ui/lib/core/addon/components/popup-menu.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@ember/component';
-import layout from '../templates/components/popup-menu';
-
-/**
- * @module PopupMenu
- * `PopupMenu` displays a button that when pressed will toggle open a menu that is yielded in the content
- * block.
- *
- * @example
- * ```js
- * <PopupMenu><nav class="menu"> <ul class="menu-list"> <li class="action"> <button type="button">A menu!</button> </li> </ul> </nav></PopupMenu>
- * ```
- *
- * @param contentClass=''{String} A class that will be applied to the yielded content of the popup.
- */
-
-export default Component.extend({
-  layout,
-  contentClass: '',
-  tagName: 'span',
-});
diff --git a/ui/lib/core/addon/templates/components/search-select-placeholder.hbs b/ui/lib/core/addon/components/search-select-placeholder.hbs
similarity index 64%
rename from ui/lib/core/addon/templates/components/search-select-placeholder.hbs
rename to ui/lib/core/addon/components/search-select-placeholder.hbs
index 2adbd9e3cfa3..1c1cfa995bba 100644
--- a/ui/lib/core/addon/templates/components/search-select-placeholder.hbs
+++ b/ui/lib/core/addon/components/search-select-placeholder.hbs
@@ -1,6 +1,6 @@
 <div class="field">
   <p class="control has-icons-left has-icons-right">
-    <span class="input has-text-grey-light">{{or this.placeholder "Search"}}</span>
+    <span class="input has-text-grey-light">{{or @placeholder "Search"}}</span>
     <Icon @name="search" class="search-icon has-text-grey-light" />
   </p>
 </div>
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/search-select-placeholder.js b/ui/lib/core/addon/components/search-select-placeholder.js
deleted file mode 100644
index 297692d4144d..000000000000
--- a/ui/lib/core/addon/components/search-select-placeholder.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@ember/component';
-import layout from '../templates/components/search-select-placeholder';
-
-export default Component.extend({
-  layout,
-});
diff --git a/ui/lib/core/addon/templates/components/toolbar-actions.hbs b/ui/lib/core/addon/components/toolbar-actions.hbs
similarity index 100%
rename from ui/lib/core/addon/templates/components/toolbar-actions.hbs
rename to ui/lib/core/addon/components/toolbar-actions.hbs
diff --git a/ui/lib/core/addon/components/toolbar-actions.js b/ui/lib/core/addon/components/toolbar-actions.js
deleted file mode 100644
index dd3e59b919a6..000000000000
--- a/ui/lib/core/addon/components/toolbar-actions.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-/**
- * @module ToolbarActions
- * `ToolbarActions` is a container for toolbar links such as "Add item".
- * It should only be used inside of `Toolbar`.
- *
- * @example
- * ```js
- * <Toolbar>
- *   <ToolbarActions>
- *     <ToolbarLink @route="vault.cluster.policy.edit">
- *       Edit policy
- *     </ToolbarLink>
- *   </ToolbarActions>
- * </Toolbar>
- * ```
- *
- */
-
-import Component from '@ember/component';
-import layout from '../templates/components/toolbar-actions';
-
-export default Component.extend({
-  tagName: '',
-  layout,
-});
diff --git a/ui/lib/core/addon/templates/components/toolbar-filters.hbs b/ui/lib/core/addon/components/toolbar-filters.hbs
similarity index 100%
rename from ui/lib/core/addon/templates/components/toolbar-filters.hbs
rename to ui/lib/core/addon/components/toolbar-filters.hbs
diff --git a/ui/lib/core/addon/components/toolbar-filters.js b/ui/lib/core/addon/components/toolbar-filters.js
deleted file mode 100644
index 7d5b1a99afe1..000000000000
--- a/ui/lib/core/addon/components/toolbar-filters.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-/**
- * @module ToolbarFilters
- * `ToolbarFilters` components are containers for Toolbar filters and toggles.
- * It should only be used inside of `Toolbar`.
- *
- * @example
- * ```js
- * <Toolbar>
- *   <ToolbarFilters>
- *     <div class="control has-icons-left">
- *       <input class="filter input" placeholder="Filter keys" type="text">
- *       <Icon @name="search" @size="24" class="search-icon has-text-grey-light" />
- *     </div>
- *   </ToolbarFilters>
- * </Toolbar>
- ```
- *
- */
-
-import Component from '@ember/component';
-import layout from '../templates/components/toolbar-filters';
-
-export default Component.extend({
-  layout,
-  tagName: '',
-});
diff --git a/ui/lib/core/addon/templates/components/toolbar.hbs b/ui/lib/core/addon/components/toolbar.hbs
similarity index 100%
rename from ui/lib/core/addon/templates/components/toolbar.hbs
rename to ui/lib/core/addon/components/toolbar.hbs
diff --git a/ui/lib/core/addon/components/toolbar.js b/ui/lib/core/addon/components/toolbar.js
deleted file mode 100644
index 9afabbb0417d..000000000000
--- a/ui/lib/core/addon/components/toolbar.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-/**
- * @module Toolbar
- * `Toolbar` components are containers for Toolbar actions.
- *
- * @example
- * ```js
- * <Toolbar>
- *   <ToolbarActions>
- *     <ToolbarSecretLink @params={{array 'vault.cluster.policies.create'}} @type="add">
- *       Create policy
- *     </ToolbarSecretLink>
- *   </ToolbarActions>
- * </Toolbar>
- * ```
- *
- */
-
-import Component from '@ember/component';
-import layout from '../templates/components/toolbar';
-
-export default Component.extend({
-  tagName: '',
-  layout,
-});
diff --git a/ui/lib/core/addon/templates/components/vault-logo-spinner.hbs b/ui/lib/core/addon/components/vault-logo-spinner.hbs
similarity index 100%
rename from ui/lib/core/addon/templates/components/vault-logo-spinner.hbs
rename to ui/lib/core/addon/components/vault-logo-spinner.hbs
diff --git a/ui/lib/core/addon/components/vault-logo-spinner.js b/ui/lib/core/addon/components/vault-logo-spinner.js
deleted file mode 100644
index e1a4d11952be..000000000000
--- a/ui/lib/core/addon/components/vault-logo-spinner.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-import Component from '@ember/component';
-import layout from '../templates/components/vault-logo-spinner';
-
-/**
- * @module VaultLogoSpinner
- * `VaultLogoSpinner` displays an animated Vault logo to use for loading screens.
- *
- * @example
- * ```js
- * <VaultLogoSpinner />
- * ```
- */
-
-export default Component.extend({
-  layout,
-  tagName: '',
-});
diff --git a/ui/lib/core/addon/templates/components/menu-loader.hbs b/ui/lib/core/addon/templates/components/menu-loader.hbs
deleted file mode 100644
index 82c2c3172128..000000000000
--- a/ui/lib/core/addon/templates/components/menu-loader.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-{{#if @loadingParam}}
-  <button disabled type="button" class="link button is-loading is-transparent">
-    loading
-  </button>
-{{else}}
-  {{yield}}
-{{/if}}
\ No newline at end of file
diff --git a/ui/lib/core/addon/templates/components/popup-menu.hbs b/ui/lib/core/addon/templates/components/popup-menu.hbs
deleted file mode 100644
index 6b3aef4e6ca7..000000000000
--- a/ui/lib/core/addon/templates/components/popup-menu.hbs
+++ /dev/null
@@ -1,14 +0,0 @@
-<BasicDropdown class="popup-menu" horizontalPosition="auto-right" verticalPosition="below" onOpen={{this.onOpen}} as |d|>
-  <d.Trigger
-    @htmlTag="button"
-    class={{concat "popup-menu-trigger button is-ghost" (if d.isOpen " is-active")}}
-    data-test-popup-menu-trigger
-  >
-    <Icon @name="more-horizontal" class="has-text-black auto-width" aria-label="More options" />
-  </d.Trigger>
-  <d.Content @defaultClass={{concat "popup-menu-content " this.contentClass}}>
-    <div class="box">
-      {{yield}}
-    </div>
-  </d.Content>
-</BasicDropdown>
\ No newline at end of file