diff --git a/ui/lib/core/addon/templates/components/edit-form.hbs b/ui/lib/core/addon/components/edit-form.hbs
similarity index 100%
rename from ui/lib/core/addon/templates/components/edit-form.hbs
rename to ui/lib/core/addon/components/edit-form.hbs
diff --git a/ui/lib/core/addon/components/edit-form.js b/ui/lib/core/addon/components/edit-form.js
index b9293f94e7..1e240834c9 100644
--- a/ui/lib/core/addon/components/edit-form.js
+++ b/ui/lib/core/addon/components/edit-form.js
@@ -7,19 +7,20 @@ import AdapterError from '@ember-data/adapter/error';
 import { service } from '@ember/service';
 import Component from '@ember/component';
 import { task } from 'ember-concurrency';
-import layout from '../templates/components/edit-form';
 import { next } from '@ember/runloop';
 import { waitFor } from '@ember/test-waiters';
 
 export default Component.extend({
-  layout,
   flashMessages: service(),
 
   // internal validations
   invalidFormAlert: '',
+
   modelValidations: null,
+
   // public API
   model: null,
+
   successMessage: 'Saved!',
   deleteSuccessMessage: 'Deleted!',
   deleteButtonText: 'Delete',
diff --git a/ui/lib/core/addon/templates/components/message-error.hbs b/ui/lib/core/addon/components/message-error.hbs
similarity index 100%
rename from ui/lib/core/addon/templates/components/message-error.hbs
rename to ui/lib/core/addon/components/message-error.hbs
diff --git a/ui/lib/core/addon/components/message-error.js b/ui/lib/core/addon/components/message-error.js
index 51f604ce3b..860069e336 100644
--- a/ui/lib/core/addon/components/message-error.js
+++ b/ui/lib/core/addon/components/message-error.js
@@ -4,8 +4,6 @@
  */
 
 import Component from '@glimmer/component';
-import layout from '../templates/components/message-error';
-import { setComponentTemplate } from '@ember/component';
 
 /**
  * @module MessageError
@@ -20,7 +18,7 @@ import { setComponentTemplate } from '@ember/component';
  * @param {string} [errorMessage=null] - An Error string to display.
  */
 
-class MessageError extends Component {
+export default class MessageError extends Component {
   get displayErrors() {
     const { errorMessage, errors, model } = this.args;
     if (errorMessage) {
@@ -47,4 +45,3 @@ class MessageError extends Component {
     return null;
   }
 }
-export default setComponentTemplate(layout, MessageError);
diff --git a/ui/lib/core/addon/templates/components/read-more.hbs b/ui/lib/core/addon/components/read-more.hbs
similarity index 100%
rename from ui/lib/core/addon/templates/components/read-more.hbs
rename to ui/lib/core/addon/components/read-more.hbs
diff --git a/ui/lib/core/addon/components/read-more.js b/ui/lib/core/addon/components/read-more.js
index 9fb3727ef1..e96b4bf93f 100644
--- a/ui/lib/core/addon/components/read-more.js
+++ b/ui/lib/core/addon/components/read-more.js
@@ -4,8 +4,6 @@
  */
 
 import Component from '@glimmer/component';
-import layout from '../templates/components/read-more';
-import { setComponentTemplate } from '@ember/component';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
 
@@ -25,7 +23,7 @@ import { tracked } from '@glimmer/tracking';
  * </div>
  */
 
-class ReadMoreComponent extends Component {
+export default class ReadMoreComponent extends Component {
   @action
   calculateOverflow(e) {
     const spanText = e.querySelector('.description-block');
@@ -45,5 +43,3 @@ class ReadMoreComponent extends Component {
     this.isOpen = !this.isOpen;
   }
 }
-
-export default setComponentTemplate(layout, ReadMoreComponent);
diff --git a/ui/lib/core/addon/templates/components/readonly-form-field.hbs b/ui/lib/core/addon/components/readonly-form-field.hbs
similarity index 100%
rename from ui/lib/core/addon/templates/components/readonly-form-field.hbs
rename to ui/lib/core/addon/components/readonly-form-field.hbs
diff --git a/ui/lib/core/addon/components/readonly-form-field.js b/ui/lib/core/addon/components/readonly-form-field.js
index 1ae6741a63..704d6a0465 100644
--- a/ui/lib/core/addon/components/readonly-form-field.js
+++ b/ui/lib/core/addon/components/readonly-form-field.js
@@ -15,12 +15,10 @@
  */
 
 import Component from '@glimmer/component';
-import { setComponentTemplate } from '@ember/component';
 import { capitalize, dasherize } from '@ember/string';
 import { humanize } from 'vault/helpers/humanize';
-import layout from '../templates/components/readonly-form-field';
 
-class ReadonlyFormField extends Component {
+export default class ReadonlyFormField extends Component {
   get labelString() {
     if (!this.args.attr) {
       return '';
@@ -36,5 +34,3 @@ class ReadonlyFormField extends Component {
     return '';
   }
 }
-
-export default setComponentTemplate(layout, ReadonlyFormField);
diff --git a/ui/lib/core/addon/templates/components/replication-action-demote.hbs b/ui/lib/core/addon/components/replication-action-demote.hbs
similarity index 100%
rename from ui/lib/core/addon/templates/components/replication-action-demote.hbs
rename to ui/lib/core/addon/components/replication-action-demote.hbs
diff --git a/ui/lib/core/addon/components/replication-action-demote.js b/ui/lib/core/addon/components/replication-action-demote.js
index 804e0d2528..cbc7b210d4 100644
--- a/ui/lib/core/addon/components/replication-action-demote.js
+++ b/ui/lib/core/addon/components/replication-action-demote.js
@@ -4,9 +4,7 @@
  */
 
 import Actions from 'core/components/replication-actions-single';
-import layout from '../templates/components/replication-action-demote';
 
 export default Actions.extend({
-  layout,
   tagName: '',
 });
diff --git a/ui/lib/core/addon/templates/components/replication-action-disable.hbs b/ui/lib/core/addon/components/replication-action-disable.hbs
similarity index 100%
rename from ui/lib/core/addon/templates/components/replication-action-disable.hbs
rename to ui/lib/core/addon/components/replication-action-disable.hbs
diff --git a/ui/lib/core/addon/components/replication-action-disable.js b/ui/lib/core/addon/components/replication-action-disable.js
index 77c5108e1f..ef686d057f 100644
--- a/ui/lib/core/addon/components/replication-action-disable.js
+++ b/ui/lib/core/addon/components/replication-action-disable.js
@@ -4,10 +4,8 @@
  */
 
 import Actions from 'core/components/replication-actions-single';
-import layout from '../templates/components/replication-action-disable';
 
 export default Actions.extend({
-  layout,
   tagName: '',
 
   actions: {
diff --git a/ui/lib/core/addon/templates/components/replication-action-generate-token.hbs b/ui/lib/core/addon/components/replication-action-generate-token.hbs
similarity index 100%
rename from ui/lib/core/addon/templates/components/replication-action-generate-token.hbs
rename to ui/lib/core/addon/components/replication-action-generate-token.hbs
diff --git a/ui/lib/core/addon/components/replication-action-generate-token.js b/ui/lib/core/addon/components/replication-action-generate-token.js
index 82b90ac96d..a0fc2d24d0 100644
--- a/ui/lib/core/addon/components/replication-action-generate-token.js
+++ b/ui/lib/core/addon/components/replication-action-generate-token.js
@@ -4,9 +4,7 @@
  */
 
 import Actions from './replication-actions-single';
-import layout from '../templates/components/replication-action-generate-token';
 
 export default Actions.extend({
-  layout,
   tagName: '',
 });
diff --git a/ui/lib/core/addon/templates/components/replication-action-promote.hbs b/ui/lib/core/addon/components/replication-action-promote.hbs
similarity index 100%
rename from ui/lib/core/addon/templates/components/replication-action-promote.hbs
rename to ui/lib/core/addon/components/replication-action-promote.hbs
diff --git a/ui/lib/core/addon/components/replication-action-promote.js b/ui/lib/core/addon/components/replication-action-promote.js
index 2677574b2a..a0fc2d24d0 100644
--- a/ui/lib/core/addon/components/replication-action-promote.js
+++ b/ui/lib/core/addon/components/replication-action-promote.js
@@ -4,9 +4,7 @@
  */
 
 import Actions from './replication-actions-single';
-import layout from '../templates/components/replication-action-promote';
 
 export default Actions.extend({
-  layout,
   tagName: '',
 });
diff --git a/ui/lib/core/addon/templates/components/replication-action-recover.hbs b/ui/lib/core/addon/components/replication-action-recover.hbs
similarity index 100%
rename from ui/lib/core/addon/templates/components/replication-action-recover.hbs
rename to ui/lib/core/addon/components/replication-action-recover.hbs
diff --git a/ui/lib/core/addon/components/replication-action-recover.js b/ui/lib/core/addon/components/replication-action-recover.js
index 1967151289..cbc7b210d4 100644
--- a/ui/lib/core/addon/components/replication-action-recover.js
+++ b/ui/lib/core/addon/components/replication-action-recover.js
@@ -4,9 +4,7 @@
  */
 
 import Actions from 'core/components/replication-actions-single';
-import layout from '../templates/components/replication-action-recover';
 
 export default Actions.extend({
-  layout,
   tagName: '',
 });
diff --git a/ui/lib/core/addon/templates/components/replication-action-reindex.hbs b/ui/lib/core/addon/components/replication-action-reindex.hbs
similarity index 100%
rename from ui/lib/core/addon/templates/components/replication-action-reindex.hbs
rename to ui/lib/core/addon/components/replication-action-reindex.hbs
diff --git a/ui/lib/core/addon/components/replication-action-reindex.js b/ui/lib/core/addon/components/replication-action-reindex.js
index 2faa3c1d10..cbc7b210d4 100644
--- a/ui/lib/core/addon/components/replication-action-reindex.js
+++ b/ui/lib/core/addon/components/replication-action-reindex.js
@@ -4,9 +4,7 @@
  */
 
 import Actions from 'core/components/replication-actions-single';
-import layout from '../templates/components/replication-action-reindex';
 
 export default Actions.extend({
-  layout,
   tagName: '',
 });
diff --git a/ui/lib/core/addon/templates/components/replication-action-update-primary.hbs b/ui/lib/core/addon/components/replication-action-update-primary.hbs
similarity index 100%
rename from ui/lib/core/addon/templates/components/replication-action-update-primary.hbs
rename to ui/lib/core/addon/components/replication-action-update-primary.hbs
diff --git a/ui/lib/core/addon/components/replication-action-update-primary.js b/ui/lib/core/addon/components/replication-action-update-primary.js
index 8d45009d04..a0fc2d24d0 100644
--- a/ui/lib/core/addon/components/replication-action-update-primary.js
+++ b/ui/lib/core/addon/components/replication-action-update-primary.js
@@ -4,9 +4,7 @@
  */
 
 import Actions from './replication-actions-single';
-import layout from '../templates/components/replication-action-update-primary';
 
 export default Actions.extend({
-  layout,
   tagName: '',
 });
diff --git a/ui/lib/core/addon/templates/components/replication-actions.hbs b/ui/lib/core/addon/components/replication-actions.hbs
similarity index 100%
rename from ui/lib/core/addon/templates/components/replication-actions.hbs
rename to ui/lib/core/addon/components/replication-actions.hbs
diff --git a/ui/lib/core/addon/components/replication-actions.js b/ui/lib/core/addon/components/replication-actions.js
index efddfaa77b..cf5ce63a3a 100644
--- a/ui/lib/core/addon/components/replication-actions.js
+++ b/ui/lib/core/addon/components/replication-actions.js
@@ -6,7 +6,6 @@
 import { alias } from '@ember/object/computed';
 import Component from '@ember/component';
 import ReplicationActions from 'core/mixins/replication-actions';
-import layout from '../templates/components/replication-actions';
 
 const DEFAULTS = {
   token: null,
@@ -18,10 +17,10 @@ const DEFAULTS = {
 };
 
 export default Component.extend(ReplicationActions, DEFAULTS, {
-  layout,
   replicationMode: null,
   model: null,
   cluster: alias('model'),
+
   reset() {
     if (!this || this.isDestroyed || this.isDestroying) {
       return;
diff --git a/ui/lib/core/addon/templates/components/replication-secondary-card.hbs b/ui/lib/core/addon/components/replication-secondary-card.hbs
similarity index 100%
rename from ui/lib/core/addon/templates/components/replication-secondary-card.hbs
rename to ui/lib/core/addon/components/replication-secondary-card.hbs
diff --git a/ui/lib/core/addon/components/replication-secondary-card.js b/ui/lib/core/addon/components/replication-secondary-card.js
index eb9cc76081..04f6401936 100644
--- a/ui/lib/core/addon/components/replication-secondary-card.js
+++ b/ui/lib/core/addon/components/replication-secondary-card.js
@@ -6,7 +6,6 @@
 import { equal, reads } from '@ember/object/computed';
 import Component from '@ember/component';
 import { computed } from '@ember/object';
-import layout from '../templates/components/replication-secondary-card';
 import { clusterStates } from 'core/helpers/cluster-states';
 
 /**
@@ -25,24 +24,28 @@ import { clusterStates } from 'core/helpers/cluster-states';
  */
 
 export default Component.extend({
-  layout,
   tagName: '',
   title: null,
   replicationDetails: null,
+
   state: computed('replicationDetails.state', function () {
     return this.replicationDetails && this.replicationDetails.state
       ? this.replicationDetails.state
       : 'unknown';
   }),
+
   connection: computed('replicationDetails.connection_state', function () {
     return this.replicationDetails.connection_state ? this.replicationDetails.connection_state : 'unknown';
   }),
+
   lastRemoteWAL: computed('replicationDetails.lastRemoteWAL', function () {
     return this.replicationDetails && this.replicationDetails.lastRemoteWAL
       ? this.replicationDetails.lastRemoteWAL
       : 0;
   }),
+
   inSyncState: equal('state', 'stream-wals'),
+
   hasErrorClass: computed('replicationDetails', 'title', 'state', 'connection', function () {
     const { title, state, connection } = this;
 
@@ -54,7 +57,9 @@ export default Component.extend({
     }
     return false;
   }),
+
   knownPrimaryClusterAddrs: reads('replicationDetails.knownPrimaryClusterAddrs'),
+
   primaryUiUrl: computed('replicationDetails.{primaries,knownPrimaryClusterAddrs}', function () {
     const { replicationDetails } = this;
     if (replicationDetails.primaries && replicationDetails.primaries.length) {
diff --git a/ui/lib/core/addon/templates/components/replication-table-rows.hbs b/ui/lib/core/addon/components/replication-table-rows.hbs
similarity index 100%
rename from ui/lib/core/addon/templates/components/replication-table-rows.hbs
rename to ui/lib/core/addon/components/replication-table-rows.hbs
diff --git a/ui/lib/core/addon/components/replication-table-rows.js b/ui/lib/core/addon/components/replication-table-rows.js
index 22d9c21a45..d00031c6d0 100644
--- a/ui/lib/core/addon/components/replication-table-rows.js
+++ b/ui/lib/core/addon/components/replication-table-rows.js
@@ -6,7 +6,6 @@
 import { reads } from '@ember/object/computed';
 import Component from '@ember/component';
 import { computed } from '@ember/object';
-import layout from '../templates/components/replication-table-rows';
 
 /**
  * @module ReplicationTableRows
@@ -24,17 +23,19 @@ import layout from '../templates/components/replication-table-rows';
  */
 
 export default Component.extend({
-  layout,
   classNames: ['replication-table-rows'],
   replicationDetails: null,
   clusterMode: null,
   secondaryId: reads('replicationDetails.secondaryId'),
+
   primaryClusterAddr: computed('replicationDetails.primaryClusterAddr', function () {
     return this.replicationDetails.primaryClusterAddr || 'None set';
   }),
+
   merkleRoot: computed('replicationDetails.merkleRoot', function () {
     return this.replicationDetails.merkleRoot || 'unknown';
   }),
+
   clusterId: computed('replicationDetails.clusterId', function () {
     return this.replicationDetails.clusterId || 'unknown';
   }),
diff --git a/ui/lib/core/addon/templates/components/select.hbs b/ui/lib/core/addon/components/select.hbs
similarity index 100%
rename from ui/lib/core/addon/templates/components/select.hbs
rename to ui/lib/core/addon/components/select.hbs
diff --git a/ui/lib/core/addon/components/select.js b/ui/lib/core/addon/components/select.js
index 822c6ed4ec..8b45db2037 100644
--- a/ui/lib/core/addon/components/select.js
+++ b/ui/lib/core/addon/components/select.js
@@ -4,7 +4,6 @@
  */
 
 import Component from '@ember/component';
-import layout from '../templates/components/select';
 
 /**
  * @module Select
@@ -27,7 +26,6 @@ import layout from '../templates/components/select';
  */
 
 export default Component.extend({
-  layout,
   classNames: ['field'],
   label: null,
   selectedValue: null,
diff --git a/ui/lib/kmip/addon/templates/components/header-scope.hbs b/ui/lib/kmip/addon/components/header-scope.hbs
similarity index 100%
rename from ui/lib/kmip/addon/templates/components/header-scope.hbs
rename to ui/lib/kmip/addon/components/header-scope.hbs
diff --git a/ui/lib/kmip/addon/components/header-scope.js b/ui/lib/kmip/addon/components/header-scope.js
index 37458f3c80..985dd8c5ba 100644
--- a/ui/lib/kmip/addon/components/header-scope.js
+++ b/ui/lib/kmip/addon/components/header-scope.js
@@ -5,10 +5,8 @@
 
 import Component from '@ember/component';
 import { service } from '@ember/service';
-import layout from '../templates/components/header-scope';
 
 export default Component.extend({
-  layout,
   tagName: '',
   secretMountPath: service(),
 });
diff --git a/ui/lib/kmip/addon/templates/components/kmip-breadcrumb.hbs b/ui/lib/kmip/addon/components/kmip-breadcrumb.hbs
similarity index 100%
rename from ui/lib/kmip/addon/templates/components/kmip-breadcrumb.hbs
rename to ui/lib/kmip/addon/components/kmip-breadcrumb.hbs
diff --git a/ui/lib/kmip/addon/components/kmip-breadcrumb.js b/ui/lib/kmip/addon/components/kmip-breadcrumb.js
index 0cc6bb7f24..d0fb450981 100644
--- a/ui/lib/kmip/addon/components/kmip-breadcrumb.js
+++ b/ui/lib/kmip/addon/components/kmip-breadcrumb.js
@@ -5,11 +5,9 @@
 
 import Component from '@ember/component';
 import { service } from '@ember/service';
-import layout from '../templates/components/kmip-breadcrumb';
 import { or } from '@ember/object/computed';
 
 export default Component.extend({
-  layout,
   tagName: '',
   secretMountPath: service(),
   shouldShowPath: or('showPath', 'scope', 'role'),
diff --git a/ui/lib/kmip/addon/templates/components/operation-field-display.hbs b/ui/lib/kmip/addon/components/operation-field-display.hbs
similarity index 100%
rename from ui/lib/kmip/addon/templates/components/operation-field-display.hbs
rename to ui/lib/kmip/addon/components/operation-field-display.hbs
diff --git a/ui/lib/kmip/addon/components/operation-field-display.js b/ui/lib/kmip/addon/components/operation-field-display.js
index 7b184d933d..4ec347f50f 100644
--- a/ui/lib/kmip/addon/components/operation-field-display.js
+++ b/ui/lib/kmip/addon/components/operation-field-display.js
@@ -16,10 +16,8 @@
  *
  */
 import Component from '@ember/component';
-import layout from '../templates/components/operation-field-display';
 
 export default Component.extend({
-  layout,
   tagName: '',
   model: null,
 
diff --git a/ui/lib/replication/addon/templates/components/known-secondaries-card.hbs b/ui/lib/replication/addon/components/known-secondaries-card.hbs
similarity index 100%
rename from ui/lib/replication/addon/templates/components/known-secondaries-card.hbs
rename to ui/lib/replication/addon/components/known-secondaries-card.hbs
diff --git a/ui/lib/replication/addon/templates/components/known-secondaries-table.hbs b/ui/lib/replication/addon/components/known-secondaries-table.hbs
similarity index 100%
rename from ui/lib/replication/addon/templates/components/known-secondaries-table.hbs
rename to ui/lib/replication/addon/components/known-secondaries-table.hbs
diff --git a/ui/lib/replication/addon/templates/components/path-filter-config-list.hbs b/ui/lib/replication/addon/components/path-filter-config-list.hbs
similarity index 100%
rename from ui/lib/replication/addon/templates/components/path-filter-config-list.hbs
rename to ui/lib/replication/addon/components/path-filter-config-list.hbs
diff --git a/ui/lib/replication/addon/templates/components/replication-primary-card.hbs b/ui/lib/replication/addon/components/replication-primary-card.hbs
similarity index 100%
rename from ui/lib/replication/addon/templates/components/replication-primary-card.hbs
rename to ui/lib/replication/addon/components/replication-primary-card.hbs
diff --git a/ui/lib/replication/addon/templates/components/replication-summary.hbs b/ui/lib/replication/addon/components/replication-summary.hbs
similarity index 100%
rename from ui/lib/replication/addon/templates/components/replication-summary.hbs
rename to ui/lib/replication/addon/components/replication-summary.hbs