diff --git a/ui/app/templates/components/b64-toggle.hbs b/ui/app/components/b64-toggle.hbs
similarity index 100%
rename from ui/app/templates/components/b64-toggle.hbs
rename to ui/app/components/b64-toggle.hbs
diff --git a/ui/app/templates/components/calendar-widget.hbs b/ui/app/components/calendar-widget.hbs
similarity index 100%
rename from ui/app/templates/components/calendar-widget.hbs
rename to ui/app/components/calendar-widget.hbs
diff --git a/ui/app/templates/components/console/command-input.hbs b/ui/app/components/console/command-input.hbs
similarity index 100%
rename from ui/app/templates/components/console/command-input.hbs
rename to ui/app/components/console/command-input.hbs
diff --git a/ui/app/templates/components/console/log-command.hbs b/ui/app/components/console/log-command.hbs
similarity index 100%
rename from ui/app/templates/components/console/log-command.hbs
rename to ui/app/components/console/log-command.hbs
diff --git a/ui/app/templates/components/console/log-error-with-html.hbs b/ui/app/components/console/log-error-with-html.hbs
similarity index 100%
rename from ui/app/templates/components/console/log-error-with-html.hbs
rename to ui/app/components/console/log-error-with-html.hbs
diff --git a/ui/app/templates/components/console/log-error.hbs b/ui/app/components/console/log-error.hbs
similarity index 100%
rename from ui/app/templates/components/console/log-error.hbs
rename to ui/app/components/console/log-error.hbs
diff --git a/ui/app/templates/components/console/log-help.hbs b/ui/app/components/console/log-help.hbs
similarity index 100%
rename from ui/app/templates/components/console/log-help.hbs
rename to ui/app/components/console/log-help.hbs
diff --git a/ui/app/templates/components/console/log-json.hbs b/ui/app/components/console/log-json.hbs
similarity index 100%
rename from ui/app/templates/components/console/log-json.hbs
rename to ui/app/components/console/log-json.hbs
diff --git a/ui/app/templates/components/console/log-list.hbs b/ui/app/components/console/log-list.hbs
similarity index 100%
rename from ui/app/templates/components/console/log-list.hbs
rename to ui/app/components/console/log-list.hbs
diff --git a/ui/app/templates/components/console/log-object.hbs b/ui/app/components/console/log-object.hbs
similarity index 100%
rename from ui/app/templates/components/console/log-object.hbs
rename to ui/app/components/console/log-object.hbs
diff --git a/ui/app/templates/components/console/log-success.hbs b/ui/app/components/console/log-success.hbs
similarity index 100%
rename from ui/app/templates/components/console/log-success.hbs
rename to ui/app/components/console/log-success.hbs
diff --git a/ui/app/templates/components/console/log-text.hbs b/ui/app/components/console/log-text.hbs
similarity index 100%
rename from ui/app/templates/components/console/log-text.hbs
rename to ui/app/components/console/log-text.hbs
diff --git a/ui/app/templates/components/console/output-log.hbs b/ui/app/components/console/output-log.hbs
similarity index 100%
rename from ui/app/templates/components/console/output-log.hbs
rename to ui/app/components/console/output-log.hbs
diff --git a/ui/app/templates/components/console/ui-panel.hbs b/ui/app/components/console/ui-panel.hbs
similarity index 100%
rename from ui/app/templates/components/console/ui-panel.hbs
rename to ui/app/components/console/ui-panel.hbs
diff --git a/ui/app/templates/components/control-group-success.hbs b/ui/app/components/control-group-success.hbs
similarity index 100%
rename from ui/app/templates/components/control-group-success.hbs
rename to ui/app/components/control-group-success.hbs
diff --git a/ui/app/templates/components/control-group.hbs b/ui/app/components/control-group.hbs
similarity index 100%
rename from ui/app/templates/components/control-group.hbs
rename to ui/app/components/control-group.hbs
diff --git a/ui/app/templates/components/database-connection.hbs b/ui/app/components/database-connection.hbs
similarity index 100%
rename from ui/app/templates/components/database-connection.hbs
rename to ui/app/components/database-connection.hbs
diff --git a/ui/app/templates/components/database-role-setting-form.hbs b/ui/app/components/database-role-setting-form.hbs
similarity index 100%
rename from ui/app/templates/components/database-role-setting-form.hbs
rename to ui/app/components/database-role-setting-form.hbs
diff --git a/ui/app/templates/components/file-to-array-buffer.hbs b/ui/app/components/file-to-array-buffer.hbs
similarity index 100%
rename from ui/app/templates/components/file-to-array-buffer.hbs
rename to ui/app/components/file-to-array-buffer.hbs
diff --git a/ui/app/templates/components/form-field-from-model.hbs b/ui/app/components/form-field-from-model.hbs
similarity index 100%
rename from ui/app/templates/components/form-field-from-model.hbs
rename to ui/app/components/form-field-from-model.hbs
diff --git a/ui/app/templates/components/generate-credentials-database.hbs b/ui/app/components/generate-credentials-database.hbs
similarity index 100%
rename from ui/app/templates/components/generate-credentials-database.hbs
rename to ui/app/components/generate-credentials-database.hbs
diff --git a/ui/app/templates/components/generated-item-list.hbs b/ui/app/components/generated-item-list.hbs
similarity index 100%
rename from ui/app/templates/components/generated-item-list.hbs
rename to ui/app/components/generated-item-list.hbs
diff --git a/ui/app/templates/components/generated-item.hbs b/ui/app/components/generated-item.hbs
similarity index 100%
rename from ui/app/templates/components/generated-item.hbs
rename to ui/app/components/generated-item.hbs
diff --git a/ui/app/templates/components/identity/edit-form.hbs b/ui/app/components/identity/edit-form.hbs
similarity index 100%
rename from ui/app/templates/components/identity/edit-form.hbs
rename to ui/app/components/identity/edit-form.hbs
diff --git a/ui/app/templates/components/identity/entity-nav.hbs b/ui/app/components/identity/entity-nav.hbs
similarity index 100%
rename from ui/app/templates/components/identity/entity-nav.hbs
rename to ui/app/components/identity/entity-nav.hbs
diff --git a/ui/app/templates/components/identity/item-alias/alias-details.hbs b/ui/app/components/identity/item-alias/alias-details.hbs
similarity index 100%
rename from ui/app/templates/components/identity/item-alias/alias-details.hbs
rename to ui/app/components/identity/item-alias/alias-details.hbs
diff --git a/ui/app/templates/components/identity/item-alias/alias-metadata.hbs b/ui/app/components/identity/item-alias/alias-metadata.hbs
similarity index 100%
rename from ui/app/templates/components/identity/item-alias/alias-metadata.hbs
rename to ui/app/components/identity/item-alias/alias-metadata.hbs
diff --git a/ui/app/templates/components/identity/item-aliases.hbs b/ui/app/components/identity/item-aliases.hbs
similarity index 100%
rename from ui/app/templates/components/identity/item-aliases.hbs
rename to ui/app/components/identity/item-aliases.hbs
diff --git a/ui/app/templates/components/identity/item-details.hbs b/ui/app/components/identity/item-details.hbs
similarity index 100%
rename from ui/app/templates/components/identity/item-details.hbs
rename to ui/app/components/identity/item-details.hbs
diff --git a/ui/app/templates/components/identity/item-groups.hbs b/ui/app/components/identity/item-groups.hbs
similarity index 100%
rename from ui/app/templates/components/identity/item-groups.hbs
rename to ui/app/components/identity/item-groups.hbs
diff --git a/ui/app/templates/components/identity/item-members.hbs b/ui/app/components/identity/item-members.hbs
similarity index 100%
rename from ui/app/templates/components/identity/item-members.hbs
rename to ui/app/components/identity/item-members.hbs
diff --git a/ui/app/templates/components/identity/item-metadata.hbs b/ui/app/components/identity/item-metadata.hbs
similarity index 100%
rename from ui/app/templates/components/identity/item-metadata.hbs
rename to ui/app/components/identity/item-metadata.hbs
diff --git a/ui/app/templates/components/identity/item-parent-groups.hbs b/ui/app/components/identity/item-parent-groups.hbs
similarity index 100%
rename from ui/app/templates/components/identity/item-parent-groups.hbs
rename to ui/app/components/identity/item-parent-groups.hbs
diff --git a/ui/app/templates/components/identity/item-policies.hbs b/ui/app/components/identity/item-policies.hbs
similarity index 100%
rename from ui/app/templates/components/identity/item-policies.hbs
rename to ui/app/components/identity/item-policies.hbs
diff --git a/ui/app/templates/components/identity/lookup-input.hbs b/ui/app/components/identity/lookup-input.hbs
similarity index 100%
rename from ui/app/templates/components/identity/lookup-input.hbs
rename to ui/app/components/identity/lookup-input.hbs
diff --git a/ui/app/templates/components/identity/popup-alias.hbs b/ui/app/components/identity/popup-alias.hbs
similarity index 100%
rename from ui/app/templates/components/identity/popup-alias.hbs
rename to ui/app/components/identity/popup-alias.hbs
diff --git a/ui/app/templates/components/identity/popup-members.hbs b/ui/app/components/identity/popup-members.hbs
similarity index 100%
rename from ui/app/templates/components/identity/popup-members.hbs
rename to ui/app/components/identity/popup-members.hbs
diff --git a/ui/app/templates/components/identity/popup-metadata.hbs b/ui/app/components/identity/popup-metadata.hbs
similarity index 100%
rename from ui/app/templates/components/identity/popup-metadata.hbs
rename to ui/app/components/identity/popup-metadata.hbs
diff --git a/ui/app/templates/components/identity/popup-policy.hbs b/ui/app/components/identity/popup-policy.hbs
similarity index 100%
rename from ui/app/templates/components/identity/popup-policy.hbs
rename to ui/app/components/identity/popup-policy.hbs
diff --git a/ui/app/templates/components/key-version-select.hbs b/ui/app/components/key-version-select.hbs
similarity index 100%
rename from ui/app/templates/components/key-version-select.hbs
rename to ui/app/components/key-version-select.hbs
diff --git a/ui/app/templates/components/keymgmt/distribute.hbs b/ui/app/components/keymgmt/distribute.hbs
similarity index 100%
rename from ui/app/templates/components/keymgmt/distribute.hbs
rename to ui/app/components/keymgmt/distribute.hbs
diff --git a/ui/app/templates/components/keymgmt/key-edit.hbs b/ui/app/components/keymgmt/key-edit.hbs
similarity index 100%
rename from ui/app/templates/components/keymgmt/key-edit.hbs
rename to ui/app/components/keymgmt/key-edit.hbs
diff --git a/ui/app/templates/components/keymgmt/provider-edit.hbs b/ui/app/components/keymgmt/provider-edit.hbs
similarity index 100%
rename from ui/app/templates/components/keymgmt/provider-edit.hbs
rename to ui/app/components/keymgmt/provider-edit.hbs
diff --git a/ui/app/templates/components/license-banners.hbs b/ui/app/components/license-banners.hbs
similarity index 100%
rename from ui/app/templates/components/license-banners.hbs
rename to ui/app/components/license-banners.hbs
diff --git a/ui/app/templates/components/link-status.hbs b/ui/app/components/link-status.hbs
similarity index 100%
rename from ui/app/templates/components/link-status.hbs
rename to ui/app/components/link-status.hbs
diff --git a/ui/app/templates/components/logo-splash.hbs b/ui/app/components/logo-splash.hbs
similarity index 100%
rename from ui/app/templates/components/logo-splash.hbs
rename to ui/app/components/logo-splash.hbs
diff --git a/ui/app/templates/components/mfa/login-enforcement-list-item.hbs b/ui/app/components/mfa/login-enforcement-list-item.hbs
similarity index 100%
rename from ui/app/templates/components/mfa/login-enforcement-list-item.hbs
rename to ui/app/components/mfa/login-enforcement-list-item.hbs
diff --git a/ui/app/templates/components/mfa/method-form.hbs b/ui/app/components/mfa/method-form.hbs
similarity index 100%
rename from ui/app/templates/components/mfa/method-form.hbs
rename to ui/app/components/mfa/method-form.hbs
diff --git a/ui/app/templates/components/mfa/method-list-item.hbs b/ui/app/components/mfa/method-list-item.hbs
similarity index 100%
rename from ui/app/templates/components/mfa/method-list-item.hbs
rename to ui/app/components/mfa/method-list-item.hbs
diff --git a/ui/app/templates/components/mfa/mfa-form.hbs b/ui/app/components/mfa/mfa-form.hbs
similarity index 100%
rename from ui/app/templates/components/mfa/mfa-form.hbs
rename to ui/app/components/mfa/mfa-form.hbs
diff --git a/ui/app/templates/components/mfa/mfa-login-enforcement-form.hbs b/ui/app/components/mfa/mfa-login-enforcement-form.hbs
similarity index 100%
rename from ui/app/templates/components/mfa/mfa-login-enforcement-form.hbs
rename to ui/app/components/mfa/mfa-login-enforcement-form.hbs
diff --git a/ui/app/templates/components/mfa/mfa-login-enforcement-header.hbs b/ui/app/components/mfa/mfa-login-enforcement-header.hbs
similarity index 100%
rename from ui/app/templates/components/mfa/mfa-login-enforcement-header.hbs
rename to ui/app/components/mfa/mfa-login-enforcement-header.hbs
diff --git a/ui/app/templates/components/mfa/mfa-setup-step-one.hbs b/ui/app/components/mfa/mfa-setup-step-one.hbs
similarity index 100%
rename from ui/app/templates/components/mfa/mfa-setup-step-one.hbs
rename to ui/app/components/mfa/mfa-setup-step-one.hbs
diff --git a/ui/app/templates/components/mfa/mfa-setup-step-two.hbs b/ui/app/components/mfa/mfa-setup-step-two.hbs
similarity index 100%
rename from ui/app/templates/components/mfa/mfa-setup-step-two.hbs
rename to ui/app/components/mfa/mfa-setup-step-two.hbs
diff --git a/ui/app/templates/components/mfa/nav.hbs b/ui/app/components/mfa/nav.hbs
similarity index 100%
rename from ui/app/templates/components/mfa/nav.hbs
rename to ui/app/components/mfa/nav.hbs
diff --git a/ui/app/templates/components/mount-accessor-select.hbs b/ui/app/components/mount-accessor-select.hbs
similarity index 100%
rename from ui/app/templates/components/mount-accessor-select.hbs
rename to ui/app/components/mount-accessor-select.hbs
diff --git a/ui/app/templates/components/oidc-callback-splash.hbs b/ui/app/components/oidc-callback-splash.hbs
similarity index 100%
rename from ui/app/templates/components/oidc-callback-splash.hbs
rename to ui/app/components/oidc-callback-splash.hbs
diff --git a/ui/app/templates/components/oidc-consent-block.hbs b/ui/app/components/oidc-consent-block.hbs
similarity index 100%
rename from ui/app/templates/components/oidc-consent-block.hbs
rename to ui/app/components/oidc-consent-block.hbs
diff --git a/ui/app/templates/components/oidc/assignment-form.hbs b/ui/app/components/oidc/assignment-form.hbs
similarity index 100%
rename from ui/app/templates/components/oidc/assignment-form.hbs
rename to ui/app/components/oidc/assignment-form.hbs
diff --git a/ui/app/templates/components/oidc/client-form.hbs b/ui/app/components/oidc/client-form.hbs
similarity index 100%
rename from ui/app/templates/components/oidc/client-form.hbs
rename to ui/app/components/oidc/client-form.hbs
diff --git a/ui/app/templates/components/oidc/client-list.hbs b/ui/app/components/oidc/client-list.hbs
similarity index 100%
rename from ui/app/templates/components/oidc/client-list.hbs
rename to ui/app/components/oidc/client-list.hbs
diff --git a/ui/app/templates/components/oidc/key-form.hbs b/ui/app/components/oidc/key-form.hbs
similarity index 100%
rename from ui/app/templates/components/oidc/key-form.hbs
rename to ui/app/components/oidc/key-form.hbs
diff --git a/ui/app/templates/components/oidc/provider-form.hbs b/ui/app/components/oidc/provider-form.hbs
similarity index 100%
rename from ui/app/templates/components/oidc/provider-form.hbs
rename to ui/app/components/oidc/provider-form.hbs
diff --git a/ui/app/templates/components/oidc/provider-list.hbs b/ui/app/components/oidc/provider-list.hbs
similarity index 100%
rename from ui/app/templates/components/oidc/provider-list.hbs
rename to ui/app/components/oidc/provider-list.hbs
diff --git a/ui/app/templates/components/oidc/scope-form.hbs b/ui/app/components/oidc/scope-form.hbs
similarity index 100%
rename from ui/app/templates/components/oidc/scope-form.hbs
rename to ui/app/components/oidc/scope-form.hbs
diff --git a/ui/app/templates/components/okta-number-challenge.hbs b/ui/app/components/okta-number-challenge.hbs
similarity index 100%
rename from ui/app/templates/components/okta-number-challenge.hbs
rename to ui/app/components/okta-number-challenge.hbs
diff --git a/ui/app/templates/components/pgp-file.hbs b/ui/app/components/pgp-file.hbs
similarity index 100%
rename from ui/app/templates/components/pgp-file.hbs
rename to ui/app/components/pgp-file.hbs
diff --git a/ui/app/templates/components/pgp-list.hbs b/ui/app/components/pgp-list.hbs
similarity index 100%
rename from ui/app/templates/components/pgp-list.hbs
rename to ui/app/components/pgp-list.hbs
diff --git a/ui/app/templates/components/radial-progress.hbs b/ui/app/components/radial-progress.hbs
similarity index 100%
rename from ui/app/templates/components/radial-progress.hbs
rename to ui/app/components/radial-progress.hbs
diff --git a/ui/app/templates/components/raft-join.hbs b/ui/app/components/raft-join.hbs
similarity index 100%
rename from ui/app/templates/components/raft-join.hbs
rename to ui/app/components/raft-join.hbs
diff --git a/ui/app/templates/components/raft-storage-overview.hbs b/ui/app/components/raft-storage-overview.hbs
similarity index 100%
rename from ui/app/templates/components/raft-storage-overview.hbs
rename to ui/app/components/raft-storage-overview.hbs
diff --git a/ui/app/templates/components/raft-storage-restore.hbs b/ui/app/components/raft-storage-restore.hbs
similarity index 100%
rename from ui/app/templates/components/raft-storage-restore.hbs
rename to ui/app/components/raft-storage-restore.hbs
diff --git a/ui/app/templates/components/role-aws-edit.hbs b/ui/app/components/role-aws-edit.hbs
similarity index 100%
rename from ui/app/templates/components/role-aws-edit.hbs
rename to ui/app/components/role-aws-edit.hbs
diff --git a/ui/app/templates/components/role-ssh-edit.hbs b/ui/app/components/role-ssh-edit.hbs
similarity index 100%
rename from ui/app/templates/components/role-ssh-edit.hbs
rename to ui/app/components/role-ssh-edit.hbs
diff --git a/ui/app/templates/components/secret-create-or-update.hbs b/ui/app/components/secret-create-or-update.hbs
similarity index 100%
rename from ui/app/templates/components/secret-create-or-update.hbs
rename to ui/app/components/secret-create-or-update.hbs
diff --git a/ui/app/templates/components/secret-edit-toolbar.hbs b/ui/app/components/secret-edit-toolbar.hbs
similarity index 100%
rename from ui/app/templates/components/secret-edit-toolbar.hbs
rename to ui/app/components/secret-edit-toolbar.hbs
diff --git a/ui/app/templates/components/secret-edit.hbs b/ui/app/components/secret-edit.hbs
similarity index 100%
rename from ui/app/templates/components/secret-edit.hbs
rename to ui/app/components/secret-edit.hbs
diff --git a/ui/app/templates/components/secret-form-show.hbs b/ui/app/components/secret-form-show.hbs
similarity index 100%
rename from ui/app/templates/components/secret-form-show.hbs
rename to ui/app/components/secret-form-show.hbs
diff --git a/ui/app/templates/components/secret-list/aws-role-item.hbs b/ui/app/components/secret-list/aws-role-item.hbs
similarity index 100%
rename from ui/app/templates/components/secret-list/aws-role-item.hbs
rename to ui/app/components/secret-list/aws-role-item.hbs
diff --git a/ui/app/templates/components/secret-list/database-list-item.hbs b/ui/app/components/secret-list/database-list-item.hbs
similarity index 100%
rename from ui/app/templates/components/secret-list/database-list-item.hbs
rename to ui/app/components/secret-list/database-list-item.hbs
diff --git a/ui/app/templates/components/secret-list/item.hbs b/ui/app/components/secret-list/item.hbs
similarity index 100%
rename from ui/app/templates/components/secret-list/item.hbs
rename to ui/app/components/secret-list/item.hbs
diff --git a/ui/app/templates/components/secret-list/ssh-role-item.hbs b/ui/app/components/secret-list/ssh-role-item.hbs
similarity index 100%
rename from ui/app/templates/components/secret-list/ssh-role-item.hbs
rename to ui/app/components/secret-list/ssh-role-item.hbs
diff --git a/ui/app/templates/components/secret-list/transform-list-item.hbs b/ui/app/components/secret-list/transform-list-item.hbs
similarity index 100%
rename from ui/app/templates/components/secret-list/transform-list-item.hbs
rename to ui/app/components/secret-list/transform-list-item.hbs
diff --git a/ui/app/templates/components/secret-list/transform-transformation-item.hbs b/ui/app/components/secret-list/transform-transformation-item.hbs
similarity index 100%
rename from ui/app/templates/components/secret-list/transform-transformation-item.hbs
rename to ui/app/components/secret-list/transform-transformation-item.hbs
diff --git a/ui/app/templates/components/shamir-progress.hbs b/ui/app/components/shamir-progress.hbs
similarity index 100%
rename from ui/app/templates/components/shamir-progress.hbs
rename to ui/app/components/shamir-progress.hbs
diff --git a/ui/app/templates/components/toolbar-secret-link.hbs b/ui/app/components/toolbar-secret-link.hbs
similarity index 100%
rename from ui/app/templates/components/toolbar-secret-link.hbs
rename to ui/app/components/toolbar-secret-link.hbs
diff --git a/ui/app/templates/components/transform-advanced-templating.hbs b/ui/app/components/transform-advanced-templating.hbs
similarity index 100%
rename from ui/app/templates/components/transform-advanced-templating.hbs
rename to ui/app/components/transform-advanced-templating.hbs
diff --git a/ui/app/templates/components/transform-create-form.hbs b/ui/app/components/transform-create-form.hbs
similarity index 100%
rename from ui/app/templates/components/transform-create-form.hbs
rename to ui/app/components/transform-create-form.hbs
diff --git a/ui/app/templates/components/transform-edit-form.hbs b/ui/app/components/transform-edit-form.hbs
similarity index 100%
rename from ui/app/templates/components/transform-edit-form.hbs
rename to ui/app/components/transform-edit-form.hbs
diff --git a/ui/app/templates/components/transform-role-edit.hbs b/ui/app/components/transform-role-edit.hbs
similarity index 100%
rename from ui/app/templates/components/transform-role-edit.hbs
rename to ui/app/components/transform-role-edit.hbs
diff --git a/ui/app/templates/components/transform-show-transformation.hbs b/ui/app/components/transform-show-transformation.hbs
similarity index 100%
rename from ui/app/templates/components/transform-show-transformation.hbs
rename to ui/app/components/transform-show-transformation.hbs
diff --git a/ui/app/templates/components/transformation-edit.hbs b/ui/app/components/transformation-edit.hbs
similarity index 100%
rename from ui/app/templates/components/transformation-edit.hbs
rename to ui/app/components/transformation-edit.hbs
diff --git a/ui/app/templates/components/transit-edit.hbs b/ui/app/components/transit-edit.hbs
similarity index 100%
rename from ui/app/templates/components/transit-edit.hbs
rename to ui/app/components/transit-edit.hbs
diff --git a/ui/app/templates/components/transit-form-create.hbs b/ui/app/components/transit-form-create.hbs
similarity index 100%
rename from ui/app/templates/components/transit-form-create.hbs
rename to ui/app/components/transit-form-create.hbs
diff --git a/ui/app/templates/components/transit-form-edit.hbs b/ui/app/components/transit-form-edit.hbs
similarity index 100%
rename from ui/app/templates/components/transit-form-edit.hbs
rename to ui/app/components/transit-form-edit.hbs
diff --git a/ui/app/templates/components/transit-form-show.hbs b/ui/app/components/transit-form-show.hbs
similarity index 100%
rename from ui/app/templates/components/transit-form-show.hbs
rename to ui/app/components/transit-form-show.hbs
diff --git a/ui/app/templates/components/transit-key-action/datakey.hbs b/ui/app/components/transit-key-action/datakey.hbs
similarity index 100%
rename from ui/app/templates/components/transit-key-action/datakey.hbs
rename to ui/app/components/transit-key-action/datakey.hbs
diff --git a/ui/app/templates/components/transit-key-action/decrypt.hbs b/ui/app/components/transit-key-action/decrypt.hbs
similarity index 100%
rename from ui/app/templates/components/transit-key-action/decrypt.hbs
rename to ui/app/components/transit-key-action/decrypt.hbs
diff --git a/ui/app/templates/components/transit-key-action/encrypt.hbs b/ui/app/components/transit-key-action/encrypt.hbs
similarity index 100%
rename from ui/app/templates/components/transit-key-action/encrypt.hbs
rename to ui/app/components/transit-key-action/encrypt.hbs
diff --git a/ui/app/templates/components/transit-key-action/export.hbs b/ui/app/components/transit-key-action/export.hbs
similarity index 100%
rename from ui/app/templates/components/transit-key-action/export.hbs
rename to ui/app/components/transit-key-action/export.hbs
diff --git a/ui/app/templates/components/transit-key-action/hmac.hbs b/ui/app/components/transit-key-action/hmac.hbs
similarity index 100%
rename from ui/app/templates/components/transit-key-action/hmac.hbs
rename to ui/app/components/transit-key-action/hmac.hbs
diff --git a/ui/app/templates/components/transit-key-action/rewrap.hbs b/ui/app/components/transit-key-action/rewrap.hbs
similarity index 100%
rename from ui/app/templates/components/transit-key-action/rewrap.hbs
rename to ui/app/components/transit-key-action/rewrap.hbs
diff --git a/ui/app/templates/components/transit-key-action/sign.hbs b/ui/app/components/transit-key-action/sign.hbs
similarity index 100%
rename from ui/app/templates/components/transit-key-action/sign.hbs
rename to ui/app/components/transit-key-action/sign.hbs
diff --git a/ui/app/templates/components/transit-key-action/verify.hbs b/ui/app/components/transit-key-action/verify.hbs
similarity index 100%
rename from ui/app/templates/components/transit-key-action/verify.hbs
rename to ui/app/components/transit-key-action/verify.hbs