diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 6a6cc8ac41..954df932a1 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -9,96 +9,96 @@ //= require ./deprecated // Stuff we need to load first -//= require ./discourse/lib/to-markdown -//= require ./discourse/lib/utilities -//= require ./discourse/lib/user-presence -//= require ./discourse/lib/logout -//= require ./discourse/mixins/singleton -//= require ./discourse/models/rest -//= require ./discourse/models/session -//= require ./discourse/lib/ajax -//= require ./discourse/lib/text -//= require ./discourse/lib/hash -//= require ./discourse/lib/load-script -//= require ./discourse/lib/notification-levels -//= require ./discourse/services/app-events -//= require ./discourse/lib/offset-calculator -//= require ./discourse/lib/lock-on -//= require ./discourse/lib/url -//= require ./discourse/lib/debounce -//= require ./discourse/lib/quote -//= require ./discourse/lib/key-value-store -//= require ./discourse/lib/computed -//= require ./discourse/lib/formatter -//= require ./discourse/lib/text-direction -//= require ./discourse/lib/eyeline -//= require ./discourse/lib/show-modal -//= require ./discourse/mixins/scrolling -//= require ./discourse/lib/ajax-error -//= require ./discourse/models/result-set -//= require ./discourse/models/store -//= require ./discourse/models/action-summary -//= require ./discourse/models/permission-type -//= require ./discourse/models/category -//= require ./discourse/models/topic -//= require ./discourse/models/draft -//= require ./discourse/models/composer -//= require ./discourse/models/badge-grouping -//= require ./discourse/models/badge -//= require ./discourse/models/permission-type -//= require ./discourse/models/user-action-group -//= require ./discourse/models/trust-level -//= require ./discourse/lib/search -//= require ./discourse/lib/user-search -//= require ./discourse/lib/export-csv -//= require ./discourse/lib/autocomplete -//= require ./discourse/lib/after-transition -//= require ./discourse/lib/safari-hacks -//= require ./discourse/lib/put-cursor-at-end -//= require_tree ./discourse/adapters -//= require ./discourse/models/post-action-type -//= require ./discourse/models/post -//= require ./discourse/lib/posts-with-placeholders -//= require ./discourse/models/post-stream -//= require ./discourse/models/topic-details -//= require ./discourse/models/topic -//= require ./discourse/models/user-action -//= require ./discourse/models/draft -//= require ./discourse/models/composer -//= require ./discourse/models/user-badge -//= require_tree ./discourse/lib -//= require_tree ./discourse/mixins -//= require ./discourse/models/invite -//= require ./discourse/controllers/discovery-sortable -//= require ./discourse/controllers/navigation/default -//= require ./discourse/components/edit-category-panel -//= require ./discourse/lib/link-mentions -//= require ./discourse/components/site-header -//= require ./discourse/components/d-editor -//= require ./discourse/lib/screen-track -//= require ./discourse/routes/discourse -//= require ./discourse/routes/build-topic-route -//= require ./discourse/routes/restricted-user -//= require ./discourse/routes/user-topic-list -//= require ./discourse/routes/user-activity-stream -//= require ./discourse/routes/topic-from-params -//= require ./discourse/components/text-field -//= require ./discourse/components/conditional-loading-spinner -//= require ./discourse/helpers/user-avatar -//= require ./discourse/helpers/cold-age-class -//= require ./discourse/helpers/loading-spinner -//= require ./discourse/helpers/category-link -//= require ./discourse/lib/export-result -//= require ./discourse/mapping-router +//= require ./discourse/app/lib/to-markdown +//= require ./discourse/app/lib/utilities +//= require ./discourse/app/lib/user-presence +//= require ./discourse/app/lib/logout +//= require ./discourse/app/mixins/singleton +//= require ./discourse/app/models/rest +//= require ./discourse/app/models/session +//= require ./discourse/app/lib/ajax +//= require ./discourse/app/lib/text +//= require ./discourse/app/lib/hash +//= require ./discourse/app/lib/load-script +//= require ./discourse/app/lib/notification-levels +//= require ./discourse/app/services/app-events +//= require ./discourse/app/lib/offset-calculator +//= require ./discourse/app/lib/lock-on +//= require ./discourse/app/lib/url +//= require ./discourse/app/lib/debounce +//= require ./discourse/app/lib/quote +//= require ./discourse/app/lib/key-value-store +//= require ./discourse/app/lib/computed +//= require ./discourse/app/lib/formatter +//= require ./discourse/app/lib/text-direction +//= require ./discourse/app/lib/eyeline +//= require ./discourse/app/lib/show-modal +//= require ./discourse/app/mixins/scrolling +//= require ./discourse/app/lib/ajax-error +//= require ./discourse/app/models/result-set +//= require ./discourse/app/models/store +//= require ./discourse/app/models/action-summary +//= require ./discourse/app/models/permission-type +//= require ./discourse/app/models/category +//= require ./discourse/app/models/topic +//= require ./discourse/app/models/draft +//= require ./discourse/app/models/composer +//= require ./discourse/app/models/badge-grouping +//= require ./discourse/app/models/badge +//= require ./discourse/app/models/permission-type +//= require ./discourse/app/models/user-action-group +//= require ./discourse/app/models/trust-level +//= require ./discourse/app/lib/search +//= require ./discourse/app/lib/user-search +//= require ./discourse/app/lib/export-csv +//= require ./discourse/app/lib/autocomplete +//= require ./discourse/app/lib/after-transition +//= require ./discourse/app/lib/safari-hacks +//= require ./discourse/app/lib/put-cursor-at-end +//= require_tree ./discourse/app/adapters +//= require ./discourse/app/models/post-action-type +//= require ./discourse/app/models/post +//= require ./discourse/app/lib/posts-with-placeholders +//= require ./discourse/app/models/post-stream +//= require ./discourse/app/models/topic-details +//= require ./discourse/app/models/topic +//= require ./discourse/app/models/user-action +//= require ./discourse/app/models/draft +//= require ./discourse/app/models/composer +//= require ./discourse/app/models/user-badge +//= require_tree ./discourse/app/lib +//= require_tree ./discourse/app/mixins +//= require ./discourse/app/models/invite +//= require ./discourse/app/controllers/discovery-sortable +//= require ./discourse/app/controllers/navigation/default +//= require ./discourse/app/components/edit-category-panel +//= require ./discourse/app/lib/link-mentions +//= require ./discourse/app/components/site-header +//= require ./discourse/app/components/d-editor +//= require ./discourse/app/lib/screen-track +//= require ./discourse/app/routes/discourse +//= require ./discourse/app/routes/build-topic-route +//= require ./discourse/app/routes/restricted-user +//= require ./discourse/app/routes/user-topic-list +//= require ./discourse/app/routes/user-activity-stream +//= require ./discourse/app/routes/topic-from-params +//= require ./discourse/app/components/text-field +//= require ./discourse/app/components/conditional-loading-spinner +//= require ./discourse/app/helpers/user-avatar +//= require ./discourse/app/helpers/cold-age-class +//= require ./discourse/app/helpers/loading-spinner +//= require ./discourse/app/helpers/category-link +//= require ./discourse/app/lib/export-result +//= require ./discourse/app/mapping-router -//= require_tree ./discourse/controllers -//= require_tree ./discourse/models -//= require_tree ./discourse/components -//= require_tree ./discourse/raw-views -//= require_tree ./discourse/helpers -//= require_tree ./discourse/templates -//= require_tree ./discourse/routes -//= require_tree ./discourse/pre-initializers -//= require_tree ./discourse/initializers -//= require_tree ./discourse/services -//= require_tree ./discourse/widgets +//= require_tree ./discourse/app/controllers +//= require_tree ./discourse/app/models +//= require_tree ./discourse/app/components +//= require_tree ./discourse/app/raw-views +//= require_tree ./discourse/app/helpers +//= require_tree ./discourse/app/templates +//= require_tree ./discourse/app/routes +//= require_tree ./discourse/app/pre-initializers +//= require_tree ./discourse/app/initializers +//= require_tree ./discourse/app/services +//= require_tree ./discourse/app/widgets diff --git a/app/assets/javascripts/discourse/adapters/email-template.js b/app/assets/javascripts/discourse/app/adapters/email-template.js similarity index 100% rename from app/assets/javascripts/discourse/adapters/email-template.js rename to app/assets/javascripts/discourse/app/adapters/email-template.js diff --git a/app/assets/javascripts/discourse/adapters/group.js b/app/assets/javascripts/discourse/app/adapters/group.js similarity index 100% rename from app/assets/javascripts/discourse/adapters/group.js rename to app/assets/javascripts/discourse/app/adapters/group.js diff --git a/app/assets/javascripts/discourse/adapters/notification.js b/app/assets/javascripts/discourse/app/adapters/notification.js similarity index 100% rename from app/assets/javascripts/discourse/adapters/notification.js rename to app/assets/javascripts/discourse/app/adapters/notification.js diff --git a/app/assets/javascripts/discourse/adapters/post-reply-history.js b/app/assets/javascripts/discourse/app/adapters/post-reply-history.js similarity index 100% rename from app/assets/javascripts/discourse/adapters/post-reply-history.js rename to app/assets/javascripts/discourse/app/adapters/post-reply-history.js diff --git a/app/assets/javascripts/discourse/adapters/post-reply.js b/app/assets/javascripts/discourse/app/adapters/post-reply.js similarity index 100% rename from app/assets/javascripts/discourse/adapters/post-reply.js rename to app/assets/javascripts/discourse/app/adapters/post-reply.js diff --git a/app/assets/javascripts/discourse/adapters/post.js b/app/assets/javascripts/discourse/app/adapters/post.js similarity index 100% rename from app/assets/javascripts/discourse/adapters/post.js rename to app/assets/javascripts/discourse/app/adapters/post.js diff --git a/app/assets/javascripts/discourse/adapters/published-page.js b/app/assets/javascripts/discourse/app/adapters/published-page.js similarity index 100% rename from app/assets/javascripts/discourse/adapters/published-page.js rename to app/assets/javascripts/discourse/app/adapters/published-page.js diff --git a/app/assets/javascripts/discourse/adapters/rest.js b/app/assets/javascripts/discourse/app/adapters/rest.js similarity index 100% rename from app/assets/javascripts/discourse/adapters/rest.js rename to app/assets/javascripts/discourse/app/adapters/rest.js diff --git a/app/assets/javascripts/discourse/adapters/reviewable-explanation.js b/app/assets/javascripts/discourse/app/adapters/reviewable-explanation.js similarity index 100% rename from app/assets/javascripts/discourse/adapters/reviewable-explanation.js rename to app/assets/javascripts/discourse/app/adapters/reviewable-explanation.js diff --git a/app/assets/javascripts/discourse/adapters/reviewable-settings.js b/app/assets/javascripts/discourse/app/adapters/reviewable-settings.js similarity index 100% rename from app/assets/javascripts/discourse/adapters/reviewable-settings.js rename to app/assets/javascripts/discourse/app/adapters/reviewable-settings.js diff --git a/app/assets/javascripts/discourse/adapters/reviewable-topic.js b/app/assets/javascripts/discourse/app/adapters/reviewable-topic.js similarity index 100% rename from app/assets/javascripts/discourse/adapters/reviewable-topic.js rename to app/assets/javascripts/discourse/app/adapters/reviewable-topic.js diff --git a/app/assets/javascripts/discourse/adapters/reviewable.js b/app/assets/javascripts/discourse/app/adapters/reviewable.js similarity index 100% rename from app/assets/javascripts/discourse/adapters/reviewable.js rename to app/assets/javascripts/discourse/app/adapters/reviewable.js diff --git a/app/assets/javascripts/discourse/adapters/tag-info.js b/app/assets/javascripts/discourse/app/adapters/tag-info.js similarity index 100% rename from app/assets/javascripts/discourse/adapters/tag-info.js rename to app/assets/javascripts/discourse/app/adapters/tag-info.js diff --git a/app/assets/javascripts/discourse/adapters/tag-notification.js b/app/assets/javascripts/discourse/app/adapters/tag-notification.js similarity index 100% rename from app/assets/javascripts/discourse/adapters/tag-notification.js rename to app/assets/javascripts/discourse/app/adapters/tag-notification.js diff --git a/app/assets/javascripts/discourse/adapters/topic-list.js b/app/assets/javascripts/discourse/app/adapters/topic-list.js similarity index 100% rename from app/assets/javascripts/discourse/adapters/topic-list.js rename to app/assets/javascripts/discourse/app/adapters/topic-list.js diff --git a/app/assets/javascripts/discourse/adapters/topic.js b/app/assets/javascripts/discourse/app/adapters/topic.js similarity index 100% rename from app/assets/javascripts/discourse/adapters/topic.js rename to app/assets/javascripts/discourse/app/adapters/topic.js diff --git a/app/assets/javascripts/discourse/components/about-page-users.js b/app/assets/javascripts/discourse/app/components/about-page-users.js similarity index 100% rename from app/assets/javascripts/discourse/components/about-page-users.js rename to app/assets/javascripts/discourse/app/components/about-page-users.js diff --git a/app/assets/javascripts/discourse/components/activation-controls.js b/app/assets/javascripts/discourse/app/components/activation-controls.js similarity index 100% rename from app/assets/javascripts/discourse/components/activation-controls.js rename to app/assets/javascripts/discourse/app/components/activation-controls.js diff --git a/app/assets/javascripts/discourse/components/add-category-tag-classes.js b/app/assets/javascripts/discourse/app/components/add-category-tag-classes.js similarity index 100% rename from app/assets/javascripts/discourse/components/add-category-tag-classes.js rename to app/assets/javascripts/discourse/app/components/add-category-tag-classes.js diff --git a/app/assets/javascripts/discourse/components/auth-token-dropdown.js b/app/assets/javascripts/discourse/app/components/auth-token-dropdown.js similarity index 100% rename from app/assets/javascripts/discourse/components/auth-token-dropdown.js rename to app/assets/javascripts/discourse/app/components/auth-token-dropdown.js diff --git a/app/assets/javascripts/discourse/components/avatar-flair.js b/app/assets/javascripts/discourse/app/components/avatar-flair.js similarity index 100% rename from app/assets/javascripts/discourse/components/avatar-flair.js rename to app/assets/javascripts/discourse/app/components/avatar-flair.js diff --git a/app/assets/javascripts/discourse/components/avatar-uploader.js b/app/assets/javascripts/discourse/app/components/avatar-uploader.js similarity index 100% rename from app/assets/javascripts/discourse/components/avatar-uploader.js rename to app/assets/javascripts/discourse/app/components/avatar-uploader.js diff --git a/app/assets/javascripts/discourse/components/backup-codes.js b/app/assets/javascripts/discourse/app/components/backup-codes.js similarity index 100% rename from app/assets/javascripts/discourse/components/backup-codes.js rename to app/assets/javascripts/discourse/app/components/backup-codes.js diff --git a/app/assets/javascripts/discourse/components/backup-uploader.js b/app/assets/javascripts/discourse/app/components/backup-uploader.js similarity index 100% rename from app/assets/javascripts/discourse/components/backup-uploader.js rename to app/assets/javascripts/discourse/app/components/backup-uploader.js diff --git a/app/assets/javascripts/discourse/components/badge-button.js b/app/assets/javascripts/discourse/app/components/badge-button.js similarity index 100% rename from app/assets/javascripts/discourse/components/badge-button.js rename to app/assets/javascripts/discourse/app/components/badge-button.js diff --git a/app/assets/javascripts/discourse/components/badge-card.js b/app/assets/javascripts/discourse/app/components/badge-card.js similarity index 100% rename from app/assets/javascripts/discourse/components/badge-card.js rename to app/assets/javascripts/discourse/app/components/badge-card.js diff --git a/app/assets/javascripts/discourse/components/badge-selector.js b/app/assets/javascripts/discourse/app/components/badge-selector.js similarity index 100% rename from app/assets/javascripts/discourse/components/badge-selector.js rename to app/assets/javascripts/discourse/app/components/badge-selector.js diff --git a/app/assets/javascripts/discourse/components/badge-title.js b/app/assets/javascripts/discourse/app/components/badge-title.js similarity index 100% rename from app/assets/javascripts/discourse/components/badge-title.js rename to app/assets/javascripts/discourse/app/components/badge-title.js diff --git a/app/assets/javascripts/discourse/components/basic-topic-list.js b/app/assets/javascripts/discourse/app/components/basic-topic-list.js similarity index 100% rename from app/assets/javascripts/discourse/components/basic-topic-list.js rename to app/assets/javascripts/discourse/app/components/basic-topic-list.js diff --git a/app/assets/javascripts/discourse/components/bookmark-actions-dropdown.js b/app/assets/javascripts/discourse/app/components/bookmark-actions-dropdown.js similarity index 100% rename from app/assets/javascripts/discourse/components/bookmark-actions-dropdown.js rename to app/assets/javascripts/discourse/app/components/bookmark-actions-dropdown.js diff --git a/app/assets/javascripts/discourse/components/bread-crumbs.js b/app/assets/javascripts/discourse/app/components/bread-crumbs.js similarity index 100% rename from app/assets/javascripts/discourse/components/bread-crumbs.js rename to app/assets/javascripts/discourse/app/components/bread-crumbs.js diff --git a/app/assets/javascripts/discourse/components/bulk-select-button.js b/app/assets/javascripts/discourse/app/components/bulk-select-button.js similarity index 100% rename from app/assets/javascripts/discourse/components/bulk-select-button.js rename to app/assets/javascripts/discourse/app/components/bulk-select-button.js diff --git a/app/assets/javascripts/discourse/components/categories-and-latest-topics.js b/app/assets/javascripts/discourse/app/components/categories-and-latest-topics.js similarity index 100% rename from app/assets/javascripts/discourse/components/categories-and-latest-topics.js rename to app/assets/javascripts/discourse/app/components/categories-and-latest-topics.js diff --git a/app/assets/javascripts/discourse/components/categories-and-top-topics.js b/app/assets/javascripts/discourse/app/components/categories-and-top-topics.js similarity index 100% rename from app/assets/javascripts/discourse/components/categories-and-top-topics.js rename to app/assets/javascripts/discourse/app/components/categories-and-top-topics.js diff --git a/app/assets/javascripts/discourse/components/categories-boxes-topic.js b/app/assets/javascripts/discourse/app/components/categories-boxes-topic.js similarity index 100% rename from app/assets/javascripts/discourse/components/categories-boxes-topic.js rename to app/assets/javascripts/discourse/app/components/categories-boxes-topic.js diff --git a/app/assets/javascripts/discourse/components/categories-boxes-with-topics.js b/app/assets/javascripts/discourse/app/components/categories-boxes-with-topics.js similarity index 100% rename from app/assets/javascripts/discourse/components/categories-boxes-with-topics.js rename to app/assets/javascripts/discourse/app/components/categories-boxes-with-topics.js diff --git a/app/assets/javascripts/discourse/components/categories-boxes.js b/app/assets/javascripts/discourse/app/components/categories-boxes.js similarity index 100% rename from app/assets/javascripts/discourse/components/categories-boxes.js rename to app/assets/javascripts/discourse/app/components/categories-boxes.js diff --git a/app/assets/javascripts/discourse/components/categories-only.js b/app/assets/javascripts/discourse/app/components/categories-only.js similarity index 100% rename from app/assets/javascripts/discourse/components/categories-only.js rename to app/assets/javascripts/discourse/app/components/categories-only.js diff --git a/app/assets/javascripts/discourse/components/categories-topic-list.js b/app/assets/javascripts/discourse/app/components/categories-topic-list.js similarity index 100% rename from app/assets/javascripts/discourse/components/categories-topic-list.js rename to app/assets/javascripts/discourse/app/components/categories-topic-list.js diff --git a/app/assets/javascripts/discourse/components/category-title-before.js b/app/assets/javascripts/discourse/app/components/category-title-before.js similarity index 100% rename from app/assets/javascripts/discourse/components/category-title-before.js rename to app/assets/javascripts/discourse/app/components/category-title-before.js diff --git a/app/assets/javascripts/discourse/components/category-title-link.js b/app/assets/javascripts/discourse/app/components/category-title-link.js similarity index 100% rename from app/assets/javascripts/discourse/components/category-title-link.js rename to app/assets/javascripts/discourse/app/components/category-title-link.js diff --git a/app/assets/javascripts/discourse/components/category-unread.js b/app/assets/javascripts/discourse/app/components/category-unread.js similarity index 100% rename from app/assets/javascripts/discourse/components/category-unread.js rename to app/assets/javascripts/discourse/app/components/category-unread.js diff --git a/app/assets/javascripts/discourse/components/cdn-img.js b/app/assets/javascripts/discourse/app/components/cdn-img.js similarity index 100% rename from app/assets/javascripts/discourse/components/cdn-img.js rename to app/assets/javascripts/discourse/app/components/cdn-img.js diff --git a/app/assets/javascripts/discourse/components/choose-message.js b/app/assets/javascripts/discourse/app/components/choose-message.js similarity index 100% rename from app/assets/javascripts/discourse/components/choose-message.js rename to app/assets/javascripts/discourse/app/components/choose-message.js diff --git a/app/assets/javascripts/discourse/components/choose-topic.js b/app/assets/javascripts/discourse/app/components/choose-topic.js similarity index 100% rename from app/assets/javascripts/discourse/components/choose-topic.js rename to app/assets/javascripts/discourse/app/components/choose-topic.js diff --git a/app/assets/javascripts/discourse/components/color-picker-choice.js b/app/assets/javascripts/discourse/app/components/color-picker-choice.js similarity index 100% rename from app/assets/javascripts/discourse/components/color-picker-choice.js rename to app/assets/javascripts/discourse/app/components/color-picker-choice.js diff --git a/app/assets/javascripts/discourse/components/color-picker.js b/app/assets/javascripts/discourse/app/components/color-picker.js similarity index 100% rename from app/assets/javascripts/discourse/components/color-picker.js rename to app/assets/javascripts/discourse/app/components/color-picker.js diff --git a/app/assets/javascripts/discourse/components/composer-action-title.js b/app/assets/javascripts/discourse/app/components/composer-action-title.js similarity index 100% rename from app/assets/javascripts/discourse/components/composer-action-title.js rename to app/assets/javascripts/discourse/app/components/composer-action-title.js diff --git a/app/assets/javascripts/discourse/components/composer-body.js b/app/assets/javascripts/discourse/app/components/composer-body.js similarity index 100% rename from app/assets/javascripts/discourse/components/composer-body.js rename to app/assets/javascripts/discourse/app/components/composer-body.js diff --git a/app/assets/javascripts/discourse/components/composer-editor.js b/app/assets/javascripts/discourse/app/components/composer-editor.js similarity index 100% rename from app/assets/javascripts/discourse/components/composer-editor.js rename to app/assets/javascripts/discourse/app/components/composer-editor.js diff --git a/app/assets/javascripts/discourse/components/composer-message.js b/app/assets/javascripts/discourse/app/components/composer-message.js similarity index 100% rename from app/assets/javascripts/discourse/components/composer-message.js rename to app/assets/javascripts/discourse/app/components/composer-message.js diff --git a/app/assets/javascripts/discourse/components/composer-messages.js b/app/assets/javascripts/discourse/app/components/composer-messages.js similarity index 100% rename from app/assets/javascripts/discourse/components/composer-messages.js rename to app/assets/javascripts/discourse/app/components/composer-messages.js diff --git a/app/assets/javascripts/discourse/components/composer-save-button.js b/app/assets/javascripts/discourse/app/components/composer-save-button.js similarity index 100% rename from app/assets/javascripts/discourse/components/composer-save-button.js rename to app/assets/javascripts/discourse/app/components/composer-save-button.js diff --git a/app/assets/javascripts/discourse/components/composer-title.js b/app/assets/javascripts/discourse/app/components/composer-title.js similarity index 100% rename from app/assets/javascripts/discourse/components/composer-title.js rename to app/assets/javascripts/discourse/app/components/composer-title.js diff --git a/app/assets/javascripts/discourse/components/composer-toggles.js b/app/assets/javascripts/discourse/app/components/composer-toggles.js similarity index 100% rename from app/assets/javascripts/discourse/components/composer-toggles.js rename to app/assets/javascripts/discourse/app/components/composer-toggles.js diff --git a/app/assets/javascripts/discourse/components/composer-user-selector.js b/app/assets/javascripts/discourse/app/components/composer-user-selector.js similarity index 100% rename from app/assets/javascripts/discourse/components/composer-user-selector.js rename to app/assets/javascripts/discourse/app/components/composer-user-selector.js diff --git a/app/assets/javascripts/discourse/components/concerns/category-search-priorities.js.erb b/app/assets/javascripts/discourse/app/components/concerns/category-search-priorities.js.erb similarity index 100% rename from app/assets/javascripts/discourse/components/concerns/category-search-priorities.js.erb rename to app/assets/javascripts/discourse/app/components/concerns/category-search-priorities.js.erb diff --git a/app/assets/javascripts/discourse/components/conditional-loading-section.js b/app/assets/javascripts/discourse/app/components/conditional-loading-section.js similarity index 100% rename from app/assets/javascripts/discourse/components/conditional-loading-section.js rename to app/assets/javascripts/discourse/app/components/conditional-loading-section.js diff --git a/app/assets/javascripts/discourse/components/conditional-loading-spinner.js b/app/assets/javascripts/discourse/app/components/conditional-loading-spinner.js similarity index 100% rename from app/assets/javascripts/discourse/components/conditional-loading-spinner.js rename to app/assets/javascripts/discourse/app/components/conditional-loading-spinner.js diff --git a/app/assets/javascripts/discourse/components/connector-container.js b/app/assets/javascripts/discourse/app/components/connector-container.js similarity index 100% rename from app/assets/javascripts/discourse/components/connector-container.js rename to app/assets/javascripts/discourse/app/components/connector-container.js diff --git a/app/assets/javascripts/discourse/components/cook-text.js b/app/assets/javascripts/discourse/app/components/cook-text.js similarity index 100% rename from app/assets/javascripts/discourse/components/cook-text.js rename to app/assets/javascripts/discourse/app/components/cook-text.js diff --git a/app/assets/javascripts/discourse/components/count-i18n.js b/app/assets/javascripts/discourse/app/components/count-i18n.js similarity index 100% rename from app/assets/javascripts/discourse/components/count-i18n.js rename to app/assets/javascripts/discourse/app/components/count-i18n.js diff --git a/app/assets/javascripts/discourse/components/create-account.js b/app/assets/javascripts/discourse/app/components/create-account.js similarity index 100% rename from app/assets/javascripts/discourse/components/create-account.js rename to app/assets/javascripts/discourse/app/components/create-account.js diff --git a/app/assets/javascripts/discourse/components/create-topic-button.js b/app/assets/javascripts/discourse/app/components/create-topic-button.js similarity index 100% rename from app/assets/javascripts/discourse/components/create-topic-button.js rename to app/assets/javascripts/discourse/app/components/create-topic-button.js diff --git a/app/assets/javascripts/discourse/components/create-topics-notice.js b/app/assets/javascripts/discourse/app/components/create-topics-notice.js similarity index 100% rename from app/assets/javascripts/discourse/components/create-topics-notice.js rename to app/assets/javascripts/discourse/app/components/create-topics-notice.js diff --git a/app/assets/javascripts/discourse/components/csv-uploader.js b/app/assets/javascripts/discourse/app/components/csv-uploader.js similarity index 100% rename from app/assets/javascripts/discourse/components/csv-uploader.js rename to app/assets/javascripts/discourse/app/components/csv-uploader.js diff --git a/app/assets/javascripts/discourse/components/custom-html.js b/app/assets/javascripts/discourse/app/components/custom-html.js similarity index 100% rename from app/assets/javascripts/discourse/components/custom-html.js rename to app/assets/javascripts/discourse/app/components/custom-html.js diff --git a/app/assets/javascripts/discourse/components/d-button.js b/app/assets/javascripts/discourse/app/components/d-button.js similarity index 100% rename from app/assets/javascripts/discourse/components/d-button.js rename to app/assets/javascripts/discourse/app/components/d-button.js diff --git a/app/assets/javascripts/discourse/components/d-editor.js b/app/assets/javascripts/discourse/app/components/d-editor.js similarity index 100% rename from app/assets/javascripts/discourse/components/d-editor.js rename to app/assets/javascripts/discourse/app/components/d-editor.js diff --git a/app/assets/javascripts/discourse/components/d-modal-body.js b/app/assets/javascripts/discourse/app/components/d-modal-body.js similarity index 100% rename from app/assets/javascripts/discourse/components/d-modal-body.js rename to app/assets/javascripts/discourse/app/components/d-modal-body.js diff --git a/app/assets/javascripts/discourse/components/d-modal-cancel.js b/app/assets/javascripts/discourse/app/components/d-modal-cancel.js similarity index 100% rename from app/assets/javascripts/discourse/components/d-modal-cancel.js rename to app/assets/javascripts/discourse/app/components/d-modal-cancel.js diff --git a/app/assets/javascripts/discourse/components/d-modal.js b/app/assets/javascripts/discourse/app/components/d-modal.js similarity index 100% rename from app/assets/javascripts/discourse/components/d-modal.js rename to app/assets/javascripts/discourse/app/components/d-modal.js diff --git a/app/assets/javascripts/discourse/components/d-navigation.js b/app/assets/javascripts/discourse/app/components/d-navigation.js similarity index 100% rename from app/assets/javascripts/discourse/components/d-navigation.js rename to app/assets/javascripts/discourse/app/components/d-navigation.js diff --git a/app/assets/javascripts/discourse/components/d-section.js b/app/assets/javascripts/discourse/app/components/d-section.js similarity index 100% rename from app/assets/javascripts/discourse/components/d-section.js rename to app/assets/javascripts/discourse/app/components/d-section.js diff --git a/app/assets/javascripts/discourse/components/date-input.js b/app/assets/javascripts/discourse/app/components/date-input.js similarity index 100% rename from app/assets/javascripts/discourse/components/date-input.js rename to app/assets/javascripts/discourse/app/components/date-input.js diff --git a/app/assets/javascripts/discourse/components/date-picker-future.js b/app/assets/javascripts/discourse/app/components/date-picker-future.js similarity index 100% rename from app/assets/javascripts/discourse/components/date-picker-future.js rename to app/assets/javascripts/discourse/app/components/date-picker-future.js diff --git a/app/assets/javascripts/discourse/components/date-picker-past.js b/app/assets/javascripts/discourse/app/components/date-picker-past.js similarity index 100% rename from app/assets/javascripts/discourse/components/date-picker-past.js rename to app/assets/javascripts/discourse/app/components/date-picker-past.js diff --git a/app/assets/javascripts/discourse/components/date-picker.js b/app/assets/javascripts/discourse/app/components/date-picker.js similarity index 100% rename from app/assets/javascripts/discourse/components/date-picker.js rename to app/assets/javascripts/discourse/app/components/date-picker.js diff --git a/app/assets/javascripts/discourse/components/date-time-input-range.js b/app/assets/javascripts/discourse/app/components/date-time-input-range.js similarity index 100% rename from app/assets/javascripts/discourse/components/date-time-input-range.js rename to app/assets/javascripts/discourse/app/components/date-time-input-range.js diff --git a/app/assets/javascripts/discourse/components/date-time-input.js b/app/assets/javascripts/discourse/app/components/date-time-input.js similarity index 100% rename from app/assets/javascripts/discourse/components/date-time-input.js rename to app/assets/javascripts/discourse/app/components/date-time-input.js diff --git a/app/assets/javascripts/discourse/components/desktop-notification-config.js b/app/assets/javascripts/discourse/app/components/desktop-notification-config.js similarity index 100% rename from app/assets/javascripts/discourse/components/desktop-notification-config.js rename to app/assets/javascripts/discourse/app/components/desktop-notification-config.js diff --git a/app/assets/javascripts/discourse/components/directory-item.js b/app/assets/javascripts/discourse/app/components/directory-item.js similarity index 100% rename from app/assets/javascripts/discourse/components/directory-item.js rename to app/assets/javascripts/discourse/app/components/directory-item.js diff --git a/app/assets/javascripts/discourse/components/directory-toggle.js b/app/assets/javascripts/discourse/app/components/directory-toggle.js similarity index 100% rename from app/assets/javascripts/discourse/components/directory-toggle.js rename to app/assets/javascripts/discourse/app/components/directory-toggle.js diff --git a/app/assets/javascripts/discourse/components/disabled-icon.js b/app/assets/javascripts/discourse/app/components/disabled-icon.js similarity index 100% rename from app/assets/javascripts/discourse/components/disabled-icon.js rename to app/assets/javascripts/discourse/app/components/disabled-icon.js diff --git a/app/assets/javascripts/discourse/components/discourse-banner.js b/app/assets/javascripts/discourse/app/components/discourse-banner.js similarity index 100% rename from app/assets/javascripts/discourse/components/discourse-banner.js rename to app/assets/javascripts/discourse/app/components/discourse-banner.js diff --git a/app/assets/javascripts/discourse/components/discourse-linked-text.js b/app/assets/javascripts/discourse/app/components/discourse-linked-text.js similarity index 100% rename from app/assets/javascripts/discourse/components/discourse-linked-text.js rename to app/assets/javascripts/discourse/app/components/discourse-linked-text.js diff --git a/app/assets/javascripts/discourse/components/discourse-tag-bound.js b/app/assets/javascripts/discourse/app/components/discourse-tag-bound.js similarity index 100% rename from app/assets/javascripts/discourse/components/discourse-tag-bound.js rename to app/assets/javascripts/discourse/app/components/discourse-tag-bound.js diff --git a/app/assets/javascripts/discourse/components/discourse-topic.js b/app/assets/javascripts/discourse/app/components/discourse-topic.js similarity index 100% rename from app/assets/javascripts/discourse/components/discourse-topic.js rename to app/assets/javascripts/discourse/app/components/discourse-topic.js diff --git a/app/assets/javascripts/discourse/components/discovery-categories.js b/app/assets/javascripts/discourse/app/components/discovery-categories.js similarity index 100% rename from app/assets/javascripts/discourse/components/discovery-categories.js rename to app/assets/javascripts/discourse/app/components/discovery-categories.js diff --git a/app/assets/javascripts/discourse/components/discovery-topics-list.js b/app/assets/javascripts/discourse/app/components/discovery-topics-list.js similarity index 100% rename from app/assets/javascripts/discourse/components/discovery-topics-list.js rename to app/assets/javascripts/discourse/app/components/discovery-topics-list.js diff --git a/app/assets/javascripts/discourse/components/edit-category-general.js b/app/assets/javascripts/discourse/app/components/edit-category-general.js similarity index 100% rename from app/assets/javascripts/discourse/components/edit-category-general.js rename to app/assets/javascripts/discourse/app/components/edit-category-general.js diff --git a/app/assets/javascripts/discourse/components/edit-category-images.js b/app/assets/javascripts/discourse/app/components/edit-category-images.js similarity index 100% rename from app/assets/javascripts/discourse/components/edit-category-images.js rename to app/assets/javascripts/discourse/app/components/edit-category-images.js diff --git a/app/assets/javascripts/discourse/components/edit-category-panel.js b/app/assets/javascripts/discourse/app/components/edit-category-panel.js similarity index 100% rename from app/assets/javascripts/discourse/components/edit-category-panel.js rename to app/assets/javascripts/discourse/app/components/edit-category-panel.js diff --git a/app/assets/javascripts/discourse/components/edit-category-security.js b/app/assets/javascripts/discourse/app/components/edit-category-security.js similarity index 100% rename from app/assets/javascripts/discourse/components/edit-category-security.js rename to app/assets/javascripts/discourse/app/components/edit-category-security.js diff --git a/app/assets/javascripts/discourse/components/edit-category-settings.js b/app/assets/javascripts/discourse/app/components/edit-category-settings.js similarity index 100% rename from app/assets/javascripts/discourse/components/edit-category-settings.js rename to app/assets/javascripts/discourse/app/components/edit-category-settings.js diff --git a/app/assets/javascripts/discourse/components/edit-category-tab.js b/app/assets/javascripts/discourse/app/components/edit-category-tab.js similarity index 100% rename from app/assets/javascripts/discourse/components/edit-category-tab.js rename to app/assets/javascripts/discourse/app/components/edit-category-tab.js diff --git a/app/assets/javascripts/discourse/components/edit-category-tags.js b/app/assets/javascripts/discourse/app/components/edit-category-tags.js similarity index 100% rename from app/assets/javascripts/discourse/components/edit-category-tags.js rename to app/assets/javascripts/discourse/app/components/edit-category-tags.js diff --git a/app/assets/javascripts/discourse/components/edit-category-topic-template.js b/app/assets/javascripts/discourse/app/components/edit-category-topic-template.js similarity index 100% rename from app/assets/javascripts/discourse/components/edit-category-topic-template.js rename to app/assets/javascripts/discourse/app/components/edit-category-topic-template.js diff --git a/app/assets/javascripts/discourse/components/edit-topic-timer-form.js b/app/assets/javascripts/discourse/app/components/edit-topic-timer-form.js similarity index 100% rename from app/assets/javascripts/discourse/components/edit-topic-timer-form.js rename to app/assets/javascripts/discourse/app/components/edit-topic-timer-form.js diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js b/app/assets/javascripts/discourse/app/components/emoji-picker.js similarity index 100% rename from app/assets/javascripts/discourse/components/emoji-picker.js rename to app/assets/javascripts/discourse/app/components/emoji-picker.js diff --git a/app/assets/javascripts/discourse/components/emoji-uploader.js b/app/assets/javascripts/discourse/app/components/emoji-uploader.js similarity index 100% rename from app/assets/javascripts/discourse/components/emoji-uploader.js rename to app/assets/javascripts/discourse/app/components/emoji-uploader.js diff --git a/app/assets/javascripts/discourse/components/expand-post.js b/app/assets/javascripts/discourse/app/components/expand-post.js similarity index 100% rename from app/assets/javascripts/discourse/components/expand-post.js rename to app/assets/javascripts/discourse/app/components/expand-post.js diff --git a/app/assets/javascripts/discourse/components/expanding-text-area.js b/app/assets/javascripts/discourse/app/components/expanding-text-area.js similarity index 100% rename from app/assets/javascripts/discourse/components/expanding-text-area.js rename to app/assets/javascripts/discourse/app/components/expanding-text-area.js diff --git a/app/assets/javascripts/discourse/components/featured-topic.js b/app/assets/javascripts/discourse/app/components/featured-topic.js similarity index 100% rename from app/assets/javascripts/discourse/components/featured-topic.js rename to app/assets/javascripts/discourse/app/components/featured-topic.js diff --git a/app/assets/javascripts/discourse/components/flag-action-type.js b/app/assets/javascripts/discourse/app/components/flag-action-type.js similarity index 100% rename from app/assets/javascripts/discourse/components/flag-action-type.js rename to app/assets/javascripts/discourse/app/components/flag-action-type.js diff --git a/app/assets/javascripts/discourse/components/flag-selection.js b/app/assets/javascripts/discourse/app/components/flag-selection.js similarity index 100% rename from app/assets/javascripts/discourse/components/flag-selection.js rename to app/assets/javascripts/discourse/app/components/flag-selection.js diff --git a/app/assets/javascripts/discourse/components/flat-button.js b/app/assets/javascripts/discourse/app/components/flat-button.js similarity index 100% rename from app/assets/javascripts/discourse/components/flat-button.js rename to app/assets/javascripts/discourse/app/components/flat-button.js diff --git a/app/assets/javascripts/discourse/components/footer-message.js b/app/assets/javascripts/discourse/app/components/footer-message.js similarity index 100% rename from app/assets/javascripts/discourse/components/footer-message.js rename to app/assets/javascripts/discourse/app/components/footer-message.js diff --git a/app/assets/javascripts/discourse/components/footer-nav.js b/app/assets/javascripts/discourse/app/components/footer-nav.js similarity index 100% rename from app/assets/javascripts/discourse/components/footer-nav.js rename to app/assets/javascripts/discourse/app/components/footer-nav.js diff --git a/app/assets/javascripts/discourse/components/future-date-input.js b/app/assets/javascripts/discourse/app/components/future-date-input.js similarity index 100% rename from app/assets/javascripts/discourse/components/future-date-input.js rename to app/assets/javascripts/discourse/app/components/future-date-input.js diff --git a/app/assets/javascripts/discourse/components/generated-invite-link.js b/app/assets/javascripts/discourse/app/components/generated-invite-link.js similarity index 100% rename from app/assets/javascripts/discourse/components/generated-invite-link.js rename to app/assets/javascripts/discourse/app/components/generated-invite-link.js diff --git a/app/assets/javascripts/discourse/components/global-notice.js b/app/assets/javascripts/discourse/app/components/global-notice.js similarity index 100% rename from app/assets/javascripts/discourse/components/global-notice.js rename to app/assets/javascripts/discourse/app/components/global-notice.js diff --git a/app/assets/javascripts/discourse/components/google-search.js b/app/assets/javascripts/discourse/app/components/google-search.js similarity index 100% rename from app/assets/javascripts/discourse/components/google-search.js rename to app/assets/javascripts/discourse/app/components/google-search.js diff --git a/app/assets/javascripts/discourse/components/group-activity-filter.js b/app/assets/javascripts/discourse/app/components/group-activity-filter.js similarity index 100% rename from app/assets/javascripts/discourse/components/group-activity-filter.js rename to app/assets/javascripts/discourse/app/components/group-activity-filter.js diff --git a/app/assets/javascripts/discourse/components/group-card-contents.js b/app/assets/javascripts/discourse/app/components/group-card-contents.js similarity index 100% rename from app/assets/javascripts/discourse/components/group-card-contents.js rename to app/assets/javascripts/discourse/app/components/group-card-contents.js diff --git a/app/assets/javascripts/discourse/components/group-flair-inputs.js b/app/assets/javascripts/discourse/app/components/group-flair-inputs.js similarity index 100% rename from app/assets/javascripts/discourse/components/group-flair-inputs.js rename to app/assets/javascripts/discourse/app/components/group-flair-inputs.js diff --git a/app/assets/javascripts/discourse/components/group-index-toggle.js b/app/assets/javascripts/discourse/app/components/group-index-toggle.js similarity index 100% rename from app/assets/javascripts/discourse/components/group-index-toggle.js rename to app/assets/javascripts/discourse/app/components/group-index-toggle.js diff --git a/app/assets/javascripts/discourse/components/group-manage-logs-filter.js b/app/assets/javascripts/discourse/app/components/group-manage-logs-filter.js similarity index 100% rename from app/assets/javascripts/discourse/components/group-manage-logs-filter.js rename to app/assets/javascripts/discourse/app/components/group-manage-logs-filter.js diff --git a/app/assets/javascripts/discourse/components/group-manage-logs-row.js b/app/assets/javascripts/discourse/app/components/group-manage-logs-row.js similarity index 100% rename from app/assets/javascripts/discourse/components/group-manage-logs-row.js rename to app/assets/javascripts/discourse/app/components/group-manage-logs-row.js diff --git a/app/assets/javascripts/discourse/components/group-manage-save-button.js b/app/assets/javascripts/discourse/app/components/group-manage-save-button.js similarity index 100% rename from app/assets/javascripts/discourse/components/group-manage-save-button.js rename to app/assets/javascripts/discourse/app/components/group-manage-save-button.js diff --git a/app/assets/javascripts/discourse/components/group-member-dropdown.js b/app/assets/javascripts/discourse/app/components/group-member-dropdown.js similarity index 100% rename from app/assets/javascripts/discourse/components/group-member-dropdown.js rename to app/assets/javascripts/discourse/app/components/group-member-dropdown.js diff --git a/app/assets/javascripts/discourse/components/group-member.js b/app/assets/javascripts/discourse/app/components/group-member.js similarity index 100% rename from app/assets/javascripts/discourse/components/group-member.js rename to app/assets/javascripts/discourse/app/components/group-member.js diff --git a/app/assets/javascripts/discourse/components/group-membership-button.js b/app/assets/javascripts/discourse/app/components/group-membership-button.js similarity index 100% rename from app/assets/javascripts/discourse/components/group-membership-button.js rename to app/assets/javascripts/discourse/app/components/group-membership-button.js diff --git a/app/assets/javascripts/discourse/components/group-navigation.js b/app/assets/javascripts/discourse/app/components/group-navigation.js similarity index 100% rename from app/assets/javascripts/discourse/components/group-navigation.js rename to app/assets/javascripts/discourse/app/components/group-navigation.js diff --git a/app/assets/javascripts/discourse/components/group-post.js b/app/assets/javascripts/discourse/app/components/group-post.js similarity index 100% rename from app/assets/javascripts/discourse/components/group-post.js rename to app/assets/javascripts/discourse/app/components/group-post.js diff --git a/app/assets/javascripts/discourse/components/group-selector.js b/app/assets/javascripts/discourse/app/components/group-selector.js similarity index 100% rename from app/assets/javascripts/discourse/components/group-selector.js rename to app/assets/javascripts/discourse/app/components/group-selector.js diff --git a/app/assets/javascripts/discourse/components/groups-form-interaction-fields.js b/app/assets/javascripts/discourse/app/components/groups-form-interaction-fields.js similarity index 100% rename from app/assets/javascripts/discourse/components/groups-form-interaction-fields.js rename to app/assets/javascripts/discourse/app/components/groups-form-interaction-fields.js diff --git a/app/assets/javascripts/discourse/components/groups-form-membership-fields.js b/app/assets/javascripts/discourse/app/components/groups-form-membership-fields.js similarity index 100% rename from app/assets/javascripts/discourse/components/groups-form-membership-fields.js rename to app/assets/javascripts/discourse/app/components/groups-form-membership-fields.js diff --git a/app/assets/javascripts/discourse/components/groups-form-profile-fields.js b/app/assets/javascripts/discourse/app/components/groups-form-profile-fields.js similarity index 100% rename from app/assets/javascripts/discourse/components/groups-form-profile-fields.js rename to app/assets/javascripts/discourse/app/components/groups-form-profile-fields.js diff --git a/app/assets/javascripts/discourse/components/groups-info.js b/app/assets/javascripts/discourse/app/components/groups-info.js similarity index 100% rename from app/assets/javascripts/discourse/components/groups-info.js rename to app/assets/javascripts/discourse/app/components/groups-info.js diff --git a/app/assets/javascripts/discourse/components/header-extra-info.js b/app/assets/javascripts/discourse/app/components/header-extra-info.js similarity index 100% rename from app/assets/javascripts/discourse/components/header-extra-info.js rename to app/assets/javascripts/discourse/app/components/header-extra-info.js diff --git a/app/assets/javascripts/discourse/components/hide-modal-trigger.js b/app/assets/javascripts/discourse/app/components/hide-modal-trigger.js similarity index 100% rename from app/assets/javascripts/discourse/components/hide-modal-trigger.js rename to app/assets/javascripts/discourse/app/components/hide-modal-trigger.js diff --git a/app/assets/javascripts/discourse/components/highlight-search.js b/app/assets/javascripts/discourse/app/components/highlight-search.js similarity index 100% rename from app/assets/javascripts/discourse/components/highlight-search.js rename to app/assets/javascripts/discourse/app/components/highlight-search.js diff --git a/app/assets/javascripts/discourse/components/highlight-text.js b/app/assets/javascripts/discourse/app/components/highlight-text.js similarity index 100% rename from app/assets/javascripts/discourse/components/highlight-text.js rename to app/assets/javascripts/discourse/app/components/highlight-text.js diff --git a/app/assets/javascripts/discourse/components/honeypot-input.js b/app/assets/javascripts/discourse/app/components/honeypot-input.js similarity index 100% rename from app/assets/javascripts/discourse/components/honeypot-input.js rename to app/assets/javascripts/discourse/app/components/honeypot-input.js diff --git a/app/assets/javascripts/discourse/components/iframed-html.js b/app/assets/javascripts/discourse/app/components/iframed-html.js similarity index 100% rename from app/assets/javascripts/discourse/components/iframed-html.js rename to app/assets/javascripts/discourse/app/components/iframed-html.js diff --git a/app/assets/javascripts/discourse/components/ignored-user-list-item.js b/app/assets/javascripts/discourse/app/components/ignored-user-list-item.js similarity index 100% rename from app/assets/javascripts/discourse/components/ignored-user-list-item.js rename to app/assets/javascripts/discourse/app/components/ignored-user-list-item.js diff --git a/app/assets/javascripts/discourse/components/ignored-user-list.js b/app/assets/javascripts/discourse/app/components/ignored-user-list.js similarity index 100% rename from app/assets/javascripts/discourse/components/ignored-user-list.js rename to app/assets/javascripts/discourse/app/components/ignored-user-list.js diff --git a/app/assets/javascripts/discourse/components/image-uploader.js b/app/assets/javascripts/discourse/app/components/image-uploader.js similarity index 100% rename from app/assets/javascripts/discourse/components/image-uploader.js rename to app/assets/javascripts/discourse/app/components/image-uploader.js diff --git a/app/assets/javascripts/discourse/components/images-uploader.js b/app/assets/javascripts/discourse/app/components/images-uploader.js similarity index 100% rename from app/assets/javascripts/discourse/components/images-uploader.js rename to app/assets/javascripts/discourse/app/components/images-uploader.js diff --git a/app/assets/javascripts/discourse/components/input-tip.js b/app/assets/javascripts/discourse/app/components/input-tip.js similarity index 100% rename from app/assets/javascripts/discourse/components/input-tip.js rename to app/assets/javascripts/discourse/app/components/input-tip.js diff --git a/app/assets/javascripts/discourse/components/invite-panel.js b/app/assets/javascripts/discourse/app/components/invite-panel.js similarity index 100% rename from app/assets/javascripts/discourse/components/invite-panel.js rename to app/assets/javascripts/discourse/app/components/invite-panel.js diff --git a/app/assets/javascripts/discourse/components/latest-topic-list-item.js b/app/assets/javascripts/discourse/app/components/latest-topic-list-item.js similarity index 100% rename from app/assets/javascripts/discourse/components/latest-topic-list-item.js rename to app/assets/javascripts/discourse/app/components/latest-topic-list-item.js diff --git a/app/assets/javascripts/discourse/components/link-to-input.js b/app/assets/javascripts/discourse/app/components/link-to-input.js similarity index 100% rename from app/assets/javascripts/discourse/components/link-to-input.js rename to app/assets/javascripts/discourse/app/components/link-to-input.js diff --git a/app/assets/javascripts/discourse/components/links-redirect.js b/app/assets/javascripts/discourse/app/components/links-redirect.js similarity index 100% rename from app/assets/javascripts/discourse/components/links-redirect.js rename to app/assets/javascripts/discourse/app/components/links-redirect.js diff --git a/app/assets/javascripts/discourse/components/load-more.js b/app/assets/javascripts/discourse/app/components/load-more.js similarity index 100% rename from app/assets/javascripts/discourse/components/load-more.js rename to app/assets/javascripts/discourse/app/components/load-more.js diff --git a/app/assets/javascripts/discourse/components/login-buttons.js b/app/assets/javascripts/discourse/app/components/login-buttons.js similarity index 100% rename from app/assets/javascripts/discourse/components/login-buttons.js rename to app/assets/javascripts/discourse/app/components/login-buttons.js diff --git a/app/assets/javascripts/discourse/components/login-modal.js b/app/assets/javascripts/discourse/app/components/login-modal.js similarity index 100% rename from app/assets/javascripts/discourse/components/login-modal.js rename to app/assets/javascripts/discourse/app/components/login-modal.js diff --git a/app/assets/javascripts/discourse/components/login-reply-button.js b/app/assets/javascripts/discourse/app/components/login-reply-button.js similarity index 100% rename from app/assets/javascripts/discourse/components/login-reply-button.js rename to app/assets/javascripts/discourse/app/components/login-reply-button.js diff --git a/app/assets/javascripts/discourse/components/mobile-category-topic.js b/app/assets/javascripts/discourse/app/components/mobile-category-topic.js similarity index 100% rename from app/assets/javascripts/discourse/components/mobile-category-topic.js rename to app/assets/javascripts/discourse/app/components/mobile-category-topic.js diff --git a/app/assets/javascripts/discourse/components/mobile-nav.js b/app/assets/javascripts/discourse/app/components/mobile-nav.js similarity index 100% rename from app/assets/javascripts/discourse/components/mobile-nav.js rename to app/assets/javascripts/discourse/app/components/mobile-nav.js diff --git a/app/assets/javascripts/discourse/components/modal-panel.js b/app/assets/javascripts/discourse/app/components/modal-panel.js similarity index 100% rename from app/assets/javascripts/discourse/components/modal-panel.js rename to app/assets/javascripts/discourse/app/components/modal-panel.js diff --git a/app/assets/javascripts/discourse/components/modal-tab.js b/app/assets/javascripts/discourse/app/components/modal-tab.js similarity index 100% rename from app/assets/javascripts/discourse/components/modal-tab.js rename to app/assets/javascripts/discourse/app/components/modal-tab.js diff --git a/app/assets/javascripts/discourse/components/mount-widget.js b/app/assets/javascripts/discourse/app/components/mount-widget.js similarity index 100% rename from app/assets/javascripts/discourse/components/mount-widget.js rename to app/assets/javascripts/discourse/app/components/mount-widget.js diff --git a/app/assets/javascripts/discourse/components/nav-item.js b/app/assets/javascripts/discourse/app/components/nav-item.js similarity index 100% rename from app/assets/javascripts/discourse/components/nav-item.js rename to app/assets/javascripts/discourse/app/components/nav-item.js diff --git a/app/assets/javascripts/discourse/components/navigation-bar.js b/app/assets/javascripts/discourse/app/components/navigation-bar.js similarity index 100% rename from app/assets/javascripts/discourse/components/navigation-bar.js rename to app/assets/javascripts/discourse/app/components/navigation-bar.js diff --git a/app/assets/javascripts/discourse/components/navigation-item.js b/app/assets/javascripts/discourse/app/components/navigation-item.js similarity index 100% rename from app/assets/javascripts/discourse/components/navigation-item.js rename to app/assets/javascripts/discourse/app/components/navigation-item.js diff --git a/app/assets/javascripts/discourse/components/notification-consent-banner.js b/app/assets/javascripts/discourse/app/components/notification-consent-banner.js similarity index 100% rename from app/assets/javascripts/discourse/components/notification-consent-banner.js rename to app/assets/javascripts/discourse/app/components/notification-consent-banner.js diff --git a/app/assets/javascripts/discourse/components/number-field.js b/app/assets/javascripts/discourse/app/components/number-field.js similarity index 100% rename from app/assets/javascripts/discourse/components/number-field.js rename to app/assets/javascripts/discourse/app/components/number-field.js diff --git a/app/assets/javascripts/discourse/components/password-field.js b/app/assets/javascripts/discourse/app/components/password-field.js similarity index 100% rename from app/assets/javascripts/discourse/components/password-field.js rename to app/assets/javascripts/discourse/app/components/password-field.js diff --git a/app/assets/javascripts/discourse/components/plugin-connector.js b/app/assets/javascripts/discourse/app/components/plugin-connector.js similarity index 100% rename from app/assets/javascripts/discourse/components/plugin-connector.js rename to app/assets/javascripts/discourse/app/components/plugin-connector.js diff --git a/app/assets/javascripts/discourse/components/plugin-outlet.js b/app/assets/javascripts/discourse/app/components/plugin-outlet.js similarity index 100% rename from app/assets/javascripts/discourse/components/plugin-outlet.js rename to app/assets/javascripts/discourse/app/components/plugin-outlet.js diff --git a/app/assets/javascripts/discourse/components/popup-input-tip.js b/app/assets/javascripts/discourse/app/components/popup-input-tip.js similarity index 100% rename from app/assets/javascripts/discourse/components/popup-input-tip.js rename to app/assets/javascripts/discourse/app/components/popup-input-tip.js diff --git a/app/assets/javascripts/discourse/components/preference-checkbox.js b/app/assets/javascripts/discourse/app/components/preference-checkbox.js similarity index 100% rename from app/assets/javascripts/discourse/components/preference-checkbox.js rename to app/assets/javascripts/discourse/app/components/preference-checkbox.js diff --git a/app/assets/javascripts/discourse/components/private-message-glyph.js b/app/assets/javascripts/discourse/app/components/private-message-glyph.js similarity index 100% rename from app/assets/javascripts/discourse/components/private-message-glyph.js rename to app/assets/javascripts/discourse/app/components/private-message-glyph.js diff --git a/app/assets/javascripts/discourse/components/pwa-install-banner.js b/app/assets/javascripts/discourse/app/components/pwa-install-banner.js similarity index 100% rename from app/assets/javascripts/discourse/components/pwa-install-banner.js rename to app/assets/javascripts/discourse/app/components/pwa-install-banner.js diff --git a/app/assets/javascripts/discourse/components/quote-button.js b/app/assets/javascripts/discourse/app/components/quote-button.js similarity index 100% rename from app/assets/javascripts/discourse/components/quote-button.js rename to app/assets/javascripts/discourse/app/components/quote-button.js diff --git a/app/assets/javascripts/discourse/components/radio-button.js b/app/assets/javascripts/discourse/app/components/radio-button.js similarity index 100% rename from app/assets/javascripts/discourse/components/radio-button.js rename to app/assets/javascripts/discourse/app/components/radio-button.js diff --git a/app/assets/javascripts/discourse/components/related-messages.js b/app/assets/javascripts/discourse/app/components/related-messages.js similarity index 100% rename from app/assets/javascripts/discourse/components/related-messages.js rename to app/assets/javascripts/discourse/app/components/related-messages.js diff --git a/app/assets/javascripts/discourse/components/reviewable-bundled-action.js b/app/assets/javascripts/discourse/app/components/reviewable-bundled-action.js similarity index 100% rename from app/assets/javascripts/discourse/components/reviewable-bundled-action.js rename to app/assets/javascripts/discourse/app/components/reviewable-bundled-action.js diff --git a/app/assets/javascripts/discourse/components/reviewable-claimed-topic.js b/app/assets/javascripts/discourse/app/components/reviewable-claimed-topic.js similarity index 100% rename from app/assets/javascripts/discourse/components/reviewable-claimed-topic.js rename to app/assets/javascripts/discourse/app/components/reviewable-claimed-topic.js diff --git a/app/assets/javascripts/discourse/components/reviewable-conversation-post.js b/app/assets/javascripts/discourse/app/components/reviewable-conversation-post.js similarity index 100% rename from app/assets/javascripts/discourse/components/reviewable-conversation-post.js rename to app/assets/javascripts/discourse/app/components/reviewable-conversation-post.js diff --git a/app/assets/javascripts/discourse/components/reviewable-field-category.js b/app/assets/javascripts/discourse/app/components/reviewable-field-category.js similarity index 100% rename from app/assets/javascripts/discourse/components/reviewable-field-category.js rename to app/assets/javascripts/discourse/app/components/reviewable-field-category.js diff --git a/app/assets/javascripts/discourse/components/reviewable-field-tags.js b/app/assets/javascripts/discourse/app/components/reviewable-field-tags.js similarity index 100% rename from app/assets/javascripts/discourse/components/reviewable-field-tags.js rename to app/assets/javascripts/discourse/app/components/reviewable-field-tags.js diff --git a/app/assets/javascripts/discourse/components/reviewable-flagged-post.js b/app/assets/javascripts/discourse/app/components/reviewable-flagged-post.js similarity index 100% rename from app/assets/javascripts/discourse/components/reviewable-flagged-post.js rename to app/assets/javascripts/discourse/app/components/reviewable-flagged-post.js diff --git a/app/assets/javascripts/discourse/components/reviewable-histories.js b/app/assets/javascripts/discourse/app/components/reviewable-histories.js similarity index 100% rename from app/assets/javascripts/discourse/components/reviewable-histories.js rename to app/assets/javascripts/discourse/app/components/reviewable-histories.js diff --git a/app/assets/javascripts/discourse/components/reviewable-item.js b/app/assets/javascripts/discourse/app/components/reviewable-item.js similarity index 100% rename from app/assets/javascripts/discourse/components/reviewable-item.js rename to app/assets/javascripts/discourse/app/components/reviewable-item.js diff --git a/app/assets/javascripts/discourse/components/reviewable-queued-post.js b/app/assets/javascripts/discourse/app/components/reviewable-queued-post.js similarity index 100% rename from app/assets/javascripts/discourse/components/reviewable-queued-post.js rename to app/assets/javascripts/discourse/app/components/reviewable-queued-post.js diff --git a/app/assets/javascripts/discourse/components/reviewable-score.js b/app/assets/javascripts/discourse/app/components/reviewable-score.js similarity index 100% rename from app/assets/javascripts/discourse/components/reviewable-score.js rename to app/assets/javascripts/discourse/app/components/reviewable-score.js diff --git a/app/assets/javascripts/discourse/components/reviewable-user.js b/app/assets/javascripts/discourse/app/components/reviewable-user.js similarity index 100% rename from app/assets/javascripts/discourse/components/reviewable-user.js rename to app/assets/javascripts/discourse/app/components/reviewable-user.js diff --git a/app/assets/javascripts/discourse/components/save-controls.js b/app/assets/javascripts/discourse/app/components/save-controls.js similarity index 100% rename from app/assets/javascripts/discourse/components/save-controls.js rename to app/assets/javascripts/discourse/app/components/save-controls.js diff --git a/app/assets/javascripts/discourse/components/scroll-tracker.js b/app/assets/javascripts/discourse/app/components/scroll-tracker.js similarity index 100% rename from app/assets/javascripts/discourse/components/scroll-tracker.js rename to app/assets/javascripts/discourse/app/components/scroll-tracker.js diff --git a/app/assets/javascripts/discourse/components/scrolling-post-stream.js b/app/assets/javascripts/discourse/app/components/scrolling-post-stream.js similarity index 100% rename from app/assets/javascripts/discourse/components/scrolling-post-stream.js rename to app/assets/javascripts/discourse/app/components/scrolling-post-stream.js diff --git a/app/assets/javascripts/discourse/components/search-advanced-options.js b/app/assets/javascripts/discourse/app/components/search-advanced-options.js similarity index 100% rename from app/assets/javascripts/discourse/components/search-advanced-options.js rename to app/assets/javascripts/discourse/app/components/search-advanced-options.js diff --git a/app/assets/javascripts/discourse/components/search-text-field.js b/app/assets/javascripts/discourse/app/components/search-text-field.js similarity index 100% rename from app/assets/javascripts/discourse/components/search-text-field.js rename to app/assets/javascripts/discourse/app/components/search-text-field.js diff --git a/app/assets/javascripts/discourse/components/second-factor-form.js b/app/assets/javascripts/discourse/app/components/second-factor-form.js similarity index 100% rename from app/assets/javascripts/discourse/components/second-factor-form.js rename to app/assets/javascripts/discourse/app/components/second-factor-form.js diff --git a/app/assets/javascripts/discourse/components/second-factor-input.js b/app/assets/javascripts/discourse/app/components/second-factor-input.js similarity index 100% rename from app/assets/javascripts/discourse/components/second-factor-input.js rename to app/assets/javascripts/discourse/app/components/second-factor-input.js diff --git a/app/assets/javascripts/discourse/components/security-key-form.js b/app/assets/javascripts/discourse/app/components/security-key-form.js similarity index 100% rename from app/assets/javascripts/discourse/components/security-key-form.js rename to app/assets/javascripts/discourse/app/components/security-key-form.js diff --git a/app/assets/javascripts/discourse/components/share-panel.js b/app/assets/javascripts/discourse/app/components/share-panel.js similarity index 100% rename from app/assets/javascripts/discourse/components/share-panel.js rename to app/assets/javascripts/discourse/app/components/share-panel.js diff --git a/app/assets/javascripts/discourse/components/share-popup.js b/app/assets/javascripts/discourse/app/components/share-popup.js similarity index 100% rename from app/assets/javascripts/discourse/components/share-popup.js rename to app/assets/javascripts/discourse/app/components/share-popup.js diff --git a/app/assets/javascripts/discourse/components/share-source.js b/app/assets/javascripts/discourse/app/components/share-source.js similarity index 100% rename from app/assets/javascripts/discourse/components/share-source.js rename to app/assets/javascripts/discourse/app/components/share-source.js diff --git a/app/assets/javascripts/discourse/components/shared-draft-controls.js b/app/assets/javascripts/discourse/app/components/shared-draft-controls.js similarity index 100% rename from app/assets/javascripts/discourse/components/shared-draft-controls.js rename to app/assets/javascripts/discourse/app/components/shared-draft-controls.js diff --git a/app/assets/javascripts/discourse/components/signup-cta.js b/app/assets/javascripts/discourse/app/components/signup-cta.js similarity index 100% rename from app/assets/javascripts/discourse/components/signup-cta.js rename to app/assets/javascripts/discourse/app/components/signup-cta.js diff --git a/app/assets/javascripts/discourse/components/site-header.js b/app/assets/javascripts/discourse/app/components/site-header.js similarity index 100% rename from app/assets/javascripts/discourse/components/site-header.js rename to app/assets/javascripts/discourse/app/components/site-header.js diff --git a/app/assets/javascripts/discourse/components/suggested-topics.js b/app/assets/javascripts/discourse/app/components/suggested-topics.js similarity index 100% rename from app/assets/javascripts/discourse/components/suggested-topics.js rename to app/assets/javascripts/discourse/app/components/suggested-topics.js diff --git a/app/assets/javascripts/discourse/components/tag-drop-link.js b/app/assets/javascripts/discourse/app/components/tag-drop-link.js similarity index 100% rename from app/assets/javascripts/discourse/components/tag-drop-link.js rename to app/assets/javascripts/discourse/app/components/tag-drop-link.js diff --git a/app/assets/javascripts/discourse/components/tag-groups-form.js b/app/assets/javascripts/discourse/app/components/tag-groups-form.js similarity index 100% rename from app/assets/javascripts/discourse/components/tag-groups-form.js rename to app/assets/javascripts/discourse/app/components/tag-groups-form.js diff --git a/app/assets/javascripts/discourse/components/tag-info.js b/app/assets/javascripts/discourse/app/components/tag-info.js similarity index 100% rename from app/assets/javascripts/discourse/components/tag-info.js rename to app/assets/javascripts/discourse/app/components/tag-info.js diff --git a/app/assets/javascripts/discourse/components/tag-list.js b/app/assets/javascripts/discourse/app/components/tag-list.js similarity index 100% rename from app/assets/javascripts/discourse/components/tag-list.js rename to app/assets/javascripts/discourse/app/components/tag-list.js diff --git a/app/assets/javascripts/discourse/components/tags-admin-dropdown.js b/app/assets/javascripts/discourse/app/components/tags-admin-dropdown.js similarity index 100% rename from app/assets/javascripts/discourse/components/tags-admin-dropdown.js rename to app/assets/javascripts/discourse/app/components/tags-admin-dropdown.js diff --git a/app/assets/javascripts/discourse/components/tap-tile-grid.js b/app/assets/javascripts/discourse/app/components/tap-tile-grid.js similarity index 100% rename from app/assets/javascripts/discourse/components/tap-tile-grid.js rename to app/assets/javascripts/discourse/app/components/tap-tile-grid.js diff --git a/app/assets/javascripts/discourse/components/tap-tile.js b/app/assets/javascripts/discourse/app/components/tap-tile.js similarity index 100% rename from app/assets/javascripts/discourse/components/tap-tile.js rename to app/assets/javascripts/discourse/app/components/tap-tile.js diff --git a/app/assets/javascripts/discourse/components/text-field.js b/app/assets/javascripts/discourse/app/components/text-field.js similarity index 100% rename from app/assets/javascripts/discourse/components/text-field.js rename to app/assets/javascripts/discourse/app/components/text-field.js diff --git a/app/assets/javascripts/discourse/components/text-overflow.js b/app/assets/javascripts/discourse/app/components/text-overflow.js similarity index 100% rename from app/assets/javascripts/discourse/components/text-overflow.js rename to app/assets/javascripts/discourse/app/components/text-overflow.js diff --git a/app/assets/javascripts/discourse/components/time-input.js b/app/assets/javascripts/discourse/app/components/time-input.js similarity index 100% rename from app/assets/javascripts/discourse/components/time-input.js rename to app/assets/javascripts/discourse/app/components/time-input.js diff --git a/app/assets/javascripts/discourse/components/top-period-buttons.js b/app/assets/javascripts/discourse/app/components/top-period-buttons.js similarity index 100% rename from app/assets/javascripts/discourse/components/top-period-buttons.js rename to app/assets/javascripts/discourse/app/components/top-period-buttons.js diff --git a/app/assets/javascripts/discourse/components/topic-admin-menu-button.js b/app/assets/javascripts/discourse/app/components/topic-admin-menu-button.js similarity index 100% rename from app/assets/javascripts/discourse/components/topic-admin-menu-button.js rename to app/assets/javascripts/discourse/app/components/topic-admin-menu-button.js diff --git a/app/assets/javascripts/discourse/components/topic-category.js b/app/assets/javascripts/discourse/app/components/topic-category.js similarity index 100% rename from app/assets/javascripts/discourse/components/topic-category.js rename to app/assets/javascripts/discourse/app/components/topic-category.js diff --git a/app/assets/javascripts/discourse/components/topic-entrance.js b/app/assets/javascripts/discourse/app/components/topic-entrance.js similarity index 100% rename from app/assets/javascripts/discourse/components/topic-entrance.js rename to app/assets/javascripts/discourse/app/components/topic-entrance.js diff --git a/app/assets/javascripts/discourse/components/topic-footer-buttons.js b/app/assets/javascripts/discourse/app/components/topic-footer-buttons.js similarity index 100% rename from app/assets/javascripts/discourse/components/topic-footer-buttons.js rename to app/assets/javascripts/discourse/app/components/topic-footer-buttons.js diff --git a/app/assets/javascripts/discourse/components/topic-join-group-notice.js b/app/assets/javascripts/discourse/app/components/topic-join-group-notice.js similarity index 100% rename from app/assets/javascripts/discourse/components/topic-join-group-notice.js rename to app/assets/javascripts/discourse/app/components/topic-join-group-notice.js diff --git a/app/assets/javascripts/discourse/components/topic-list-item.js b/app/assets/javascripts/discourse/app/components/topic-list-item.js similarity index 100% rename from app/assets/javascripts/discourse/components/topic-list-item.js rename to app/assets/javascripts/discourse/app/components/topic-list-item.js diff --git a/app/assets/javascripts/discourse/components/topic-list.js b/app/assets/javascripts/discourse/app/components/topic-list.js similarity index 100% rename from app/assets/javascripts/discourse/components/topic-list.js rename to app/assets/javascripts/discourse/app/components/topic-list.js diff --git a/app/assets/javascripts/discourse/components/topic-navigation.js b/app/assets/javascripts/discourse/app/components/topic-navigation.js similarity index 100% rename from app/assets/javascripts/discourse/components/topic-navigation.js rename to app/assets/javascripts/discourse/app/components/topic-navigation.js diff --git a/app/assets/javascripts/discourse/components/topic-post-badges.js b/app/assets/javascripts/discourse/app/components/topic-post-badges.js similarity index 100% rename from app/assets/javascripts/discourse/components/topic-post-badges.js rename to app/assets/javascripts/discourse/app/components/topic-post-badges.js diff --git a/app/assets/javascripts/discourse/components/topic-progress.js b/app/assets/javascripts/discourse/app/components/topic-progress.js similarity index 100% rename from app/assets/javascripts/discourse/components/topic-progress.js rename to app/assets/javascripts/discourse/app/components/topic-progress.js diff --git a/app/assets/javascripts/discourse/components/topic-status.js b/app/assets/javascripts/discourse/app/components/topic-status.js similarity index 100% rename from app/assets/javascripts/discourse/components/topic-status.js rename to app/assets/javascripts/discourse/app/components/topic-status.js diff --git a/app/assets/javascripts/discourse/components/topic-timeline.js b/app/assets/javascripts/discourse/app/components/topic-timeline.js similarity index 100% rename from app/assets/javascripts/discourse/components/topic-timeline.js rename to app/assets/javascripts/discourse/app/components/topic-timeline.js diff --git a/app/assets/javascripts/discourse/components/topic-timer-info.js b/app/assets/javascripts/discourse/app/components/topic-timer-info.js similarity index 100% rename from app/assets/javascripts/discourse/components/topic-timer-info.js rename to app/assets/javascripts/discourse/app/components/topic-timer-info.js diff --git a/app/assets/javascripts/discourse/components/topic-title.js b/app/assets/javascripts/discourse/app/components/topic-title.js similarity index 100% rename from app/assets/javascripts/discourse/components/topic-title.js rename to app/assets/javascripts/discourse/app/components/topic-title.js diff --git a/app/assets/javascripts/discourse/components/track-selected.js b/app/assets/javascripts/discourse/app/components/track-selected.js similarity index 100% rename from app/assets/javascripts/discourse/components/track-selected.js rename to app/assets/javascripts/discourse/app/components/track-selected.js diff --git a/app/assets/javascripts/discourse/components/user-badge.js b/app/assets/javascripts/discourse/app/components/user-badge.js similarity index 100% rename from app/assets/javascripts/discourse/components/user-badge.js rename to app/assets/javascripts/discourse/app/components/user-badge.js diff --git a/app/assets/javascripts/discourse/components/user-card-contents.js b/app/assets/javascripts/discourse/app/components/user-card-contents.js similarity index 100% rename from app/assets/javascripts/discourse/components/user-card-contents.js rename to app/assets/javascripts/discourse/app/components/user-card-contents.js diff --git a/app/assets/javascripts/discourse/components/user-field.js b/app/assets/javascripts/discourse/app/components/user-field.js similarity index 100% rename from app/assets/javascripts/discourse/components/user-field.js rename to app/assets/javascripts/discourse/app/components/user-field.js diff --git a/app/assets/javascripts/discourse/components/user-flag-percentage.js b/app/assets/javascripts/discourse/app/components/user-flag-percentage.js similarity index 100% rename from app/assets/javascripts/discourse/components/user-flag-percentage.js rename to app/assets/javascripts/discourse/app/components/user-flag-percentage.js diff --git a/app/assets/javascripts/discourse/components/user-info.js b/app/assets/javascripts/discourse/app/components/user-info.js similarity index 100% rename from app/assets/javascripts/discourse/components/user-info.js rename to app/assets/javascripts/discourse/app/components/user-info.js diff --git a/app/assets/javascripts/discourse/components/user-link.js b/app/assets/javascripts/discourse/app/components/user-link.js similarity index 100% rename from app/assets/javascripts/discourse/components/user-link.js rename to app/assets/javascripts/discourse/app/components/user-link.js diff --git a/app/assets/javascripts/discourse/components/user-notifications-large.js b/app/assets/javascripts/discourse/app/components/user-notifications-large.js similarity index 100% rename from app/assets/javascripts/discourse/components/user-notifications-large.js rename to app/assets/javascripts/discourse/app/components/user-notifications-large.js diff --git a/app/assets/javascripts/discourse/components/user-selector.js b/app/assets/javascripts/discourse/app/components/user-selector.js similarity index 100% rename from app/assets/javascripts/discourse/components/user-selector.js rename to app/assets/javascripts/discourse/app/components/user-selector.js diff --git a/app/assets/javascripts/discourse/components/user-stat.js b/app/assets/javascripts/discourse/app/components/user-stat.js similarity index 100% rename from app/assets/javascripts/discourse/components/user-stat.js rename to app/assets/javascripts/discourse/app/components/user-stat.js diff --git a/app/assets/javascripts/discourse/components/user-stream-item.js b/app/assets/javascripts/discourse/app/components/user-stream-item.js similarity index 100% rename from app/assets/javascripts/discourse/components/user-stream-item.js rename to app/assets/javascripts/discourse/app/components/user-stream-item.js diff --git a/app/assets/javascripts/discourse/components/user-stream.js b/app/assets/javascripts/discourse/app/components/user-stream.js similarity index 100% rename from app/assets/javascripts/discourse/components/user-stream.js rename to app/assets/javascripts/discourse/app/components/user-stream.js diff --git a/app/assets/javascripts/discourse/components/user-summary-category-search.js b/app/assets/javascripts/discourse/app/components/user-summary-category-search.js similarity index 100% rename from app/assets/javascripts/discourse/components/user-summary-category-search.js rename to app/assets/javascripts/discourse/app/components/user-summary-category-search.js diff --git a/app/assets/javascripts/discourse/components/user-summary-section.js b/app/assets/javascripts/discourse/app/components/user-summary-section.js similarity index 100% rename from app/assets/javascripts/discourse/components/user-summary-section.js rename to app/assets/javascripts/discourse/app/components/user-summary-section.js diff --git a/app/assets/javascripts/discourse/components/user-summary-topic.js b/app/assets/javascripts/discourse/app/components/user-summary-topic.js similarity index 100% rename from app/assets/javascripts/discourse/components/user-summary-topic.js rename to app/assets/javascripts/discourse/app/components/user-summary-topic.js diff --git a/app/assets/javascripts/discourse/components/user-summary-topics-list.js b/app/assets/javascripts/discourse/app/components/user-summary-topics-list.js similarity index 100% rename from app/assets/javascripts/discourse/components/user-summary-topics-list.js rename to app/assets/javascripts/discourse/app/components/user-summary-topics-list.js diff --git a/app/assets/javascripts/discourse/components/user-summary-user.js b/app/assets/javascripts/discourse/app/components/user-summary-user.js similarity index 100% rename from app/assets/javascripts/discourse/components/user-summary-user.js rename to app/assets/javascripts/discourse/app/components/user-summary-user.js diff --git a/app/assets/javascripts/discourse/components/watch-read.js b/app/assets/javascripts/discourse/app/components/watch-read.js similarity index 100% rename from app/assets/javascripts/discourse/components/watch-read.js rename to app/assets/javascripts/discourse/app/components/watch-read.js diff --git a/app/assets/javascripts/discourse/controllers/about.js b/app/assets/javascripts/discourse/app/controllers/about.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/about.js rename to app/assets/javascripts/discourse/app/controllers/about.js diff --git a/app/assets/javascripts/discourse/controllers/account-created-edit-email.js b/app/assets/javascripts/discourse/app/controllers/account-created-edit-email.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/account-created-edit-email.js rename to app/assets/javascripts/discourse/app/controllers/account-created-edit-email.js diff --git a/app/assets/javascripts/discourse/controllers/account-created-index.js b/app/assets/javascripts/discourse/app/controllers/account-created-index.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/account-created-index.js rename to app/assets/javascripts/discourse/app/controllers/account-created-index.js diff --git a/app/assets/javascripts/discourse/controllers/activation-edit.js b/app/assets/javascripts/discourse/app/controllers/activation-edit.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/activation-edit.js rename to app/assets/javascripts/discourse/app/controllers/activation-edit.js diff --git a/app/assets/javascripts/discourse/controllers/add-post-notice.js b/app/assets/javascripts/discourse/app/controllers/add-post-notice.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/add-post-notice.js rename to app/assets/javascripts/discourse/app/controllers/add-post-notice.js diff --git a/app/assets/javascripts/discourse/controllers/application.js b/app/assets/javascripts/discourse/app/controllers/application.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/application.js rename to app/assets/javascripts/discourse/app/controllers/application.js diff --git a/app/assets/javascripts/discourse/controllers/associate-account-confirm.js b/app/assets/javascripts/discourse/app/controllers/associate-account-confirm.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/associate-account-confirm.js rename to app/assets/javascripts/discourse/app/controllers/associate-account-confirm.js diff --git a/app/assets/javascripts/discourse/controllers/auth-token.js b/app/assets/javascripts/discourse/app/controllers/auth-token.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/auth-token.js rename to app/assets/javascripts/discourse/app/controllers/auth-token.js diff --git a/app/assets/javascripts/discourse/controllers/avatar-selector.js b/app/assets/javascripts/discourse/app/controllers/avatar-selector.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/avatar-selector.js rename to app/assets/javascripts/discourse/app/controllers/avatar-selector.js diff --git a/app/assets/javascripts/discourse/controllers/badges/index.js b/app/assets/javascripts/discourse/app/controllers/badges/index.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/badges/index.js rename to app/assets/javascripts/discourse/app/controllers/badges/index.js diff --git a/app/assets/javascripts/discourse/controllers/badges/show.js b/app/assets/javascripts/discourse/app/controllers/badges/show.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/badges/show.js rename to app/assets/javascripts/discourse/app/controllers/badges/show.js diff --git a/app/assets/javascripts/discourse/controllers/basic-modal-body.js b/app/assets/javascripts/discourse/app/controllers/basic-modal-body.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/basic-modal-body.js rename to app/assets/javascripts/discourse/app/controllers/basic-modal-body.js diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/app/controllers/bookmark.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/bookmark.js rename to app/assets/javascripts/discourse/app/controllers/bookmark.js diff --git a/app/assets/javascripts/discourse/controllers/bulk-notification-level.js b/app/assets/javascripts/discourse/app/controllers/bulk-notification-level.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/bulk-notification-level.js rename to app/assets/javascripts/discourse/app/controllers/bulk-notification-level.js diff --git a/app/assets/javascripts/discourse/controllers/change-owner.js b/app/assets/javascripts/discourse/app/controllers/change-owner.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/change-owner.js rename to app/assets/javascripts/discourse/app/controllers/change-owner.js diff --git a/app/assets/javascripts/discourse/controllers/change-timestamp.js b/app/assets/javascripts/discourse/app/controllers/change-timestamp.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/change-timestamp.js rename to app/assets/javascripts/discourse/app/controllers/change-timestamp.js diff --git a/app/assets/javascripts/discourse/controllers/composer.js b/app/assets/javascripts/discourse/app/controllers/composer.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/composer.js rename to app/assets/javascripts/discourse/app/controllers/composer.js diff --git a/app/assets/javascripts/discourse/controllers/convert-to-public-topic.js b/app/assets/javascripts/discourse/app/controllers/convert-to-public-topic.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/convert-to-public-topic.js rename to app/assets/javascripts/discourse/app/controllers/convert-to-public-topic.js diff --git a/app/assets/javascripts/discourse/controllers/create-account.js b/app/assets/javascripts/discourse/app/controllers/create-account.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/create-account.js rename to app/assets/javascripts/discourse/app/controllers/create-account.js diff --git a/app/assets/javascripts/discourse/controllers/discovery-sortable.js b/app/assets/javascripts/discourse/app/controllers/discovery-sortable.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/discovery-sortable.js rename to app/assets/javascripts/discourse/app/controllers/discovery-sortable.js diff --git a/app/assets/javascripts/discourse/controllers/discovery.js b/app/assets/javascripts/discourse/app/controllers/discovery.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/discovery.js rename to app/assets/javascripts/discourse/app/controllers/discovery.js diff --git a/app/assets/javascripts/discourse/controllers/discovery/categories.js b/app/assets/javascripts/discourse/app/controllers/discovery/categories.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/discovery/categories.js rename to app/assets/javascripts/discourse/app/controllers/discovery/categories.js diff --git a/app/assets/javascripts/discourse/controllers/discovery/topics.js b/app/assets/javascripts/discourse/app/controllers/discovery/topics.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/discovery/topics.js rename to app/assets/javascripts/discourse/app/controllers/discovery/topics.js diff --git a/app/assets/javascripts/discourse/controllers/edit-category.js b/app/assets/javascripts/discourse/app/controllers/edit-category.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/edit-category.js rename to app/assets/javascripts/discourse/app/controllers/edit-category.js diff --git a/app/assets/javascripts/discourse/controllers/edit-topic-timer.js b/app/assets/javascripts/discourse/app/controllers/edit-topic-timer.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/edit-topic-timer.js rename to app/assets/javascripts/discourse/app/controllers/edit-topic-timer.js diff --git a/app/assets/javascripts/discourse/controllers/email-login.js b/app/assets/javascripts/discourse/app/controllers/email-login.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/email-login.js rename to app/assets/javascripts/discourse/app/controllers/email-login.js diff --git a/app/assets/javascripts/discourse/controllers/exception.js b/app/assets/javascripts/discourse/app/controllers/exception.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/exception.js rename to app/assets/javascripts/discourse/app/controllers/exception.js diff --git a/app/assets/javascripts/discourse/controllers/explain-reviewable.js b/app/assets/javascripts/discourse/app/controllers/explain-reviewable.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/explain-reviewable.js rename to app/assets/javascripts/discourse/app/controllers/explain-reviewable.js diff --git a/app/assets/javascripts/discourse/controllers/feature-topic-on-profile.js b/app/assets/javascripts/discourse/app/controllers/feature-topic-on-profile.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/feature-topic-on-profile.js rename to app/assets/javascripts/discourse/app/controllers/feature-topic-on-profile.js diff --git a/app/assets/javascripts/discourse/controllers/feature-topic.js b/app/assets/javascripts/discourse/app/controllers/feature-topic.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/feature-topic.js rename to app/assets/javascripts/discourse/app/controllers/feature-topic.js diff --git a/app/assets/javascripts/discourse/controllers/flag.js b/app/assets/javascripts/discourse/app/controllers/flag.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/flag.js rename to app/assets/javascripts/discourse/app/controllers/flag.js diff --git a/app/assets/javascripts/discourse/controllers/forgot-password.js b/app/assets/javascripts/discourse/app/controllers/forgot-password.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/forgot-password.js rename to app/assets/javascripts/discourse/app/controllers/forgot-password.js diff --git a/app/assets/javascripts/discourse/controllers/full-page-search.js b/app/assets/javascripts/discourse/app/controllers/full-page-search.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/full-page-search.js rename to app/assets/javascripts/discourse/app/controllers/full-page-search.js diff --git a/app/assets/javascripts/discourse/controllers/grant-badge.js b/app/assets/javascripts/discourse/app/controllers/grant-badge.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/grant-badge.js rename to app/assets/javascripts/discourse/app/controllers/grant-badge.js diff --git a/app/assets/javascripts/discourse/controllers/group-activity-posts.js b/app/assets/javascripts/discourse/app/controllers/group-activity-posts.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/group-activity-posts.js rename to app/assets/javascripts/discourse/app/controllers/group-activity-posts.js diff --git a/app/assets/javascripts/discourse/controllers/group-activity-topics.js b/app/assets/javascripts/discourse/app/controllers/group-activity-topics.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/group-activity-topics.js rename to app/assets/javascripts/discourse/app/controllers/group-activity-topics.js diff --git a/app/assets/javascripts/discourse/controllers/group-activity.js b/app/assets/javascripts/discourse/app/controllers/group-activity.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/group-activity.js rename to app/assets/javascripts/discourse/app/controllers/group-activity.js diff --git a/app/assets/javascripts/discourse/controllers/group-add-members.js b/app/assets/javascripts/discourse/app/controllers/group-add-members.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/group-add-members.js rename to app/assets/javascripts/discourse/app/controllers/group-add-members.js diff --git a/app/assets/javascripts/discourse/controllers/group-bulk-add.js b/app/assets/javascripts/discourse/app/controllers/group-bulk-add.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/group-bulk-add.js rename to app/assets/javascripts/discourse/app/controllers/group-bulk-add.js diff --git a/app/assets/javascripts/discourse/controllers/group-index.js b/app/assets/javascripts/discourse/app/controllers/group-index.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/group-index.js rename to app/assets/javascripts/discourse/app/controllers/group-index.js diff --git a/app/assets/javascripts/discourse/controllers/group-manage-logs.js b/app/assets/javascripts/discourse/app/controllers/group-manage-logs.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/group-manage-logs.js rename to app/assets/javascripts/discourse/app/controllers/group-manage-logs.js diff --git a/app/assets/javascripts/discourse/controllers/group-manage-profile.js b/app/assets/javascripts/discourse/app/controllers/group-manage-profile.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/group-manage-profile.js rename to app/assets/javascripts/discourse/app/controllers/group-manage-profile.js diff --git a/app/assets/javascripts/discourse/controllers/group-manage.js b/app/assets/javascripts/discourse/app/controllers/group-manage.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/group-manage.js rename to app/assets/javascripts/discourse/app/controllers/group-manage.js diff --git a/app/assets/javascripts/discourse/controllers/group-messages.js b/app/assets/javascripts/discourse/app/controllers/group-messages.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/group-messages.js rename to app/assets/javascripts/discourse/app/controllers/group-messages.js diff --git a/app/assets/javascripts/discourse/controllers/group-requests.js b/app/assets/javascripts/discourse/app/controllers/group-requests.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/group-requests.js rename to app/assets/javascripts/discourse/app/controllers/group-requests.js diff --git a/app/assets/javascripts/discourse/controllers/group.js b/app/assets/javascripts/discourse/app/controllers/group.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/group.js rename to app/assets/javascripts/discourse/app/controllers/group.js diff --git a/app/assets/javascripts/discourse/controllers/groups-index.js b/app/assets/javascripts/discourse/app/controllers/groups-index.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/groups-index.js rename to app/assets/javascripts/discourse/app/controllers/groups-index.js diff --git a/app/assets/javascripts/discourse/controllers/groups-new.js b/app/assets/javascripts/discourse/app/controllers/groups-new.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/groups-new.js rename to app/assets/javascripts/discourse/app/controllers/groups-new.js diff --git a/app/assets/javascripts/discourse/controllers/history.js b/app/assets/javascripts/discourse/app/controllers/history.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/history.js rename to app/assets/javascripts/discourse/app/controllers/history.js diff --git a/app/assets/javascripts/discourse/controllers/ignore-duration-with-username.js b/app/assets/javascripts/discourse/app/controllers/ignore-duration-with-username.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/ignore-duration-with-username.js rename to app/assets/javascripts/discourse/app/controllers/ignore-duration-with-username.js diff --git a/app/assets/javascripts/discourse/controllers/ignore-duration.js b/app/assets/javascripts/discourse/app/controllers/ignore-duration.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/ignore-duration.js rename to app/assets/javascripts/discourse/app/controllers/ignore-duration.js diff --git a/app/assets/javascripts/discourse/controllers/insert-hyperlink.js b/app/assets/javascripts/discourse/app/controllers/insert-hyperlink.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/insert-hyperlink.js rename to app/assets/javascripts/discourse/app/controllers/insert-hyperlink.js diff --git a/app/assets/javascripts/discourse/controllers/invites-show.js b/app/assets/javascripts/discourse/app/controllers/invites-show.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/invites-show.js rename to app/assets/javascripts/discourse/app/controllers/invites-show.js diff --git a/app/assets/javascripts/discourse/controllers/jump-to-post.js b/app/assets/javascripts/discourse/app/controllers/jump-to-post.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/jump-to-post.js rename to app/assets/javascripts/discourse/app/controllers/jump-to-post.js diff --git a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js b/app/assets/javascripts/discourse/app/controllers/keyboard-shortcuts-help.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js rename to app/assets/javascripts/discourse/app/controllers/keyboard-shortcuts-help.js diff --git a/app/assets/javascripts/discourse/controllers/login.js b/app/assets/javascripts/discourse/app/controllers/login.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/login.js rename to app/assets/javascripts/discourse/app/controllers/login.js diff --git a/app/assets/javascripts/discourse/controllers/modal.js b/app/assets/javascripts/discourse/app/controllers/modal.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/modal.js rename to app/assets/javascripts/discourse/app/controllers/modal.js diff --git a/app/assets/javascripts/discourse/controllers/move-to-topic.js b/app/assets/javascripts/discourse/app/controllers/move-to-topic.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/move-to-topic.js rename to app/assets/javascripts/discourse/app/controllers/move-to-topic.js diff --git a/app/assets/javascripts/discourse/controllers/navigation/categories.js b/app/assets/javascripts/discourse/app/controllers/navigation/categories.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/navigation/categories.js rename to app/assets/javascripts/discourse/app/controllers/navigation/categories.js diff --git a/app/assets/javascripts/discourse/controllers/navigation/category.js b/app/assets/javascripts/discourse/app/controllers/navigation/category.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/navigation/category.js rename to app/assets/javascripts/discourse/app/controllers/navigation/category.js diff --git a/app/assets/javascripts/discourse/controllers/navigation/default.js b/app/assets/javascripts/discourse/app/controllers/navigation/default.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/navigation/default.js rename to app/assets/javascripts/discourse/app/controllers/navigation/default.js diff --git a/app/assets/javascripts/discourse/controllers/not-activated.js b/app/assets/javascripts/discourse/app/controllers/not-activated.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/not-activated.js rename to app/assets/javascripts/discourse/app/controllers/not-activated.js diff --git a/app/assets/javascripts/discourse/controllers/password-reset.js b/app/assets/javascripts/discourse/app/controllers/password-reset.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/password-reset.js rename to app/assets/javascripts/discourse/app/controllers/password-reset.js diff --git a/app/assets/javascripts/discourse/controllers/preferences.js b/app/assets/javascripts/discourse/app/controllers/preferences.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/preferences.js rename to app/assets/javascripts/discourse/app/controllers/preferences.js diff --git a/app/assets/javascripts/discourse/controllers/preferences/account.js b/app/assets/javascripts/discourse/app/controllers/preferences/account.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/preferences/account.js rename to app/assets/javascripts/discourse/app/controllers/preferences/account.js diff --git a/app/assets/javascripts/discourse/controllers/preferences/categories.js b/app/assets/javascripts/discourse/app/controllers/preferences/categories.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/preferences/categories.js rename to app/assets/javascripts/discourse/app/controllers/preferences/categories.js diff --git a/app/assets/javascripts/discourse/controllers/preferences/email.js b/app/assets/javascripts/discourse/app/controllers/preferences/email.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/preferences/email.js rename to app/assets/javascripts/discourse/app/controllers/preferences/email.js diff --git a/app/assets/javascripts/discourse/controllers/preferences/emails.js b/app/assets/javascripts/discourse/app/controllers/preferences/emails.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/preferences/emails.js rename to app/assets/javascripts/discourse/app/controllers/preferences/emails.js diff --git a/app/assets/javascripts/discourse/controllers/preferences/interface.js b/app/assets/javascripts/discourse/app/controllers/preferences/interface.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/preferences/interface.js rename to app/assets/javascripts/discourse/app/controllers/preferences/interface.js diff --git a/app/assets/javascripts/discourse/controllers/preferences/notifications.js b/app/assets/javascripts/discourse/app/controllers/preferences/notifications.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/preferences/notifications.js rename to app/assets/javascripts/discourse/app/controllers/preferences/notifications.js diff --git a/app/assets/javascripts/discourse/controllers/preferences/profile.js b/app/assets/javascripts/discourse/app/controllers/preferences/profile.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/preferences/profile.js rename to app/assets/javascripts/discourse/app/controllers/preferences/profile.js diff --git a/app/assets/javascripts/discourse/controllers/preferences/second-factor.js b/app/assets/javascripts/discourse/app/controllers/preferences/second-factor.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/preferences/second-factor.js rename to app/assets/javascripts/discourse/app/controllers/preferences/second-factor.js diff --git a/app/assets/javascripts/discourse/controllers/preferences/tags.js b/app/assets/javascripts/discourse/app/controllers/preferences/tags.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/preferences/tags.js rename to app/assets/javascripts/discourse/app/controllers/preferences/tags.js diff --git a/app/assets/javascripts/discourse/controllers/preferences/username.js b/app/assets/javascripts/discourse/app/controllers/preferences/username.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/preferences/username.js rename to app/assets/javascripts/discourse/app/controllers/preferences/username.js diff --git a/app/assets/javascripts/discourse/controllers/preferences/users.js b/app/assets/javascripts/discourse/app/controllers/preferences/users.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/preferences/users.js rename to app/assets/javascripts/discourse/app/controllers/preferences/users.js diff --git a/app/assets/javascripts/discourse/controllers/publish-page.js b/app/assets/javascripts/discourse/app/controllers/publish-page.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/publish-page.js rename to app/assets/javascripts/discourse/app/controllers/publish-page.js diff --git a/app/assets/javascripts/discourse/controllers/raw-email.js b/app/assets/javascripts/discourse/app/controllers/raw-email.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/raw-email.js rename to app/assets/javascripts/discourse/app/controllers/raw-email.js diff --git a/app/assets/javascripts/discourse/controllers/rename-tag.js b/app/assets/javascripts/discourse/app/controllers/rename-tag.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/rename-tag.js rename to app/assets/javascripts/discourse/app/controllers/rename-tag.js diff --git a/app/assets/javascripts/discourse/controllers/reorder-categories.js b/app/assets/javascripts/discourse/app/controllers/reorder-categories.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/reorder-categories.js rename to app/assets/javascripts/discourse/app/controllers/reorder-categories.js diff --git a/app/assets/javascripts/discourse/controllers/request-group-membership-form.js b/app/assets/javascripts/discourse/app/controllers/request-group-membership-form.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/request-group-membership-form.js rename to app/assets/javascripts/discourse/app/controllers/request-group-membership-form.js diff --git a/app/assets/javascripts/discourse/controllers/review-index.js b/app/assets/javascripts/discourse/app/controllers/review-index.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/review-index.js rename to app/assets/javascripts/discourse/app/controllers/review-index.js diff --git a/app/assets/javascripts/discourse/controllers/review-settings.js b/app/assets/javascripts/discourse/app/controllers/review-settings.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/review-settings.js rename to app/assets/javascripts/discourse/app/controllers/review-settings.js diff --git a/app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js b/app/assets/javascripts/discourse/app/controllers/second-factor-add-security-key.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js rename to app/assets/javascripts/discourse/app/controllers/second-factor-add-security-key.js diff --git a/app/assets/javascripts/discourse/controllers/second-factor-add-totp.js b/app/assets/javascripts/discourse/app/controllers/second-factor-add-totp.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/second-factor-add-totp.js rename to app/assets/javascripts/discourse/app/controllers/second-factor-add-totp.js diff --git a/app/assets/javascripts/discourse/controllers/second-factor-backup-edit.js b/app/assets/javascripts/discourse/app/controllers/second-factor-backup-edit.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/second-factor-backup-edit.js rename to app/assets/javascripts/discourse/app/controllers/second-factor-backup-edit.js diff --git a/app/assets/javascripts/discourse/controllers/second-factor-edit-security-key.js b/app/assets/javascripts/discourse/app/controllers/second-factor-edit-security-key.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/second-factor-edit-security-key.js rename to app/assets/javascripts/discourse/app/controllers/second-factor-edit-security-key.js diff --git a/app/assets/javascripts/discourse/controllers/second-factor-edit.js b/app/assets/javascripts/discourse/app/controllers/second-factor-edit.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/second-factor-edit.js rename to app/assets/javascripts/discourse/app/controllers/second-factor-edit.js diff --git a/app/assets/javascripts/discourse/controllers/share-and-invite.js b/app/assets/javascripts/discourse/app/controllers/share-and-invite.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/share-and-invite.js rename to app/assets/javascripts/discourse/app/controllers/share-and-invite.js diff --git a/app/assets/javascripts/discourse/controllers/static.js b/app/assets/javascripts/discourse/app/controllers/static.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/static.js rename to app/assets/javascripts/discourse/app/controllers/static.js diff --git a/app/assets/javascripts/discourse/controllers/tag-groups-edit.js b/app/assets/javascripts/discourse/app/controllers/tag-groups-edit.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/tag-groups-edit.js rename to app/assets/javascripts/discourse/app/controllers/tag-groups-edit.js diff --git a/app/assets/javascripts/discourse/controllers/tag-groups-new.js b/app/assets/javascripts/discourse/app/controllers/tag-groups-new.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/tag-groups-new.js rename to app/assets/javascripts/discourse/app/controllers/tag-groups-new.js diff --git a/app/assets/javascripts/discourse/controllers/tag-groups.js b/app/assets/javascripts/discourse/app/controllers/tag-groups.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/tag-groups.js rename to app/assets/javascripts/discourse/app/controllers/tag-groups.js diff --git a/app/assets/javascripts/discourse/controllers/tags-index.js b/app/assets/javascripts/discourse/app/controllers/tags-index.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/tags-index.js rename to app/assets/javascripts/discourse/app/controllers/tags-index.js diff --git a/app/assets/javascripts/discourse/controllers/tags-show.js b/app/assets/javascripts/discourse/app/controllers/tags-show.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/tags-show.js rename to app/assets/javascripts/discourse/app/controllers/tags-show.js diff --git a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js b/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/topic-bulk-actions.js rename to app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js diff --git a/app/assets/javascripts/discourse/controllers/topic.js b/app/assets/javascripts/discourse/app/controllers/topic.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/topic.js rename to app/assets/javascripts/discourse/app/controllers/topic.js diff --git a/app/assets/javascripts/discourse/controllers/upload-selector.js b/app/assets/javascripts/discourse/app/controllers/upload-selector.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/upload-selector.js rename to app/assets/javascripts/discourse/app/controllers/upload-selector.js diff --git a/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js b/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks-with-reminders.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js rename to app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks-with-reminders.js diff --git a/app/assets/javascripts/discourse/controllers/user-activity.js b/app/assets/javascripts/discourse/app/controllers/user-activity.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/user-activity.js rename to app/assets/javascripts/discourse/app/controllers/user-activity.js diff --git a/app/assets/javascripts/discourse/controllers/user-badges.js b/app/assets/javascripts/discourse/app/controllers/user-badges.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/user-badges.js rename to app/assets/javascripts/discourse/app/controllers/user-badges.js diff --git a/app/assets/javascripts/discourse/controllers/user-card.js b/app/assets/javascripts/discourse/app/controllers/user-card.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/user-card.js rename to app/assets/javascripts/discourse/app/controllers/user-card.js diff --git a/app/assets/javascripts/discourse/controllers/user-invited-show.js b/app/assets/javascripts/discourse/app/controllers/user-invited-show.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/user-invited-show.js rename to app/assets/javascripts/discourse/app/controllers/user-invited-show.js diff --git a/app/assets/javascripts/discourse/controllers/user-notifications.js b/app/assets/javascripts/discourse/app/controllers/user-notifications.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/user-notifications.js rename to app/assets/javascripts/discourse/app/controllers/user-notifications.js diff --git a/app/assets/javascripts/discourse/controllers/user-posts.js b/app/assets/javascripts/discourse/app/controllers/user-posts.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/user-posts.js rename to app/assets/javascripts/discourse/app/controllers/user-posts.js diff --git a/app/assets/javascripts/discourse/controllers/user-private-messages-tags.js b/app/assets/javascripts/discourse/app/controllers/user-private-messages-tags.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/user-private-messages-tags.js rename to app/assets/javascripts/discourse/app/controllers/user-private-messages-tags.js diff --git a/app/assets/javascripts/discourse/controllers/user-private-messages.js b/app/assets/javascripts/discourse/app/controllers/user-private-messages.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/user-private-messages.js rename to app/assets/javascripts/discourse/app/controllers/user-private-messages.js diff --git a/app/assets/javascripts/discourse/controllers/user-summary.js b/app/assets/javascripts/discourse/app/controllers/user-summary.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/user-summary.js rename to app/assets/javascripts/discourse/app/controllers/user-summary.js diff --git a/app/assets/javascripts/discourse/controllers/user-topics-list.js b/app/assets/javascripts/discourse/app/controllers/user-topics-list.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/user-topics-list.js rename to app/assets/javascripts/discourse/app/controllers/user-topics-list.js diff --git a/app/assets/javascripts/discourse/controllers/user.js b/app/assets/javascripts/discourse/app/controllers/user.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/user.js rename to app/assets/javascripts/discourse/app/controllers/user.js diff --git a/app/assets/javascripts/discourse/controllers/users.js b/app/assets/javascripts/discourse/app/controllers/users.js similarity index 100% rename from app/assets/javascripts/discourse/controllers/users.js rename to app/assets/javascripts/discourse/app/controllers/users.js diff --git a/app/assets/javascripts/discourse/helpers/application.js b/app/assets/javascripts/discourse/app/helpers/application.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/application.js rename to app/assets/javascripts/discourse/app/helpers/application.js diff --git a/app/assets/javascripts/discourse/helpers/border-color.js b/app/assets/javascripts/discourse/app/helpers/border-color.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/border-color.js rename to app/assets/javascripts/discourse/app/helpers/border-color.js diff --git a/app/assets/javascripts/discourse/helpers/bound-avatar-template.js b/app/assets/javascripts/discourse/app/helpers/bound-avatar-template.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/bound-avatar-template.js rename to app/assets/javascripts/discourse/app/helpers/bound-avatar-template.js diff --git a/app/assets/javascripts/discourse/helpers/bound-avatar.js b/app/assets/javascripts/discourse/app/helpers/bound-avatar.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/bound-avatar.js rename to app/assets/javascripts/discourse/app/helpers/bound-avatar.js diff --git a/app/assets/javascripts/discourse/helpers/bound-category-link.js b/app/assets/javascripts/discourse/app/helpers/bound-category-link.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/bound-category-link.js rename to app/assets/javascripts/discourse/app/helpers/bound-category-link.js diff --git a/app/assets/javascripts/discourse/helpers/bound-date.js b/app/assets/javascripts/discourse/app/helpers/bound-date.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/bound-date.js rename to app/assets/javascripts/discourse/app/helpers/bound-date.js diff --git a/app/assets/javascripts/discourse/helpers/capitalize-string.js b/app/assets/javascripts/discourse/app/helpers/capitalize-string.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/capitalize-string.js rename to app/assets/javascripts/discourse/app/helpers/capitalize-string.js diff --git a/app/assets/javascripts/discourse/helpers/category-badge.js b/app/assets/javascripts/discourse/app/helpers/category-badge.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/category-badge.js rename to app/assets/javascripts/discourse/app/helpers/category-badge.js diff --git a/app/assets/javascripts/discourse/helpers/category-link.js b/app/assets/javascripts/discourse/app/helpers/category-link.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/category-link.js rename to app/assets/javascripts/discourse/app/helpers/category-link.js diff --git a/app/assets/javascripts/discourse/helpers/cold-age-class.js b/app/assets/javascripts/discourse/app/helpers/cold-age-class.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/cold-age-class.js rename to app/assets/javascripts/discourse/app/helpers/cold-age-class.js diff --git a/app/assets/javascripts/discourse/helpers/custom-html.js b/app/assets/javascripts/discourse/app/helpers/custom-html.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/custom-html.js rename to app/assets/javascripts/discourse/app/helpers/custom-html.js diff --git a/app/assets/javascripts/discourse/helpers/dash-if-empty.js b/app/assets/javascripts/discourse/app/helpers/dash-if-empty.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/dash-if-empty.js rename to app/assets/javascripts/discourse/app/helpers/dash-if-empty.js diff --git a/app/assets/javascripts/discourse/helpers/dasherize.js b/app/assets/javascripts/discourse/app/helpers/dasherize.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/dasherize.js rename to app/assets/javascripts/discourse/app/helpers/dasherize.js diff --git a/app/assets/javascripts/discourse/helpers/dir-span.js b/app/assets/javascripts/discourse/app/helpers/dir-span.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/dir-span.js rename to app/assets/javascripts/discourse/app/helpers/dir-span.js diff --git a/app/assets/javascripts/discourse/helpers/discourse-tag.js b/app/assets/javascripts/discourse/app/helpers/discourse-tag.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/discourse-tag.js rename to app/assets/javascripts/discourse/app/helpers/discourse-tag.js diff --git a/app/assets/javascripts/discourse/helpers/discourse-tags.js b/app/assets/javascripts/discourse/app/helpers/discourse-tags.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/discourse-tags.js rename to app/assets/javascripts/discourse/app/helpers/discourse-tags.js diff --git a/app/assets/javascripts/discourse/helpers/editable-value.js b/app/assets/javascripts/discourse/app/helpers/editable-value.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/editable-value.js rename to app/assets/javascripts/discourse/app/helpers/editable-value.js diff --git a/app/assets/javascripts/discourse/helpers/fa-icon-node.js b/app/assets/javascripts/discourse/app/helpers/fa-icon-node.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/fa-icon-node.js rename to app/assets/javascripts/discourse/app/helpers/fa-icon-node.js diff --git a/app/assets/javascripts/discourse/helpers/float.js b/app/assets/javascripts/discourse/app/helpers/float.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/float.js rename to app/assets/javascripts/discourse/app/helpers/float.js diff --git a/app/assets/javascripts/discourse/helpers/format-age.js b/app/assets/javascripts/discourse/app/helpers/format-age.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/format-age.js rename to app/assets/javascripts/discourse/app/helpers/format-age.js diff --git a/app/assets/javascripts/discourse/helpers/format-date.js b/app/assets/javascripts/discourse/app/helpers/format-date.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/format-date.js rename to app/assets/javascripts/discourse/app/helpers/format-date.js diff --git a/app/assets/javascripts/discourse/helpers/format-username.js b/app/assets/javascripts/discourse/app/helpers/format-username.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/format-username.js rename to app/assets/javascripts/discourse/app/helpers/format-username.js diff --git a/app/assets/javascripts/discourse/helpers/icon-or-image.js b/app/assets/javascripts/discourse/app/helpers/icon-or-image.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/icon-or-image.js rename to app/assets/javascripts/discourse/app/helpers/icon-or-image.js diff --git a/app/assets/javascripts/discourse/helpers/inline-date.js b/app/assets/javascripts/discourse/app/helpers/inline-date.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/inline-date.js rename to app/assets/javascripts/discourse/app/helpers/inline-date.js diff --git a/app/assets/javascripts/discourse/helpers/loading-spinner.js b/app/assets/javascripts/discourse/app/helpers/loading-spinner.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/loading-spinner.js rename to app/assets/javascripts/discourse/app/helpers/loading-spinner.js diff --git a/app/assets/javascripts/discourse/helpers/node.js b/app/assets/javascripts/discourse/app/helpers/node.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/node.js rename to app/assets/javascripts/discourse/app/helpers/node.js diff --git a/app/assets/javascripts/discourse/helpers/period-title.js b/app/assets/javascripts/discourse/app/helpers/period-title.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/period-title.js rename to app/assets/javascripts/discourse/app/helpers/period-title.js diff --git a/app/assets/javascripts/discourse/helpers/raw-plugin-outlet.js b/app/assets/javascripts/discourse/app/helpers/raw-plugin-outlet.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/raw-plugin-outlet.js rename to app/assets/javascripts/discourse/app/helpers/raw-plugin-outlet.js diff --git a/app/assets/javascripts/discourse/helpers/raw.js b/app/assets/javascripts/discourse/app/helpers/raw.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/raw.js rename to app/assets/javascripts/discourse/app/helpers/raw.js diff --git a/app/assets/javascripts/discourse/helpers/replace-emoji.js b/app/assets/javascripts/discourse/app/helpers/replace-emoji.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/replace-emoji.js rename to app/assets/javascripts/discourse/app/helpers/replace-emoji.js diff --git a/app/assets/javascripts/discourse/helpers/reviewable-history-description.js b/app/assets/javascripts/discourse/app/helpers/reviewable-history-description.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/reviewable-history-description.js rename to app/assets/javascripts/discourse/app/helpers/reviewable-history-description.js diff --git a/app/assets/javascripts/discourse/helpers/reviewable-status.js b/app/assets/javascripts/discourse/app/helpers/reviewable-status.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/reviewable-status.js rename to app/assets/javascripts/discourse/app/helpers/reviewable-status.js diff --git a/app/assets/javascripts/discourse/helpers/route-action.js b/app/assets/javascripts/discourse/app/helpers/route-action.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/route-action.js rename to app/assets/javascripts/discourse/app/helpers/route-action.js diff --git a/app/assets/javascripts/discourse/helpers/shorten-url.js b/app/assets/javascripts/discourse/app/helpers/shorten-url.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/shorten-url.js rename to app/assets/javascripts/discourse/app/helpers/shorten-url.js diff --git a/app/assets/javascripts/discourse/helpers/theme-helpers.js b/app/assets/javascripts/discourse/app/helpers/theme-helpers.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/theme-helpers.js rename to app/assets/javascripts/discourse/app/helpers/theme-helpers.js diff --git a/app/assets/javascripts/discourse/helpers/topic-featured-link.js b/app/assets/javascripts/discourse/app/helpers/topic-featured-link.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/topic-featured-link.js rename to app/assets/javascripts/discourse/app/helpers/topic-featured-link.js diff --git a/app/assets/javascripts/discourse/helpers/topic-link.js b/app/assets/javascripts/discourse/app/helpers/topic-link.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/topic-link.js rename to app/assets/javascripts/discourse/app/helpers/topic-link.js diff --git a/app/assets/javascripts/discourse/helpers/topic-status-icons.js b/app/assets/javascripts/discourse/app/helpers/topic-status-icons.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/topic-status-icons.js rename to app/assets/javascripts/discourse/app/helpers/topic-status-icons.js diff --git a/app/assets/javascripts/discourse/helpers/user-avatar.js b/app/assets/javascripts/discourse/app/helpers/user-avatar.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/user-avatar.js rename to app/assets/javascripts/discourse/app/helpers/user-avatar.js diff --git a/app/assets/javascripts/discourse/helpers/user-status.js b/app/assets/javascripts/discourse/app/helpers/user-status.js similarity index 100% rename from app/assets/javascripts/discourse/helpers/user-status.js rename to app/assets/javascripts/discourse/app/helpers/user-status.js diff --git a/app/assets/javascripts/discourse/initializers/asset-version.js b/app/assets/javascripts/discourse/app/initializers/asset-version.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/asset-version.js rename to app/assets/javascripts/discourse/app/initializers/asset-version.js diff --git a/app/assets/javascripts/discourse/initializers/auth-complete.js b/app/assets/javascripts/discourse/app/initializers/auth-complete.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/auth-complete.js rename to app/assets/javascripts/discourse/app/initializers/auth-complete.js diff --git a/app/assets/javascripts/discourse/initializers/auto-load-modules.js b/app/assets/javascripts/discourse/app/initializers/auto-load-modules.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/auto-load-modules.js rename to app/assets/javascripts/discourse/app/initializers/auto-load-modules.js diff --git a/app/assets/javascripts/discourse/initializers/avatar-select.js b/app/assets/javascripts/discourse/app/initializers/avatar-select.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/avatar-select.js rename to app/assets/javascripts/discourse/app/initializers/avatar-select.js diff --git a/app/assets/javascripts/discourse/initializers/badging.js b/app/assets/javascripts/discourse/app/initializers/badging.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/badging.js rename to app/assets/javascripts/discourse/app/initializers/badging.js diff --git a/app/assets/javascripts/discourse/initializers/banner.js b/app/assets/javascripts/discourse/app/initializers/banner.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/banner.js rename to app/assets/javascripts/discourse/app/initializers/banner.js diff --git a/app/assets/javascripts/discourse/initializers/click-interceptor.js b/app/assets/javascripts/discourse/app/initializers/click-interceptor.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/click-interceptor.js rename to app/assets/javascripts/discourse/app/initializers/click-interceptor.js diff --git a/app/assets/javascripts/discourse/initializers/copy-codeblocks.js b/app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/copy-codeblocks.js rename to app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js diff --git a/app/assets/javascripts/discourse/initializers/csrf-token.js b/app/assets/javascripts/discourse/app/initializers/csrf-token.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/csrf-token.js rename to app/assets/javascripts/discourse/app/initializers/csrf-token.js diff --git a/app/assets/javascripts/discourse/initializers/d-popover.js b/app/assets/javascripts/discourse/app/initializers/d-popover.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/d-popover.js rename to app/assets/javascripts/discourse/app/initializers/d-popover.js diff --git a/app/assets/javascripts/discourse/initializers/ember-events.js b/app/assets/javascripts/discourse/app/initializers/ember-events.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/ember-events.js rename to app/assets/javascripts/discourse/app/initializers/ember-events.js diff --git a/app/assets/javascripts/discourse/initializers/enable-emoji.js b/app/assets/javascripts/discourse/app/initializers/enable-emoji.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/enable-emoji.js rename to app/assets/javascripts/discourse/app/initializers/enable-emoji.js diff --git a/app/assets/javascripts/discourse/initializers/ensure-max-image-dimensions.js b/app/assets/javascripts/discourse/app/initializers/ensure-max-image-dimensions.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/ensure-max-image-dimensions.js rename to app/assets/javascripts/discourse/app/initializers/ensure-max-image-dimensions.js diff --git a/app/assets/javascripts/discourse/initializers/inject-objects.js b/app/assets/javascripts/discourse/app/initializers/inject-objects.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/inject-objects.js rename to app/assets/javascripts/discourse/app/initializers/inject-objects.js diff --git a/app/assets/javascripts/discourse/initializers/jquery-plugins.js b/app/assets/javascripts/discourse/app/initializers/jquery-plugins.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/jquery-plugins.js rename to app/assets/javascripts/discourse/app/initializers/jquery-plugins.js diff --git a/app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js b/app/assets/javascripts/discourse/app/initializers/keyboard-shortcuts.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js rename to app/assets/javascripts/discourse/app/initializers/keyboard-shortcuts.js diff --git a/app/assets/javascripts/discourse/initializers/live-development.js b/app/assets/javascripts/discourse/app/initializers/live-development.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/live-development.js rename to app/assets/javascripts/discourse/app/initializers/live-development.js diff --git a/app/assets/javascripts/discourse/initializers/localization.js b/app/assets/javascripts/discourse/app/initializers/localization.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/localization.js rename to app/assets/javascripts/discourse/app/initializers/localization.js diff --git a/app/assets/javascripts/discourse/initializers/logout.js b/app/assets/javascripts/discourse/app/initializers/logout.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/logout.js rename to app/assets/javascripts/discourse/app/initializers/logout.js diff --git a/app/assets/javascripts/discourse/initializers/logs-notice.js b/app/assets/javascripts/discourse/app/initializers/logs-notice.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/logs-notice.js rename to app/assets/javascripts/discourse/app/initializers/logs-notice.js diff --git a/app/assets/javascripts/discourse/initializers/message-bus.js b/app/assets/javascripts/discourse/app/initializers/message-bus.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/message-bus.js rename to app/assets/javascripts/discourse/app/initializers/message-bus.js diff --git a/app/assets/javascripts/discourse/initializers/mobile.js b/app/assets/javascripts/discourse/app/initializers/mobile.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/mobile.js rename to app/assets/javascripts/discourse/app/initializers/mobile.js diff --git a/app/assets/javascripts/discourse/initializers/page-tracking.js b/app/assets/javascripts/discourse/app/initializers/page-tracking.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/page-tracking.js rename to app/assets/javascripts/discourse/app/initializers/page-tracking.js diff --git a/app/assets/javascripts/discourse/initializers/post-decorations.js b/app/assets/javascripts/discourse/app/initializers/post-decorations.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/post-decorations.js rename to app/assets/javascripts/discourse/app/initializers/post-decorations.js diff --git a/app/assets/javascripts/discourse/initializers/read-only.js b/app/assets/javascripts/discourse/app/initializers/read-only.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/read-only.js rename to app/assets/javascripts/discourse/app/initializers/read-only.js diff --git a/app/assets/javascripts/discourse/initializers/register-discourse-location.js b/app/assets/javascripts/discourse/app/initializers/register-discourse-location.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/register-discourse-location.js rename to app/assets/javascripts/discourse/app/initializers/register-discourse-location.js diff --git a/app/assets/javascripts/discourse/initializers/register-service-worker.js b/app/assets/javascripts/discourse/app/initializers/register-service-worker.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/register-service-worker.js rename to app/assets/javascripts/discourse/app/initializers/register-service-worker.js diff --git a/app/assets/javascripts/discourse/initializers/relative-ages.js b/app/assets/javascripts/discourse/app/initializers/relative-ages.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/relative-ages.js rename to app/assets/javascripts/discourse/app/initializers/relative-ages.js diff --git a/app/assets/javascripts/discourse/initializers/sharing-sources.js b/app/assets/javascripts/discourse/app/initializers/sharing-sources.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/sharing-sources.js rename to app/assets/javascripts/discourse/app/initializers/sharing-sources.js diff --git a/app/assets/javascripts/discourse/initializers/show-footer.js b/app/assets/javascripts/discourse/app/initializers/show-footer.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/show-footer.js rename to app/assets/javascripts/discourse/app/initializers/show-footer.js diff --git a/app/assets/javascripts/discourse/initializers/signup-cta.js b/app/assets/javascripts/discourse/app/initializers/signup-cta.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/signup-cta.js rename to app/assets/javascripts/discourse/app/initializers/signup-cta.js diff --git a/app/assets/javascripts/discourse/initializers/strip-mobile-app-url-params.js b/app/assets/javascripts/discourse/app/initializers/strip-mobile-app-url-params.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/strip-mobile-app-url-params.js rename to app/assets/javascripts/discourse/app/initializers/strip-mobile-app-url-params.js diff --git a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js b/app/assets/javascripts/discourse/app/initializers/subscribe-user-notifications.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js rename to app/assets/javascripts/discourse/app/initializers/subscribe-user-notifications.js diff --git a/app/assets/javascripts/discourse/initializers/title-notifications.js b/app/assets/javascripts/discourse/app/initializers/title-notifications.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/title-notifications.js rename to app/assets/javascripts/discourse/app/initializers/title-notifications.js diff --git a/app/assets/javascripts/discourse/initializers/topic-footer-buttons.js b/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/topic-footer-buttons.js rename to app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js diff --git a/app/assets/javascripts/discourse/initializers/url-redirects.js b/app/assets/javascripts/discourse/app/initializers/url-redirects.js similarity index 100% rename from app/assets/javascripts/discourse/initializers/url-redirects.js rename to app/assets/javascripts/discourse/app/initializers/url-redirects.js diff --git a/app/assets/javascripts/discourse/lib/after-transition.js b/app/assets/javascripts/discourse/app/lib/after-transition.js similarity index 100% rename from app/assets/javascripts/discourse/lib/after-transition.js rename to app/assets/javascripts/discourse/app/lib/after-transition.js diff --git a/app/assets/javascripts/discourse/lib/ajax-error.js b/app/assets/javascripts/discourse/app/lib/ajax-error.js similarity index 100% rename from app/assets/javascripts/discourse/lib/ajax-error.js rename to app/assets/javascripts/discourse/app/lib/ajax-error.js diff --git a/app/assets/javascripts/discourse/lib/ajax.js b/app/assets/javascripts/discourse/app/lib/ajax.js similarity index 100% rename from app/assets/javascripts/discourse/lib/ajax.js rename to app/assets/javascripts/discourse/app/lib/ajax.js diff --git a/app/assets/javascripts/discourse/lib/autocomplete.js b/app/assets/javascripts/discourse/app/lib/autocomplete.js similarity index 100% rename from app/assets/javascripts/discourse/lib/autocomplete.js rename to app/assets/javascripts/discourse/app/lib/autocomplete.js diff --git a/app/assets/javascripts/discourse/lib/autosize.js b/app/assets/javascripts/discourse/app/lib/autosize.js similarity index 100% rename from app/assets/javascripts/discourse/lib/autosize.js rename to app/assets/javascripts/discourse/app/lib/autosize.js diff --git a/app/assets/javascripts/discourse/lib/bookmark.js b/app/assets/javascripts/discourse/app/lib/bookmark.js similarity index 100% rename from app/assets/javascripts/discourse/lib/bookmark.js rename to app/assets/javascripts/discourse/app/lib/bookmark.js diff --git a/app/assets/javascripts/discourse/lib/cached-topic-list.js b/app/assets/javascripts/discourse/app/lib/cached-topic-list.js similarity index 100% rename from app/assets/javascripts/discourse/lib/cached-topic-list.js rename to app/assets/javascripts/discourse/app/lib/cached-topic-list.js diff --git a/app/assets/javascripts/discourse/lib/category-hashtags.js b/app/assets/javascripts/discourse/app/lib/category-hashtags.js similarity index 100% rename from app/assets/javascripts/discourse/lib/category-hashtags.js rename to app/assets/javascripts/discourse/app/lib/category-hashtags.js diff --git a/app/assets/javascripts/discourse/lib/category-tag-search.js b/app/assets/javascripts/discourse/app/lib/category-tag-search.js similarity index 100% rename from app/assets/javascripts/discourse/lib/category-tag-search.js rename to app/assets/javascripts/discourse/app/lib/category-tag-search.js diff --git a/app/assets/javascripts/discourse/lib/clean-dom.js b/app/assets/javascripts/discourse/app/lib/clean-dom.js similarity index 100% rename from app/assets/javascripts/discourse/lib/clean-dom.js rename to app/assets/javascripts/discourse/app/lib/clean-dom.js diff --git a/app/assets/javascripts/discourse/lib/click-track.js b/app/assets/javascripts/discourse/app/lib/click-track.js similarity index 100% rename from app/assets/javascripts/discourse/lib/click-track.js rename to app/assets/javascripts/discourse/app/lib/click-track.js diff --git a/app/assets/javascripts/discourse/lib/computed.js b/app/assets/javascripts/discourse/app/lib/computed.js similarity index 100% rename from app/assets/javascripts/discourse/lib/computed.js rename to app/assets/javascripts/discourse/app/lib/computed.js diff --git a/app/assets/javascripts/discourse/lib/concerns/search-constants.js.erb b/app/assets/javascripts/discourse/app/lib/concerns/search-constants.js.erb similarity index 100% rename from app/assets/javascripts/discourse/lib/concerns/search-constants.js.erb rename to app/assets/javascripts/discourse/app/lib/concerns/search-constants.js.erb diff --git a/app/assets/javascripts/discourse/lib/copy-text.js b/app/assets/javascripts/discourse/app/lib/copy-text.js similarity index 100% rename from app/assets/javascripts/discourse/lib/copy-text.js rename to app/assets/javascripts/discourse/app/lib/copy-text.js diff --git a/app/assets/javascripts/discourse/lib/d-popover.js b/app/assets/javascripts/discourse/app/lib/d-popover.js similarity index 100% rename from app/assets/javascripts/discourse/lib/d-popover.js rename to app/assets/javascripts/discourse/app/lib/d-popover.js diff --git a/app/assets/javascripts/discourse/lib/debounce.js b/app/assets/javascripts/discourse/app/lib/debounce.js similarity index 100% rename from app/assets/javascripts/discourse/lib/debounce.js rename to app/assets/javascripts/discourse/app/lib/debounce.js diff --git a/app/assets/javascripts/discourse/lib/decimal-adjust.js b/app/assets/javascripts/discourse/app/lib/decimal-adjust.js similarity index 100% rename from app/assets/javascripts/discourse/lib/decimal-adjust.js rename to app/assets/javascripts/discourse/app/lib/decimal-adjust.js diff --git a/app/assets/javascripts/discourse/lib/desktop-notifications.js b/app/assets/javascripts/discourse/app/lib/desktop-notifications.js similarity index 100% rename from app/assets/javascripts/discourse/lib/desktop-notifications.js rename to app/assets/javascripts/discourse/app/lib/desktop-notifications.js diff --git a/app/assets/javascripts/discourse/lib/dirty-keys.js b/app/assets/javascripts/discourse/app/lib/dirty-keys.js similarity index 100% rename from app/assets/javascripts/discourse/lib/dirty-keys.js rename to app/assets/javascripts/discourse/app/lib/dirty-keys.js diff --git a/app/assets/javascripts/discourse/lib/discourse-location.js b/app/assets/javascripts/discourse/app/lib/discourse-location.js similarity index 100% rename from app/assets/javascripts/discourse/lib/discourse-location.js rename to app/assets/javascripts/discourse/app/lib/discourse-location.js diff --git a/app/assets/javascripts/discourse/lib/export-csv.js b/app/assets/javascripts/discourse/app/lib/export-csv.js similarity index 100% rename from app/assets/javascripts/discourse/lib/export-csv.js rename to app/assets/javascripts/discourse/app/lib/export-csv.js diff --git a/app/assets/javascripts/discourse/lib/export-result.js b/app/assets/javascripts/discourse/app/lib/export-result.js similarity index 100% rename from app/assets/javascripts/discourse/lib/export-result.js rename to app/assets/javascripts/discourse/app/lib/export-result.js diff --git a/app/assets/javascripts/discourse/lib/eyeline.js b/app/assets/javascripts/discourse/app/lib/eyeline.js similarity index 100% rename from app/assets/javascripts/discourse/lib/eyeline.js rename to app/assets/javascripts/discourse/app/lib/eyeline.js diff --git a/app/assets/javascripts/discourse/lib/formatter.js b/app/assets/javascripts/discourse/app/lib/formatter.js similarity index 100% rename from app/assets/javascripts/discourse/lib/formatter.js rename to app/assets/javascripts/discourse/app/lib/formatter.js diff --git a/app/assets/javascripts/discourse/lib/hash.js b/app/assets/javascripts/discourse/app/lib/hash.js similarity index 100% rename from app/assets/javascripts/discourse/lib/hash.js rename to app/assets/javascripts/discourse/app/lib/hash.js diff --git a/app/assets/javascripts/discourse/lib/highlight-html.js b/app/assets/javascripts/discourse/app/lib/highlight-html.js similarity index 100% rename from app/assets/javascripts/discourse/lib/highlight-html.js rename to app/assets/javascripts/discourse/app/lib/highlight-html.js diff --git a/app/assets/javascripts/discourse/lib/highlight-search.js b/app/assets/javascripts/discourse/app/lib/highlight-search.js similarity index 100% rename from app/assets/javascripts/discourse/lib/highlight-search.js rename to app/assets/javascripts/discourse/app/lib/highlight-search.js diff --git a/app/assets/javascripts/discourse/lib/highlight-syntax.js b/app/assets/javascripts/discourse/app/lib/highlight-syntax.js similarity index 100% rename from app/assets/javascripts/discourse/lib/highlight-syntax.js rename to app/assets/javascripts/discourse/app/lib/highlight-syntax.js diff --git a/app/assets/javascripts/discourse/lib/intercept-click.js b/app/assets/javascripts/discourse/app/lib/intercept-click.js similarity index 100% rename from app/assets/javascripts/discourse/lib/intercept-click.js rename to app/assets/javascripts/discourse/app/lib/intercept-click.js diff --git a/app/assets/javascripts/discourse/lib/is-element-in-viewport.js b/app/assets/javascripts/discourse/app/lib/is-element-in-viewport.js similarity index 100% rename from app/assets/javascripts/discourse/lib/is-element-in-viewport.js rename to app/assets/javascripts/discourse/app/lib/is-element-in-viewport.js diff --git a/app/assets/javascripts/discourse/lib/key-value-store.js b/app/assets/javascripts/discourse/app/lib/key-value-store.js similarity index 100% rename from app/assets/javascripts/discourse/lib/key-value-store.js rename to app/assets/javascripts/discourse/app/lib/key-value-store.js diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js similarity index 100% rename from app/assets/javascripts/discourse/lib/keyboard-shortcuts.js rename to app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js diff --git a/app/assets/javascripts/discourse/lib/lazy-load-images.js b/app/assets/javascripts/discourse/app/lib/lazy-load-images.js similarity index 100% rename from app/assets/javascripts/discourse/lib/lazy-load-images.js rename to app/assets/javascripts/discourse/app/lib/lazy-load-images.js diff --git a/app/assets/javascripts/discourse/lib/lightbox.js b/app/assets/javascripts/discourse/app/lib/lightbox.js similarity index 100% rename from app/assets/javascripts/discourse/lib/lightbox.js rename to app/assets/javascripts/discourse/app/lib/lightbox.js diff --git a/app/assets/javascripts/discourse/lib/link-category-hashtags.js b/app/assets/javascripts/discourse/app/lib/link-category-hashtags.js similarity index 100% rename from app/assets/javascripts/discourse/lib/link-category-hashtags.js rename to app/assets/javascripts/discourse/app/lib/link-category-hashtags.js diff --git a/app/assets/javascripts/discourse/lib/link-lookup.js b/app/assets/javascripts/discourse/app/lib/link-lookup.js similarity index 100% rename from app/assets/javascripts/discourse/lib/link-lookup.js rename to app/assets/javascripts/discourse/app/lib/link-lookup.js diff --git a/app/assets/javascripts/discourse/lib/link-mentions.js b/app/assets/javascripts/discourse/app/lib/link-mentions.js similarity index 100% rename from app/assets/javascripts/discourse/lib/link-mentions.js rename to app/assets/javascripts/discourse/app/lib/link-mentions.js diff --git a/app/assets/javascripts/discourse/lib/link-tag-hashtag.js b/app/assets/javascripts/discourse/app/lib/link-tag-hashtag.js similarity index 100% rename from app/assets/javascripts/discourse/lib/link-tag-hashtag.js rename to app/assets/javascripts/discourse/app/lib/link-tag-hashtag.js diff --git a/app/assets/javascripts/discourse/lib/load-script.js b/app/assets/javascripts/discourse/app/lib/load-script.js similarity index 100% rename from app/assets/javascripts/discourse/lib/load-script.js rename to app/assets/javascripts/discourse/app/lib/load-script.js diff --git a/app/assets/javascripts/discourse/lib/lock-on.js b/app/assets/javascripts/discourse/app/lib/lock-on.js similarity index 100% rename from app/assets/javascripts/discourse/lib/lock-on.js rename to app/assets/javascripts/discourse/app/lib/lock-on.js diff --git a/app/assets/javascripts/discourse/lib/logout.js b/app/assets/javascripts/discourse/app/lib/logout.js similarity index 100% rename from app/assets/javascripts/discourse/lib/logout.js rename to app/assets/javascripts/discourse/app/lib/logout.js diff --git a/app/assets/javascripts/discourse/lib/mobile.js b/app/assets/javascripts/discourse/app/lib/mobile.js similarity index 100% rename from app/assets/javascripts/discourse/lib/mobile.js rename to app/assets/javascripts/discourse/app/lib/mobile.js diff --git a/app/assets/javascripts/discourse/lib/notification-levels.js b/app/assets/javascripts/discourse/app/lib/notification-levels.js similarity index 100% rename from app/assets/javascripts/discourse/lib/notification-levels.js rename to app/assets/javascripts/discourse/app/lib/notification-levels.js diff --git a/app/assets/javascripts/discourse/lib/offset-calculator.js b/app/assets/javascripts/discourse/app/lib/offset-calculator.js similarity index 100% rename from app/assets/javascripts/discourse/lib/offset-calculator.js rename to app/assets/javascripts/discourse/app/lib/offset-calculator.js diff --git a/app/assets/javascripts/discourse/lib/optional-service.js b/app/assets/javascripts/discourse/app/lib/optional-service.js similarity index 100% rename from app/assets/javascripts/discourse/lib/optional-service.js rename to app/assets/javascripts/discourse/app/lib/optional-service.js diff --git a/app/assets/javascripts/discourse/lib/page-tracker.js b/app/assets/javascripts/discourse/app/lib/page-tracker.js similarity index 100% rename from app/assets/javascripts/discourse/lib/page-tracker.js rename to app/assets/javascripts/discourse/app/lib/page-tracker.js diff --git a/app/assets/javascripts/discourse/lib/page-visible.js b/app/assets/javascripts/discourse/app/lib/page-visible.js similarity index 100% rename from app/assets/javascripts/discourse/lib/page-visible.js rename to app/assets/javascripts/discourse/app/lib/page-visible.js diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js similarity index 100% rename from app/assets/javascripts/discourse/lib/plugin-api.js rename to app/assets/javascripts/discourse/app/lib/plugin-api.js diff --git a/app/assets/javascripts/discourse/lib/plugin-connectors.js b/app/assets/javascripts/discourse/app/lib/plugin-connectors.js similarity index 100% rename from app/assets/javascripts/discourse/lib/plugin-connectors.js rename to app/assets/javascripts/discourse/app/lib/plugin-connectors.js diff --git a/app/assets/javascripts/discourse/lib/posts-with-placeholders.js b/app/assets/javascripts/discourse/app/lib/posts-with-placeholders.js similarity index 100% rename from app/assets/javascripts/discourse/lib/posts-with-placeholders.js rename to app/assets/javascripts/discourse/app/lib/posts-with-placeholders.js diff --git a/app/assets/javascripts/discourse/lib/push-notifications.js b/app/assets/javascripts/discourse/app/lib/push-notifications.js similarity index 100% rename from app/assets/javascripts/discourse/lib/push-notifications.js rename to app/assets/javascripts/discourse/app/lib/push-notifications.js diff --git a/app/assets/javascripts/discourse/lib/put-cursor-at-end.js b/app/assets/javascripts/discourse/app/lib/put-cursor-at-end.js similarity index 100% rename from app/assets/javascripts/discourse/lib/put-cursor-at-end.js rename to app/assets/javascripts/discourse/app/lib/put-cursor-at-end.js diff --git a/app/assets/javascripts/discourse/lib/pwa-utils.js b/app/assets/javascripts/discourse/app/lib/pwa-utils.js similarity index 100% rename from app/assets/javascripts/discourse/lib/pwa-utils.js rename to app/assets/javascripts/discourse/app/lib/pwa-utils.js diff --git a/app/assets/javascripts/discourse/lib/quote-state.js b/app/assets/javascripts/discourse/app/lib/quote-state.js similarity index 100% rename from app/assets/javascripts/discourse/lib/quote-state.js rename to app/assets/javascripts/discourse/app/lib/quote-state.js diff --git a/app/assets/javascripts/discourse/lib/quote.js b/app/assets/javascripts/discourse/app/lib/quote.js similarity index 100% rename from app/assets/javascripts/discourse/lib/quote.js rename to app/assets/javascripts/discourse/app/lib/quote.js diff --git a/app/assets/javascripts/discourse/lib/raw-templates.js b/app/assets/javascripts/discourse/app/lib/raw-templates.js similarity index 100% rename from app/assets/javascripts/discourse/lib/raw-templates.js rename to app/assets/javascripts/discourse/app/lib/raw-templates.js diff --git a/app/assets/javascripts/discourse/lib/register-topic-footer-button.js b/app/assets/javascripts/discourse/app/lib/register-topic-footer-button.js similarity index 100% rename from app/assets/javascripts/discourse/lib/register-topic-footer-button.js rename to app/assets/javascripts/discourse/app/lib/register-topic-footer-button.js diff --git a/app/assets/javascripts/discourse/lib/render-tag.js b/app/assets/javascripts/discourse/app/lib/render-tag.js similarity index 100% rename from app/assets/javascripts/discourse/lib/render-tag.js rename to app/assets/javascripts/discourse/app/lib/render-tag.js diff --git a/app/assets/javascripts/discourse/lib/render-tags.js b/app/assets/javascripts/discourse/app/lib/render-tags.js similarity index 100% rename from app/assets/javascripts/discourse/lib/render-tags.js rename to app/assets/javascripts/discourse/app/lib/render-tags.js diff --git a/app/assets/javascripts/discourse/lib/render-topic-featured-link.js b/app/assets/javascripts/discourse/app/lib/render-topic-featured-link.js similarity index 100% rename from app/assets/javascripts/discourse/lib/render-topic-featured-link.js rename to app/assets/javascripts/discourse/app/lib/render-topic-featured-link.js diff --git a/app/assets/javascripts/discourse/lib/reports-loader.js b/app/assets/javascripts/discourse/app/lib/reports-loader.js similarity index 100% rename from app/assets/javascripts/discourse/lib/reports-loader.js rename to app/assets/javascripts/discourse/app/lib/reports-loader.js diff --git a/app/assets/javascripts/discourse/lib/round.js b/app/assets/javascripts/discourse/app/lib/round.js similarity index 100% rename from app/assets/javascripts/discourse/lib/round.js rename to app/assets/javascripts/discourse/app/lib/round.js diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js b/app/assets/javascripts/discourse/app/lib/safari-hacks.js similarity index 100% rename from app/assets/javascripts/discourse/lib/safari-hacks.js rename to app/assets/javascripts/discourse/app/lib/safari-hacks.js diff --git a/app/assets/javascripts/discourse/lib/screen-track.js b/app/assets/javascripts/discourse/app/lib/screen-track.js similarity index 100% rename from app/assets/javascripts/discourse/lib/screen-track.js rename to app/assets/javascripts/discourse/app/lib/screen-track.js diff --git a/app/assets/javascripts/discourse/lib/search.js b/app/assets/javascripts/discourse/app/lib/search.js similarity index 100% rename from app/assets/javascripts/discourse/lib/search.js rename to app/assets/javascripts/discourse/app/lib/search.js diff --git a/app/assets/javascripts/discourse/lib/settings.js b/app/assets/javascripts/discourse/app/lib/settings.js similarity index 100% rename from app/assets/javascripts/discourse/lib/settings.js rename to app/assets/javascripts/discourse/app/lib/settings.js diff --git a/app/assets/javascripts/discourse/lib/sharing.js b/app/assets/javascripts/discourse/app/lib/sharing.js similarity index 100% rename from app/assets/javascripts/discourse/lib/sharing.js rename to app/assets/javascripts/discourse/app/lib/sharing.js diff --git a/app/assets/javascripts/discourse/lib/show-modal.js b/app/assets/javascripts/discourse/app/lib/show-modal.js similarity index 100% rename from app/assets/javascripts/discourse/lib/show-modal.js rename to app/assets/javascripts/discourse/app/lib/show-modal.js diff --git a/app/assets/javascripts/discourse/lib/static-route-builder.js b/app/assets/javascripts/discourse/app/lib/static-route-builder.js similarity index 100% rename from app/assets/javascripts/discourse/lib/static-route-builder.js rename to app/assets/javascripts/discourse/app/lib/static-route-builder.js diff --git a/app/assets/javascripts/discourse/lib/svg-sprite-loader.js b/app/assets/javascripts/discourse/app/lib/svg-sprite-loader.js similarity index 100% rename from app/assets/javascripts/discourse/lib/svg-sprite-loader.js rename to app/assets/javascripts/discourse/app/lib/svg-sprite-loader.js diff --git a/app/assets/javascripts/discourse/lib/tag-hashtags.js b/app/assets/javascripts/discourse/app/lib/tag-hashtags.js similarity index 100% rename from app/assets/javascripts/discourse/lib/tag-hashtags.js rename to app/assets/javascripts/discourse/app/lib/tag-hashtags.js diff --git a/app/assets/javascripts/discourse/lib/text-direction.js b/app/assets/javascripts/discourse/app/lib/text-direction.js similarity index 100% rename from app/assets/javascripts/discourse/lib/text-direction.js rename to app/assets/javascripts/discourse/app/lib/text-direction.js diff --git a/app/assets/javascripts/discourse/lib/text.js b/app/assets/javascripts/discourse/app/lib/text.js similarity index 100% rename from app/assets/javascripts/discourse/lib/text.js rename to app/assets/javascripts/discourse/app/lib/text.js diff --git a/app/assets/javascripts/discourse/lib/theme-selector.js b/app/assets/javascripts/discourse/app/lib/theme-selector.js similarity index 100% rename from app/assets/javascripts/discourse/lib/theme-selector.js rename to app/assets/javascripts/discourse/app/lib/theme-selector.js diff --git a/app/assets/javascripts/discourse/lib/to-markdown.js b/app/assets/javascripts/discourse/app/lib/to-markdown.js similarity index 100% rename from app/assets/javascripts/discourse/lib/to-markdown.js rename to app/assets/javascripts/discourse/app/lib/to-markdown.js diff --git a/app/assets/javascripts/discourse/lib/tooltip.js b/app/assets/javascripts/discourse/app/lib/tooltip.js similarity index 100% rename from app/assets/javascripts/discourse/lib/tooltip.js rename to app/assets/javascripts/discourse/app/lib/tooltip.js diff --git a/app/assets/javascripts/discourse/lib/transform-post.js b/app/assets/javascripts/discourse/app/lib/transform-post.js similarity index 100% rename from app/assets/javascripts/discourse/lib/transform-post.js rename to app/assets/javascripts/discourse/app/lib/transform-post.js diff --git a/app/assets/javascripts/discourse/lib/uploads.js b/app/assets/javascripts/discourse/app/lib/uploads.js similarity index 100% rename from app/assets/javascripts/discourse/lib/uploads.js rename to app/assets/javascripts/discourse/app/lib/uploads.js diff --git a/app/assets/javascripts/discourse/lib/url.js b/app/assets/javascripts/discourse/app/lib/url.js similarity index 100% rename from app/assets/javascripts/discourse/lib/url.js rename to app/assets/javascripts/discourse/app/lib/url.js diff --git a/app/assets/javascripts/discourse/lib/user-activation.js b/app/assets/javascripts/discourse/app/lib/user-activation.js similarity index 100% rename from app/assets/javascripts/discourse/lib/user-activation.js rename to app/assets/javascripts/discourse/app/lib/user-activation.js diff --git a/app/assets/javascripts/discourse/lib/user-presence.js b/app/assets/javascripts/discourse/app/lib/user-presence.js similarity index 100% rename from app/assets/javascripts/discourse/lib/user-presence.js rename to app/assets/javascripts/discourse/app/lib/user-presence.js diff --git a/app/assets/javascripts/discourse/lib/user-search.js b/app/assets/javascripts/discourse/app/lib/user-search.js similarity index 100% rename from app/assets/javascripts/discourse/lib/user-search.js rename to app/assets/javascripts/discourse/app/lib/user-search.js diff --git a/app/assets/javascripts/discourse/lib/utilities.js b/app/assets/javascripts/discourse/app/lib/utilities.js similarity index 100% rename from app/assets/javascripts/discourse/lib/utilities.js rename to app/assets/javascripts/discourse/app/lib/utilities.js diff --git a/app/assets/javascripts/discourse/lib/webauthn.js b/app/assets/javascripts/discourse/app/lib/webauthn.js similarity index 100% rename from app/assets/javascripts/discourse/lib/webauthn.js rename to app/assets/javascripts/discourse/app/lib/webauthn.js diff --git a/app/assets/javascripts/discourse/mapping-router.js b/app/assets/javascripts/discourse/app/mapping-router.js similarity index 100% rename from app/assets/javascripts/discourse/mapping-router.js rename to app/assets/javascripts/discourse/app/mapping-router.js diff --git a/app/assets/javascripts/discourse/mixins/add-archetype-class.js b/app/assets/javascripts/discourse/app/mixins/add-archetype-class.js similarity index 100% rename from app/assets/javascripts/discourse/mixins/add-archetype-class.js rename to app/assets/javascripts/discourse/app/mixins/add-archetype-class.js diff --git a/app/assets/javascripts/discourse/mixins/buffered-content.js b/app/assets/javascripts/discourse/app/mixins/buffered-content.js similarity index 100% rename from app/assets/javascripts/discourse/mixins/buffered-content.js rename to app/assets/javascripts/discourse/app/mixins/buffered-content.js diff --git a/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js b/app/assets/javascripts/discourse/app/mixins/bulk-topic-selection.js similarity index 100% rename from app/assets/javascripts/discourse/mixins/bulk-topic-selection.js rename to app/assets/javascripts/discourse/app/mixins/bulk-topic-selection.js diff --git a/app/assets/javascripts/discourse/mixins/can-check-emails.js b/app/assets/javascripts/discourse/app/mixins/can-check-emails.js similarity index 100% rename from app/assets/javascripts/discourse/mixins/can-check-emails.js rename to app/assets/javascripts/discourse/app/mixins/can-check-emails.js diff --git a/app/assets/javascripts/discourse/mixins/card-contents-base.js b/app/assets/javascripts/discourse/app/mixins/card-contents-base.js similarity index 100% rename from app/assets/javascripts/discourse/mixins/card-contents-base.js rename to app/assets/javascripts/discourse/app/mixins/card-contents-base.js diff --git a/app/assets/javascripts/discourse/mixins/cleans-up.js b/app/assets/javascripts/discourse/app/mixins/cleans-up.js similarity index 100% rename from app/assets/javascripts/discourse/mixins/cleans-up.js rename to app/assets/javascripts/discourse/app/mixins/cleans-up.js diff --git a/app/assets/javascripts/discourse/mixins/docking.js b/app/assets/javascripts/discourse/app/mixins/docking.js similarity index 100% rename from app/assets/javascripts/discourse/mixins/docking.js rename to app/assets/javascripts/discourse/app/mixins/docking.js diff --git a/app/assets/javascripts/discourse/mixins/filter-mode.js b/app/assets/javascripts/discourse/app/mixins/filter-mode.js similarity index 100% rename from app/assets/javascripts/discourse/mixins/filter-mode.js rename to app/assets/javascripts/discourse/app/mixins/filter-mode.js diff --git a/app/assets/javascripts/discourse/mixins/grant-badge-controller.js b/app/assets/javascripts/discourse/app/mixins/grant-badge-controller.js similarity index 100% rename from app/assets/javascripts/discourse/mixins/grant-badge-controller.js rename to app/assets/javascripts/discourse/app/mixins/grant-badge-controller.js diff --git a/app/assets/javascripts/discourse/mixins/key-enter-escape.js b/app/assets/javascripts/discourse/app/mixins/key-enter-escape.js similarity index 100% rename from app/assets/javascripts/discourse/mixins/key-enter-escape.js rename to app/assets/javascripts/discourse/app/mixins/key-enter-escape.js diff --git a/app/assets/javascripts/discourse/mixins/load-more.js b/app/assets/javascripts/discourse/app/mixins/load-more.js similarity index 100% rename from app/assets/javascripts/discourse/mixins/load-more.js rename to app/assets/javascripts/discourse/app/mixins/load-more.js diff --git a/app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js b/app/assets/javascripts/discourse/app/mixins/mobile-scroll-direction.js similarity index 100% rename from app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js rename to app/assets/javascripts/discourse/app/mixins/mobile-scroll-direction.js diff --git a/app/assets/javascripts/discourse/mixins/modal-functionality.js b/app/assets/javascripts/discourse/app/mixins/modal-functionality.js similarity index 100% rename from app/assets/javascripts/discourse/mixins/modal-functionality.js rename to app/assets/javascripts/discourse/app/mixins/modal-functionality.js diff --git a/app/assets/javascripts/discourse/mixins/name-validation.js b/app/assets/javascripts/discourse/app/mixins/name-validation.js similarity index 100% rename from app/assets/javascripts/discourse/mixins/name-validation.js rename to app/assets/javascripts/discourse/app/mixins/name-validation.js diff --git a/app/assets/javascripts/discourse/mixins/open-composer.js b/app/assets/javascripts/discourse/app/mixins/open-composer.js similarity index 100% rename from app/assets/javascripts/discourse/mixins/open-composer.js rename to app/assets/javascripts/discourse/app/mixins/open-composer.js diff --git a/app/assets/javascripts/discourse/mixins/pan-events.js b/app/assets/javascripts/discourse/app/mixins/pan-events.js similarity index 100% rename from app/assets/javascripts/discourse/mixins/pan-events.js rename to app/assets/javascripts/discourse/app/mixins/pan-events.js diff --git a/app/assets/javascripts/discourse/mixins/password-validation.js b/app/assets/javascripts/discourse/app/mixins/password-validation.js similarity index 100% rename from app/assets/javascripts/discourse/mixins/password-validation.js rename to app/assets/javascripts/discourse/app/mixins/password-validation.js diff --git a/app/assets/javascripts/discourse/mixins/scroll-top.js b/app/assets/javascripts/discourse/app/mixins/scroll-top.js similarity index 100% rename from app/assets/javascripts/discourse/mixins/scroll-top.js rename to app/assets/javascripts/discourse/app/mixins/scroll-top.js diff --git a/app/assets/javascripts/discourse/mixins/scrolling.js b/app/assets/javascripts/discourse/app/mixins/scrolling.js similarity index 100% rename from app/assets/javascripts/discourse/mixins/scrolling.js rename to app/assets/javascripts/discourse/app/mixins/scrolling.js diff --git a/app/assets/javascripts/discourse/mixins/singleton.js b/app/assets/javascripts/discourse/app/mixins/singleton.js similarity index 100% rename from app/assets/javascripts/discourse/mixins/singleton.js rename to app/assets/javascripts/discourse/app/mixins/singleton.js diff --git a/app/assets/javascripts/discourse/mixins/upload.js b/app/assets/javascripts/discourse/app/mixins/upload.js similarity index 100% rename from app/assets/javascripts/discourse/mixins/upload.js rename to app/assets/javascripts/discourse/app/mixins/upload.js diff --git a/app/assets/javascripts/discourse/mixins/url-refresh.js b/app/assets/javascripts/discourse/app/mixins/url-refresh.js similarity index 100% rename from app/assets/javascripts/discourse/mixins/url-refresh.js rename to app/assets/javascripts/discourse/app/mixins/url-refresh.js diff --git a/app/assets/javascripts/discourse/mixins/user-fields-validation.js b/app/assets/javascripts/discourse/app/mixins/user-fields-validation.js similarity index 100% rename from app/assets/javascripts/discourse/mixins/user-fields-validation.js rename to app/assets/javascripts/discourse/app/mixins/user-fields-validation.js diff --git a/app/assets/javascripts/discourse/mixins/username-validation.js b/app/assets/javascripts/discourse/app/mixins/username-validation.js similarity index 100% rename from app/assets/javascripts/discourse/mixins/username-validation.js rename to app/assets/javascripts/discourse/app/mixins/username-validation.js diff --git a/app/assets/javascripts/discourse/mixins/viewing-action-type.js b/app/assets/javascripts/discourse/app/mixins/viewing-action-type.js similarity index 100% rename from app/assets/javascripts/discourse/mixins/viewing-action-type.js rename to app/assets/javascripts/discourse/app/mixins/viewing-action-type.js diff --git a/app/assets/javascripts/discourse/models/action-summary.js b/app/assets/javascripts/discourse/app/models/action-summary.js similarity index 100% rename from app/assets/javascripts/discourse/models/action-summary.js rename to app/assets/javascripts/discourse/app/models/action-summary.js diff --git a/app/assets/javascripts/discourse/models/archetype.js b/app/assets/javascripts/discourse/app/models/archetype.js similarity index 100% rename from app/assets/javascripts/discourse/models/archetype.js rename to app/assets/javascripts/discourse/app/models/archetype.js diff --git a/app/assets/javascripts/discourse/models/badge-grouping.js b/app/assets/javascripts/discourse/app/models/badge-grouping.js similarity index 100% rename from app/assets/javascripts/discourse/models/badge-grouping.js rename to app/assets/javascripts/discourse/app/models/badge-grouping.js diff --git a/app/assets/javascripts/discourse/models/badge.js b/app/assets/javascripts/discourse/app/models/badge.js similarity index 100% rename from app/assets/javascripts/discourse/models/badge.js rename to app/assets/javascripts/discourse/app/models/badge.js diff --git a/app/assets/javascripts/discourse/models/bookmark.js b/app/assets/javascripts/discourse/app/models/bookmark.js similarity index 100% rename from app/assets/javascripts/discourse/models/bookmark.js rename to app/assets/javascripts/discourse/app/models/bookmark.js diff --git a/app/assets/javascripts/discourse/models/category-list.js b/app/assets/javascripts/discourse/app/models/category-list.js similarity index 100% rename from app/assets/javascripts/discourse/models/category-list.js rename to app/assets/javascripts/discourse/app/models/category-list.js diff --git a/app/assets/javascripts/discourse/models/category.js b/app/assets/javascripts/discourse/app/models/category.js similarity index 100% rename from app/assets/javascripts/discourse/models/category.js rename to app/assets/javascripts/discourse/app/models/category.js diff --git a/app/assets/javascripts/discourse/models/composer.js b/app/assets/javascripts/discourse/app/models/composer.js similarity index 100% rename from app/assets/javascripts/discourse/models/composer.js rename to app/assets/javascripts/discourse/app/models/composer.js diff --git a/app/assets/javascripts/discourse/models/draft.js b/app/assets/javascripts/discourse/app/models/draft.js similarity index 100% rename from app/assets/javascripts/discourse/models/draft.js rename to app/assets/javascripts/discourse/app/models/draft.js diff --git a/app/assets/javascripts/discourse/models/group-history.js b/app/assets/javascripts/discourse/app/models/group-history.js similarity index 100% rename from app/assets/javascripts/discourse/models/group-history.js rename to app/assets/javascripts/discourse/app/models/group-history.js diff --git a/app/assets/javascripts/discourse/models/group.js b/app/assets/javascripts/discourse/app/models/group.js similarity index 100% rename from app/assets/javascripts/discourse/models/group.js rename to app/assets/javascripts/discourse/app/models/group.js diff --git a/app/assets/javascripts/discourse/models/invite.js b/app/assets/javascripts/discourse/app/models/invite.js similarity index 100% rename from app/assets/javascripts/discourse/models/invite.js rename to app/assets/javascripts/discourse/app/models/invite.js diff --git a/app/assets/javascripts/discourse/models/live-post-counts.js b/app/assets/javascripts/discourse/app/models/live-post-counts.js similarity index 100% rename from app/assets/javascripts/discourse/models/live-post-counts.js rename to app/assets/javascripts/discourse/app/models/live-post-counts.js diff --git a/app/assets/javascripts/discourse/models/login-method.js b/app/assets/javascripts/discourse/app/models/login-method.js similarity index 100% rename from app/assets/javascripts/discourse/models/login-method.js rename to app/assets/javascripts/discourse/app/models/login-method.js diff --git a/app/assets/javascripts/discourse/models/nav-item.js b/app/assets/javascripts/discourse/app/models/nav-item.js similarity index 100% rename from app/assets/javascripts/discourse/models/nav-item.js rename to app/assets/javascripts/discourse/app/models/nav-item.js diff --git a/app/assets/javascripts/discourse/models/permission-type.js b/app/assets/javascripts/discourse/app/models/permission-type.js similarity index 100% rename from app/assets/javascripts/discourse/models/permission-type.js rename to app/assets/javascripts/discourse/app/models/permission-type.js diff --git a/app/assets/javascripts/discourse/models/post-action-type.js b/app/assets/javascripts/discourse/app/models/post-action-type.js similarity index 100% rename from app/assets/javascripts/discourse/models/post-action-type.js rename to app/assets/javascripts/discourse/app/models/post-action-type.js diff --git a/app/assets/javascripts/discourse/models/post-stream.js b/app/assets/javascripts/discourse/app/models/post-stream.js similarity index 100% rename from app/assets/javascripts/discourse/models/post-stream.js rename to app/assets/javascripts/discourse/app/models/post-stream.js diff --git a/app/assets/javascripts/discourse/models/post.js b/app/assets/javascripts/discourse/app/models/post.js similarity index 100% rename from app/assets/javascripts/discourse/models/post.js rename to app/assets/javascripts/discourse/app/models/post.js diff --git a/app/assets/javascripts/discourse/models/published-page.js b/app/assets/javascripts/discourse/app/models/published-page.js similarity index 100% rename from app/assets/javascripts/discourse/models/published-page.js rename to app/assets/javascripts/discourse/app/models/published-page.js diff --git a/app/assets/javascripts/discourse/models/rest.js b/app/assets/javascripts/discourse/app/models/rest.js similarity index 100% rename from app/assets/javascripts/discourse/models/rest.js rename to app/assets/javascripts/discourse/app/models/rest.js diff --git a/app/assets/javascripts/discourse/models/result-set.js b/app/assets/javascripts/discourse/app/models/result-set.js similarity index 100% rename from app/assets/javascripts/discourse/models/result-set.js rename to app/assets/javascripts/discourse/app/models/result-set.js diff --git a/app/assets/javascripts/discourse/models/reviewable-history.js b/app/assets/javascripts/discourse/app/models/reviewable-history.js similarity index 100% rename from app/assets/javascripts/discourse/models/reviewable-history.js rename to app/assets/javascripts/discourse/app/models/reviewable-history.js diff --git a/app/assets/javascripts/discourse/models/reviewable.js b/app/assets/javascripts/discourse/app/models/reviewable.js similarity index 100% rename from app/assets/javascripts/discourse/models/reviewable.js rename to app/assets/javascripts/discourse/app/models/reviewable.js diff --git a/app/assets/javascripts/discourse/models/session.js b/app/assets/javascripts/discourse/app/models/session.js similarity index 100% rename from app/assets/javascripts/discourse/models/session.js rename to app/assets/javascripts/discourse/app/models/session.js diff --git a/app/assets/javascripts/discourse/models/site.js b/app/assets/javascripts/discourse/app/models/site.js similarity index 100% rename from app/assets/javascripts/discourse/models/site.js rename to app/assets/javascripts/discourse/app/models/site.js diff --git a/app/assets/javascripts/discourse/models/static-page.js b/app/assets/javascripts/discourse/app/models/static-page.js similarity index 100% rename from app/assets/javascripts/discourse/models/static-page.js rename to app/assets/javascripts/discourse/app/models/static-page.js diff --git a/app/assets/javascripts/discourse/models/store.js b/app/assets/javascripts/discourse/app/models/store.js similarity index 100% rename from app/assets/javascripts/discourse/models/store.js rename to app/assets/javascripts/discourse/app/models/store.js diff --git a/app/assets/javascripts/discourse/models/tag-group.js b/app/assets/javascripts/discourse/app/models/tag-group.js similarity index 100% rename from app/assets/javascripts/discourse/models/tag-group.js rename to app/assets/javascripts/discourse/app/models/tag-group.js diff --git a/app/assets/javascripts/discourse/models/tag.js b/app/assets/javascripts/discourse/app/models/tag.js similarity index 100% rename from app/assets/javascripts/discourse/models/tag.js rename to app/assets/javascripts/discourse/app/models/tag.js diff --git a/app/assets/javascripts/discourse/models/topic-details.js b/app/assets/javascripts/discourse/app/models/topic-details.js similarity index 100% rename from app/assets/javascripts/discourse/models/topic-details.js rename to app/assets/javascripts/discourse/app/models/topic-details.js diff --git a/app/assets/javascripts/discourse/models/topic-list.js b/app/assets/javascripts/discourse/app/models/topic-list.js similarity index 100% rename from app/assets/javascripts/discourse/models/topic-list.js rename to app/assets/javascripts/discourse/app/models/topic-list.js diff --git a/app/assets/javascripts/discourse/models/topic-timer.js b/app/assets/javascripts/discourse/app/models/topic-timer.js similarity index 100% rename from app/assets/javascripts/discourse/models/topic-timer.js rename to app/assets/javascripts/discourse/app/models/topic-timer.js diff --git a/app/assets/javascripts/discourse/models/topic-tracking-state.js b/app/assets/javascripts/discourse/app/models/topic-tracking-state.js similarity index 100% rename from app/assets/javascripts/discourse/models/topic-tracking-state.js rename to app/assets/javascripts/discourse/app/models/topic-tracking-state.js diff --git a/app/assets/javascripts/discourse/models/topic.js b/app/assets/javascripts/discourse/app/models/topic.js similarity index 100% rename from app/assets/javascripts/discourse/models/topic.js rename to app/assets/javascripts/discourse/app/models/topic.js diff --git a/app/assets/javascripts/discourse/models/trust-level.js b/app/assets/javascripts/discourse/app/models/trust-level.js similarity index 100% rename from app/assets/javascripts/discourse/models/trust-level.js rename to app/assets/javascripts/discourse/app/models/trust-level.js diff --git a/app/assets/javascripts/discourse/models/user-action-group.js b/app/assets/javascripts/discourse/app/models/user-action-group.js similarity index 100% rename from app/assets/javascripts/discourse/models/user-action-group.js rename to app/assets/javascripts/discourse/app/models/user-action-group.js diff --git a/app/assets/javascripts/discourse/models/user-action-stat.js b/app/assets/javascripts/discourse/app/models/user-action-stat.js similarity index 100% rename from app/assets/javascripts/discourse/models/user-action-stat.js rename to app/assets/javascripts/discourse/app/models/user-action-stat.js diff --git a/app/assets/javascripts/discourse/models/user-action.js b/app/assets/javascripts/discourse/app/models/user-action.js similarity index 100% rename from app/assets/javascripts/discourse/models/user-action.js rename to app/assets/javascripts/discourse/app/models/user-action.js diff --git a/app/assets/javascripts/discourse/models/user-badge.js b/app/assets/javascripts/discourse/app/models/user-badge.js similarity index 100% rename from app/assets/javascripts/discourse/models/user-badge.js rename to app/assets/javascripts/discourse/app/models/user-badge.js diff --git a/app/assets/javascripts/discourse/models/user-draft.js b/app/assets/javascripts/discourse/app/models/user-draft.js similarity index 100% rename from app/assets/javascripts/discourse/models/user-draft.js rename to app/assets/javascripts/discourse/app/models/user-draft.js diff --git a/app/assets/javascripts/discourse/models/user-drafts-stream.js b/app/assets/javascripts/discourse/app/models/user-drafts-stream.js similarity index 100% rename from app/assets/javascripts/discourse/models/user-drafts-stream.js rename to app/assets/javascripts/discourse/app/models/user-drafts-stream.js diff --git a/app/assets/javascripts/discourse/models/user-posts-stream.js b/app/assets/javascripts/discourse/app/models/user-posts-stream.js similarity index 100% rename from app/assets/javascripts/discourse/models/user-posts-stream.js rename to app/assets/javascripts/discourse/app/models/user-posts-stream.js diff --git a/app/assets/javascripts/discourse/models/user-stream.js b/app/assets/javascripts/discourse/app/models/user-stream.js similarity index 100% rename from app/assets/javascripts/discourse/models/user-stream.js rename to app/assets/javascripts/discourse/app/models/user-stream.js diff --git a/app/assets/javascripts/discourse/models/user.js b/app/assets/javascripts/discourse/app/models/user.js similarity index 100% rename from app/assets/javascripts/discourse/models/user.js rename to app/assets/javascripts/discourse/app/models/user.js diff --git a/app/assets/javascripts/discourse/pre-initializers/dynamic-route-builders.js b/app/assets/javascripts/discourse/app/pre-initializers/dynamic-route-builders.js similarity index 100% rename from app/assets/javascripts/discourse/pre-initializers/dynamic-route-builders.js rename to app/assets/javascripts/discourse/app/pre-initializers/dynamic-route-builders.js diff --git a/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js similarity index 100% rename from app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js rename to app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js diff --git a/app/assets/javascripts/discourse/pre-initializers/map-routes.js b/app/assets/javascripts/discourse/app/pre-initializers/map-routes.js similarity index 100% rename from app/assets/javascripts/discourse/pre-initializers/map-routes.js rename to app/assets/javascripts/discourse/app/pre-initializers/map-routes.js diff --git a/app/assets/javascripts/discourse/pre-initializers/register-dom-templates.js b/app/assets/javascripts/discourse/app/pre-initializers/register-dom-templates.js similarity index 100% rename from app/assets/javascripts/discourse/pre-initializers/register-dom-templates.js rename to app/assets/javascripts/discourse/app/pre-initializers/register-dom-templates.js diff --git a/app/assets/javascripts/discourse/pre-initializers/sniff-capabilities.js b/app/assets/javascripts/discourse/app/pre-initializers/sniff-capabilities.js similarity index 100% rename from app/assets/javascripts/discourse/pre-initializers/sniff-capabilities.js rename to app/assets/javascripts/discourse/app/pre-initializers/sniff-capabilities.js diff --git a/app/assets/javascripts/discourse/pre-initializers/svg-sprite-fontawesome.js b/app/assets/javascripts/discourse/app/pre-initializers/svg-sprite-fontawesome.js similarity index 100% rename from app/assets/javascripts/discourse/pre-initializers/svg-sprite-fontawesome.js rename to app/assets/javascripts/discourse/app/pre-initializers/svg-sprite-fontawesome.js diff --git a/app/assets/javascripts/discourse/raw-views/list/post-count-or-badges.js b/app/assets/javascripts/discourse/app/raw-views/list/post-count-or-badges.js similarity index 100% rename from app/assets/javascripts/discourse/raw-views/list/post-count-or-badges.js rename to app/assets/javascripts/discourse/app/raw-views/list/post-count-or-badges.js diff --git a/app/assets/javascripts/discourse/raw-views/list/posts-count-column.js b/app/assets/javascripts/discourse/app/raw-views/list/posts-count-column.js similarity index 100% rename from app/assets/javascripts/discourse/raw-views/list/posts-count-column.js rename to app/assets/javascripts/discourse/app/raw-views/list/posts-count-column.js diff --git a/app/assets/javascripts/discourse/raw-views/list/visited-line.js b/app/assets/javascripts/discourse/app/raw-views/list/visited-line.js similarity index 100% rename from app/assets/javascripts/discourse/raw-views/list/visited-line.js rename to app/assets/javascripts/discourse/app/raw-views/list/visited-line.js diff --git a/app/assets/javascripts/discourse/raw-views/topic-list-header-column.js b/app/assets/javascripts/discourse/app/raw-views/topic-list-header-column.js similarity index 100% rename from app/assets/javascripts/discourse/raw-views/topic-list-header-column.js rename to app/assets/javascripts/discourse/app/raw-views/topic-list-header-column.js diff --git a/app/assets/javascripts/discourse/raw-views/topic-status.js b/app/assets/javascripts/discourse/app/raw-views/topic-status.js similarity index 100% rename from app/assets/javascripts/discourse/raw-views/topic-status.js rename to app/assets/javascripts/discourse/app/raw-views/topic-status.js diff --git a/app/assets/javascripts/discourse/routes/about.js b/app/assets/javascripts/discourse/app/routes/about.js similarity index 100% rename from app/assets/javascripts/discourse/routes/about.js rename to app/assets/javascripts/discourse/app/routes/about.js diff --git a/app/assets/javascripts/discourse/routes/account-created-edit-email.js b/app/assets/javascripts/discourse/app/routes/account-created-edit-email.js similarity index 100% rename from app/assets/javascripts/discourse/routes/account-created-edit-email.js rename to app/assets/javascripts/discourse/app/routes/account-created-edit-email.js diff --git a/app/assets/javascripts/discourse/routes/account-created-index.js b/app/assets/javascripts/discourse/app/routes/account-created-index.js similarity index 100% rename from app/assets/javascripts/discourse/routes/account-created-index.js rename to app/assets/javascripts/discourse/app/routes/account-created-index.js diff --git a/app/assets/javascripts/discourse/routes/account-created-resent.js b/app/assets/javascripts/discourse/app/routes/account-created-resent.js similarity index 100% rename from app/assets/javascripts/discourse/routes/account-created-resent.js rename to app/assets/javascripts/discourse/app/routes/account-created-resent.js diff --git a/app/assets/javascripts/discourse/routes/account-created.js b/app/assets/javascripts/discourse/app/routes/account-created.js similarity index 100% rename from app/assets/javascripts/discourse/routes/account-created.js rename to app/assets/javascripts/discourse/app/routes/account-created.js diff --git a/app/assets/javascripts/discourse/routes/app-route-map.js b/app/assets/javascripts/discourse/app/routes/app-route-map.js similarity index 100% rename from app/assets/javascripts/discourse/routes/app-route-map.js rename to app/assets/javascripts/discourse/app/routes/app-route-map.js diff --git a/app/assets/javascripts/discourse/routes/application.js b/app/assets/javascripts/discourse/app/routes/application.js similarity index 100% rename from app/assets/javascripts/discourse/routes/application.js rename to app/assets/javascripts/discourse/app/routes/application.js diff --git a/app/assets/javascripts/discourse/routes/associate-account.js b/app/assets/javascripts/discourse/app/routes/associate-account.js similarity index 100% rename from app/assets/javascripts/discourse/routes/associate-account.js rename to app/assets/javascripts/discourse/app/routes/associate-account.js diff --git a/app/assets/javascripts/discourse/routes/badges-index.js b/app/assets/javascripts/discourse/app/routes/badges-index.js similarity index 100% rename from app/assets/javascripts/discourse/routes/badges-index.js rename to app/assets/javascripts/discourse/app/routes/badges-index.js diff --git a/app/assets/javascripts/discourse/routes/badges-show.js b/app/assets/javascripts/discourse/app/routes/badges-show.js similarity index 100% rename from app/assets/javascripts/discourse/routes/badges-show.js rename to app/assets/javascripts/discourse/app/routes/badges-show.js diff --git a/app/assets/javascripts/discourse/routes/build-admin-user-posts-route.js b/app/assets/javascripts/discourse/app/routes/build-admin-user-posts-route.js similarity index 100% rename from app/assets/javascripts/discourse/routes/build-admin-user-posts-route.js rename to app/assets/javascripts/discourse/app/routes/build-admin-user-posts-route.js diff --git a/app/assets/javascripts/discourse/routes/build-category-route.js b/app/assets/javascripts/discourse/app/routes/build-category-route.js similarity index 100% rename from app/assets/javascripts/discourse/routes/build-category-route.js rename to app/assets/javascripts/discourse/app/routes/build-category-route.js diff --git a/app/assets/javascripts/discourse/routes/build-group-messages-route.js b/app/assets/javascripts/discourse/app/routes/build-group-messages-route.js similarity index 100% rename from app/assets/javascripts/discourse/routes/build-group-messages-route.js rename to app/assets/javascripts/discourse/app/routes/build-group-messages-route.js diff --git a/app/assets/javascripts/discourse/routes/build-private-messages-route.js b/app/assets/javascripts/discourse/app/routes/build-private-messages-route.js similarity index 100% rename from app/assets/javascripts/discourse/routes/build-private-messages-route.js rename to app/assets/javascripts/discourse/app/routes/build-private-messages-route.js diff --git a/app/assets/javascripts/discourse/routes/build-static-route.js b/app/assets/javascripts/discourse/app/routes/build-static-route.js similarity index 100% rename from app/assets/javascripts/discourse/routes/build-static-route.js rename to app/assets/javascripts/discourse/app/routes/build-static-route.js diff --git a/app/assets/javascripts/discourse/routes/build-topic-route.js b/app/assets/javascripts/discourse/app/routes/build-topic-route.js similarity index 100% rename from app/assets/javascripts/discourse/routes/build-topic-route.js rename to app/assets/javascripts/discourse/app/routes/build-topic-route.js diff --git a/app/assets/javascripts/discourse/routes/conduct.js b/app/assets/javascripts/discourse/app/routes/conduct.js similarity index 100% rename from app/assets/javascripts/discourse/routes/conduct.js rename to app/assets/javascripts/discourse/app/routes/conduct.js diff --git a/app/assets/javascripts/discourse/routes/discourse.js b/app/assets/javascripts/discourse/app/routes/discourse.js similarity index 100% rename from app/assets/javascripts/discourse/routes/discourse.js rename to app/assets/javascripts/discourse/app/routes/discourse.js diff --git a/app/assets/javascripts/discourse/routes/discovery-categories.js b/app/assets/javascripts/discourse/app/routes/discovery-categories.js similarity index 100% rename from app/assets/javascripts/discourse/routes/discovery-categories.js rename to app/assets/javascripts/discourse/app/routes/discovery-categories.js diff --git a/app/assets/javascripts/discourse/routes/discovery.js b/app/assets/javascripts/discourse/app/routes/discovery.js similarity index 100% rename from app/assets/javascripts/discourse/routes/discovery.js rename to app/assets/javascripts/discourse/app/routes/discovery.js diff --git a/app/assets/javascripts/discourse/routes/email-login.js b/app/assets/javascripts/discourse/app/routes/email-login.js similarity index 100% rename from app/assets/javascripts/discourse/routes/email-login.js rename to app/assets/javascripts/discourse/app/routes/email-login.js diff --git a/app/assets/javascripts/discourse/routes/exception-unknown.js b/app/assets/javascripts/discourse/app/routes/exception-unknown.js similarity index 100% rename from app/assets/javascripts/discourse/routes/exception-unknown.js rename to app/assets/javascripts/discourse/app/routes/exception-unknown.js diff --git a/app/assets/javascripts/discourse/routes/exception.js b/app/assets/javascripts/discourse/app/routes/exception.js similarity index 100% rename from app/assets/javascripts/discourse/routes/exception.js rename to app/assets/javascripts/discourse/app/routes/exception.js diff --git a/app/assets/javascripts/discourse/routes/faq.js b/app/assets/javascripts/discourse/app/routes/faq.js similarity index 100% rename from app/assets/javascripts/discourse/routes/faq.js rename to app/assets/javascripts/discourse/app/routes/faq.js diff --git a/app/assets/javascripts/discourse/routes/forgot-password.js b/app/assets/javascripts/discourse/app/routes/forgot-password.js similarity index 100% rename from app/assets/javascripts/discourse/routes/forgot-password.js rename to app/assets/javascripts/discourse/app/routes/forgot-password.js diff --git a/app/assets/javascripts/discourse/routes/full-page-search.js b/app/assets/javascripts/discourse/app/routes/full-page-search.js similarity index 100% rename from app/assets/javascripts/discourse/routes/full-page-search.js rename to app/assets/javascripts/discourse/app/routes/full-page-search.js diff --git a/app/assets/javascripts/discourse/routes/group-activity-index.js b/app/assets/javascripts/discourse/app/routes/group-activity-index.js similarity index 100% rename from app/assets/javascripts/discourse/routes/group-activity-index.js rename to app/assets/javascripts/discourse/app/routes/group-activity-index.js diff --git a/app/assets/javascripts/discourse/routes/group-activity-mentions.js b/app/assets/javascripts/discourse/app/routes/group-activity-mentions.js similarity index 100% rename from app/assets/javascripts/discourse/routes/group-activity-mentions.js rename to app/assets/javascripts/discourse/app/routes/group-activity-mentions.js diff --git a/app/assets/javascripts/discourse/routes/group-activity-posts.js b/app/assets/javascripts/discourse/app/routes/group-activity-posts.js similarity index 100% rename from app/assets/javascripts/discourse/routes/group-activity-posts.js rename to app/assets/javascripts/discourse/app/routes/group-activity-posts.js diff --git a/app/assets/javascripts/discourse/routes/group-activity-topics.js b/app/assets/javascripts/discourse/app/routes/group-activity-topics.js similarity index 100% rename from app/assets/javascripts/discourse/routes/group-activity-topics.js rename to app/assets/javascripts/discourse/app/routes/group-activity-topics.js diff --git a/app/assets/javascripts/discourse/routes/group-index.js b/app/assets/javascripts/discourse/app/routes/group-index.js similarity index 100% rename from app/assets/javascripts/discourse/routes/group-index.js rename to app/assets/javascripts/discourse/app/routes/group-index.js diff --git a/app/assets/javascripts/discourse/routes/group-manage-index.js b/app/assets/javascripts/discourse/app/routes/group-manage-index.js similarity index 100% rename from app/assets/javascripts/discourse/routes/group-manage-index.js rename to app/assets/javascripts/discourse/app/routes/group-manage-index.js diff --git a/app/assets/javascripts/discourse/routes/group-manage-interaction.js b/app/assets/javascripts/discourse/app/routes/group-manage-interaction.js similarity index 100% rename from app/assets/javascripts/discourse/routes/group-manage-interaction.js rename to app/assets/javascripts/discourse/app/routes/group-manage-interaction.js diff --git a/app/assets/javascripts/discourse/routes/group-manage-logs.js b/app/assets/javascripts/discourse/app/routes/group-manage-logs.js similarity index 100% rename from app/assets/javascripts/discourse/routes/group-manage-logs.js rename to app/assets/javascripts/discourse/app/routes/group-manage-logs.js diff --git a/app/assets/javascripts/discourse/routes/group-manage-membership.js b/app/assets/javascripts/discourse/app/routes/group-manage-membership.js similarity index 100% rename from app/assets/javascripts/discourse/routes/group-manage-membership.js rename to app/assets/javascripts/discourse/app/routes/group-manage-membership.js diff --git a/app/assets/javascripts/discourse/routes/group-manage-profile.js b/app/assets/javascripts/discourse/app/routes/group-manage-profile.js similarity index 100% rename from app/assets/javascripts/discourse/routes/group-manage-profile.js rename to app/assets/javascripts/discourse/app/routes/group-manage-profile.js diff --git a/app/assets/javascripts/discourse/routes/group-manage.js b/app/assets/javascripts/discourse/app/routes/group-manage.js similarity index 100% rename from app/assets/javascripts/discourse/routes/group-manage.js rename to app/assets/javascripts/discourse/app/routes/group-manage.js diff --git a/app/assets/javascripts/discourse/routes/group-members.js b/app/assets/javascripts/discourse/app/routes/group-members.js similarity index 100% rename from app/assets/javascripts/discourse/routes/group-members.js rename to app/assets/javascripts/discourse/app/routes/group-members.js diff --git a/app/assets/javascripts/discourse/routes/group-messages-archive.js b/app/assets/javascripts/discourse/app/routes/group-messages-archive.js similarity index 100% rename from app/assets/javascripts/discourse/routes/group-messages-archive.js rename to app/assets/javascripts/discourse/app/routes/group-messages-archive.js diff --git a/app/assets/javascripts/discourse/routes/group-messages-inbox.js b/app/assets/javascripts/discourse/app/routes/group-messages-inbox.js similarity index 100% rename from app/assets/javascripts/discourse/routes/group-messages-inbox.js rename to app/assets/javascripts/discourse/app/routes/group-messages-inbox.js diff --git a/app/assets/javascripts/discourse/routes/group-messages-index.js b/app/assets/javascripts/discourse/app/routes/group-messages-index.js similarity index 100% rename from app/assets/javascripts/discourse/routes/group-messages-index.js rename to app/assets/javascripts/discourse/app/routes/group-messages-index.js diff --git a/app/assets/javascripts/discourse/routes/group-messages.js b/app/assets/javascripts/discourse/app/routes/group-messages.js similarity index 100% rename from app/assets/javascripts/discourse/routes/group-messages.js rename to app/assets/javascripts/discourse/app/routes/group-messages.js diff --git a/app/assets/javascripts/discourse/routes/group-requests.js b/app/assets/javascripts/discourse/app/routes/group-requests.js similarity index 100% rename from app/assets/javascripts/discourse/routes/group-requests.js rename to app/assets/javascripts/discourse/app/routes/group-requests.js diff --git a/app/assets/javascripts/discourse/routes/group.js b/app/assets/javascripts/discourse/app/routes/group.js similarity index 100% rename from app/assets/javascripts/discourse/routes/group.js rename to app/assets/javascripts/discourse/app/routes/group.js diff --git a/app/assets/javascripts/discourse/routes/groups-index.js b/app/assets/javascripts/discourse/app/routes/groups-index.js similarity index 100% rename from app/assets/javascripts/discourse/routes/groups-index.js rename to app/assets/javascripts/discourse/app/routes/groups-index.js diff --git a/app/assets/javascripts/discourse/routes/groups-new.js b/app/assets/javascripts/discourse/app/routes/groups-new.js similarity index 100% rename from app/assets/javascripts/discourse/routes/groups-new.js rename to app/assets/javascripts/discourse/app/routes/groups-new.js diff --git a/app/assets/javascripts/discourse/routes/guidelines.js b/app/assets/javascripts/discourse/app/routes/guidelines.js similarity index 100% rename from app/assets/javascripts/discourse/routes/guidelines.js rename to app/assets/javascripts/discourse/app/routes/guidelines.js diff --git a/app/assets/javascripts/discourse/routes/invites-show.js b/app/assets/javascripts/discourse/app/routes/invites-show.js similarity index 100% rename from app/assets/javascripts/discourse/routes/invites-show.js rename to app/assets/javascripts/discourse/app/routes/invites-show.js diff --git a/app/assets/javascripts/discourse/routes/login.js b/app/assets/javascripts/discourse/app/routes/login.js similarity index 100% rename from app/assets/javascripts/discourse/routes/login.js rename to app/assets/javascripts/discourse/app/routes/login.js diff --git a/app/assets/javascripts/discourse/routes/new-message.js b/app/assets/javascripts/discourse/app/routes/new-message.js similarity index 100% rename from app/assets/javascripts/discourse/routes/new-message.js rename to app/assets/javascripts/discourse/app/routes/new-message.js diff --git a/app/assets/javascripts/discourse/routes/new-topic.js b/app/assets/javascripts/discourse/app/routes/new-topic.js similarity index 100% rename from app/assets/javascripts/discourse/routes/new-topic.js rename to app/assets/javascripts/discourse/app/routes/new-topic.js diff --git a/app/assets/javascripts/discourse/routes/password-reset.js b/app/assets/javascripts/discourse/app/routes/password-reset.js similarity index 100% rename from app/assets/javascripts/discourse/routes/password-reset.js rename to app/assets/javascripts/discourse/app/routes/password-reset.js diff --git a/app/assets/javascripts/discourse/routes/post.js b/app/assets/javascripts/discourse/app/routes/post.js similarity index 100% rename from app/assets/javascripts/discourse/routes/post.js rename to app/assets/javascripts/discourse/app/routes/post.js diff --git a/app/assets/javascripts/discourse/routes/preferences-account.js b/app/assets/javascripts/discourse/app/routes/preferences-account.js similarity index 100% rename from app/assets/javascripts/discourse/routes/preferences-account.js rename to app/assets/javascripts/discourse/app/routes/preferences-account.js diff --git a/app/assets/javascripts/discourse/routes/preferences-apps.js b/app/assets/javascripts/discourse/app/routes/preferences-apps.js similarity index 100% rename from app/assets/javascripts/discourse/routes/preferences-apps.js rename to app/assets/javascripts/discourse/app/routes/preferences-apps.js diff --git a/app/assets/javascripts/discourse/routes/preferences-categories.js b/app/assets/javascripts/discourse/app/routes/preferences-categories.js similarity index 100% rename from app/assets/javascripts/discourse/routes/preferences-categories.js rename to app/assets/javascripts/discourse/app/routes/preferences-categories.js diff --git a/app/assets/javascripts/discourse/routes/preferences-email.js b/app/assets/javascripts/discourse/app/routes/preferences-email.js similarity index 100% rename from app/assets/javascripts/discourse/routes/preferences-email.js rename to app/assets/javascripts/discourse/app/routes/preferences-email.js diff --git a/app/assets/javascripts/discourse/routes/preferences-emails.js b/app/assets/javascripts/discourse/app/routes/preferences-emails.js similarity index 100% rename from app/assets/javascripts/discourse/routes/preferences-emails.js rename to app/assets/javascripts/discourse/app/routes/preferences-emails.js diff --git a/app/assets/javascripts/discourse/routes/preferences-index.js b/app/assets/javascripts/discourse/app/routes/preferences-index.js similarity index 100% rename from app/assets/javascripts/discourse/routes/preferences-index.js rename to app/assets/javascripts/discourse/app/routes/preferences-index.js diff --git a/app/assets/javascripts/discourse/routes/preferences-interface.js b/app/assets/javascripts/discourse/app/routes/preferences-interface.js similarity index 100% rename from app/assets/javascripts/discourse/routes/preferences-interface.js rename to app/assets/javascripts/discourse/app/routes/preferences-interface.js diff --git a/app/assets/javascripts/discourse/routes/preferences-notifications.js b/app/assets/javascripts/discourse/app/routes/preferences-notifications.js similarity index 100% rename from app/assets/javascripts/discourse/routes/preferences-notifications.js rename to app/assets/javascripts/discourse/app/routes/preferences-notifications.js diff --git a/app/assets/javascripts/discourse/routes/preferences-profile.js b/app/assets/javascripts/discourse/app/routes/preferences-profile.js similarity index 100% rename from app/assets/javascripts/discourse/routes/preferences-profile.js rename to app/assets/javascripts/discourse/app/routes/preferences-profile.js diff --git a/app/assets/javascripts/discourse/routes/preferences-second-factor.js b/app/assets/javascripts/discourse/app/routes/preferences-second-factor.js similarity index 100% rename from app/assets/javascripts/discourse/routes/preferences-second-factor.js rename to app/assets/javascripts/discourse/app/routes/preferences-second-factor.js diff --git a/app/assets/javascripts/discourse/routes/preferences-tags.js b/app/assets/javascripts/discourse/app/routes/preferences-tags.js similarity index 100% rename from app/assets/javascripts/discourse/routes/preferences-tags.js rename to app/assets/javascripts/discourse/app/routes/preferences-tags.js diff --git a/app/assets/javascripts/discourse/routes/preferences-username.js b/app/assets/javascripts/discourse/app/routes/preferences-username.js similarity index 100% rename from app/assets/javascripts/discourse/routes/preferences-username.js rename to app/assets/javascripts/discourse/app/routes/preferences-username.js diff --git a/app/assets/javascripts/discourse/routes/preferences-users.js b/app/assets/javascripts/discourse/app/routes/preferences-users.js similarity index 100% rename from app/assets/javascripts/discourse/routes/preferences-users.js rename to app/assets/javascripts/discourse/app/routes/preferences-users.js diff --git a/app/assets/javascripts/discourse/routes/preferences.js b/app/assets/javascripts/discourse/app/routes/preferences.js similarity index 100% rename from app/assets/javascripts/discourse/routes/preferences.js rename to app/assets/javascripts/discourse/app/routes/preferences.js diff --git a/app/assets/javascripts/discourse/routes/privacy.js b/app/assets/javascripts/discourse/app/routes/privacy.js similarity index 100% rename from app/assets/javascripts/discourse/routes/privacy.js rename to app/assets/javascripts/discourse/app/routes/privacy.js diff --git a/app/assets/javascripts/discourse/routes/restricted-user.js b/app/assets/javascripts/discourse/app/routes/restricted-user.js similarity index 100% rename from app/assets/javascripts/discourse/routes/restricted-user.js rename to app/assets/javascripts/discourse/app/routes/restricted-user.js diff --git a/app/assets/javascripts/discourse/routes/review-index.js b/app/assets/javascripts/discourse/app/routes/review-index.js similarity index 100% rename from app/assets/javascripts/discourse/routes/review-index.js rename to app/assets/javascripts/discourse/app/routes/review-index.js diff --git a/app/assets/javascripts/discourse/routes/review-settings.js b/app/assets/javascripts/discourse/app/routes/review-settings.js similarity index 100% rename from app/assets/javascripts/discourse/routes/review-settings.js rename to app/assets/javascripts/discourse/app/routes/review-settings.js diff --git a/app/assets/javascripts/discourse/routes/review-show.js b/app/assets/javascripts/discourse/app/routes/review-show.js similarity index 100% rename from app/assets/javascripts/discourse/routes/review-show.js rename to app/assets/javascripts/discourse/app/routes/review-show.js diff --git a/app/assets/javascripts/discourse/routes/review-topics.js b/app/assets/javascripts/discourse/app/routes/review-topics.js similarity index 100% rename from app/assets/javascripts/discourse/routes/review-topics.js rename to app/assets/javascripts/discourse/app/routes/review-topics.js diff --git a/app/assets/javascripts/discourse/routes/review.js b/app/assets/javascripts/discourse/app/routes/review.js similarity index 100% rename from app/assets/javascripts/discourse/routes/review.js rename to app/assets/javascripts/discourse/app/routes/review.js diff --git a/app/assets/javascripts/discourse/routes/rules.js b/app/assets/javascripts/discourse/app/routes/rules.js similarity index 100% rename from app/assets/javascripts/discourse/routes/rules.js rename to app/assets/javascripts/discourse/app/routes/rules.js diff --git a/app/assets/javascripts/discourse/routes/signup.js b/app/assets/javascripts/discourse/app/routes/signup.js similarity index 100% rename from app/assets/javascripts/discourse/routes/signup.js rename to app/assets/javascripts/discourse/app/routes/signup.js diff --git a/app/assets/javascripts/discourse/routes/tag-groups-edit.js b/app/assets/javascripts/discourse/app/routes/tag-groups-edit.js similarity index 100% rename from app/assets/javascripts/discourse/routes/tag-groups-edit.js rename to app/assets/javascripts/discourse/app/routes/tag-groups-edit.js diff --git a/app/assets/javascripts/discourse/routes/tag-groups-new.js b/app/assets/javascripts/discourse/app/routes/tag-groups-new.js similarity index 100% rename from app/assets/javascripts/discourse/routes/tag-groups-new.js rename to app/assets/javascripts/discourse/app/routes/tag-groups-new.js diff --git a/app/assets/javascripts/discourse/routes/tag-groups.js b/app/assets/javascripts/discourse/app/routes/tag-groups.js similarity index 100% rename from app/assets/javascripts/discourse/routes/tag-groups.js rename to app/assets/javascripts/discourse/app/routes/tag-groups.js diff --git a/app/assets/javascripts/discourse/routes/tags-index.js b/app/assets/javascripts/discourse/app/routes/tags-index.js similarity index 100% rename from app/assets/javascripts/discourse/routes/tags-index.js rename to app/assets/javascripts/discourse/app/routes/tags-index.js diff --git a/app/assets/javascripts/discourse/routes/tags-intersection.js b/app/assets/javascripts/discourse/app/routes/tags-intersection.js similarity index 100% rename from app/assets/javascripts/discourse/routes/tags-intersection.js rename to app/assets/javascripts/discourse/app/routes/tags-intersection.js diff --git a/app/assets/javascripts/discourse/routes/tags-show.js b/app/assets/javascripts/discourse/app/routes/tags-show.js similarity index 100% rename from app/assets/javascripts/discourse/routes/tags-show.js rename to app/assets/javascripts/discourse/app/routes/tags-show.js diff --git a/app/assets/javascripts/discourse/routes/topic-by-slug-or-id.js b/app/assets/javascripts/discourse/app/routes/topic-by-slug-or-id.js similarity index 100% rename from app/assets/javascripts/discourse/routes/topic-by-slug-or-id.js rename to app/assets/javascripts/discourse/app/routes/topic-by-slug-or-id.js diff --git a/app/assets/javascripts/discourse/routes/topic-from-params-near.js b/app/assets/javascripts/discourse/app/routes/topic-from-params-near.js similarity index 100% rename from app/assets/javascripts/discourse/routes/topic-from-params-near.js rename to app/assets/javascripts/discourse/app/routes/topic-from-params-near.js diff --git a/app/assets/javascripts/discourse/routes/topic-from-params.js b/app/assets/javascripts/discourse/app/routes/topic-from-params.js similarity index 100% rename from app/assets/javascripts/discourse/routes/topic-from-params.js rename to app/assets/javascripts/discourse/app/routes/topic-from-params.js diff --git a/app/assets/javascripts/discourse/routes/topic.js b/app/assets/javascripts/discourse/app/routes/topic.js similarity index 100% rename from app/assets/javascripts/discourse/routes/topic.js rename to app/assets/javascripts/discourse/app/routes/topic.js diff --git a/app/assets/javascripts/discourse/routes/tos.js b/app/assets/javascripts/discourse/app/routes/tos.js similarity index 100% rename from app/assets/javascripts/discourse/routes/tos.js rename to app/assets/javascripts/discourse/app/routes/tos.js diff --git a/app/assets/javascripts/discourse/routes/unknown.js b/app/assets/javascripts/discourse/app/routes/unknown.js similarity index 100% rename from app/assets/javascripts/discourse/routes/unknown.js rename to app/assets/javascripts/discourse/app/routes/unknown.js diff --git a/app/assets/javascripts/discourse/routes/user-activity-bookmarks-with-reminders.js b/app/assets/javascripts/discourse/app/routes/user-activity-bookmarks-with-reminders.js similarity index 100% rename from app/assets/javascripts/discourse/routes/user-activity-bookmarks-with-reminders.js rename to app/assets/javascripts/discourse/app/routes/user-activity-bookmarks-with-reminders.js diff --git a/app/assets/javascripts/discourse/routes/user-activity-bookmarks.js b/app/assets/javascripts/discourse/app/routes/user-activity-bookmarks.js similarity index 100% rename from app/assets/javascripts/discourse/routes/user-activity-bookmarks.js rename to app/assets/javascripts/discourse/app/routes/user-activity-bookmarks.js diff --git a/app/assets/javascripts/discourse/routes/user-activity-drafts.js b/app/assets/javascripts/discourse/app/routes/user-activity-drafts.js similarity index 100% rename from app/assets/javascripts/discourse/routes/user-activity-drafts.js rename to app/assets/javascripts/discourse/app/routes/user-activity-drafts.js diff --git a/app/assets/javascripts/discourse/routes/user-activity-index.js b/app/assets/javascripts/discourse/app/routes/user-activity-index.js similarity index 100% rename from app/assets/javascripts/discourse/routes/user-activity-index.js rename to app/assets/javascripts/discourse/app/routes/user-activity-index.js diff --git a/app/assets/javascripts/discourse/routes/user-activity-likes-given.js b/app/assets/javascripts/discourse/app/routes/user-activity-likes-given.js similarity index 100% rename from app/assets/javascripts/discourse/routes/user-activity-likes-given.js rename to app/assets/javascripts/discourse/app/routes/user-activity-likes-given.js diff --git a/app/assets/javascripts/discourse/routes/user-activity-pending.js b/app/assets/javascripts/discourse/app/routes/user-activity-pending.js similarity index 100% rename from app/assets/javascripts/discourse/routes/user-activity-pending.js rename to app/assets/javascripts/discourse/app/routes/user-activity-pending.js diff --git a/app/assets/javascripts/discourse/routes/user-activity-replies.js b/app/assets/javascripts/discourse/app/routes/user-activity-replies.js similarity index 100% rename from app/assets/javascripts/discourse/routes/user-activity-replies.js rename to app/assets/javascripts/discourse/app/routes/user-activity-replies.js diff --git a/app/assets/javascripts/discourse/routes/user-activity-stream.js b/app/assets/javascripts/discourse/app/routes/user-activity-stream.js similarity index 100% rename from app/assets/javascripts/discourse/routes/user-activity-stream.js rename to app/assets/javascripts/discourse/app/routes/user-activity-stream.js diff --git a/app/assets/javascripts/discourse/routes/user-activity-topics.js b/app/assets/javascripts/discourse/app/routes/user-activity-topics.js similarity index 100% rename from app/assets/javascripts/discourse/routes/user-activity-topics.js rename to app/assets/javascripts/discourse/app/routes/user-activity-topics.js diff --git a/app/assets/javascripts/discourse/routes/user-activity.js b/app/assets/javascripts/discourse/app/routes/user-activity.js similarity index 100% rename from app/assets/javascripts/discourse/routes/user-activity.js rename to app/assets/javascripts/discourse/app/routes/user-activity.js diff --git a/app/assets/javascripts/discourse/routes/user-badges.js b/app/assets/javascripts/discourse/app/routes/user-badges.js similarity index 100% rename from app/assets/javascripts/discourse/routes/user-badges.js rename to app/assets/javascripts/discourse/app/routes/user-badges.js diff --git a/app/assets/javascripts/discourse/routes/user-deleted-posts.js b/app/assets/javascripts/discourse/app/routes/user-deleted-posts.js similarity index 100% rename from app/assets/javascripts/discourse/routes/user-deleted-posts.js rename to app/assets/javascripts/discourse/app/routes/user-deleted-posts.js diff --git a/app/assets/javascripts/discourse/routes/user-index.js b/app/assets/javascripts/discourse/app/routes/user-index.js similarity index 100% rename from app/assets/javascripts/discourse/routes/user-index.js rename to app/assets/javascripts/discourse/app/routes/user-index.js diff --git a/app/assets/javascripts/discourse/routes/user-invited-index.js b/app/assets/javascripts/discourse/app/routes/user-invited-index.js similarity index 100% rename from app/assets/javascripts/discourse/routes/user-invited-index.js rename to app/assets/javascripts/discourse/app/routes/user-invited-index.js diff --git a/app/assets/javascripts/discourse/routes/user-invited-show.js b/app/assets/javascripts/discourse/app/routes/user-invited-show.js similarity index 100% rename from app/assets/javascripts/discourse/routes/user-invited-show.js rename to app/assets/javascripts/discourse/app/routes/user-invited-show.js diff --git a/app/assets/javascripts/discourse/routes/user-notifications-edits.js b/app/assets/javascripts/discourse/app/routes/user-notifications-edits.js similarity index 100% rename from app/assets/javascripts/discourse/routes/user-notifications-edits.js rename to app/assets/javascripts/discourse/app/routes/user-notifications-edits.js diff --git a/app/assets/javascripts/discourse/routes/user-notifications-index.js b/app/assets/javascripts/discourse/app/routes/user-notifications-index.js similarity index 100% rename from app/assets/javascripts/discourse/routes/user-notifications-index.js rename to app/assets/javascripts/discourse/app/routes/user-notifications-index.js diff --git a/app/assets/javascripts/discourse/routes/user-notifications-likes-received.js b/app/assets/javascripts/discourse/app/routes/user-notifications-likes-received.js similarity index 100% rename from app/assets/javascripts/discourse/routes/user-notifications-likes-received.js rename to app/assets/javascripts/discourse/app/routes/user-notifications-likes-received.js diff --git a/app/assets/javascripts/discourse/routes/user-notifications-mentions.js b/app/assets/javascripts/discourse/app/routes/user-notifications-mentions.js similarity index 100% rename from app/assets/javascripts/discourse/routes/user-notifications-mentions.js rename to app/assets/javascripts/discourse/app/routes/user-notifications-mentions.js diff --git a/app/assets/javascripts/discourse/routes/user-notifications-responses.js b/app/assets/javascripts/discourse/app/routes/user-notifications-responses.js similarity index 100% rename from app/assets/javascripts/discourse/routes/user-notifications-responses.js rename to app/assets/javascripts/discourse/app/routes/user-notifications-responses.js diff --git a/app/assets/javascripts/discourse/routes/user-notifications.js b/app/assets/javascripts/discourse/app/routes/user-notifications.js similarity index 100% rename from app/assets/javascripts/discourse/routes/user-notifications.js rename to app/assets/javascripts/discourse/app/routes/user-notifications.js diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-archive.js b/app/assets/javascripts/discourse/app/routes/user-private-messages-archive.js similarity index 100% rename from app/assets/javascripts/discourse/routes/user-private-messages-archive.js rename to app/assets/javascripts/discourse/app/routes/user-private-messages-archive.js diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-group-archive.js b/app/assets/javascripts/discourse/app/routes/user-private-messages-group-archive.js similarity index 100% rename from app/assets/javascripts/discourse/routes/user-private-messages-group-archive.js rename to app/assets/javascripts/discourse/app/routes/user-private-messages-group-archive.js diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-group.js b/app/assets/javascripts/discourse/app/routes/user-private-messages-group.js similarity index 100% rename from app/assets/javascripts/discourse/routes/user-private-messages-group.js rename to app/assets/javascripts/discourse/app/routes/user-private-messages-group.js diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-index.js b/app/assets/javascripts/discourse/app/routes/user-private-messages-index.js similarity index 100% rename from app/assets/javascripts/discourse/routes/user-private-messages-index.js rename to app/assets/javascripts/discourse/app/routes/user-private-messages-index.js diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-sent.js b/app/assets/javascripts/discourse/app/routes/user-private-messages-sent.js similarity index 100% rename from app/assets/javascripts/discourse/routes/user-private-messages-sent.js rename to app/assets/javascripts/discourse/app/routes/user-private-messages-sent.js diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-tags-show.js b/app/assets/javascripts/discourse/app/routes/user-private-messages-tags-show.js similarity index 100% rename from app/assets/javascripts/discourse/routes/user-private-messages-tags-show.js rename to app/assets/javascripts/discourse/app/routes/user-private-messages-tags-show.js diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-tags.js b/app/assets/javascripts/discourse/app/routes/user-private-messages-tags.js similarity index 100% rename from app/assets/javascripts/discourse/routes/user-private-messages-tags.js rename to app/assets/javascripts/discourse/app/routes/user-private-messages-tags.js diff --git a/app/assets/javascripts/discourse/routes/user-private-messages.js b/app/assets/javascripts/discourse/app/routes/user-private-messages.js similarity index 100% rename from app/assets/javascripts/discourse/routes/user-private-messages.js rename to app/assets/javascripts/discourse/app/routes/user-private-messages.js diff --git a/app/assets/javascripts/discourse/routes/user-summary.js b/app/assets/javascripts/discourse/app/routes/user-summary.js similarity index 100% rename from app/assets/javascripts/discourse/routes/user-summary.js rename to app/assets/javascripts/discourse/app/routes/user-summary.js diff --git a/app/assets/javascripts/discourse/routes/user-topic-list.js b/app/assets/javascripts/discourse/app/routes/user-topic-list.js similarity index 100% rename from app/assets/javascripts/discourse/routes/user-topic-list.js rename to app/assets/javascripts/discourse/app/routes/user-topic-list.js diff --git a/app/assets/javascripts/discourse/routes/user.js b/app/assets/javascripts/discourse/app/routes/user.js similarity index 100% rename from app/assets/javascripts/discourse/routes/user.js rename to app/assets/javascripts/discourse/app/routes/user.js diff --git a/app/assets/javascripts/discourse/routes/users.js b/app/assets/javascripts/discourse/app/routes/users.js similarity index 100% rename from app/assets/javascripts/discourse/routes/users.js rename to app/assets/javascripts/discourse/app/routes/users.js diff --git a/app/assets/javascripts/discourse/services/app-events.js b/app/assets/javascripts/discourse/app/services/app-events.js similarity index 100% rename from app/assets/javascripts/discourse/services/app-events.js rename to app/assets/javascripts/discourse/app/services/app-events.js diff --git a/app/assets/javascripts/discourse/services/emoji-store.js b/app/assets/javascripts/discourse/app/services/emoji-store.js similarity index 100% rename from app/assets/javascripts/discourse/services/emoji-store.js rename to app/assets/javascripts/discourse/app/services/emoji-store.js diff --git a/app/assets/javascripts/discourse/services/logs-notice.js b/app/assets/javascripts/discourse/app/services/logs-notice.js similarity index 100% rename from app/assets/javascripts/discourse/services/logs-notice.js rename to app/assets/javascripts/discourse/app/services/logs-notice.js diff --git a/app/assets/javascripts/discourse/services/search.js b/app/assets/javascripts/discourse/app/services/search.js similarity index 100% rename from app/assets/javascripts/discourse/services/search.js rename to app/assets/javascripts/discourse/app/services/search.js diff --git a/app/assets/javascripts/discourse/services/theme-settings.js b/app/assets/javascripts/discourse/app/services/theme-settings.js similarity index 100% rename from app/assets/javascripts/discourse/services/theme-settings.js rename to app/assets/javascripts/discourse/app/services/theme-settings.js diff --git a/app/assets/javascripts/discourse/templates/about.hbs b/app/assets/javascripts/discourse/app/templates/about.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/about.hbs rename to app/assets/javascripts/discourse/app/templates/about.hbs diff --git a/app/assets/javascripts/discourse/templates/account-created.hbs b/app/assets/javascripts/discourse/app/templates/account-created.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/account-created.hbs rename to app/assets/javascripts/discourse/app/templates/account-created.hbs diff --git a/app/assets/javascripts/discourse/templates/account-created/edit-email.hbs b/app/assets/javascripts/discourse/app/templates/account-created/edit-email.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/account-created/edit-email.hbs rename to app/assets/javascripts/discourse/app/templates/account-created/edit-email.hbs diff --git a/app/assets/javascripts/discourse/templates/account-created/index.hbs b/app/assets/javascripts/discourse/app/templates/account-created/index.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/account-created/index.hbs rename to app/assets/javascripts/discourse/app/templates/account-created/index.hbs diff --git a/app/assets/javascripts/discourse/templates/account-created/resent.hbs b/app/assets/javascripts/discourse/app/templates/account-created/resent.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/account-created/resent.hbs rename to app/assets/javascripts/discourse/app/templates/account-created/resent.hbs diff --git a/app/assets/javascripts/discourse/templates/application.hbs b/app/assets/javascripts/discourse/app/templates/application.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/application.hbs rename to app/assets/javascripts/discourse/app/templates/application.hbs diff --git a/app/assets/javascripts/discourse/templates/badge-selector-autocomplete.hbr b/app/assets/javascripts/discourse/app/templates/badge-selector-autocomplete.hbr similarity index 100% rename from app/assets/javascripts/discourse/templates/badge-selector-autocomplete.hbr rename to app/assets/javascripts/discourse/app/templates/badge-selector-autocomplete.hbr diff --git a/app/assets/javascripts/discourse/templates/badges/index.hbs b/app/assets/javascripts/discourse/app/templates/badges/index.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/badges/index.hbs rename to app/assets/javascripts/discourse/app/templates/badges/index.hbs diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/app/templates/badges/show.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/badges/show.hbs rename to app/assets/javascripts/discourse/app/templates/badges/show.hbs diff --git a/app/assets/javascripts/discourse/templates/bulk-tag.hbs b/app/assets/javascripts/discourse/app/templates/bulk-tag.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/bulk-tag.hbs rename to app/assets/javascripts/discourse/app/templates/bulk-tag.hbs diff --git a/app/assets/javascripts/discourse/templates/category-selector-autocomplete.hbr b/app/assets/javascripts/discourse/app/templates/category-selector-autocomplete.hbr similarity index 100% rename from app/assets/javascripts/discourse/templates/category-selector-autocomplete.hbr rename to app/assets/javascripts/discourse/app/templates/category-selector-autocomplete.hbr diff --git a/app/assets/javascripts/discourse/templates/category-tag-autocomplete.hbr b/app/assets/javascripts/discourse/app/templates/category-tag-autocomplete.hbr similarity index 100% rename from app/assets/javascripts/discourse/templates/category-tag-autocomplete.hbr rename to app/assets/javascripts/discourse/app/templates/category-tag-autocomplete.hbr diff --git a/app/assets/javascripts/discourse/templates/components/about-page-users.hbs b/app/assets/javascripts/discourse/app/templates/components/about-page-users.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/about-page-users.hbs rename to app/assets/javascripts/discourse/app/templates/components/about-page-users.hbs diff --git a/app/assets/javascripts/discourse/templates/components/activation-controls.hbs b/app/assets/javascripts/discourse/app/templates/components/activation-controls.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/activation-controls.hbs rename to app/assets/javascripts/discourse/app/templates/components/activation-controls.hbs diff --git a/app/assets/javascripts/discourse/templates/components/activation-email-form.hbs b/app/assets/javascripts/discourse/app/templates/components/activation-email-form.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/activation-email-form.hbs rename to app/assets/javascripts/discourse/app/templates/components/activation-email-form.hbs diff --git a/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs b/app/assets/javascripts/discourse/app/templates/components/avatar-uploader.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs rename to app/assets/javascripts/discourse/app/templates/components/avatar-uploader.hbs diff --git a/app/assets/javascripts/discourse/templates/components/backup-codes.hbs b/app/assets/javascripts/discourse/app/templates/components/backup-codes.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/backup-codes.hbs rename to app/assets/javascripts/discourse/app/templates/components/backup-codes.hbs diff --git a/app/assets/javascripts/discourse/templates/components/backup-uploader.hbs b/app/assets/javascripts/discourse/app/templates/components/backup-uploader.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/backup-uploader.hbs rename to app/assets/javascripts/discourse/app/templates/components/backup-uploader.hbs diff --git a/app/assets/javascripts/discourse/templates/components/badge-button.hbs b/app/assets/javascripts/discourse/app/templates/components/badge-button.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/badge-button.hbs rename to app/assets/javascripts/discourse/app/templates/components/badge-button.hbs diff --git a/app/assets/javascripts/discourse/templates/components/badge-card.hbs b/app/assets/javascripts/discourse/app/templates/components/badge-card.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/badge-card.hbs rename to app/assets/javascripts/discourse/app/templates/components/badge-card.hbs diff --git a/app/assets/javascripts/discourse/templates/components/badge-selector.hbs b/app/assets/javascripts/discourse/app/templates/components/badge-selector.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/badge-selector.hbs rename to app/assets/javascripts/discourse/app/templates/components/badge-selector.hbs diff --git a/app/assets/javascripts/discourse/templates/components/badge-title.hbs b/app/assets/javascripts/discourse/app/templates/components/badge-title.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/badge-title.hbs rename to app/assets/javascripts/discourse/app/templates/components/badge-title.hbs diff --git a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/app/templates/components/basic-topic-list.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs rename to app/assets/javascripts/discourse/app/templates/components/basic-topic-list.hbs diff --git a/app/assets/javascripts/discourse/templates/components/bread-crumbs.hbs b/app/assets/javascripts/discourse/app/templates/components/bread-crumbs.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/bread-crumbs.hbs rename to app/assets/javascripts/discourse/app/templates/components/bread-crumbs.hbs diff --git a/app/assets/javascripts/discourse/templates/components/bulk-select-button.hbs b/app/assets/javascripts/discourse/app/templates/components/bulk-select-button.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/bulk-select-button.hbs rename to app/assets/javascripts/discourse/app/templates/components/bulk-select-button.hbs diff --git a/app/assets/javascripts/discourse/templates/components/cancel-link.hbs b/app/assets/javascripts/discourse/app/templates/components/cancel-link.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/cancel-link.hbs rename to app/assets/javascripts/discourse/app/templates/components/cancel-link.hbs diff --git a/app/assets/javascripts/discourse/templates/components/categories-and-latest-topics.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-and-latest-topics.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/categories-and-latest-topics.hbs rename to app/assets/javascripts/discourse/app/templates/components/categories-and-latest-topics.hbs diff --git a/app/assets/javascripts/discourse/templates/components/categories-and-top-topics.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-and-top-topics.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/categories-and-top-topics.hbs rename to app/assets/javascripts/discourse/app/templates/components/categories-and-top-topics.hbs diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-boxes-topic.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs rename to app/assets/javascripts/discourse/app/templates/components/categories-boxes-topic.hbs diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-boxes-with-topics.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs rename to app/assets/javascripts/discourse/app/templates/components/categories-boxes-with-topics.hbs diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-boxes.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/categories-boxes.hbs rename to app/assets/javascripts/discourse/app/templates/components/categories-boxes.hbs diff --git a/app/assets/javascripts/discourse/templates/components/categories-only.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-only.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/categories-only.hbs rename to app/assets/javascripts/discourse/app/templates/components/categories-only.hbs diff --git a/app/assets/javascripts/discourse/templates/components/categories-topic-list.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-topic-list.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/categories-topic-list.hbs rename to app/assets/javascripts/discourse/app/templates/components/categories-topic-list.hbs diff --git a/app/assets/javascripts/discourse/templates/components/categories-with-featured-topics.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-with-featured-topics.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/categories-with-featured-topics.hbs rename to app/assets/javascripts/discourse/app/templates/components/categories-with-featured-topics.hbs diff --git a/app/assets/javascripts/discourse/templates/components/category-name-fields.hbs b/app/assets/javascripts/discourse/app/templates/components/category-name-fields.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/category-name-fields.hbs rename to app/assets/javascripts/discourse/app/templates/components/category-name-fields.hbs diff --git a/app/assets/javascripts/discourse/templates/components/category-title-before.hbs b/app/assets/javascripts/discourse/app/templates/components/category-title-before.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/category-title-before.hbs rename to app/assets/javascripts/discourse/app/templates/components/category-title-before.hbs diff --git a/app/assets/javascripts/discourse/templates/components/category-title-link.hbs b/app/assets/javascripts/discourse/app/templates/components/category-title-link.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/category-title-link.hbs rename to app/assets/javascripts/discourse/app/templates/components/category-title-link.hbs diff --git a/app/assets/javascripts/discourse/templates/components/category-unread.hbs b/app/assets/javascripts/discourse/app/templates/components/category-unread.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/category-unread.hbs rename to app/assets/javascripts/discourse/app/templates/components/category-unread.hbs diff --git a/app/assets/javascripts/discourse/templates/components/cdn-img.hbs b/app/assets/javascripts/discourse/app/templates/components/cdn-img.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/cdn-img.hbs rename to app/assets/javascripts/discourse/app/templates/components/cdn-img.hbs diff --git a/app/assets/javascripts/discourse/templates/components/choose-message.hbs b/app/assets/javascripts/discourse/app/templates/components/choose-message.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/choose-message.hbs rename to app/assets/javascripts/discourse/app/templates/components/choose-message.hbs diff --git a/app/assets/javascripts/discourse/templates/components/choose-topic.hbs b/app/assets/javascripts/discourse/app/templates/components/choose-topic.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/choose-topic.hbs rename to app/assets/javascripts/discourse/app/templates/components/choose-topic.hbs diff --git a/app/assets/javascripts/discourse/templates/components/color-input.hbs b/app/assets/javascripts/discourse/app/templates/components/color-input.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/color-input.hbs rename to app/assets/javascripts/discourse/app/templates/components/color-input.hbs diff --git a/app/assets/javascripts/discourse/templates/components/color-picker.hbs b/app/assets/javascripts/discourse/app/templates/components/color-picker.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/color-picker.hbs rename to app/assets/javascripts/discourse/app/templates/components/color-picker.hbs diff --git a/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs b/app/assets/javascripts/discourse/app/templates/components/composer-action-title.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/composer-action-title.hbs rename to app/assets/javascripts/discourse/app/templates/components/composer-action-title.hbs diff --git a/app/assets/javascripts/discourse/templates/components/composer-editor.hbs b/app/assets/javascripts/discourse/app/templates/components/composer-editor.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/composer-editor.hbs rename to app/assets/javascripts/discourse/app/templates/components/composer-editor.hbs diff --git a/app/assets/javascripts/discourse/templates/components/composer-messages.hbs b/app/assets/javascripts/discourse/app/templates/components/composer-messages.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/composer-messages.hbs rename to app/assets/javascripts/discourse/app/templates/components/composer-messages.hbs diff --git a/app/assets/javascripts/discourse/templates/components/composer-title.hbs b/app/assets/javascripts/discourse/app/templates/components/composer-title.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/composer-title.hbs rename to app/assets/javascripts/discourse/app/templates/components/composer-title.hbs diff --git a/app/assets/javascripts/discourse/templates/components/composer-toggles.hbs b/app/assets/javascripts/discourse/app/templates/components/composer-toggles.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/composer-toggles.hbs rename to app/assets/javascripts/discourse/app/templates/components/composer-toggles.hbs diff --git a/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs b/app/assets/javascripts/discourse/app/templates/components/composer-user-selector.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs rename to app/assets/javascripts/discourse/app/templates/components/composer-user-selector.hbs diff --git a/app/assets/javascripts/discourse/templates/components/conditional-loading-section.hbs b/app/assets/javascripts/discourse/app/templates/components/conditional-loading-section.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/conditional-loading-section.hbs rename to app/assets/javascripts/discourse/app/templates/components/conditional-loading-section.hbs diff --git a/app/assets/javascripts/discourse/templates/components/conditional-loading-spinner.hbs b/app/assets/javascripts/discourse/app/templates/components/conditional-loading-spinner.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/conditional-loading-spinner.hbs rename to app/assets/javascripts/discourse/app/templates/components/conditional-loading-spinner.hbs diff --git a/app/assets/javascripts/discourse/templates/components/cook-text.hbs b/app/assets/javascripts/discourse/app/templates/components/cook-text.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/cook-text.hbs rename to app/assets/javascripts/discourse/app/templates/components/cook-text.hbs diff --git a/app/assets/javascripts/discourse/templates/components/count-i18n.hbs b/app/assets/javascripts/discourse/app/templates/components/count-i18n.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/count-i18n.hbs rename to app/assets/javascripts/discourse/app/templates/components/count-i18n.hbs diff --git a/app/assets/javascripts/discourse/templates/components/create-topic-button.hbs b/app/assets/javascripts/discourse/app/templates/components/create-topic-button.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/create-topic-button.hbs rename to app/assets/javascripts/discourse/app/templates/components/create-topic-button.hbs diff --git a/app/assets/javascripts/discourse/templates/components/create-topics-notice.hbs b/app/assets/javascripts/discourse/app/templates/components/create-topics-notice.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/create-topics-notice.hbs rename to app/assets/javascripts/discourse/app/templates/components/create-topics-notice.hbs diff --git a/app/assets/javascripts/discourse/templates/components/csv-uploader.hbs b/app/assets/javascripts/discourse/app/templates/components/csv-uploader.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/csv-uploader.hbs rename to app/assets/javascripts/discourse/app/templates/components/csv-uploader.hbs diff --git a/app/assets/javascripts/discourse/templates/components/custom-html-container.hbs b/app/assets/javascripts/discourse/app/templates/components/custom-html-container.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/custom-html-container.hbs rename to app/assets/javascripts/discourse/app/templates/components/custom-html-container.hbs diff --git a/app/assets/javascripts/discourse/templates/components/d-button.hbs b/app/assets/javascripts/discourse/app/templates/components/d-button.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/d-button.hbs rename to app/assets/javascripts/discourse/app/templates/components/d-button.hbs diff --git a/app/assets/javascripts/discourse/templates/components/d-editor.hbs b/app/assets/javascripts/discourse/app/templates/components/d-editor.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/d-editor.hbs rename to app/assets/javascripts/discourse/app/templates/components/d-editor.hbs diff --git a/app/assets/javascripts/discourse/templates/components/d-modal-cancel.hbs b/app/assets/javascripts/discourse/app/templates/components/d-modal-cancel.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/d-modal-cancel.hbs rename to app/assets/javascripts/discourse/app/templates/components/d-modal-cancel.hbs diff --git a/app/assets/javascripts/discourse/templates/components/d-modal.hbs b/app/assets/javascripts/discourse/app/templates/components/d-modal.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/d-modal.hbs rename to app/assets/javascripts/discourse/app/templates/components/d-modal.hbs diff --git a/app/assets/javascripts/discourse/templates/components/d-navigation.hbs b/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/d-navigation.hbs rename to app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs diff --git a/app/assets/javascripts/discourse/templates/components/date-input.hbs b/app/assets/javascripts/discourse/app/templates/components/date-input.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/date-input.hbs rename to app/assets/javascripts/discourse/app/templates/components/date-input.hbs diff --git a/app/assets/javascripts/discourse/templates/components/date-picker.hbs b/app/assets/javascripts/discourse/app/templates/components/date-picker.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/date-picker.hbs rename to app/assets/javascripts/discourse/app/templates/components/date-picker.hbs diff --git a/app/assets/javascripts/discourse/templates/components/date-time-input-range.hbs b/app/assets/javascripts/discourse/app/templates/components/date-time-input-range.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/date-time-input-range.hbs rename to app/assets/javascripts/discourse/app/templates/components/date-time-input-range.hbs diff --git a/app/assets/javascripts/discourse/templates/components/date-time-input.hbs b/app/assets/javascripts/discourse/app/templates/components/date-time-input.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/date-time-input.hbs rename to app/assets/javascripts/discourse/app/templates/components/date-time-input.hbs diff --git a/app/assets/javascripts/discourse/templates/components/desktop-notification-config.hbs b/app/assets/javascripts/discourse/app/templates/components/desktop-notification-config.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/desktop-notification-config.hbs rename to app/assets/javascripts/discourse/app/templates/components/desktop-notification-config.hbs diff --git a/app/assets/javascripts/discourse/templates/components/directory-item.hbs b/app/assets/javascripts/discourse/app/templates/components/directory-item.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/directory-item.hbs rename to app/assets/javascripts/discourse/app/templates/components/directory-item.hbs diff --git a/app/assets/javascripts/discourse/templates/components/directory-toggle.hbs b/app/assets/javascripts/discourse/app/templates/components/directory-toggle.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/directory-toggle.hbs rename to app/assets/javascripts/discourse/app/templates/components/directory-toggle.hbs diff --git a/app/assets/javascripts/discourse/templates/components/disabled-icon.hbs b/app/assets/javascripts/discourse/app/templates/components/disabled-icon.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/disabled-icon.hbs rename to app/assets/javascripts/discourse/app/templates/components/disabled-icon.hbs diff --git a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs b/app/assets/javascripts/discourse/app/templates/components/discourse-banner.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/discourse-banner.hbs rename to app/assets/javascripts/discourse/app/templates/components/discourse-banner.hbs diff --git a/app/assets/javascripts/discourse/templates/components/discourse-linked-text.hbs b/app/assets/javascripts/discourse/app/templates/components/discourse-linked-text.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/discourse-linked-text.hbs rename to app/assets/javascripts/discourse/app/templates/components/discourse-linked-text.hbs diff --git a/app/assets/javascripts/discourse/templates/components/discourse-tag-bound.hbs b/app/assets/javascripts/discourse/app/templates/components/discourse-tag-bound.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/discourse-tag-bound.hbs rename to app/assets/javascripts/discourse/app/templates/components/discourse-tag-bound.hbs diff --git a/app/assets/javascripts/discourse/templates/components/discovery-topics-list.hbs b/app/assets/javascripts/discourse/app/templates/components/discovery-topics-list.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/discovery-topics-list.hbs rename to app/assets/javascripts/discourse/app/templates/components/discovery-topics-list.hbs diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-general.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/edit-category-general.hbs rename to app/assets/javascripts/discourse/app/templates/components/edit-category-general.hbs diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-images.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-images.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/edit-category-images.hbs rename to app/assets/javascripts/discourse/app/templates/components/edit-category-images.hbs diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-panel.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-panel.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/edit-category-panel.hbs rename to app/assets/javascripts/discourse/app/templates/components/edit-category-panel.hbs diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-security.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/edit-category-security.hbs rename to app/assets/javascripts/discourse/app/templates/components/edit-category-security.hbs diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs rename to app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-tab.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-tab.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/edit-category-tab.hbs rename to app/assets/javascripts/discourse/app/templates/components/edit-category-tab.hbs diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-tags.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-tags.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/edit-category-tags.hbs rename to app/assets/javascripts/discourse/app/templates/components/edit-category-tags.hbs diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-topic-template.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-topic-template.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/edit-category-topic-template.hbs rename to app/assets/javascripts/discourse/app/templates/components/edit-category-topic-template.hbs diff --git a/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-topic-timer-form.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs rename to app/assets/javascripts/discourse/app/templates/components/edit-topic-timer-form.hbs diff --git a/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs.erb b/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs.erb similarity index 100% rename from app/assets/javascripts/discourse/templates/components/emoji-picker.hbs.erb rename to app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs.erb diff --git a/app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs b/app/assets/javascripts/discourse/app/templates/components/emoji-uploader.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs rename to app/assets/javascripts/discourse/app/templates/components/emoji-uploader.hbs diff --git a/app/assets/javascripts/discourse/templates/components/expand-post.hbs b/app/assets/javascripts/discourse/app/templates/components/expand-post.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/expand-post.hbs rename to app/assets/javascripts/discourse/app/templates/components/expand-post.hbs diff --git a/app/assets/javascripts/discourse/templates/components/featured-topic.hbs b/app/assets/javascripts/discourse/app/templates/components/featured-topic.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/featured-topic.hbs rename to app/assets/javascripts/discourse/app/templates/components/featured-topic.hbs diff --git a/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs b/app/assets/javascripts/discourse/app/templates/components/flag-action-type.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/flag-action-type.hbs rename to app/assets/javascripts/discourse/app/templates/components/flag-action-type.hbs diff --git a/app/assets/javascripts/discourse/templates/components/flag-selection.hbs b/app/assets/javascripts/discourse/app/templates/components/flag-selection.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/flag-selection.hbs rename to app/assets/javascripts/discourse/app/templates/components/flag-selection.hbs diff --git a/app/assets/javascripts/discourse/templates/components/flat-button.hbs b/app/assets/javascripts/discourse/app/templates/components/flat-button.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/flat-button.hbs rename to app/assets/javascripts/discourse/app/templates/components/flat-button.hbs diff --git a/app/assets/javascripts/discourse/templates/components/footer-message.hbs b/app/assets/javascripts/discourse/app/templates/components/footer-message.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/footer-message.hbs rename to app/assets/javascripts/discourse/app/templates/components/footer-message.hbs diff --git a/app/assets/javascripts/discourse/templates/components/future-date-input.hbs b/app/assets/javascripts/discourse/app/templates/components/future-date-input.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/future-date-input.hbs rename to app/assets/javascripts/discourse/app/templates/components/future-date-input.hbs diff --git a/app/assets/javascripts/discourse/templates/components/generated-invite-link.hbs b/app/assets/javascripts/discourse/app/templates/components/generated-invite-link.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/generated-invite-link.hbs rename to app/assets/javascripts/discourse/app/templates/components/generated-invite-link.hbs diff --git a/app/assets/javascripts/discourse/templates/components/global-notice.hbs b/app/assets/javascripts/discourse/app/templates/components/global-notice.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/global-notice.hbs rename to app/assets/javascripts/discourse/app/templates/components/global-notice.hbs diff --git a/app/assets/javascripts/discourse/templates/components/google-search.hbs b/app/assets/javascripts/discourse/app/templates/components/google-search.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/google-search.hbs rename to app/assets/javascripts/discourse/app/templates/components/google-search.hbs diff --git a/app/assets/javascripts/discourse/templates/components/group-activity-filter.hbs b/app/assets/javascripts/discourse/app/templates/components/group-activity-filter.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/group-activity-filter.hbs rename to app/assets/javascripts/discourse/app/templates/components/group-activity-filter.hbs diff --git a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs b/app/assets/javascripts/discourse/app/templates/components/group-card-contents.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/group-card-contents.hbs rename to app/assets/javascripts/discourse/app/templates/components/group-card-contents.hbs diff --git a/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs b/app/assets/javascripts/discourse/app/templates/components/group-flair-inputs.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs rename to app/assets/javascripts/discourse/app/templates/components/group-flair-inputs.hbs diff --git a/app/assets/javascripts/discourse/templates/components/group-index-toggle.hbs b/app/assets/javascripts/discourse/app/templates/components/group-index-toggle.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/group-index-toggle.hbs rename to app/assets/javascripts/discourse/app/templates/components/group-index-toggle.hbs diff --git a/app/assets/javascripts/discourse/templates/components/group-manage-logs-filter.hbs b/app/assets/javascripts/discourse/app/templates/components/group-manage-logs-filter.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/group-manage-logs-filter.hbs rename to app/assets/javascripts/discourse/app/templates/components/group-manage-logs-filter.hbs diff --git a/app/assets/javascripts/discourse/templates/components/group-manage-logs-row.hbs b/app/assets/javascripts/discourse/app/templates/components/group-manage-logs-row.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/group-manage-logs-row.hbs rename to app/assets/javascripts/discourse/app/templates/components/group-manage-logs-row.hbs diff --git a/app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs b/app/assets/javascripts/discourse/app/templates/components/group-manage-save-button.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs rename to app/assets/javascripts/discourse/app/templates/components/group-manage-save-button.hbs diff --git a/app/assets/javascripts/discourse/templates/components/group-member.hbs b/app/assets/javascripts/discourse/app/templates/components/group-member.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/group-member.hbs rename to app/assets/javascripts/discourse/app/templates/components/group-member.hbs diff --git a/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs b/app/assets/javascripts/discourse/app/templates/components/group-membership-button.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/group-membership-button.hbs rename to app/assets/javascripts/discourse/app/templates/components/group-membership-button.hbs diff --git a/app/assets/javascripts/discourse/templates/components/group-navigation.hbs b/app/assets/javascripts/discourse/app/templates/components/group-navigation.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/group-navigation.hbs rename to app/assets/javascripts/discourse/app/templates/components/group-navigation.hbs diff --git a/app/assets/javascripts/discourse/templates/components/group-post.hbs b/app/assets/javascripts/discourse/app/templates/components/group-post.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/group-post.hbs rename to app/assets/javascripts/discourse/app/templates/components/group-post.hbs diff --git a/app/assets/javascripts/discourse/templates/components/group-selector.hbs b/app/assets/javascripts/discourse/app/templates/components/group-selector.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/group-selector.hbs rename to app/assets/javascripts/discourse/app/templates/components/group-selector.hbs diff --git a/app/assets/javascripts/discourse/templates/components/groups-form-interaction-fields.hbs b/app/assets/javascripts/discourse/app/templates/components/groups-form-interaction-fields.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/groups-form-interaction-fields.hbs rename to app/assets/javascripts/discourse/app/templates/components/groups-form-interaction-fields.hbs diff --git a/app/assets/javascripts/discourse/templates/components/groups-form-membership-fields.hbs b/app/assets/javascripts/discourse/app/templates/components/groups-form-membership-fields.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/groups-form-membership-fields.hbs rename to app/assets/javascripts/discourse/app/templates/components/groups-form-membership-fields.hbs diff --git a/app/assets/javascripts/discourse/templates/components/groups-form-profile-fields.hbs b/app/assets/javascripts/discourse/app/templates/components/groups-form-profile-fields.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/groups-form-profile-fields.hbs rename to app/assets/javascripts/discourse/app/templates/components/groups-form-profile-fields.hbs diff --git a/app/assets/javascripts/discourse/templates/components/groups-info.hbs b/app/assets/javascripts/discourse/app/templates/components/groups-info.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/groups-info.hbs rename to app/assets/javascripts/discourse/app/templates/components/groups-info.hbs diff --git a/app/assets/javascripts/discourse/templates/components/ignored-user-list-item.hbs b/app/assets/javascripts/discourse/app/templates/components/ignored-user-list-item.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/ignored-user-list-item.hbs rename to app/assets/javascripts/discourse/app/templates/components/ignored-user-list-item.hbs diff --git a/app/assets/javascripts/discourse/templates/components/ignored-user-list.hbs b/app/assets/javascripts/discourse/app/templates/components/ignored-user-list.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/ignored-user-list.hbs rename to app/assets/javascripts/discourse/app/templates/components/ignored-user-list.hbs diff --git a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs b/app/assets/javascripts/discourse/app/templates/components/image-uploader.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/image-uploader.hbs rename to app/assets/javascripts/discourse/app/templates/components/image-uploader.hbs diff --git a/app/assets/javascripts/discourse/templates/components/images-uploader.hbs b/app/assets/javascripts/discourse/app/templates/components/images-uploader.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/images-uploader.hbs rename to app/assets/javascripts/discourse/app/templates/components/images-uploader.hbs diff --git a/app/assets/javascripts/discourse/templates/components/input-tip.hbs b/app/assets/javascripts/discourse/app/templates/components/input-tip.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/input-tip.hbs rename to app/assets/javascripts/discourse/app/templates/components/input-tip.hbs diff --git a/app/assets/javascripts/discourse/templates/components/invite-panel.hbs b/app/assets/javascripts/discourse/app/templates/components/invite-panel.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/invite-panel.hbs rename to app/assets/javascripts/discourse/app/templates/components/invite-panel.hbs diff --git a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs b/app/assets/javascripts/discourse/app/templates/components/ip-lookup.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/ip-lookup.hbs rename to app/assets/javascripts/discourse/app/templates/components/ip-lookup.hbs diff --git a/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs b/app/assets/javascripts/discourse/app/templates/components/latest-topic-list-item.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs rename to app/assets/javascripts/discourse/app/templates/components/latest-topic-list-item.hbs diff --git a/app/assets/javascripts/discourse/templates/components/link-to-input.hbs b/app/assets/javascripts/discourse/app/templates/components/link-to-input.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/link-to-input.hbs rename to app/assets/javascripts/discourse/app/templates/components/link-to-input.hbs diff --git a/app/assets/javascripts/discourse/templates/components/login-buttons.hbs b/app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/login-buttons.hbs rename to app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs diff --git a/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs b/app/assets/javascripts/discourse/app/templates/components/mobile-category-topic.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs rename to app/assets/javascripts/discourse/app/templates/components/mobile-category-topic.hbs diff --git a/app/assets/javascripts/discourse/templates/components/mobile-nav.hbs b/app/assets/javascripts/discourse/app/templates/components/mobile-nav.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/mobile-nav.hbs rename to app/assets/javascripts/discourse/app/templates/components/mobile-nav.hbs diff --git a/app/assets/javascripts/discourse/templates/components/modal-footer-close.hbs b/app/assets/javascripts/discourse/app/templates/components/modal-footer-close.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/modal-footer-close.hbs rename to app/assets/javascripts/discourse/app/templates/components/modal-footer-close.hbs diff --git a/app/assets/javascripts/discourse/templates/components/modal-panel.hbs b/app/assets/javascripts/discourse/app/templates/components/modal-panel.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/modal-panel.hbs rename to app/assets/javascripts/discourse/app/templates/components/modal-panel.hbs diff --git a/app/assets/javascripts/discourse/templates/components/modal-tab.hbs b/app/assets/javascripts/discourse/app/templates/components/modal-tab.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/modal-tab.hbs rename to app/assets/javascripts/discourse/app/templates/components/modal-tab.hbs diff --git a/app/assets/javascripts/discourse/templates/components/nav-item.hbs b/app/assets/javascripts/discourse/app/templates/components/nav-item.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/nav-item.hbs rename to app/assets/javascripts/discourse/app/templates/components/nav-item.hbs diff --git a/app/assets/javascripts/discourse/templates/components/navigation-bar.hbs b/app/assets/javascripts/discourse/app/templates/components/navigation-bar.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/navigation-bar.hbs rename to app/assets/javascripts/discourse/app/templates/components/navigation-bar.hbs diff --git a/app/assets/javascripts/discourse/templates/components/navigation-item.hbs b/app/assets/javascripts/discourse/app/templates/components/navigation-item.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/navigation-item.hbs rename to app/assets/javascripts/discourse/app/templates/components/navigation-item.hbs diff --git a/app/assets/javascripts/discourse/templates/components/notification-consent-banner.hbs b/app/assets/javascripts/discourse/app/templates/components/notification-consent-banner.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/notification-consent-banner.hbs rename to app/assets/javascripts/discourse/app/templates/components/notification-consent-banner.hbs diff --git a/app/assets/javascripts/discourse/templates/components/plugin-outlet.hbs b/app/assets/javascripts/discourse/app/templates/components/plugin-outlet.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/plugin-outlet.hbs rename to app/assets/javascripts/discourse/app/templates/components/plugin-outlet.hbs diff --git a/app/assets/javascripts/discourse/templates/components/popup-input-tip.hbs b/app/assets/javascripts/discourse/app/templates/components/popup-input-tip.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/popup-input-tip.hbs rename to app/assets/javascripts/discourse/app/templates/components/popup-input-tip.hbs diff --git a/app/assets/javascripts/discourse/templates/components/popup-menu.hbs b/app/assets/javascripts/discourse/app/templates/components/popup-menu.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/popup-menu.hbs rename to app/assets/javascripts/discourse/app/templates/components/popup-menu.hbs diff --git a/app/assets/javascripts/discourse/templates/components/preference-checkbox.hbs b/app/assets/javascripts/discourse/app/templates/components/preference-checkbox.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/preference-checkbox.hbs rename to app/assets/javascripts/discourse/app/templates/components/preference-checkbox.hbs diff --git a/app/assets/javascripts/discourse/templates/components/private-message-glyph.hbs b/app/assets/javascripts/discourse/app/templates/components/private-message-glyph.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/private-message-glyph.hbs rename to app/assets/javascripts/discourse/app/templates/components/private-message-glyph.hbs diff --git a/app/assets/javascripts/discourse/templates/components/pwa-install-banner.hbs b/app/assets/javascripts/discourse/app/templates/components/pwa-install-banner.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/pwa-install-banner.hbs rename to app/assets/javascripts/discourse/app/templates/components/pwa-install-banner.hbs diff --git a/app/assets/javascripts/discourse/templates/components/quote-button.hbs b/app/assets/javascripts/discourse/app/templates/components/quote-button.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/quote-button.hbs rename to app/assets/javascripts/discourse/app/templates/components/quote-button.hbs diff --git a/app/assets/javascripts/discourse/templates/components/related-messages.hbs b/app/assets/javascripts/discourse/app/templates/components/related-messages.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/related-messages.hbs rename to app/assets/javascripts/discourse/app/templates/components/related-messages.hbs diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-bundled-action.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-bundled-action.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/reviewable-bundled-action.hbs rename to app/assets/javascripts/discourse/app/templates/components/reviewable-bundled-action.hbs diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-claimed-topic.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-claimed-topic.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/reviewable-claimed-topic.hbs rename to app/assets/javascripts/discourse/app/templates/components/reviewable-claimed-topic.hbs diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-conversation-post.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs rename to app/assets/javascripts/discourse/app/templates/components/reviewable-conversation-post.hbs diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-created-by-name.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-created-by-name.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/reviewable-created-by-name.hbs rename to app/assets/javascripts/discourse/app/templates/components/reviewable-created-by-name.hbs diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-created-by.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-created-by.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/reviewable-created-by.hbs rename to app/assets/javascripts/discourse/app/templates/components/reviewable-created-by.hbs diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-field-category.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-field-category.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/reviewable-field-category.hbs rename to app/assets/javascripts/discourse/app/templates/components/reviewable-field-category.hbs diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-field-editor.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-field-editor.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/reviewable-field-editor.hbs rename to app/assets/javascripts/discourse/app/templates/components/reviewable-field-editor.hbs diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-field-tags.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-field-tags.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/reviewable-field-tags.hbs rename to app/assets/javascripts/discourse/app/templates/components/reviewable-field-tags.hbs diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-field-text.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-field-text.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/reviewable-field-text.hbs rename to app/assets/javascripts/discourse/app/templates/components/reviewable-field-text.hbs diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-field-textarea.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-field-textarea.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/reviewable-field-textarea.hbs rename to app/assets/javascripts/discourse/app/templates/components/reviewable-field-textarea.hbs diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-field.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-field.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/reviewable-field.hbs rename to app/assets/javascripts/discourse/app/templates/components/reviewable-field.hbs diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-flagged-post.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs rename to app/assets/javascripts/discourse/app/templates/components/reviewable-flagged-post.hbs diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-histories.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-histories.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/reviewable-histories.hbs rename to app/assets/javascripts/discourse/app/templates/components/reviewable-histories.hbs diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/reviewable-item.hbs rename to app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-post-header.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-post-header.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/reviewable-post-header.hbs rename to app/assets/javascripts/discourse/app/templates/components/reviewable-post-header.hbs diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-queued-post.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-queued-post.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/reviewable-queued-post.hbs rename to app/assets/javascripts/discourse/app/templates/components/reviewable-queued-post.hbs diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-score.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/reviewable-score.hbs rename to app/assets/javascripts/discourse/app/templates/components/reviewable-score.hbs diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-scores.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-scores.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/reviewable-scores.hbs rename to app/assets/javascripts/discourse/app/templates/components/reviewable-scores.hbs diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-tags.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-tags.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/reviewable-tags.hbs rename to app/assets/javascripts/discourse/app/templates/components/reviewable-tags.hbs diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-topic-link.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-topic-link.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/reviewable-topic-link.hbs rename to app/assets/javascripts/discourse/app/templates/components/reviewable-topic-link.hbs diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-user.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-user.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/reviewable-user.hbs rename to app/assets/javascripts/discourse/app/templates/components/reviewable-user.hbs diff --git a/app/assets/javascripts/discourse/templates/components/save-controls.hbs b/app/assets/javascripts/discourse/app/templates/components/save-controls.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/save-controls.hbs rename to app/assets/javascripts/discourse/app/templates/components/save-controls.hbs diff --git a/app/assets/javascripts/discourse/templates/components/score-value.hbs b/app/assets/javascripts/discourse/app/templates/components/score-value.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/score-value.hbs rename to app/assets/javascripts/discourse/app/templates/components/score-value.hbs diff --git a/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs b/app/assets/javascripts/discourse/app/templates/components/search-advanced-options.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs rename to app/assets/javascripts/discourse/app/templates/components/search-advanced-options.hbs diff --git a/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs b/app/assets/javascripts/discourse/app/templates/components/second-factor-form.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/second-factor-form.hbs rename to app/assets/javascripts/discourse/app/templates/components/second-factor-form.hbs diff --git a/app/assets/javascripts/discourse/templates/components/second-factor-input.hbs b/app/assets/javascripts/discourse/app/templates/components/second-factor-input.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/second-factor-input.hbs rename to app/assets/javascripts/discourse/app/templates/components/second-factor-input.hbs diff --git a/app/assets/javascripts/discourse/templates/components/security-key-form.hbs b/app/assets/javascripts/discourse/app/templates/components/security-key-form.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/security-key-form.hbs rename to app/assets/javascripts/discourse/app/templates/components/security-key-form.hbs diff --git a/app/assets/javascripts/discourse/templates/components/selected-posts.hbs b/app/assets/javascripts/discourse/app/templates/components/selected-posts.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/selected-posts.hbs rename to app/assets/javascripts/discourse/app/templates/components/selected-posts.hbs diff --git a/app/assets/javascripts/discourse/templates/components/share-panel.hbs b/app/assets/javascripts/discourse/app/templates/components/share-panel.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/share-panel.hbs rename to app/assets/javascripts/discourse/app/templates/components/share-panel.hbs diff --git a/app/assets/javascripts/discourse/templates/components/share-popup.hbs b/app/assets/javascripts/discourse/app/templates/components/share-popup.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/share-popup.hbs rename to app/assets/javascripts/discourse/app/templates/components/share-popup.hbs diff --git a/app/assets/javascripts/discourse/templates/components/share-source.hbs b/app/assets/javascripts/discourse/app/templates/components/share-source.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/share-source.hbs rename to app/assets/javascripts/discourse/app/templates/components/share-source.hbs diff --git a/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs b/app/assets/javascripts/discourse/app/templates/components/shared-draft-controls.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs rename to app/assets/javascripts/discourse/app/templates/components/shared-draft-controls.hbs diff --git a/app/assets/javascripts/discourse/templates/components/signup-cta.hbs b/app/assets/javascripts/discourse/app/templates/components/signup-cta.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/signup-cta.hbs rename to app/assets/javascripts/discourse/app/templates/components/signup-cta.hbs diff --git a/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs b/app/assets/javascripts/discourse/app/templates/components/suggested-topics.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/suggested-topics.hbs rename to app/assets/javascripts/discourse/app/templates/components/suggested-topics.hbs diff --git a/app/assets/javascripts/discourse/templates/components/tag-drop-link.hbs b/app/assets/javascripts/discourse/app/templates/components/tag-drop-link.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/tag-drop-link.hbs rename to app/assets/javascripts/discourse/app/templates/components/tag-drop-link.hbs diff --git a/app/assets/javascripts/discourse/templates/components/tag-groups-form.hbs b/app/assets/javascripts/discourse/app/templates/components/tag-groups-form.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/tag-groups-form.hbs rename to app/assets/javascripts/discourse/app/templates/components/tag-groups-form.hbs diff --git a/app/assets/javascripts/discourse/templates/components/tag-info.hbs b/app/assets/javascripts/discourse/app/templates/components/tag-info.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/tag-info.hbs rename to app/assets/javascripts/discourse/app/templates/components/tag-info.hbs diff --git a/app/assets/javascripts/discourse/templates/components/tag-list.hbs b/app/assets/javascripts/discourse/app/templates/components/tag-list.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/tag-list.hbs rename to app/assets/javascripts/discourse/app/templates/components/tag-list.hbs diff --git a/app/assets/javascripts/discourse/templates/components/tap-tile-grid.hbs b/app/assets/javascripts/discourse/app/templates/components/tap-tile-grid.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/tap-tile-grid.hbs rename to app/assets/javascripts/discourse/app/templates/components/tap-tile-grid.hbs diff --git a/app/assets/javascripts/discourse/templates/components/tap-tile.hbs b/app/assets/javascripts/discourse/app/templates/components/tap-tile.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/tap-tile.hbs rename to app/assets/javascripts/discourse/app/templates/components/tap-tile.hbs diff --git a/app/assets/javascripts/discourse/templates/components/text-overflow.hbs b/app/assets/javascripts/discourse/app/templates/components/text-overflow.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/text-overflow.hbs rename to app/assets/javascripts/discourse/app/templates/components/text-overflow.hbs diff --git a/app/assets/javascripts/discourse/templates/components/time-input.hbs b/app/assets/javascripts/discourse/app/templates/components/time-input.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/time-input.hbs rename to app/assets/javascripts/discourse/app/templates/components/time-input.hbs diff --git a/app/assets/javascripts/discourse/templates/components/top-period-buttons.hbs b/app/assets/javascripts/discourse/app/templates/components/top-period-buttons.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/top-period-buttons.hbs rename to app/assets/javascripts/discourse/app/templates/components/top-period-buttons.hbs diff --git a/app/assets/javascripts/discourse/templates/components/topic-category.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-category.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/topic-category.hbs rename to app/assets/javascripts/discourse/app/templates/components/topic-category.hbs diff --git a/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-entrance.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/topic-entrance.hbs rename to app/assets/javascripts/discourse/app/templates/components/topic-entrance.hbs diff --git a/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs rename to app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs diff --git a/app/assets/javascripts/discourse/templates/components/topic-join-group-notice.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-join-group-notice.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/topic-join-group-notice.hbs rename to app/assets/javascripts/discourse/app/templates/components/topic-join-group-notice.hbs diff --git a/app/assets/javascripts/discourse/templates/components/topic-list-item.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-list-item.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/topic-list-item.hbs rename to app/assets/javascripts/discourse/app/templates/components/topic-list-item.hbs diff --git a/app/assets/javascripts/discourse/templates/components/topic-list.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-list.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/topic-list.hbs rename to app/assets/javascripts/discourse/app/templates/components/topic-list.hbs diff --git a/app/assets/javascripts/discourse/templates/components/topic-navigation.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-navigation.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/topic-navigation.hbs rename to app/assets/javascripts/discourse/app/templates/components/topic-navigation.hbs diff --git a/app/assets/javascripts/discourse/templates/components/topic-post-badges.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-post-badges.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/topic-post-badges.hbs rename to app/assets/javascripts/discourse/app/templates/components/topic-post-badges.hbs diff --git a/app/assets/javascripts/discourse/templates/components/topic-progress.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-progress.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/topic-progress.hbs rename to app/assets/javascripts/discourse/app/templates/components/topic-progress.hbs diff --git a/app/assets/javascripts/discourse/templates/components/topic-status.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-status.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/topic-status.hbs rename to app/assets/javascripts/discourse/app/templates/components/topic-status.hbs diff --git a/app/assets/javascripts/discourse/templates/components/topic-timer-info.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-timer-info.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/topic-timer-info.hbs rename to app/assets/javascripts/discourse/app/templates/components/topic-timer-info.hbs diff --git a/app/assets/javascripts/discourse/templates/components/topic-title.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-title.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/topic-title.hbs rename to app/assets/javascripts/discourse/app/templates/components/topic-title.hbs diff --git a/app/assets/javascripts/discourse/templates/components/track-selected.hbs b/app/assets/javascripts/discourse/app/templates/components/track-selected.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/track-selected.hbs rename to app/assets/javascripts/discourse/app/templates/components/track-selected.hbs diff --git a/app/assets/javascripts/discourse/templates/components/user-badge.hbs b/app/assets/javascripts/discourse/app/templates/components/user-badge.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/user-badge.hbs rename to app/assets/javascripts/discourse/app/templates/components/user-badge.hbs diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/user-card-contents.hbs rename to app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs b/app/assets/javascripts/discourse/app/templates/components/user-fields/confirm.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs rename to app/assets/javascripts/discourse/app/templates/components/user-fields/confirm.hbs diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs b/app/assets/javascripts/discourse/app/templates/components/user-fields/dropdown.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs rename to app/assets/javascripts/discourse/app/templates/components/user-fields/dropdown.hbs diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs b/app/assets/javascripts/discourse/app/templates/components/user-fields/text.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/user-fields/text.hbs rename to app/assets/javascripts/discourse/app/templates/components/user-fields/text.hbs diff --git a/app/assets/javascripts/discourse/templates/components/user-flag-percentage.hbs b/app/assets/javascripts/discourse/app/templates/components/user-flag-percentage.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/user-flag-percentage.hbs rename to app/assets/javascripts/discourse/app/templates/components/user-flag-percentage.hbs diff --git a/app/assets/javascripts/discourse/templates/components/user-info.hbs b/app/assets/javascripts/discourse/app/templates/components/user-info.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/user-info.hbs rename to app/assets/javascripts/discourse/app/templates/components/user-info.hbs diff --git a/app/assets/javascripts/discourse/templates/components/user-profile-avatar.hbs b/app/assets/javascripts/discourse/app/templates/components/user-profile-avatar.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/user-profile-avatar.hbs rename to app/assets/javascripts/discourse/app/templates/components/user-profile-avatar.hbs diff --git a/app/assets/javascripts/discourse/templates/components/user-stat.hbs b/app/assets/javascripts/discourse/app/templates/components/user-stat.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/user-stat.hbs rename to app/assets/javascripts/discourse/app/templates/components/user-stat.hbs diff --git a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs b/app/assets/javascripts/discourse/app/templates/components/user-stream-item.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/user-stream-item.hbs rename to app/assets/javascripts/discourse/app/templates/components/user-stream-item.hbs diff --git a/app/assets/javascripts/discourse/templates/components/user-stream.hbs b/app/assets/javascripts/discourse/app/templates/components/user-stream.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/user-stream.hbs rename to app/assets/javascripts/discourse/app/templates/components/user-stream.hbs diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-category-search.hbs b/app/assets/javascripts/discourse/app/templates/components/user-summary-category-search.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/user-summary-category-search.hbs rename to app/assets/javascripts/discourse/app/templates/components/user-summary-category-search.hbs diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-section.hbs b/app/assets/javascripts/discourse/app/templates/components/user-summary-section.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/user-summary-section.hbs rename to app/assets/javascripts/discourse/app/templates/components/user-summary-section.hbs diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs b/app/assets/javascripts/discourse/app/templates/components/user-summary-topic.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs rename to app/assets/javascripts/discourse/app/templates/components/user-summary-topic.hbs diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-topics-list.hbs b/app/assets/javascripts/discourse/app/templates/components/user-summary-topics-list.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/user-summary-topics-list.hbs rename to app/assets/javascripts/discourse/app/templates/components/user-summary-topics-list.hbs diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-user.hbs b/app/assets/javascripts/discourse/app/templates/components/user-summary-user.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/user-summary-user.hbs rename to app/assets/javascripts/discourse/app/templates/components/user-summary-user.hbs diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-users-list.hbs b/app/assets/javascripts/discourse/app/templates/components/user-summary-users-list.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/components/user-summary-users-list.hbs rename to app/assets/javascripts/discourse/app/templates/components/user-summary-users-list.hbs diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/app/templates/composer.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/composer.hbs rename to app/assets/javascripts/discourse/app/templates/composer.hbs diff --git a/app/assets/javascripts/discourse/templates/composer/custom-body.hbs b/app/assets/javascripts/discourse/app/templates/composer/custom-body.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/composer/custom-body.hbs rename to app/assets/javascripts/discourse/app/templates/composer/custom-body.hbs diff --git a/app/assets/javascripts/discourse/templates/composer/education.hbs b/app/assets/javascripts/discourse/app/templates/composer/education.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/composer/education.hbs rename to app/assets/javascripts/discourse/app/templates/composer/education.hbs diff --git a/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs b/app/assets/javascripts/discourse/app/templates/composer/group-mentioned.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs rename to app/assets/javascripts/discourse/app/templates/composer/group-mentioned.hbs diff --git a/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs b/app/assets/javascripts/discourse/app/templates/composer/similar-topics.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/composer/similar-topics.hbs rename to app/assets/javascripts/discourse/app/templates/composer/similar-topics.hbs diff --git a/app/assets/javascripts/discourse/templates/discovery.hbs b/app/assets/javascripts/discourse/app/templates/discovery.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/discovery.hbs rename to app/assets/javascripts/discourse/app/templates/discovery.hbs diff --git a/app/assets/javascripts/discourse/templates/discovery/categories.hbs b/app/assets/javascripts/discourse/app/templates/discovery/categories.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/discovery/categories.hbs rename to app/assets/javascripts/discourse/app/templates/discovery/categories.hbs diff --git a/app/assets/javascripts/discourse/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/discovery/topics.hbs rename to app/assets/javascripts/discourse/app/templates/discovery/topics.hbs diff --git a/app/assets/javascripts/discourse/templates/email-login.hbs b/app/assets/javascripts/discourse/app/templates/email-login.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/email-login.hbs rename to app/assets/javascripts/discourse/app/templates/email-login.hbs diff --git a/app/assets/javascripts/discourse/templates/emoji-picker-recent.hbr b/app/assets/javascripts/discourse/app/templates/emoji-picker-recent.hbr similarity index 100% rename from app/assets/javascripts/discourse/templates/emoji-picker-recent.hbr rename to app/assets/javascripts/discourse/app/templates/emoji-picker-recent.hbr diff --git a/app/assets/javascripts/discourse/templates/emoji-selector-autocomplete.hbr b/app/assets/javascripts/discourse/app/templates/emoji-selector-autocomplete.hbr similarity index 100% rename from app/assets/javascripts/discourse/templates/emoji-selector-autocomplete.hbr rename to app/assets/javascripts/discourse/app/templates/emoji-selector-autocomplete.hbr diff --git a/app/assets/javascripts/discourse/templates/exception.hbs b/app/assets/javascripts/discourse/app/templates/exception.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/exception.hbs rename to app/assets/javascripts/discourse/app/templates/exception.hbs diff --git a/app/assets/javascripts/discourse/templates/flat-button.hbr b/app/assets/javascripts/discourse/app/templates/flat-button.hbr similarity index 100% rename from app/assets/javascripts/discourse/templates/flat-button.hbr rename to app/assets/javascripts/discourse/app/templates/flat-button.hbr diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/app/templates/full-page-search.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/full-page-search.hbs rename to app/assets/javascripts/discourse/app/templates/full-page-search.hbs diff --git a/app/assets/javascripts/discourse/templates/group-activity-posts.hbs b/app/assets/javascripts/discourse/app/templates/group-activity-posts.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/group-activity-posts.hbs rename to app/assets/javascripts/discourse/app/templates/group-activity-posts.hbs diff --git a/app/assets/javascripts/discourse/templates/group-activity-topics.hbs b/app/assets/javascripts/discourse/app/templates/group-activity-topics.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/group-activity-topics.hbs rename to app/assets/javascripts/discourse/app/templates/group-activity-topics.hbs diff --git a/app/assets/javascripts/discourse/templates/group-index.hbs b/app/assets/javascripts/discourse/app/templates/group-index.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/group-index.hbs rename to app/assets/javascripts/discourse/app/templates/group-index.hbs diff --git a/app/assets/javascripts/discourse/templates/group-requests.hbs b/app/assets/javascripts/discourse/app/templates/group-requests.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/group-requests.hbs rename to app/assets/javascripts/discourse/app/templates/group-requests.hbs diff --git a/app/assets/javascripts/discourse/templates/group-selector-autocomplete.hbr b/app/assets/javascripts/discourse/app/templates/group-selector-autocomplete.hbr similarity index 100% rename from app/assets/javascripts/discourse/templates/group-selector-autocomplete.hbr rename to app/assets/javascripts/discourse/app/templates/group-selector-autocomplete.hbr diff --git a/app/assets/javascripts/discourse/templates/group.hbs b/app/assets/javascripts/discourse/app/templates/group.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/group.hbs rename to app/assets/javascripts/discourse/app/templates/group.hbs diff --git a/app/assets/javascripts/discourse/templates/group/activity.hbs b/app/assets/javascripts/discourse/app/templates/group/activity.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/group/activity.hbs rename to app/assets/javascripts/discourse/app/templates/group/activity.hbs diff --git a/app/assets/javascripts/discourse/templates/group/manage.hbs b/app/assets/javascripts/discourse/app/templates/group/manage.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/group/manage.hbs rename to app/assets/javascripts/discourse/app/templates/group/manage.hbs diff --git a/app/assets/javascripts/discourse/templates/group/manage/interaction.hbs b/app/assets/javascripts/discourse/app/templates/group/manage/interaction.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/group/manage/interaction.hbs rename to app/assets/javascripts/discourse/app/templates/group/manage/interaction.hbs diff --git a/app/assets/javascripts/discourse/templates/group/manage/logs.hbs b/app/assets/javascripts/discourse/app/templates/group/manage/logs.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/group/manage/logs.hbs rename to app/assets/javascripts/discourse/app/templates/group/manage/logs.hbs diff --git a/app/assets/javascripts/discourse/templates/group/manage/membership.hbs b/app/assets/javascripts/discourse/app/templates/group/manage/membership.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/group/manage/membership.hbs rename to app/assets/javascripts/discourse/app/templates/group/manage/membership.hbs diff --git a/app/assets/javascripts/discourse/templates/group/manage/profile.hbs b/app/assets/javascripts/discourse/app/templates/group/manage/profile.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/group/manage/profile.hbs rename to app/assets/javascripts/discourse/app/templates/group/manage/profile.hbs diff --git a/app/assets/javascripts/discourse/templates/group/messages.hbs b/app/assets/javascripts/discourse/app/templates/group/messages.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/group/messages.hbs rename to app/assets/javascripts/discourse/app/templates/group/messages.hbs diff --git a/app/assets/javascripts/discourse/templates/groups/index.hbs b/app/assets/javascripts/discourse/app/templates/groups/index.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/groups/index.hbs rename to app/assets/javascripts/discourse/app/templates/groups/index.hbs diff --git a/app/assets/javascripts/discourse/templates/groups/new.hbs b/app/assets/javascripts/discourse/app/templates/groups/new.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/groups/new.hbs rename to app/assets/javascripts/discourse/app/templates/groups/new.hbs diff --git a/app/assets/javascripts/discourse/templates/hide-modal.hbs b/app/assets/javascripts/discourse/app/templates/hide-modal.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/hide-modal.hbs rename to app/assets/javascripts/discourse/app/templates/hide-modal.hbs diff --git a/app/assets/javascripts/discourse/templates/invites.hbs b/app/assets/javascripts/discourse/app/templates/invites.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/invites.hbs rename to app/assets/javascripts/discourse/app/templates/invites.hbs diff --git a/app/assets/javascripts/discourse/templates/invites/show.hbs b/app/assets/javascripts/discourse/app/templates/invites/show.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/invites/show.hbs rename to app/assets/javascripts/discourse/app/templates/invites/show.hbs diff --git a/app/assets/javascripts/discourse/templates/list/action-list.hbr b/app/assets/javascripts/discourse/app/templates/list/action-list.hbr similarity index 100% rename from app/assets/javascripts/discourse/templates/list/action-list.hbr rename to app/assets/javascripts/discourse/app/templates/list/action-list.hbr diff --git a/app/assets/javascripts/discourse/templates/list/activity-column.hbr b/app/assets/javascripts/discourse/app/templates/list/activity-column.hbr similarity index 100% rename from app/assets/javascripts/discourse/templates/list/activity-column.hbr rename to app/assets/javascripts/discourse/app/templates/list/activity-column.hbr diff --git a/app/assets/javascripts/discourse/templates/list/category-column.hbr b/app/assets/javascripts/discourse/app/templates/list/category-column.hbr similarity index 100% rename from app/assets/javascripts/discourse/templates/list/category-column.hbr rename to app/assets/javascripts/discourse/app/templates/list/category-column.hbr diff --git a/app/assets/javascripts/discourse/templates/list/post-count-or-badges.hbr b/app/assets/javascripts/discourse/app/templates/list/post-count-or-badges.hbr similarity index 100% rename from app/assets/javascripts/discourse/templates/list/post-count-or-badges.hbr rename to app/assets/javascripts/discourse/app/templates/list/post-count-or-badges.hbr diff --git a/app/assets/javascripts/discourse/templates/list/posters-column.hbr b/app/assets/javascripts/discourse/app/templates/list/posters-column.hbr similarity index 100% rename from app/assets/javascripts/discourse/templates/list/posters-column.hbr rename to app/assets/javascripts/discourse/app/templates/list/posters-column.hbr diff --git a/app/assets/javascripts/discourse/templates/list/posts-count-column.hbr b/app/assets/javascripts/discourse/app/templates/list/posts-count-column.hbr similarity index 100% rename from app/assets/javascripts/discourse/templates/list/posts-count-column.hbr rename to app/assets/javascripts/discourse/app/templates/list/posts-count-column.hbr diff --git a/app/assets/javascripts/discourse/templates/list/topic-excerpt.hbr b/app/assets/javascripts/discourse/app/templates/list/topic-excerpt.hbr similarity index 100% rename from app/assets/javascripts/discourse/templates/list/topic-excerpt.hbr rename to app/assets/javascripts/discourse/app/templates/list/topic-excerpt.hbr diff --git a/app/assets/javascripts/discourse/templates/list/topic-list-item.hbr b/app/assets/javascripts/discourse/app/templates/list/topic-list-item.hbr similarity index 100% rename from app/assets/javascripts/discourse/templates/list/topic-list-item.hbr rename to app/assets/javascripts/discourse/app/templates/list/topic-list-item.hbr diff --git a/app/assets/javascripts/discourse/templates/list/unread-indicator.hbr b/app/assets/javascripts/discourse/app/templates/list/unread-indicator.hbr similarity index 100% rename from app/assets/javascripts/discourse/templates/list/unread-indicator.hbr rename to app/assets/javascripts/discourse/app/templates/list/unread-indicator.hbr diff --git a/app/assets/javascripts/discourse/templates/list/visited-line.hbr b/app/assets/javascripts/discourse/app/templates/list/visited-line.hbr similarity index 100% rename from app/assets/javascripts/discourse/templates/list/visited-line.hbr rename to app/assets/javascripts/discourse/app/templates/list/visited-line.hbr diff --git a/app/assets/javascripts/discourse/templates/loading.hbs b/app/assets/javascripts/discourse/app/templates/loading.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/loading.hbs rename to app/assets/javascripts/discourse/app/templates/loading.hbs diff --git a/app/assets/javascripts/discourse/templates/login-preferences.hbs b/app/assets/javascripts/discourse/app/templates/login-preferences.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/login-preferences.hbs rename to app/assets/javascripts/discourse/app/templates/login-preferences.hbs diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/basic-topic-list.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs rename to app/assets/javascripts/discourse/app/templates/mobile/components/basic-topic-list.hbs diff --git a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/categories-only.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs rename to app/assets/javascripts/discourse/app/templates/mobile/components/categories-only.hbs diff --git a/app/assets/javascripts/discourse/templates/mobile/components/categories-with-featured-topics.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/categories-with-featured-topics.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/mobile/components/categories-with-featured-topics.hbs rename to app/assets/javascripts/discourse/app/templates/mobile/components/categories-with-featured-topics.hbs diff --git a/app/assets/javascripts/discourse/templates/mobile/components/directory-item.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/directory-item.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/mobile/components/directory-item.hbs rename to app/assets/javascripts/discourse/app/templates/mobile/components/directory-item.hbs diff --git a/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/mobile-nav.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs rename to app/assets/javascripts/discourse/app/templates/mobile/components/mobile-nav.hbs diff --git a/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/navigation-bar.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs rename to app/assets/javascripts/discourse/app/templates/mobile/components/navigation-bar.hbs diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs b/app/assets/javascripts/discourse/app/templates/mobile/discovery/categories.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs rename to app/assets/javascripts/discourse/app/templates/mobile/discovery/categories.hbs diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs b/app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs rename to app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs diff --git a/app/assets/javascripts/discourse/templates/mobile/group-index.hbs b/app/assets/javascripts/discourse/app/templates/mobile/group-index.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/mobile/group-index.hbs rename to app/assets/javascripts/discourse/app/templates/mobile/group-index.hbs diff --git a/app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.hbr b/app/assets/javascripts/discourse/app/templates/mobile/list/topic-list-item.hbr similarity index 100% rename from app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.hbr rename to app/assets/javascripts/discourse/app/templates/mobile/list/topic-list-item.hbr diff --git a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs b/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/mobile/modal/login.hbs rename to app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs diff --git a/app/assets/javascripts/discourse/templates/mobile/users.hbs b/app/assets/javascripts/discourse/app/templates/mobile/users.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/mobile/users.hbs rename to app/assets/javascripts/discourse/app/templates/mobile/users.hbs diff --git a/app/assets/javascripts/discourse/templates/modal.hbs b/app/assets/javascripts/discourse/app/templates/modal.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal.hbs rename to app/assets/javascripts/discourse/app/templates/modal.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/activation-edit.hbs b/app/assets/javascripts/discourse/app/templates/modal/activation-edit.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/activation-edit.hbs rename to app/assets/javascripts/discourse/app/templates/modal/activation-edit.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs b/app/assets/javascripts/discourse/app/templates/modal/activation-resent.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/activation-resent.hbs rename to app/assets/javascripts/discourse/app/templates/modal/activation-resent.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/add-post-notice.hbs b/app/assets/javascripts/discourse/app/templates/modal/add-post-notice.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/add-post-notice.hbs rename to app/assets/javascripts/discourse/app/templates/modal/add-post-notice.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/associate-account-confirm.hbs b/app/assets/javascripts/discourse/app/templates/modal/associate-account-confirm.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/associate-account-confirm.hbs rename to app/assets/javascripts/discourse/app/templates/modal/associate-account-confirm.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/auth-token.hbs b/app/assets/javascripts/discourse/app/templates/modal/auth-token.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/auth-token.hbs rename to app/assets/javascripts/discourse/app/templates/modal/auth-token.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs b/app/assets/javascripts/discourse/app/templates/modal/avatar-selector.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs rename to app/assets/javascripts/discourse/app/templates/modal/avatar-selector.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/bookmark.hbs rename to app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/bulk-actions-buttons.hbs b/app/assets/javascripts/discourse/app/templates/modal/bulk-actions-buttons.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/bulk-actions-buttons.hbs rename to app/assets/javascripts/discourse/app/templates/modal/bulk-actions-buttons.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/bulk-change-category.hbs b/app/assets/javascripts/discourse/app/templates/modal/bulk-change-category.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/bulk-change-category.hbs rename to app/assets/javascripts/discourse/app/templates/modal/bulk-change-category.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs b/app/assets/javascripts/discourse/app/templates/modal/bulk-notification-level.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs rename to app/assets/javascripts/discourse/app/templates/modal/bulk-notification-level.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs b/app/assets/javascripts/discourse/app/templates/modal/change-owner.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/change-owner.hbs rename to app/assets/javascripts/discourse/app/templates/modal/change-owner.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/change-timestamp.hbs b/app/assets/javascripts/discourse/app/templates/modal/change-timestamp.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/change-timestamp.hbs rename to app/assets/javascripts/discourse/app/templates/modal/change-timestamp.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/convert-to-public-topic.hbs b/app/assets/javascripts/discourse/app/templates/modal/convert-to-public-topic.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/convert-to-public-topic.hbs rename to app/assets/javascripts/discourse/app/templates/modal/convert-to-public-topic.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/app/templates/modal/create-account.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/create-account.hbs rename to app/assets/javascripts/discourse/app/templates/modal/create-account.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs b/app/assets/javascripts/discourse/app/templates/modal/delete-topic-disallowed.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs rename to app/assets/javascripts/discourse/app/templates/modal/delete-topic-disallowed.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/dismiss-read.hbs b/app/assets/javascripts/discourse/app/templates/modal/dismiss-read.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/dismiss-read.hbs rename to app/assets/javascripts/discourse/app/templates/modal/dismiss-read.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category.hbs b/app/assets/javascripts/discourse/app/templates/modal/edit-category.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/edit-category.hbs rename to app/assets/javascripts/discourse/app/templates/modal/edit-category.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs b/app/assets/javascripts/discourse/app/templates/modal/edit-topic-timer.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs rename to app/assets/javascripts/discourse/app/templates/modal/edit-topic-timer.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/explain-reviewable.hbs b/app/assets/javascripts/discourse/app/templates/modal/explain-reviewable.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/explain-reviewable.hbs rename to app/assets/javascripts/discourse/app/templates/modal/explain-reviewable.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/feature-topic-on-profile.hbs b/app/assets/javascripts/discourse/app/templates/modal/feature-topic-on-profile.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/feature-topic-on-profile.hbs rename to app/assets/javascripts/discourse/app/templates/modal/feature-topic-on-profile.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs b/app/assets/javascripts/discourse/app/templates/modal/feature-topic.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/feature-topic.hbs rename to app/assets/javascripts/discourse/app/templates/modal/feature-topic.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/flag.hbs b/app/assets/javascripts/discourse/app/templates/modal/flag.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/flag.hbs rename to app/assets/javascripts/discourse/app/templates/modal/flag.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs b/app/assets/javascripts/discourse/app/templates/modal/forgot-password.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/forgot-password.hbs rename to app/assets/javascripts/discourse/app/templates/modal/forgot-password.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/grant-badge.hbs b/app/assets/javascripts/discourse/app/templates/modal/grant-badge.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/grant-badge.hbs rename to app/assets/javascripts/discourse/app/templates/modal/grant-badge.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/group-add-members.hbs b/app/assets/javascripts/discourse/app/templates/modal/group-add-members.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/group-add-members.hbs rename to app/assets/javascripts/discourse/app/templates/modal/group-add-members.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/group-bulk-add.hbs b/app/assets/javascripts/discourse/app/templates/modal/group-bulk-add.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/group-bulk-add.hbs rename to app/assets/javascripts/discourse/app/templates/modal/group-bulk-add.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/history.hbs b/app/assets/javascripts/discourse/app/templates/modal/history.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/history.hbs rename to app/assets/javascripts/discourse/app/templates/modal/history.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/ignore-duration-with-username.hbs b/app/assets/javascripts/discourse/app/templates/modal/ignore-duration-with-username.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/ignore-duration-with-username.hbs rename to app/assets/javascripts/discourse/app/templates/modal/ignore-duration-with-username.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/ignore-duration.hbs b/app/assets/javascripts/discourse/app/templates/modal/ignore-duration.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/ignore-duration.hbs rename to app/assets/javascripts/discourse/app/templates/modal/ignore-duration.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs b/app/assets/javascripts/discourse/app/templates/modal/insert-hyperlink.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs rename to app/assets/javascripts/discourse/app/templates/modal/insert-hyperlink.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/jump-to-post.hbs b/app/assets/javascripts/discourse/app/templates/modal/jump-to-post.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/jump-to-post.hbs rename to app/assets/javascripts/discourse/app/templates/modal/jump-to-post.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/app/templates/modal/keyboard-shortcuts-help.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs rename to app/assets/javascripts/discourse/app/templates/modal/keyboard-shortcuts-help.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/login.hbs b/app/assets/javascripts/discourse/app/templates/modal/login.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/login.hbs rename to app/assets/javascripts/discourse/app/templates/modal/login.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs b/app/assets/javascripts/discourse/app/templates/modal/move-to-topic.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs rename to app/assets/javascripts/discourse/app/templates/modal/move-to-topic.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/not-activated.hbs b/app/assets/javascripts/discourse/app/templates/modal/not-activated.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/not-activated.hbs rename to app/assets/javascripts/discourse/app/templates/modal/not-activated.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs b/app/assets/javascripts/discourse/app/templates/modal/post-enqueued.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs rename to app/assets/javascripts/discourse/app/templates/modal/post-enqueued.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/publish-page.hbs b/app/assets/javascripts/discourse/app/templates/modal/publish-page.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/publish-page.hbs rename to app/assets/javascripts/discourse/app/templates/modal/publish-page.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/raw-email.hbs b/app/assets/javascripts/discourse/app/templates/modal/raw-email.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/raw-email.hbs rename to app/assets/javascripts/discourse/app/templates/modal/raw-email.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/rename-tag.hbs b/app/assets/javascripts/discourse/app/templates/modal/rename-tag.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/rename-tag.hbs rename to app/assets/javascripts/discourse/app/templates/modal/rename-tag.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs b/app/assets/javascripts/discourse/app/templates/modal/reorder-categories.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs rename to app/assets/javascripts/discourse/app/templates/modal/reorder-categories.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/request-group-membership-form.hbs b/app/assets/javascripts/discourse/app/templates/modal/request-group-membership-form.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/request-group-membership-form.hbs rename to app/assets/javascripts/discourse/app/templates/modal/request-group-membership-form.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs b/app/assets/javascripts/discourse/app/templates/modal/second-factor-add-security-key.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs rename to app/assets/javascripts/discourse/app/templates/modal/second-factor-add-security-key.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs b/app/assets/javascripts/discourse/app/templates/modal/second-factor-add-totp.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs rename to app/assets/javascripts/discourse/app/templates/modal/second-factor-add-totp.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs b/app/assets/javascripts/discourse/app/templates/modal/second-factor-backup-edit.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs rename to app/assets/javascripts/discourse/app/templates/modal/second-factor-backup-edit.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-edit-security-key.hbs b/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit-security-key.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/second-factor-edit-security-key.hbs rename to app/assets/javascripts/discourse/app/templates/modal/second-factor-edit-security-key.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-edit.hbs b/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/second-factor-edit.hbs rename to app/assets/javascripts/discourse/app/templates/modal/second-factor-edit.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/share-and-invite.hbs b/app/assets/javascripts/discourse/app/templates/modal/share-and-invite.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/share-and-invite.hbs rename to app/assets/javascripts/discourse/app/templates/modal/share-and-invite.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/tag-upload.hbs b/app/assets/javascripts/discourse/app/templates/modal/tag-upload.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/tag-upload.hbs rename to app/assets/javascripts/discourse/app/templates/modal/tag-upload.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs b/app/assets/javascripts/discourse/app/templates/modal/topic-bulk-actions.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs rename to app/assets/javascripts/discourse/app/templates/modal/topic-bulk-actions.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/upload-selector.hbs b/app/assets/javascripts/discourse/app/templates/modal/upload-selector.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/upload-selector.hbs rename to app/assets/javascripts/discourse/app/templates/modal/upload-selector.hbs diff --git a/app/assets/javascripts/discourse/templates/navigation/categories.hbs b/app/assets/javascripts/discourse/app/templates/navigation/categories.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/navigation/categories.hbs rename to app/assets/javascripts/discourse/app/templates/navigation/categories.hbs diff --git a/app/assets/javascripts/discourse/templates/navigation/category.hbs b/app/assets/javascripts/discourse/app/templates/navigation/category.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/navigation/category.hbs rename to app/assets/javascripts/discourse/app/templates/navigation/category.hbs diff --git a/app/assets/javascripts/discourse/templates/navigation/default.hbs b/app/assets/javascripts/discourse/app/templates/navigation/default.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/navigation/default.hbs rename to app/assets/javascripts/discourse/app/templates/navigation/default.hbs diff --git a/app/assets/javascripts/discourse/templates/outlet-list.hbs b/app/assets/javascripts/discourse/app/templates/outlet-list.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/outlet-list.hbs rename to app/assets/javascripts/discourse/app/templates/outlet-list.hbs diff --git a/app/assets/javascripts/discourse/templates/password-reset.hbs b/app/assets/javascripts/discourse/app/templates/password-reset.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/password-reset.hbs rename to app/assets/javascripts/discourse/app/templates/password-reset.hbs diff --git a/app/assets/javascripts/discourse/templates/post/poster-avatar.hbr b/app/assets/javascripts/discourse/app/templates/post/poster-avatar.hbr similarity index 100% rename from app/assets/javascripts/discourse/templates/post/poster-avatar.hbr rename to app/assets/javascripts/discourse/app/templates/post/poster-avatar.hbr diff --git a/app/assets/javascripts/discourse/templates/preferences-email.hbs b/app/assets/javascripts/discourse/app/templates/preferences-email.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/preferences-email.hbs rename to app/assets/javascripts/discourse/app/templates/preferences-email.hbs diff --git a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/preferences-second-factor.hbs rename to app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs diff --git a/app/assets/javascripts/discourse/templates/preferences-username.hbs b/app/assets/javascripts/discourse/app/templates/preferences-username.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/preferences-username.hbs rename to app/assets/javascripts/discourse/app/templates/preferences-username.hbs diff --git a/app/assets/javascripts/discourse/templates/preferences.hbs b/app/assets/javascripts/discourse/app/templates/preferences.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/preferences.hbs rename to app/assets/javascripts/discourse/app/templates/preferences.hbs diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/app/templates/preferences/account.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/preferences/account.hbs rename to app/assets/javascripts/discourse/app/templates/preferences/account.hbs diff --git a/app/assets/javascripts/discourse/templates/preferences/apps.hbs b/app/assets/javascripts/discourse/app/templates/preferences/apps.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/preferences/apps.hbs rename to app/assets/javascripts/discourse/app/templates/preferences/apps.hbs diff --git a/app/assets/javascripts/discourse/templates/preferences/categories.hbs b/app/assets/javascripts/discourse/app/templates/preferences/categories.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/preferences/categories.hbs rename to app/assets/javascripts/discourse/app/templates/preferences/categories.hbs diff --git a/app/assets/javascripts/discourse/templates/preferences/emails.hbs b/app/assets/javascripts/discourse/app/templates/preferences/emails.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/preferences/emails.hbs rename to app/assets/javascripts/discourse/app/templates/preferences/emails.hbs diff --git a/app/assets/javascripts/discourse/templates/preferences/interface.hbs b/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/preferences/interface.hbs rename to app/assets/javascripts/discourse/app/templates/preferences/interface.hbs diff --git a/app/assets/javascripts/discourse/templates/preferences/notifications.hbs b/app/assets/javascripts/discourse/app/templates/preferences/notifications.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/preferences/notifications.hbs rename to app/assets/javascripts/discourse/app/templates/preferences/notifications.hbs diff --git a/app/assets/javascripts/discourse/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/preferences/profile.hbs rename to app/assets/javascripts/discourse/app/templates/preferences/profile.hbs diff --git a/app/assets/javascripts/discourse/templates/preferences/tags.hbs b/app/assets/javascripts/discourse/app/templates/preferences/tags.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/preferences/tags.hbs rename to app/assets/javascripts/discourse/app/templates/preferences/tags.hbs diff --git a/app/assets/javascripts/discourse/templates/preferences/users.hbs b/app/assets/javascripts/discourse/app/templates/preferences/users.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/preferences/users.hbs rename to app/assets/javascripts/discourse/app/templates/preferences/users.hbs diff --git a/app/assets/javascripts/discourse/templates/review-index.hbs b/app/assets/javascripts/discourse/app/templates/review-index.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/review-index.hbs rename to app/assets/javascripts/discourse/app/templates/review-index.hbs diff --git a/app/assets/javascripts/discourse/templates/review-settings.hbs b/app/assets/javascripts/discourse/app/templates/review-settings.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/review-settings.hbs rename to app/assets/javascripts/discourse/app/templates/review-settings.hbs diff --git a/app/assets/javascripts/discourse/templates/review-show.hbs b/app/assets/javascripts/discourse/app/templates/review-show.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/review-show.hbs rename to app/assets/javascripts/discourse/app/templates/review-show.hbs diff --git a/app/assets/javascripts/discourse/templates/review-topics.hbs b/app/assets/javascripts/discourse/app/templates/review-topics.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/review-topics.hbs rename to app/assets/javascripts/discourse/app/templates/review-topics.hbs diff --git a/app/assets/javascripts/discourse/templates/review.hbs b/app/assets/javascripts/discourse/app/templates/review.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/review.hbs rename to app/assets/javascripts/discourse/app/templates/review.hbs diff --git a/app/assets/javascripts/discourse/templates/selected-posts.hbs b/app/assets/javascripts/discourse/app/templates/selected-posts.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/selected-posts.hbs rename to app/assets/javascripts/discourse/app/templates/selected-posts.hbs diff --git a/app/assets/javascripts/discourse/templates/static.hbs b/app/assets/javascripts/discourse/app/templates/static.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/static.hbs rename to app/assets/javascripts/discourse/app/templates/static.hbs diff --git a/app/assets/javascripts/discourse/templates/tag-groups-edit.hbs b/app/assets/javascripts/discourse/app/templates/tag-groups-edit.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/tag-groups-edit.hbs rename to app/assets/javascripts/discourse/app/templates/tag-groups-edit.hbs diff --git a/app/assets/javascripts/discourse/templates/tag-groups-index.hbs b/app/assets/javascripts/discourse/app/templates/tag-groups-index.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/tag-groups-index.hbs rename to app/assets/javascripts/discourse/app/templates/tag-groups-index.hbs diff --git a/app/assets/javascripts/discourse/templates/tag-groups-new.hbs b/app/assets/javascripts/discourse/app/templates/tag-groups-new.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/tag-groups-new.hbs rename to app/assets/javascripts/discourse/app/templates/tag-groups-new.hbs diff --git a/app/assets/javascripts/discourse/templates/tag-groups.hbs b/app/assets/javascripts/discourse/app/templates/tag-groups.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/tag-groups.hbs rename to app/assets/javascripts/discourse/app/templates/tag-groups.hbs diff --git a/app/assets/javascripts/discourse/templates/tags.hbs b/app/assets/javascripts/discourse/app/templates/tags.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/tags.hbs rename to app/assets/javascripts/discourse/app/templates/tags.hbs diff --git a/app/assets/javascripts/discourse/templates/tags/index.hbs b/app/assets/javascripts/discourse/app/templates/tags/index.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/tags/index.hbs rename to app/assets/javascripts/discourse/app/templates/tags/index.hbs diff --git a/app/assets/javascripts/discourse/templates/tags/show.hbs b/app/assets/javascripts/discourse/app/templates/tags/show.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/tags/show.hbs rename to app/assets/javascripts/discourse/app/templates/tags/show.hbs diff --git a/app/assets/javascripts/discourse/templates/topic-list-header-column.hbr b/app/assets/javascripts/discourse/app/templates/topic-list-header-column.hbr similarity index 100% rename from app/assets/javascripts/discourse/templates/topic-list-header-column.hbr rename to app/assets/javascripts/discourse/app/templates/topic-list-header-column.hbr diff --git a/app/assets/javascripts/discourse/templates/topic-list-header.hbr b/app/assets/javascripts/discourse/app/templates/topic-list-header.hbr similarity index 100% rename from app/assets/javascripts/discourse/templates/topic-list-header.hbr rename to app/assets/javascripts/discourse/app/templates/topic-list-header.hbr diff --git a/app/assets/javascripts/discourse/templates/topic-post-badges.hbr b/app/assets/javascripts/discourse/app/templates/topic-post-badges.hbr similarity index 100% rename from app/assets/javascripts/discourse/templates/topic-post-badges.hbr rename to app/assets/javascripts/discourse/app/templates/topic-post-badges.hbr diff --git a/app/assets/javascripts/discourse/templates/topic-status.hbr b/app/assets/javascripts/discourse/app/templates/topic-status.hbr similarity index 100% rename from app/assets/javascripts/discourse/templates/topic-status.hbr rename to app/assets/javascripts/discourse/app/templates/topic-status.hbr diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/app/templates/topic.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/topic.hbs rename to app/assets/javascripts/discourse/app/templates/topic.hbs diff --git a/app/assets/javascripts/discourse/templates/unknown.hbs b/app/assets/javascripts/discourse/app/templates/unknown.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/unknown.hbs rename to app/assets/javascripts/discourse/app/templates/unknown.hbs diff --git a/app/assets/javascripts/discourse/templates/user-card.hbs b/app/assets/javascripts/discourse/app/templates/user-card.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/user-card.hbs rename to app/assets/javascripts/discourse/app/templates/user-card.hbs diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/app/templates/user-invited-show.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/user-invited-show.hbs rename to app/assets/javascripts/discourse/app/templates/user-invited-show.hbs diff --git a/app/assets/javascripts/discourse/templates/user-private-messages-tags.hbs b/app/assets/javascripts/discourse/app/templates/user-private-messages-tags.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/user-private-messages-tags.hbs rename to app/assets/javascripts/discourse/app/templates/user-private-messages-tags.hbs diff --git a/app/assets/javascripts/discourse/templates/user-selector-autocomplete.hbr b/app/assets/javascripts/discourse/app/templates/user-selector-autocomplete.hbr similarity index 100% rename from app/assets/javascripts/discourse/templates/user-selector-autocomplete.hbr rename to app/assets/javascripts/discourse/app/templates/user-selector-autocomplete.hbr diff --git a/app/assets/javascripts/discourse/templates/user-topics-list.hbs b/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/user-topics-list.hbs rename to app/assets/javascripts/discourse/app/templates/user-topics-list.hbs diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/app/templates/user.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/user.hbs rename to app/assets/javascripts/discourse/app/templates/user.hbs diff --git a/app/assets/javascripts/discourse/templates/user/activity.hbs b/app/assets/javascripts/discourse/app/templates/user/activity.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/user/activity.hbs rename to app/assets/javascripts/discourse/app/templates/user/activity.hbs diff --git a/app/assets/javascripts/discourse/templates/user/badges.hbs b/app/assets/javascripts/discourse/app/templates/user/badges.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/user/badges.hbs rename to app/assets/javascripts/discourse/app/templates/user/badges.hbs diff --git a/app/assets/javascripts/discourse/templates/user/bookmarks.hbs b/app/assets/javascripts/discourse/app/templates/user/bookmarks.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/user/bookmarks.hbs rename to app/assets/javascripts/discourse/app/templates/user/bookmarks.hbs diff --git a/app/assets/javascripts/discourse/templates/user/messages.hbs b/app/assets/javascripts/discourse/app/templates/user/messages.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/user/messages.hbs rename to app/assets/javascripts/discourse/app/templates/user/messages.hbs diff --git a/app/assets/javascripts/discourse/templates/user/notifications-index.hbs b/app/assets/javascripts/discourse/app/templates/user/notifications-index.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/user/notifications-index.hbs rename to app/assets/javascripts/discourse/app/templates/user/notifications-index.hbs diff --git a/app/assets/javascripts/discourse/templates/user/notifications.hbs b/app/assets/javascripts/discourse/app/templates/user/notifications.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/user/notifications.hbs rename to app/assets/javascripts/discourse/app/templates/user/notifications.hbs diff --git a/app/assets/javascripts/discourse/templates/user/posts.hbs b/app/assets/javascripts/discourse/app/templates/user/posts.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/user/posts.hbs rename to app/assets/javascripts/discourse/app/templates/user/posts.hbs diff --git a/app/assets/javascripts/discourse/templates/user/profile-hidden.hbs b/app/assets/javascripts/discourse/app/templates/user/profile-hidden.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/user/profile-hidden.hbs rename to app/assets/javascripts/discourse/app/templates/user/profile-hidden.hbs diff --git a/app/assets/javascripts/discourse/templates/user/stream.hbs b/app/assets/javascripts/discourse/app/templates/user/stream.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/user/stream.hbs rename to app/assets/javascripts/discourse/app/templates/user/stream.hbs diff --git a/app/assets/javascripts/discourse/templates/user/summary.hbs b/app/assets/javascripts/discourse/app/templates/user/summary.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/user/summary.hbs rename to app/assets/javascripts/discourse/app/templates/user/summary.hbs diff --git a/app/assets/javascripts/discourse/templates/users.hbs b/app/assets/javascripts/discourse/app/templates/users.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/users.hbs rename to app/assets/javascripts/discourse/app/templates/users.hbs diff --git a/app/assets/javascripts/discourse/widgets/actions-summary.js b/app/assets/javascripts/discourse/app/widgets/actions-summary.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/actions-summary.js rename to app/assets/javascripts/discourse/app/widgets/actions-summary.js diff --git a/app/assets/javascripts/discourse/widgets/avatar-flair.js b/app/assets/javascripts/discourse/app/widgets/avatar-flair.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/avatar-flair.js rename to app/assets/javascripts/discourse/app/widgets/avatar-flair.js diff --git a/app/assets/javascripts/discourse/widgets/bookmark-reminder-notification-item.js b/app/assets/javascripts/discourse/app/widgets/bookmark-reminder-notification-item.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/bookmark-reminder-notification-item.js rename to app/assets/javascripts/discourse/app/widgets/bookmark-reminder-notification-item.js diff --git a/app/assets/javascripts/discourse/widgets/button.js b/app/assets/javascripts/discourse/app/widgets/button.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/button.js rename to app/assets/javascripts/discourse/app/widgets/button.js diff --git a/app/assets/javascripts/discourse/widgets/category-link.js b/app/assets/javascripts/discourse/app/widgets/category-link.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/category-link.js rename to app/assets/javascripts/discourse/app/widgets/category-link.js diff --git a/app/assets/javascripts/discourse/widgets/component-connector.js b/app/assets/javascripts/discourse/app/widgets/component-connector.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/component-connector.js rename to app/assets/javascripts/discourse/app/widgets/component-connector.js diff --git a/app/assets/javascripts/discourse/widgets/connector.js b/app/assets/javascripts/discourse/app/widgets/connector.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/connector.js rename to app/assets/javascripts/discourse/app/widgets/connector.js diff --git a/app/assets/javascripts/discourse/widgets/custom-notification-item.js b/app/assets/javascripts/discourse/app/widgets/custom-notification-item.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/custom-notification-item.js rename to app/assets/javascripts/discourse/app/widgets/custom-notification-item.js diff --git a/app/assets/javascripts/discourse/widgets/decorator-helper.js b/app/assets/javascripts/discourse/app/widgets/decorator-helper.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/decorator-helper.js rename to app/assets/javascripts/discourse/app/widgets/decorator-helper.js diff --git a/app/assets/javascripts/discourse/widgets/default-notification-item.js b/app/assets/javascripts/discourse/app/widgets/default-notification-item.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/default-notification-item.js rename to app/assets/javascripts/discourse/app/widgets/default-notification-item.js diff --git a/app/assets/javascripts/discourse/widgets/discourse-tags.js b/app/assets/javascripts/discourse/app/widgets/discourse-tags.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/discourse-tags.js rename to app/assets/javascripts/discourse/app/widgets/discourse-tags.js diff --git a/app/assets/javascripts/discourse/widgets/embedded-post.js b/app/assets/javascripts/discourse/app/widgets/embedded-post.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/embedded-post.js rename to app/assets/javascripts/discourse/app/widgets/embedded-post.js diff --git a/app/assets/javascripts/discourse/widgets/emoji.js b/app/assets/javascripts/discourse/app/widgets/emoji.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/emoji.js rename to app/assets/javascripts/discourse/app/widgets/emoji.js diff --git a/app/assets/javascripts/discourse/widgets/footer-nav.js b/app/assets/javascripts/discourse/app/widgets/footer-nav.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/footer-nav.js rename to app/assets/javascripts/discourse/app/widgets/footer-nav.js diff --git a/app/assets/javascripts/discourse/widgets/glue.js b/app/assets/javascripts/discourse/app/widgets/glue.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/glue.js rename to app/assets/javascripts/discourse/app/widgets/glue.js diff --git a/app/assets/javascripts/discourse/widgets/group-message-summary-notification-item.js b/app/assets/javascripts/discourse/app/widgets/group-message-summary-notification-item.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/group-message-summary-notification-item.js rename to app/assets/javascripts/discourse/app/widgets/group-message-summary-notification-item.js diff --git a/app/assets/javascripts/discourse/widgets/hamburger-categories.js b/app/assets/javascripts/discourse/app/widgets/hamburger-categories.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/hamburger-categories.js rename to app/assets/javascripts/discourse/app/widgets/hamburger-categories.js diff --git a/app/assets/javascripts/discourse/widgets/hamburger-menu.js b/app/assets/javascripts/discourse/app/widgets/hamburger-menu.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/hamburger-menu.js rename to app/assets/javascripts/discourse/app/widgets/hamburger-menu.js diff --git a/app/assets/javascripts/discourse/widgets/hbs-compiler.js b/app/assets/javascripts/discourse/app/widgets/hbs-compiler.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/hbs-compiler.js rename to app/assets/javascripts/discourse/app/widgets/hbs-compiler.js diff --git a/app/assets/javascripts/discourse/widgets/header-contents.js b/app/assets/javascripts/discourse/app/widgets/header-contents.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/header-contents.js rename to app/assets/javascripts/discourse/app/widgets/header-contents.js diff --git a/app/assets/javascripts/discourse/widgets/header-topic-info.js b/app/assets/javascripts/discourse/app/widgets/header-topic-info.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/header-topic-info.js rename to app/assets/javascripts/discourse/app/widgets/header-topic-info.js diff --git a/app/assets/javascripts/discourse/widgets/header.js b/app/assets/javascripts/discourse/app/widgets/header.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/header.js rename to app/assets/javascripts/discourse/app/widgets/header.js diff --git a/app/assets/javascripts/discourse/widgets/home-logo.js b/app/assets/javascripts/discourse/app/widgets/home-logo.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/home-logo.js rename to app/assets/javascripts/discourse/app/widgets/home-logo.js diff --git a/app/assets/javascripts/discourse/widgets/hooks.js b/app/assets/javascripts/discourse/app/widgets/hooks.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/hooks.js rename to app/assets/javascripts/discourse/app/widgets/hooks.js diff --git a/app/assets/javascripts/discourse/widgets/invitee-accepted-notification-item.js b/app/assets/javascripts/discourse/app/widgets/invitee-accepted-notification-item.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/invitee-accepted-notification-item.js rename to app/assets/javascripts/discourse/app/widgets/invitee-accepted-notification-item.js diff --git a/app/assets/javascripts/discourse/widgets/liked-consolidated-notification-item.js b/app/assets/javascripts/discourse/app/widgets/liked-consolidated-notification-item.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/liked-consolidated-notification-item.js rename to app/assets/javascripts/discourse/app/widgets/liked-consolidated-notification-item.js diff --git a/app/assets/javascripts/discourse/widgets/liked-notification-item.js b/app/assets/javascripts/discourse/app/widgets/liked-notification-item.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/liked-notification-item.js rename to app/assets/javascripts/discourse/app/widgets/liked-notification-item.js diff --git a/app/assets/javascripts/discourse/widgets/link.js b/app/assets/javascripts/discourse/app/widgets/link.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/link.js rename to app/assets/javascripts/discourse/app/widgets/link.js diff --git a/app/assets/javascripts/discourse/widgets/membership-request-accepted-notification-item.js b/app/assets/javascripts/discourse/app/widgets/membership-request-accepted-notification-item.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/membership-request-accepted-notification-item.js rename to app/assets/javascripts/discourse/app/widgets/membership-request-accepted-notification-item.js diff --git a/app/assets/javascripts/discourse/widgets/membership-request-consolidated-notification-item.js b/app/assets/javascripts/discourse/app/widgets/membership-request-consolidated-notification-item.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/membership-request-consolidated-notification-item.js rename to app/assets/javascripts/discourse/app/widgets/membership-request-consolidated-notification-item.js diff --git a/app/assets/javascripts/discourse/widgets/menu-panel.js b/app/assets/javascripts/discourse/app/widgets/menu-panel.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/menu-panel.js rename to app/assets/javascripts/discourse/app/widgets/menu-panel.js diff --git a/app/assets/javascripts/discourse/widgets/post-admin-menu.js b/app/assets/javascripts/discourse/app/widgets/post-admin-menu.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/post-admin-menu.js rename to app/assets/javascripts/discourse/app/widgets/post-admin-menu.js diff --git a/app/assets/javascripts/discourse/widgets/post-cooked.js b/app/assets/javascripts/discourse/app/widgets/post-cooked.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/post-cooked.js rename to app/assets/javascripts/discourse/app/widgets/post-cooked.js diff --git a/app/assets/javascripts/discourse/widgets/post-edits-indicator.js b/app/assets/javascripts/discourse/app/widgets/post-edits-indicator.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/post-edits-indicator.js rename to app/assets/javascripts/discourse/app/widgets/post-edits-indicator.js diff --git a/app/assets/javascripts/discourse/widgets/post-gap.js b/app/assets/javascripts/discourse/app/widgets/post-gap.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/post-gap.js rename to app/assets/javascripts/discourse/app/widgets/post-gap.js diff --git a/app/assets/javascripts/discourse/widgets/post-links.js b/app/assets/javascripts/discourse/app/widgets/post-links.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/post-links.js rename to app/assets/javascripts/discourse/app/widgets/post-links.js diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js b/app/assets/javascripts/discourse/app/widgets/post-menu.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/post-menu.js rename to app/assets/javascripts/discourse/app/widgets/post-menu.js diff --git a/app/assets/javascripts/discourse/widgets/post-placeholder.js b/app/assets/javascripts/discourse/app/widgets/post-placeholder.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/post-placeholder.js rename to app/assets/javascripts/discourse/app/widgets/post-placeholder.js diff --git a/app/assets/javascripts/discourse/widgets/post-small-action.js b/app/assets/javascripts/discourse/app/widgets/post-small-action.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/post-small-action.js rename to app/assets/javascripts/discourse/app/widgets/post-small-action.js diff --git a/app/assets/javascripts/discourse/widgets/post-stream.js b/app/assets/javascripts/discourse/app/widgets/post-stream.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/post-stream.js rename to app/assets/javascripts/discourse/app/widgets/post-stream.js diff --git a/app/assets/javascripts/discourse/widgets/post.js b/app/assets/javascripts/discourse/app/widgets/post.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/post.js rename to app/assets/javascripts/discourse/app/widgets/post.js diff --git a/app/assets/javascripts/discourse/widgets/poster-name.js b/app/assets/javascripts/discourse/app/widgets/poster-name.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/poster-name.js rename to app/assets/javascripts/discourse/app/widgets/poster-name.js diff --git a/app/assets/javascripts/discourse/widgets/private-message-map.js b/app/assets/javascripts/discourse/app/widgets/private-message-map.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/private-message-map.js rename to app/assets/javascripts/discourse/app/widgets/private-message-map.js diff --git a/app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js b/app/assets/javascripts/discourse/app/widgets/quick-access-bookmarks.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js rename to app/assets/javascripts/discourse/app/widgets/quick-access-bookmarks.js diff --git a/app/assets/javascripts/discourse/widgets/quick-access-item.js b/app/assets/javascripts/discourse/app/widgets/quick-access-item.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/quick-access-item.js rename to app/assets/javascripts/discourse/app/widgets/quick-access-item.js diff --git a/app/assets/javascripts/discourse/widgets/quick-access-messages.js b/app/assets/javascripts/discourse/app/widgets/quick-access-messages.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/quick-access-messages.js rename to app/assets/javascripts/discourse/app/widgets/quick-access-messages.js diff --git a/app/assets/javascripts/discourse/widgets/quick-access-notifications.js b/app/assets/javascripts/discourse/app/widgets/quick-access-notifications.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/quick-access-notifications.js rename to app/assets/javascripts/discourse/app/widgets/quick-access-notifications.js diff --git a/app/assets/javascripts/discourse/widgets/quick-access-panel.js b/app/assets/javascripts/discourse/app/widgets/quick-access-panel.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/quick-access-panel.js rename to app/assets/javascripts/discourse/app/widgets/quick-access-panel.js diff --git a/app/assets/javascripts/discourse/widgets/quick-access-profile.js b/app/assets/javascripts/discourse/app/widgets/quick-access-profile.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/quick-access-profile.js rename to app/assets/javascripts/discourse/app/widgets/quick-access-profile.js diff --git a/app/assets/javascripts/discourse/widgets/raw-html.js b/app/assets/javascripts/discourse/app/widgets/raw-html.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/raw-html.js rename to app/assets/javascripts/discourse/app/widgets/raw-html.js diff --git a/app/assets/javascripts/discourse/widgets/search-menu-controls.js b/app/assets/javascripts/discourse/app/widgets/search-menu-controls.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/search-menu-controls.js rename to app/assets/javascripts/discourse/app/widgets/search-menu-controls.js diff --git a/app/assets/javascripts/discourse/widgets/search-menu-results.js b/app/assets/javascripts/discourse/app/widgets/search-menu-results.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/search-menu-results.js rename to app/assets/javascripts/discourse/app/widgets/search-menu-results.js diff --git a/app/assets/javascripts/discourse/widgets/search-menu.js b/app/assets/javascripts/discourse/app/widgets/search-menu.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/search-menu.js rename to app/assets/javascripts/discourse/app/widgets/search-menu.js diff --git a/app/assets/javascripts/discourse/widgets/time-gap.js b/app/assets/javascripts/discourse/app/widgets/time-gap.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/time-gap.js rename to app/assets/javascripts/discourse/app/widgets/time-gap.js diff --git a/app/assets/javascripts/discourse/widgets/toggle-topic-summary.js b/app/assets/javascripts/discourse/app/widgets/toggle-topic-summary.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/toggle-topic-summary.js rename to app/assets/javascripts/discourse/app/widgets/toggle-topic-summary.js diff --git a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js b/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/topic-admin-menu.js rename to app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js diff --git a/app/assets/javascripts/discourse/widgets/topic-map.js b/app/assets/javascripts/discourse/app/widgets/topic-map.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/topic-map.js rename to app/assets/javascripts/discourse/app/widgets/topic-map.js diff --git a/app/assets/javascripts/discourse/widgets/topic-status.js b/app/assets/javascripts/discourse/app/widgets/topic-status.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/topic-status.js rename to app/assets/javascripts/discourse/app/widgets/topic-status.js diff --git a/app/assets/javascripts/discourse/widgets/topic-timeline.js b/app/assets/javascripts/discourse/app/widgets/topic-timeline.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/topic-timeline.js rename to app/assets/javascripts/discourse/app/widgets/topic-timeline.js diff --git a/app/assets/javascripts/discourse/widgets/user-menu.js b/app/assets/javascripts/discourse/app/widgets/user-menu.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/user-menu.js rename to app/assets/javascripts/discourse/app/widgets/user-menu.js diff --git a/app/assets/javascripts/discourse/widgets/user-notifications-large.js b/app/assets/javascripts/discourse/app/widgets/user-notifications-large.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/user-notifications-large.js rename to app/assets/javascripts/discourse/app/widgets/user-notifications-large.js diff --git a/app/assets/javascripts/discourse/widgets/widget-dropdown.js b/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/widget-dropdown.js rename to app/assets/javascripts/discourse/app/widgets/widget-dropdown.js diff --git a/app/assets/javascripts/discourse/widgets/widget.js b/app/assets/javascripts/discourse/app/widgets/widget.js similarity index 100% rename from app/assets/javascripts/discourse/widgets/widget.js rename to app/assets/javascripts/discourse/app/widgets/widget.js diff --git a/app/assets/javascripts/main_include_admin.js b/app/assets/javascripts/main_include_admin.js index 6dd3680ad5..bf7f2d9de2 100644 --- a/app/assets/javascripts/main_include_admin.js +++ b/app/assets/javascripts/main_include_admin.js @@ -6,7 +6,7 @@ //= require admin/models/tl3-requirements //= require admin/models/admin-user //= require_tree ./admin/models -//= require discourse/lib/export-result +//= require discourse/app/lib/export-result //= require_tree ./admin //= require resumable.js diff --git a/app/views/users_email/show_confirm_new_email.html.erb b/app/views/users_email/show_confirm_new_email.html.erb index a1e0eda56e..45a3f2a7d2 100644 --- a/app/views/users_email/show_confirm_new_email.html.erb +++ b/app/views/users_email/show_confirm_new_email.html.erb @@ -76,7 +76,7 @@ <%= preload_script "ember_jquery" %> <%= preload_script "locales/#{I18n.locale}" %> <%= preload_script "locales/i18n" %> - <%= preload_script "discourse/lib/webauthn" %> + <%= preload_script "discourse/app/lib/webauthn" %> <%= preload_script "confirm-new-email/confirm-new-email" %> <%= preload_script "confirm-new-email/bootstrap" %> diff --git a/config/application.rb b/config/application.rb index bad76c94f6..4afdad9292 100644 --- a/config/application.rb +++ b/config/application.rb @@ -153,7 +153,7 @@ module Discourse auto-redirect.js wizard-start.js locales/i18n.js - discourse/lib/webauthn.js + discourse/app/lib/webauthn.js confirm-new-email/confirm-new-email.js confirm-new-email/bootstrap.js onpopstate-handler.js @@ -238,8 +238,8 @@ module Discourse require 'middleware/discourse_public_exceptions' config.exceptions_app = Middleware::DiscoursePublicExceptions.new(Rails.public_path) - # Our templates shouldn't start with 'discourse/templates' - config.handlebars.templates_root = 'discourse/templates' + # Our templates shouldn't start with 'discourse/app/templates' + config.handlebars.templates_root = 'discourse/app/templates' config.handlebars.raw_template_namespace = "Discourse.RAW_TEMPLATES" Sprockets.register_mime_type 'text/x-handlebars', extensions: ['.hbr'] Sprockets.register_transformer 'text/x-handlebars', 'application/javascript', Ember::Handlebars::Template diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb index 6d56af7098..e9735d3eea 100644 --- a/lib/discourse_js_processor.rb +++ b/lib/discourse_js_processor.rb @@ -161,7 +161,8 @@ JS path = "discourse/plugins/#{plugin.name}/#{logical_path.sub(/javascripts\//, '')}" if plugin end - path || logical_path + # We need to strip the app subdirectory to replicate how ember-cli works. + path || logical_path&.gsub('app/', '') end end diff --git a/lib/freedom_patches/raw_handlebars.rb b/lib/freedom_patches/raw_handlebars.rb index 0f4a0bd8f7..7a02f1209d 100644 --- a/lib/freedom_patches/raw_handlebars.rb +++ b/lib/freedom_patches/raw_handlebars.rb @@ -65,7 +65,11 @@ class Ember::Handlebars::Template end def global_template_target(namespace, module_name, config) - "#{namespace}[#{template_path(module_name, config).inspect}]" + # We need this for backward-compatibility reasons. + # Plugins may not have an app subdirectory. + path = template_path(module_name, config).inspect.gsub('discourse/templates/', '') + + "#{namespace}[#{path}]" end # FIXME: Previously, ember-handlebars-templates uses the logical path which incorrectly diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb index d29f4e84ee..0843f32348 100644 --- a/lib/pretty_text.rb +++ b/lib/pretty_text.rb @@ -81,8 +81,8 @@ module PrettyText ctx_load_manifest(ctx, "markdown-it-bundle.js") root_path = "#{Rails.root}/app/assets/javascripts/" - apply_es6_file(ctx, root_path, "discourse/lib/to-markdown") - apply_es6_file(ctx, root_path, "discourse/lib/utilities") + apply_es6_file(ctx, root_path, "discourse/app/lib/to-markdown") + apply_es6_file(ctx, root_path, "discourse/app/lib/utilities") PrettyText::Helpers.instance_methods.each do |method| ctx.attach("__helpers.#{method}", PrettyText::Helpers.method(method))