diff --git a/app/assets/javascripts/discourse/app/templates/components/about-page-users.hbs b/app/assets/javascripts/discourse/app/components/about-page-users.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/about-page-users.hbs
rename to app/assets/javascripts/discourse/app/components/about-page-users.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/activation-controls.hbs b/app/assets/javascripts/discourse/app/components/activation-controls.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/activation-controls.hbs
rename to app/assets/javascripts/discourse/app/components/activation-controls.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/activation-email-form.hbs b/app/assets/javascripts/discourse/app/components/activation-email-form.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/activation-email-form.hbs
rename to app/assets/javascripts/discourse/app/components/activation-email-form.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/avatar-uploader.hbs b/app/assets/javascripts/discourse/app/components/avatar-uploader.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/avatar-uploader.hbs
rename to app/assets/javascripts/discourse/app/components/avatar-uploader.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/backup-codes.hbs b/app/assets/javascripts/discourse/app/components/backup-codes.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/backup-codes.hbs
rename to app/assets/javascripts/discourse/app/components/backup-codes.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/badge-button.hbs b/app/assets/javascripts/discourse/app/components/badge-button.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/badge-button.hbs
rename to app/assets/javascripts/discourse/app/components/badge-button.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/badge-card.hbs b/app/assets/javascripts/discourse/app/components/badge-card.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/badge-card.hbs
rename to app/assets/javascripts/discourse/app/components/badge-card.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/badge-selector.hbs b/app/assets/javascripts/discourse/app/components/badge-selector.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/badge-selector.hbs
rename to app/assets/javascripts/discourse/app/components/badge-selector.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/badge-title.hbs b/app/assets/javascripts/discourse/app/components/badge-title.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/badge-title.hbs
rename to app/assets/javascripts/discourse/app/components/badge-title.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/app/components/basic-topic-list.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/basic-topic-list.hbs
rename to app/assets/javascripts/discourse/app/components/basic-topic-list.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/bookmark-icon.hbs b/app/assets/javascripts/discourse/app/components/bookmark-icon.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/bookmark-icon.hbs
rename to app/assets/javascripts/discourse/app/components/bookmark-icon.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/bookmark-list.hbs b/app/assets/javascripts/discourse/app/components/bookmark-list.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/bookmark-list.hbs
rename to app/assets/javascripts/discourse/app/components/bookmark-list.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/bookmark.hbs b/app/assets/javascripts/discourse/app/components/bookmark.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/bookmark.hbs
rename to app/assets/javascripts/discourse/app/components/bookmark.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/bootstrap-mode-notice.hbs b/app/assets/javascripts/discourse/app/components/bootstrap-mode-notice.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/bootstrap-mode-notice.hbs
rename to app/assets/javascripts/discourse/app/components/bootstrap-mode-notice.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/bread-crumbs.hbs b/app/assets/javascripts/discourse/app/components/bread-crumbs.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/bread-crumbs.hbs
rename to app/assets/javascripts/discourse/app/components/bread-crumbs.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/bulk-select-toggle.hbs b/app/assets/javascripts/discourse/app/components/bulk-select-toggle.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/bulk-select-toggle.hbs
rename to app/assets/javascripts/discourse/app/components/bulk-select-toggle.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/cancel-link.hbs b/app/assets/javascripts/discourse/app/components/cancel-link.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/cancel-link.hbs
rename to app/assets/javascripts/discourse/app/components/cancel-link.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-and-latest-topics.hbs b/app/assets/javascripts/discourse/app/components/categories-and-latest-topics.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/categories-and-latest-topics.hbs
rename to app/assets/javascripts/discourse/app/components/categories-and-latest-topics.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-and-top-topics.hbs b/app/assets/javascripts/discourse/app/components/categories-and-top-topics.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/categories-and-top-topics.hbs
rename to app/assets/javascripts/discourse/app/components/categories-and-top-topics.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-boxes-topic.hbs b/app/assets/javascripts/discourse/app/components/categories-boxes-topic.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/categories-boxes-topic.hbs
rename to app/assets/javascripts/discourse/app/components/categories-boxes-topic.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-boxes-with-topics.hbs b/app/assets/javascripts/discourse/app/components/categories-boxes-with-topics.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/categories-boxes-with-topics.hbs
rename to app/assets/javascripts/discourse/app/components/categories-boxes-with-topics.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-boxes.hbs b/app/assets/javascripts/discourse/app/components/categories-boxes.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/categories-boxes.hbs
rename to app/assets/javascripts/discourse/app/components/categories-boxes.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-only.hbs b/app/assets/javascripts/discourse/app/components/categories-only.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/categories-only.hbs
rename to app/assets/javascripts/discourse/app/components/categories-only.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-topic-list.hbs b/app/assets/javascripts/discourse/app/components/categories-topic-list.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/categories-topic-list.hbs
rename to app/assets/javascripts/discourse/app/components/categories-topic-list.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-with-featured-topics.hbs b/app/assets/javascripts/discourse/app/components/categories-with-featured-topics.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/categories-with-featured-topics.hbs
rename to app/assets/javascripts/discourse/app/components/categories-with-featured-topics.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/category-logo.hbs b/app/assets/javascripts/discourse/app/components/category-logo.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/category-logo.hbs
rename to app/assets/javascripts/discourse/app/components/category-logo.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/category-name-fields.hbs b/app/assets/javascripts/discourse/app/components/category-name-fields.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/category-name-fields.hbs
rename to app/assets/javascripts/discourse/app/components/category-name-fields.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/category-permission-row.hbs b/app/assets/javascripts/discourse/app/components/category-permission-row.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/category-permission-row.hbs
rename to app/assets/javascripts/discourse/app/components/category-permission-row.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/category-read-only-banner.hbs b/app/assets/javascripts/discourse/app/components/category-read-only-banner.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/category-read-only-banner.hbs
rename to app/assets/javascripts/discourse/app/components/category-read-only-banner.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/category-title-before.hbs b/app/assets/javascripts/discourse/app/components/category-title-before.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/category-title-before.hbs
rename to app/assets/javascripts/discourse/app/components/category-title-before.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/category-title-link.hbs b/app/assets/javascripts/discourse/app/components/category-title-link.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/category-title-link.hbs
rename to app/assets/javascripts/discourse/app/components/category-title-link.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/category-unread.hbs b/app/assets/javascripts/discourse/app/components/category-unread.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/category-unread.hbs
rename to app/assets/javascripts/discourse/app/components/category-unread.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/cdn-img.hbs b/app/assets/javascripts/discourse/app/components/cdn-img.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/cdn-img.hbs
rename to app/assets/javascripts/discourse/app/components/cdn-img.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/choose-message.hbs b/app/assets/javascripts/discourse/app/components/choose-message.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/choose-message.hbs
rename to app/assets/javascripts/discourse/app/components/choose-message.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/choose-topic.hbs b/app/assets/javascripts/discourse/app/components/choose-topic.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/choose-topic.hbs
rename to app/assets/javascripts/discourse/app/components/choose-topic.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/color-picker.hbs b/app/assets/javascripts/discourse/app/components/color-picker.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/color-picker.hbs
rename to app/assets/javascripts/discourse/app/components/color-picker.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/composer-action-title.hbs b/app/assets/javascripts/discourse/app/components/composer-action-title.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/composer-action-title.hbs
rename to app/assets/javascripts/discourse/app/components/composer-action-title.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/composer-editor.hbs b/app/assets/javascripts/discourse/app/components/composer-editor.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/composer-editor.hbs
rename to app/assets/javascripts/discourse/app/components/composer-editor.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/composer-messages.hbs b/app/assets/javascripts/discourse/app/components/composer-messages.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/composer-messages.hbs
rename to app/assets/javascripts/discourse/app/components/composer-messages.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/composer-title.hbs b/app/assets/javascripts/discourse/app/components/composer-title.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/composer-title.hbs
rename to app/assets/javascripts/discourse/app/components/composer-title.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/composer-toggles.hbs b/app/assets/javascripts/discourse/app/components/composer-toggles.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/composer-toggles.hbs
rename to app/assets/javascripts/discourse/app/components/composer-toggles.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/composer-user-selector.hbs b/app/assets/javascripts/discourse/app/components/composer-user-selector.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/composer-user-selector.hbs
rename to app/assets/javascripts/discourse/app/components/composer-user-selector.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/conditional-loading-section.hbs b/app/assets/javascripts/discourse/app/components/conditional-loading-section.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/conditional-loading-section.hbs
rename to app/assets/javascripts/discourse/app/components/conditional-loading-section.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/conditional-loading-spinner.hbs b/app/assets/javascripts/discourse/app/components/conditional-loading-spinner.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/conditional-loading-spinner.hbs
rename to app/assets/javascripts/discourse/app/components/conditional-loading-spinner.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/cook-text.hbs b/app/assets/javascripts/discourse/app/components/cook-text.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/cook-text.hbs
rename to app/assets/javascripts/discourse/app/components/cook-text.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/copy-button.hbs b/app/assets/javascripts/discourse/app/components/copy-button.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/copy-button.hbs
rename to app/assets/javascripts/discourse/app/components/copy-button.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/count-i18n.hbs b/app/assets/javascripts/discourse/app/components/count-i18n.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/count-i18n.hbs
rename to app/assets/javascripts/discourse/app/components/count-i18n.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/create-invite-uploader.hbs b/app/assets/javascripts/discourse/app/components/create-invite-uploader.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/create-invite-uploader.hbs
rename to app/assets/javascripts/discourse/app/components/create-invite-uploader.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/create-topic-button.hbs b/app/assets/javascripts/discourse/app/components/create-topic-button.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/create-topic-button.hbs
rename to app/assets/javascripts/discourse/app/components/create-topic-button.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/create-topics-notice.hbs b/app/assets/javascripts/discourse/app/components/create-topics-notice.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/create-topics-notice.hbs
rename to app/assets/javascripts/discourse/app/components/create-topics-notice.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-button.hbs b/app/assets/javascripts/discourse/app/components/d-button.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/d-button.hbs
rename to app/assets/javascripts/discourse/app/components/d-button.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-editor.hbs b/app/assets/javascripts/discourse/app/components/d-editor.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/d-editor.hbs
rename to app/assets/javascripts/discourse/app/components/d-editor.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-modal-cancel.hbs b/app/assets/javascripts/discourse/app/components/d-modal-cancel.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/d-modal-cancel.hbs
rename to app/assets/javascripts/discourse/app/components/d-modal-cancel.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-modal.hbs b/app/assets/javascripts/discourse/app/components/d-modal.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/d-modal.hbs
rename to app/assets/javascripts/discourse/app/components/d-modal.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-navigation-item.hbs b/app/assets/javascripts/discourse/app/components/d-navigation-item.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/d-navigation-item.hbs
rename to app/assets/javascripts/discourse/app/components/d-navigation-item.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs b/app/assets/javascripts/discourse/app/components/d-navigation.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
rename to app/assets/javascripts/discourse/app/components/d-navigation.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-popover.hbs b/app/assets/javascripts/discourse/app/components/d-popover.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/d-popover.hbs
rename to app/assets/javascripts/discourse/app/components/d-popover.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-tooltip.hbs b/app/assets/javascripts/discourse/app/components/d-tooltip.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/d-tooltip.hbs
rename to app/assets/javascripts/discourse/app/components/d-tooltip.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/date-input.hbs b/app/assets/javascripts/discourse/app/components/date-input.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/date-input.hbs
rename to app/assets/javascripts/discourse/app/components/date-input.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/date-picker.hbs b/app/assets/javascripts/discourse/app/components/date-picker.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/date-picker.hbs
rename to app/assets/javascripts/discourse/app/components/date-picker.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/date-time-input-range.hbs b/app/assets/javascripts/discourse/app/components/date-time-input-range.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/date-time-input-range.hbs
rename to app/assets/javascripts/discourse/app/components/date-time-input-range.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/date-time-input.hbs b/app/assets/javascripts/discourse/app/components/date-time-input.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/date-time-input.hbs
rename to app/assets/javascripts/discourse/app/components/date-time-input.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/desktop-notification-config.hbs b/app/assets/javascripts/discourse/app/components/desktop-notification-config.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/desktop-notification-config.hbs
rename to app/assets/javascripts/discourse/app/components/desktop-notification-config.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/directory-item.hbs b/app/assets/javascripts/discourse/app/components/directory-item.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/directory-item.hbs
rename to app/assets/javascripts/discourse/app/components/directory-item.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/directory-table.hbs b/app/assets/javascripts/discourse/app/components/directory-table.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/directory-table.hbs
rename to app/assets/javascripts/discourse/app/components/directory-table.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/disabled-icon.hbs b/app/assets/javascripts/discourse/app/components/disabled-icon.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/disabled-icon.hbs
rename to app/assets/javascripts/discourse/app/components/disabled-icon.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/discourse-banner.hbs b/app/assets/javascripts/discourse/app/components/discourse-banner.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/discourse-banner.hbs
rename to app/assets/javascripts/discourse/app/components/discourse-banner.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/discourse-linked-text.hbs b/app/assets/javascripts/discourse/app/components/discourse-linked-text.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/discourse-linked-text.hbs
rename to app/assets/javascripts/discourse/app/components/discourse-linked-text.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/discourse-tag-bound.hbs b/app/assets/javascripts/discourse/app/components/discourse-tag-bound.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/discourse-tag-bound.hbs
rename to app/assets/javascripts/discourse/app/components/discourse-tag-bound.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/discovery-topics-list.hbs b/app/assets/javascripts/discourse/app/components/discovery-topics-list.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/discovery-topics-list.hbs
rename to app/assets/javascripts/discourse/app/components/discovery-topics-list.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-general.hbs b/app/assets/javascripts/discourse/app/components/edit-category-general.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/edit-category-general.hbs
rename to app/assets/javascripts/discourse/app/components/edit-category-general.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-images.hbs b/app/assets/javascripts/discourse/app/components/edit-category-images.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/edit-category-images.hbs
rename to app/assets/javascripts/discourse/app/components/edit-category-images.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-panel.hbs b/app/assets/javascripts/discourse/app/components/edit-category-panel.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/edit-category-panel.hbs
rename to app/assets/javascripts/discourse/app/components/edit-category-panel.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-security.hbs b/app/assets/javascripts/discourse/app/components/edit-category-security.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/edit-category-security.hbs
rename to app/assets/javascripts/discourse/app/components/edit-category-security.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs b/app/assets/javascripts/discourse/app/components/edit-category-settings.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs
rename to app/assets/javascripts/discourse/app/components/edit-category-settings.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-tab.hbs b/app/assets/javascripts/discourse/app/components/edit-category-tab.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/edit-category-tab.hbs
rename to app/assets/javascripts/discourse/app/components/edit-category-tab.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-tags.hbs b/app/assets/javascripts/discourse/app/components/edit-category-tags.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/edit-category-tags.hbs
rename to app/assets/javascripts/discourse/app/components/edit-category-tags.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-topic-template.hbs b/app/assets/javascripts/discourse/app/components/edit-category-topic-template.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/edit-category-topic-template.hbs
rename to app/assets/javascripts/discourse/app/components/edit-category-topic-template.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-topic-timer-form.hbs b/app/assets/javascripts/discourse/app/components/edit-topic-timer-form.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/edit-topic-timer-form.hbs
rename to app/assets/javascripts/discourse/app/components/edit-topic-timer-form.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/emoji-group-buttons.hbs b/app/assets/javascripts/discourse/app/components/emoji-group-buttons.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/emoji-group-buttons.hbs
rename to app/assets/javascripts/discourse/app/components/emoji-group-buttons.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/emoji-group-sections.hbs b/app/assets/javascripts/discourse/app/components/emoji-group-sections.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/emoji-group-sections.hbs
rename to app/assets/javascripts/discourse/app/components/emoji-group-sections.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs b/app/assets/javascripts/discourse/app/components/emoji-picker.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs
rename to app/assets/javascripts/discourse/app/components/emoji-picker.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/emoji-uploader.hbs b/app/assets/javascripts/discourse/app/components/emoji-uploader.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/emoji-uploader.hbs
rename to app/assets/javascripts/discourse/app/components/emoji-uploader.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/empty-state.hbs b/app/assets/javascripts/discourse/app/components/empty-state.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/empty-state.hbs
rename to app/assets/javascripts/discourse/app/components/empty-state.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/expand-post.hbs b/app/assets/javascripts/discourse/app/components/expand-post.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/expand-post.hbs
rename to app/assets/javascripts/discourse/app/components/expand-post.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/featured-topic.hbs b/app/assets/javascripts/discourse/app/components/featured-topic.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/featured-topic.hbs
rename to app/assets/javascripts/discourse/app/components/featured-topic.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/flag-action-type.hbs b/app/assets/javascripts/discourse/app/components/flag-action-type.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/flag-action-type.hbs
rename to app/assets/javascripts/discourse/app/components/flag-action-type.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/flag-selection.hbs b/app/assets/javascripts/discourse/app/components/flag-selection.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/flag-selection.hbs
rename to app/assets/javascripts/discourse/app/components/flag-selection.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/flat-button.hbs b/app/assets/javascripts/discourse/app/components/flat-button.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/flat-button.hbs
rename to app/assets/javascripts/discourse/app/components/flat-button.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/footer-message.hbs b/app/assets/javascripts/discourse/app/components/footer-message.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/footer-message.hbs
rename to app/assets/javascripts/discourse/app/components/footer-message.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/future-date-input.hbs b/app/assets/javascripts/discourse/app/components/future-date-input.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/future-date-input.hbs
rename to app/assets/javascripts/discourse/app/components/future-date-input.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/generated-invite-link.hbs b/app/assets/javascripts/discourse/app/components/generated-invite-link.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/generated-invite-link.hbs
rename to app/assets/javascripts/discourse/app/components/generated-invite-link.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/global-notice.hbs b/app/assets/javascripts/discourse/app/components/global-notice.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/global-notice.hbs
rename to app/assets/javascripts/discourse/app/components/global-notice.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/google-search.hbs b/app/assets/javascripts/discourse/app/components/google-search.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/google-search.hbs
rename to app/assets/javascripts/discourse/app/components/google-search.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-activity-filter.hbs b/app/assets/javascripts/discourse/app/components/group-activity-filter.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/group-activity-filter.hbs
rename to app/assets/javascripts/discourse/app/components/group-activity-filter.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-card-contents.hbs b/app/assets/javascripts/discourse/app/components/group-card-contents.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/group-card-contents.hbs
rename to app/assets/javascripts/discourse/app/components/group-card-contents.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-flair-inputs.hbs b/app/assets/javascripts/discourse/app/components/group-flair-inputs.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/group-flair-inputs.hbs
rename to app/assets/javascripts/discourse/app/components/group-flair-inputs.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-imap-email-settings.hbs b/app/assets/javascripts/discourse/app/components/group-imap-email-settings.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/group-imap-email-settings.hbs
rename to app/assets/javascripts/discourse/app/components/group-imap-email-settings.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs b/app/assets/javascripts/discourse/app/components/group-manage-email-settings.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs
rename to app/assets/javascripts/discourse/app/components/group-manage-email-settings.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-manage-logs-filter.hbs b/app/assets/javascripts/discourse/app/components/group-manage-logs-filter.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/group-manage-logs-filter.hbs
rename to app/assets/javascripts/discourse/app/components/group-manage-logs-filter.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-manage-logs-row.hbs b/app/assets/javascripts/discourse/app/components/group-manage-logs-row.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/group-manage-logs-row.hbs
rename to app/assets/javascripts/discourse/app/components/group-manage-logs-row.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-manage-save-button.hbs b/app/assets/javascripts/discourse/app/components/group-manage-save-button.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/group-manage-save-button.hbs
rename to app/assets/javascripts/discourse/app/components/group-manage-save-button.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-member.hbs b/app/assets/javascripts/discourse/app/components/group-member.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/group-member.hbs
rename to app/assets/javascripts/discourse/app/components/group-member.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-membership-button.hbs b/app/assets/javascripts/discourse/app/components/group-membership-button.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/group-membership-button.hbs
rename to app/assets/javascripts/discourse/app/components/group-membership-button.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-navigation.hbs b/app/assets/javascripts/discourse/app/components/group-navigation.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/group-navigation.hbs
rename to app/assets/javascripts/discourse/app/components/group-navigation.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-post.hbs b/app/assets/javascripts/discourse/app/components/group-post.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/group-post.hbs
rename to app/assets/javascripts/discourse/app/components/group-post.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-selector.hbs b/app/assets/javascripts/discourse/app/components/group-selector.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/group-selector.hbs
rename to app/assets/javascripts/discourse/app/components/group-selector.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-smtp-email-settings.hbs b/app/assets/javascripts/discourse/app/components/group-smtp-email-settings.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/group-smtp-email-settings.hbs
rename to app/assets/javascripts/discourse/app/components/group-smtp-email-settings.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/groups-form-interaction-fields.hbs b/app/assets/javascripts/discourse/app/components/groups-form-interaction-fields.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/groups-form-interaction-fields.hbs
rename to app/assets/javascripts/discourse/app/components/groups-form-interaction-fields.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/groups-form-membership-fields.hbs b/app/assets/javascripts/discourse/app/components/groups-form-membership-fields.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/groups-form-membership-fields.hbs
rename to app/assets/javascripts/discourse/app/components/groups-form-membership-fields.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/groups-form-profile-fields.hbs b/app/assets/javascripts/discourse/app/components/groups-form-profile-fields.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/groups-form-profile-fields.hbs
rename to app/assets/javascripts/discourse/app/components/groups-form-profile-fields.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/groups-info.hbs b/app/assets/javascripts/discourse/app/components/groups-info.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/groups-info.hbs
rename to app/assets/javascripts/discourse/app/components/groups-info.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/hidden-details.hbs b/app/assets/javascripts/discourse/app/components/hidden-details.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/hidden-details.hbs
rename to app/assets/javascripts/discourse/app/components/hidden-details.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/horizontal-overflow-nav.hbs b/app/assets/javascripts/discourse/app/components/horizontal-overflow-nav.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/horizontal-overflow-nav.hbs
rename to app/assets/javascripts/discourse/app/components/horizontal-overflow-nav.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/ignored-user-list-item.hbs b/app/assets/javascripts/discourse/app/components/ignored-user-list-item.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/ignored-user-list-item.hbs
rename to app/assets/javascripts/discourse/app/components/ignored-user-list-item.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/ignored-user-list.hbs b/app/assets/javascripts/discourse/app/components/ignored-user-list.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/ignored-user-list.hbs
rename to app/assets/javascripts/discourse/app/components/ignored-user-list.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/images-uploader.hbs b/app/assets/javascripts/discourse/app/components/images-uploader.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/images-uploader.hbs
rename to app/assets/javascripts/discourse/app/components/images-uploader.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/input-tip.hbs b/app/assets/javascripts/discourse/app/components/input-tip.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/input-tip.hbs
rename to app/assets/javascripts/discourse/app/components/input-tip.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/invite-link-panel.hbs b/app/assets/javascripts/discourse/app/components/invite-link-panel.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/invite-link-panel.hbs
rename to app/assets/javascripts/discourse/app/components/invite-link-panel.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/invite-panel.hbs b/app/assets/javascripts/discourse/app/components/invite-panel.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/invite-panel.hbs
rename to app/assets/javascripts/discourse/app/components/invite-panel.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/json-editor.hbs b/app/assets/javascripts/discourse/app/components/json-editor.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/json-editor.hbs
rename to app/assets/javascripts/discourse/app/components/json-editor.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/latest-topic-list-item.hbs b/app/assets/javascripts/discourse/app/components/latest-topic-list-item.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/latest-topic-list-item.hbs
rename to app/assets/javascripts/discourse/app/components/latest-topic-list-item.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/link-to-input.hbs b/app/assets/javascripts/discourse/app/components/link-to-input.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/link-to-input.hbs
rename to app/assets/javascripts/discourse/app/components/link-to-input.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs b/app/assets/javascripts/discourse/app/components/login-buttons.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs
rename to app/assets/javascripts/discourse/app/components/login-buttons.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/mobile-category-topic.hbs b/app/assets/javascripts/discourse/app/components/mobile-category-topic.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/mobile-category-topic.hbs
rename to app/assets/javascripts/discourse/app/components/mobile-category-topic.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/modal-footer-close.hbs b/app/assets/javascripts/discourse/app/components/modal-footer-close.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/modal-footer-close.hbs
rename to app/assets/javascripts/discourse/app/components/modal-footer-close.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/modal-panel.hbs b/app/assets/javascripts/discourse/app/components/modal-panel.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/modal-panel.hbs
rename to app/assets/javascripts/discourse/app/components/modal-panel.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/modal-tab.hbs b/app/assets/javascripts/discourse/app/components/modal-tab.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/modal-tab.hbs
rename to app/assets/javascripts/discourse/app/components/modal-tab.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/mount-widget.hbs b/app/assets/javascripts/discourse/app/components/mount-widget.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/mount-widget.hbs
rename to app/assets/javascripts/discourse/app/components/mount-widget.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/nav-item.hbs b/app/assets/javascripts/discourse/app/components/nav-item.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/nav-item.hbs
rename to app/assets/javascripts/discourse/app/components/nav-item.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/navigation-bar.hbs b/app/assets/javascripts/discourse/app/components/navigation-bar.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/navigation-bar.hbs
rename to app/assets/javascripts/discourse/app/components/navigation-bar.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/navigation-item.hbs b/app/assets/javascripts/discourse/app/components/navigation-item.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/navigation-item.hbs
rename to app/assets/javascripts/discourse/app/components/navigation-item.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/notification-consent-banner.hbs b/app/assets/javascripts/discourse/app/components/notification-consent-banner.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/notification-consent-banner.hbs
rename to app/assets/javascripts/discourse/app/components/notification-consent-banner.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/parent-category-row.hbs b/app/assets/javascripts/discourse/app/components/parent-category-row.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/parent-category-row.hbs
rename to app/assets/javascripts/discourse/app/components/parent-category-row.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/pending-post.hbs b/app/assets/javascripts/discourse/app/components/pending-post.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/pending-post.hbs
rename to app/assets/javascripts/discourse/app/components/pending-post.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/pick-files-button.hbs b/app/assets/javascripts/discourse/app/components/pick-files-button.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/pick-files-button.hbs
rename to app/assets/javascripts/discourse/app/components/pick-files-button.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/plugin-outlet.hbs b/app/assets/javascripts/discourse/app/components/plugin-outlet.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/plugin-outlet.hbs
rename to app/assets/javascripts/discourse/app/components/plugin-outlet.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/popup-input-tip.hbs b/app/assets/javascripts/discourse/app/components/popup-input-tip.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/popup-input-tip.hbs
rename to app/assets/javascripts/discourse/app/components/popup-input-tip.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/popup-menu.hbs b/app/assets/javascripts/discourse/app/components/popup-menu.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/popup-menu.hbs
rename to app/assets/javascripts/discourse/app/components/popup-menu.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/preference-checkbox.hbs b/app/assets/javascripts/discourse/app/components/preference-checkbox.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/preference-checkbox.hbs
rename to app/assets/javascripts/discourse/app/components/preference-checkbox.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/private-message-glyph.hbs b/app/assets/javascripts/discourse/app/components/private-message-glyph.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/private-message-glyph.hbs
rename to app/assets/javascripts/discourse/app/components/private-message-glyph.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/pwa-install-banner.hbs b/app/assets/javascripts/discourse/app/components/pwa-install-banner.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/pwa-install-banner.hbs
rename to app/assets/javascripts/discourse/app/components/pwa-install-banner.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/quote-button.hbs b/app/assets/javascripts/discourse/app/components/quote-button.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/quote-button.hbs
rename to app/assets/javascripts/discourse/app/components/quote-button.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/related-messages.hbs b/app/assets/javascripts/discourse/app/components/related-messages.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/related-messages.hbs
rename to app/assets/javascripts/discourse/app/components/related-messages.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/relative-time-picker.hbs b/app/assets/javascripts/discourse/app/components/relative-time-picker.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/relative-time-picker.hbs
rename to app/assets/javascripts/discourse/app/components/relative-time-picker.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-bundled-action.hbs b/app/assets/javascripts/discourse/app/components/reviewable-bundled-action.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-bundled-action.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-bundled-action.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-claimed-topic.hbs b/app/assets/javascripts/discourse/app/components/reviewable-claimed-topic.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-claimed-topic.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-claimed-topic.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-conversation-post.hbs b/app/assets/javascripts/discourse/app/components/reviewable-conversation-post.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-conversation-post.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-conversation-post.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-created-by-name.hbs b/app/assets/javascripts/discourse/app/components/reviewable-created-by-name.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-created-by-name.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-created-by-name.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-created-by.hbs b/app/assets/javascripts/discourse/app/components/reviewable-created-by.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-created-by.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-created-by.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-field-category.hbs b/app/assets/javascripts/discourse/app/components/reviewable-field-category.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-field-category.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-field-category.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-field-editor.hbs b/app/assets/javascripts/discourse/app/components/reviewable-field-editor.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-field-editor.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-field-editor.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-field-tags.hbs b/app/assets/javascripts/discourse/app/components/reviewable-field-tags.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-field-tags.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-field-tags.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-field-text.hbs b/app/assets/javascripts/discourse/app/components/reviewable-field-text.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-field-text.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-field-text.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-field-textarea.hbs b/app/assets/javascripts/discourse/app/components/reviewable-field-textarea.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-field-textarea.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-field-textarea.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-field.hbs b/app/assets/javascripts/discourse/app/components/reviewable-field.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-field.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-field.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-flagged-post.hbs b/app/assets/javascripts/discourse/app/components/reviewable-flagged-post.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-flagged-post.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-flagged-post.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-histories.hbs b/app/assets/javascripts/discourse/app/components/reviewable-histories.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-histories.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-histories.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs b/app/assets/javascripts/discourse/app/components/reviewable-item.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-item.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-post-edits.hbs b/app/assets/javascripts/discourse/app/components/reviewable-post-edits.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-post-edits.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-post-edits.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-post-header.hbs b/app/assets/javascripts/discourse/app/components/reviewable-post-header.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-post-header.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-post-header.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-post.hbs b/app/assets/javascripts/discourse/app/components/reviewable-post.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-post.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-post.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-queued-post.hbs b/app/assets/javascripts/discourse/app/components/reviewable-queued-post.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-queued-post.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-queued-post.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-score.hbs b/app/assets/javascripts/discourse/app/components/reviewable-score.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-score.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-score.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-scores.hbs b/app/assets/javascripts/discourse/app/components/reviewable-scores.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-scores.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-scores.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-tags.hbs b/app/assets/javascripts/discourse/app/components/reviewable-tags.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-tags.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-tags.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-topic-link.hbs b/app/assets/javascripts/discourse/app/components/reviewable-topic-link.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-topic-link.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-topic-link.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-user.hbs b/app/assets/javascripts/discourse/app/components/reviewable-user.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-user.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-user.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/save-controls.hbs b/app/assets/javascripts/discourse/app/components/save-controls.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/save-controls.hbs
rename to app/assets/javascripts/discourse/app/components/save-controls.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/score-value.hbs b/app/assets/javascripts/discourse/app/components/score-value.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/score-value.hbs
rename to app/assets/javascripts/discourse/app/components/score-value.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/search-advanced-options.hbs b/app/assets/javascripts/discourse/app/components/search-advanced-options.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/search-advanced-options.hbs
rename to app/assets/javascripts/discourse/app/components/search-advanced-options.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/search-result-entries.hbs b/app/assets/javascripts/discourse/app/components/search-result-entries.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/search-result-entries.hbs
rename to app/assets/javascripts/discourse/app/components/search-result-entries.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/search-result-entry.hbs b/app/assets/javascripts/discourse/app/components/search-result-entry.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/search-result-entry.hbs
rename to app/assets/javascripts/discourse/app/components/search-result-entry.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/second-factor-form.hbs b/app/assets/javascripts/discourse/app/components/second-factor-form.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/second-factor-form.hbs
rename to app/assets/javascripts/discourse/app/components/second-factor-form.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/second-factor-input.hbs b/app/assets/javascripts/discourse/app/components/second-factor-input.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/second-factor-input.hbs
rename to app/assets/javascripts/discourse/app/components/second-factor-input.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/security-key-form.hbs b/app/assets/javascripts/discourse/app/components/security-key-form.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/security-key-form.hbs
rename to app/assets/javascripts/discourse/app/components/security-key-form.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/selected-posts.hbs b/app/assets/javascripts/discourse/app/components/selected-posts.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/selected-posts.hbs
rename to app/assets/javascripts/discourse/app/components/selected-posts.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/share-panel.hbs b/app/assets/javascripts/discourse/app/components/share-panel.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/share-panel.hbs
rename to app/assets/javascripts/discourse/app/components/share-panel.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/share-source.hbs b/app/assets/javascripts/discourse/app/components/share-source.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/share-source.hbs
rename to app/assets/javascripts/discourse/app/components/share-source.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/shared-draft-controls.hbs b/app/assets/javascripts/discourse/app/components/shared-draft-controls.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/shared-draft-controls.hbs
rename to app/assets/javascripts/discourse/app/components/shared-draft-controls.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/signup-cta.hbs b/app/assets/javascripts/discourse/app/components/signup-cta.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/signup-cta.hbs
rename to app/assets/javascripts/discourse/app/components/signup-cta.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/slow-mode-info.hbs b/app/assets/javascripts/discourse/app/components/slow-mode-info.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/slow-mode-info.hbs
rename to app/assets/javascripts/discourse/app/components/slow-mode-info.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/software-update-prompt.hbs b/app/assets/javascripts/discourse/app/components/software-update-prompt.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/software-update-prompt.hbs
rename to app/assets/javascripts/discourse/app/components/software-update-prompt.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/sub-category-item.hbs b/app/assets/javascripts/discourse/app/components/sub-category-item.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/sub-category-item.hbs
rename to app/assets/javascripts/discourse/app/components/sub-category-item.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/sub-category-row.hbs b/app/assets/javascripts/discourse/app/components/sub-category-row.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/sub-category-row.hbs
rename to app/assets/javascripts/discourse/app/components/sub-category-row.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/subcategories-with-featured-topics.hbs b/app/assets/javascripts/discourse/app/components/subcategories-with-featured-topics.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/subcategories-with-featured-topics.hbs
rename to app/assets/javascripts/discourse/app/components/subcategories-with-featured-topics.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/suggested-topics.hbs b/app/assets/javascripts/discourse/app/components/suggested-topics.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/suggested-topics.hbs
rename to app/assets/javascripts/discourse/app/components/suggested-topics.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/table-header-toggle.hbs b/app/assets/javascripts/discourse/app/components/table-header-toggle.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/table-header-toggle.hbs
rename to app/assets/javascripts/discourse/app/components/table-header-toggle.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/tag-drop-link.hbs b/app/assets/javascripts/discourse/app/components/tag-drop-link.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/tag-drop-link.hbs
rename to app/assets/javascripts/discourse/app/components/tag-drop-link.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/tag-groups-form.hbs b/app/assets/javascripts/discourse/app/components/tag-groups-form.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/tag-groups-form.hbs
rename to app/assets/javascripts/discourse/app/components/tag-groups-form.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/tag-info.hbs b/app/assets/javascripts/discourse/app/components/tag-info.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/tag-info.hbs
rename to app/assets/javascripts/discourse/app/components/tag-info.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/tag-list.hbs b/app/assets/javascripts/discourse/app/components/tag-list.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/tag-list.hbs
rename to app/assets/javascripts/discourse/app/components/tag-list.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/tap-tile-grid.hbs b/app/assets/javascripts/discourse/app/components/tap-tile-grid.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/tap-tile-grid.hbs
rename to app/assets/javascripts/discourse/app/components/tap-tile-grid.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/tap-tile.hbs b/app/assets/javascripts/discourse/app/components/tap-tile.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/tap-tile.hbs
rename to app/assets/javascripts/discourse/app/components/tap-tile.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/text-overflow.hbs b/app/assets/javascripts/discourse/app/components/text-overflow.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/text-overflow.hbs
rename to app/assets/javascripts/discourse/app/components/text-overflow.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/time-input.hbs b/app/assets/javascripts/discourse/app/components/time-input.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/time-input.hbs
rename to app/assets/javascripts/discourse/app/components/time-input.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/time-shortcut-picker.hbs b/app/assets/javascripts/discourse/app/components/time-shortcut-picker.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/time-shortcut-picker.hbs
rename to app/assets/javascripts/discourse/app/components/time-shortcut-picker.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/top-period-buttons.hbs b/app/assets/javascripts/discourse/app/components/top-period-buttons.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/top-period-buttons.hbs
rename to app/assets/javascripts/discourse/app/components/top-period-buttons.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-category.hbs b/app/assets/javascripts/discourse/app/components/topic-category.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/topic-category.hbs
rename to app/assets/javascripts/discourse/app/components/topic-category.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-dismiss-buttons.hbs b/app/assets/javascripts/discourse/app/components/topic-dismiss-buttons.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/topic-dismiss-buttons.hbs
rename to app/assets/javascripts/discourse/app/components/topic-dismiss-buttons.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-entrance.hbs b/app/assets/javascripts/discourse/app/components/topic-entrance.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/topic-entrance.hbs
rename to app/assets/javascripts/discourse/app/components/topic-entrance.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs b/app/assets/javascripts/discourse/app/components/topic-footer-buttons.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs
rename to app/assets/javascripts/discourse/app/components/topic-footer-buttons.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-list-item.hbs b/app/assets/javascripts/discourse/app/components/topic-list-item.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/topic-list-item.hbs
rename to app/assets/javascripts/discourse/app/components/topic-list-item.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-list.hbs b/app/assets/javascripts/discourse/app/components/topic-list.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/topic-list.hbs
rename to app/assets/javascripts/discourse/app/components/topic-list.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-navigation-popup.hbs b/app/assets/javascripts/discourse/app/components/topic-navigation-popup.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/topic-navigation-popup.hbs
rename to app/assets/javascripts/discourse/app/components/topic-navigation-popup.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-navigation.hbs b/app/assets/javascripts/discourse/app/components/topic-navigation.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/topic-navigation.hbs
rename to app/assets/javascripts/discourse/app/components/topic-navigation.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-post-badges.hbs b/app/assets/javascripts/discourse/app/components/topic-post-badges.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/topic-post-badges.hbs
rename to app/assets/javascripts/discourse/app/components/topic-post-badges.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-progress.hbs b/app/assets/javascripts/discourse/app/components/topic-progress.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/topic-progress.hbs
rename to app/assets/javascripts/discourse/app/components/topic-progress.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-status.hbs b/app/assets/javascripts/discourse/app/components/topic-status.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/topic-status.hbs
rename to app/assets/javascripts/discourse/app/components/topic-status.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-timer-info.hbs b/app/assets/javascripts/discourse/app/components/topic-timer-info.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/topic-timer-info.hbs
rename to app/assets/javascripts/discourse/app/components/topic-timer-info.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-title.hbs b/app/assets/javascripts/discourse/app/components/topic-title.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/topic-title.hbs
rename to app/assets/javascripts/discourse/app/components/topic-title.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/track-selected.hbs b/app/assets/javascripts/discourse/app/components/track-selected.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/track-selected.hbs
rename to app/assets/javascripts/discourse/app/components/track-selected.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/uppy-backup-uploader.hbs b/app/assets/javascripts/discourse/app/components/uppy-backup-uploader.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/uppy-backup-uploader.hbs
rename to app/assets/javascripts/discourse/app/components/uppy-backup-uploader.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/uppy-image-uploader.hbs b/app/assets/javascripts/discourse/app/components/uppy-image-uploader.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/uppy-image-uploader.hbs
rename to app/assets/javascripts/discourse/app/components/uppy-image-uploader.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-avatar-flair.hbs b/app/assets/javascripts/discourse/app/components/user-avatar-flair.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-avatar-flair.hbs
rename to app/assets/javascripts/discourse/app/components/user-avatar-flair.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-badge.hbs b/app/assets/javascripts/discourse/app/components/user-badge.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-badge.hbs
rename to app/assets/javascripts/discourse/app/components/user-badge.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/app/components/user-card-contents.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
rename to app/assets/javascripts/discourse/app/components/user-card-contents.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-flag-percentage.hbs b/app/assets/javascripts/discourse/app/components/user-flag-percentage.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-flag-percentage.hbs
rename to app/assets/javascripts/discourse/app/components/user-flag-percentage.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-info.hbs b/app/assets/javascripts/discourse/app/components/user-info.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-info.hbs
rename to app/assets/javascripts/discourse/app/components/user-info.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-notification-schedule-day.hbs b/app/assets/javascripts/discourse/app/components/user-notification-schedule-day.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-notification-schedule-day.hbs
rename to app/assets/javascripts/discourse/app/components/user-notification-schedule-day.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-notification-schedule.hbs b/app/assets/javascripts/discourse/app/components/user-notification-schedule.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-notification-schedule.hbs
rename to app/assets/javascripts/discourse/app/components/user-notification-schedule.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-profile-avatar.hbs b/app/assets/javascripts/discourse/app/components/user-profile-avatar.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-profile-avatar.hbs
rename to app/assets/javascripts/discourse/app/components/user-profile-avatar.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-stat.hbs b/app/assets/javascripts/discourse/app/components/user-stat.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-stat.hbs
rename to app/assets/javascripts/discourse/app/components/user-stat.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-status-message.hbs b/app/assets/javascripts/discourse/app/components/user-status-message.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-status-message.hbs
rename to app/assets/javascripts/discourse/app/components/user-status-message.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-status-picker.hbs b/app/assets/javascripts/discourse/app/components/user-status-picker.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-status-picker.hbs
rename to app/assets/javascripts/discourse/app/components/user-status-picker.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-stream-item.hbs b/app/assets/javascripts/discourse/app/components/user-stream-item.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-stream-item.hbs
rename to app/assets/javascripts/discourse/app/components/user-stream-item.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-stream.hbs b/app/assets/javascripts/discourse/app/components/user-stream.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-stream.hbs
rename to app/assets/javascripts/discourse/app/components/user-stream.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-summary-category-search.hbs b/app/assets/javascripts/discourse/app/components/user-summary-category-search.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-summary-category-search.hbs
rename to app/assets/javascripts/discourse/app/components/user-summary-category-search.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-summary-section.hbs b/app/assets/javascripts/discourse/app/components/user-summary-section.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-summary-section.hbs
rename to app/assets/javascripts/discourse/app/components/user-summary-section.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-summary-topic.hbs b/app/assets/javascripts/discourse/app/components/user-summary-topic.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-summary-topic.hbs
rename to app/assets/javascripts/discourse/app/components/user-summary-topic.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-summary-topics-list.hbs b/app/assets/javascripts/discourse/app/components/user-summary-topics-list.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-summary-topics-list.hbs
rename to app/assets/javascripts/discourse/app/components/user-summary-topics-list.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-summary-user.hbs b/app/assets/javascripts/discourse/app/components/user-summary-user.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-summary-user.hbs
rename to app/assets/javascripts/discourse/app/components/user-summary-user.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-summary-users-list.hbs b/app/assets/javascripts/discourse/app/components/user-summary-users-list.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-summary-users-list.hbs
rename to app/assets/javascripts/discourse/app/components/user-summary-users-list.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/welcome-topic-banner.hbs b/app/assets/javascripts/discourse/app/components/welcome-topic-banner.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/welcome-topic-banner.hbs
rename to app/assets/javascripts/discourse/app/components/welcome-topic-banner.hbs