diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index ab85796b3c2..ba7130d10ee 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -53,5 +53,5 @@ ce3fe2f4c4ddf166949ee3cec3d9ecbf9108ab52
 # DEV: Tidy up imports. (#11364)
 1c2358ba162eb9f9ba9095c9afe30cf51dd85e04
 
-# DEV: Sort imports alphabetically (#11382) 
+# DEV: Sort imports alphabetically (#11382)
 bbe5d8d5cf1220165842985c0e2cd4c454d501cd
diff --git a/app/assets/javascripts/discourse/app/templates/components/sidebar.hbs b/app/assets/javascripts/discourse/app/components/sidebar.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/sidebar.hbs
rename to app/assets/javascripts/discourse/app/components/sidebar.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/sidebar/categories-section.hbs b/app/assets/javascripts/discourse/app/components/sidebar/categories-section.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/sidebar/categories-section.hbs
rename to app/assets/javascripts/discourse/app/components/sidebar/categories-section.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/sidebar/community-section.hbs b/app/assets/javascripts/discourse/app/components/sidebar/community-section.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/sidebar/community-section.hbs
rename to app/assets/javascripts/discourse/app/components/sidebar/community-section.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/sidebar/footer.hbs b/app/assets/javascripts/discourse/app/components/sidebar/footer.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/sidebar/footer.hbs
rename to app/assets/javascripts/discourse/app/components/sidebar/footer.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/sidebar/hamburger-dropdown.hbs b/app/assets/javascripts/discourse/app/components/sidebar/hamburger-dropdown.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/sidebar/hamburger-dropdown.hbs
rename to app/assets/javascripts/discourse/app/components/sidebar/hamburger-dropdown.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/sidebar/header-sidebar-toggle.hbs b/app/assets/javascripts/discourse/app/components/sidebar/header-sidebar-toggle.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/sidebar/header-sidebar-toggle.hbs
rename to app/assets/javascripts/discourse/app/components/sidebar/header-sidebar-toggle.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/sidebar/messages-section.hbs b/app/assets/javascripts/discourse/app/components/sidebar/messages-section.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/sidebar/messages-section.hbs
rename to app/assets/javascripts/discourse/app/components/sidebar/messages-section.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/sidebar/more-section-link.hbs b/app/assets/javascripts/discourse/app/components/sidebar/more-section-link.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/sidebar/more-section-link.hbs
rename to app/assets/javascripts/discourse/app/components/sidebar/more-section-link.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/sidebar/more-section-links.hbs b/app/assets/javascripts/discourse/app/components/sidebar/more-section-links.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/sidebar/more-section-links.hbs
rename to app/assets/javascripts/discourse/app/components/sidebar/more-section-links.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/sidebar/section-link.hbs b/app/assets/javascripts/discourse/app/components/sidebar/section-link.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/sidebar/section-link.hbs
rename to app/assets/javascripts/discourse/app/components/sidebar/section-link.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/sidebar/section-message.hbs b/app/assets/javascripts/discourse/app/components/sidebar/section-message.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/sidebar/section-message.hbs
rename to app/assets/javascripts/discourse/app/components/sidebar/section-message.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/sidebar/section.hbs b/app/assets/javascripts/discourse/app/components/sidebar/section.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/sidebar/section.hbs
rename to app/assets/javascripts/discourse/app/components/sidebar/section.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/sidebar/sections.hbs b/app/assets/javascripts/discourse/app/components/sidebar/sections.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/sidebar/sections.hbs
rename to app/assets/javascripts/discourse/app/components/sidebar/sections.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/sidebar/tags-section.hbs b/app/assets/javascripts/discourse/app/components/sidebar/tags-section.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/sidebar/tags-section.hbs
rename to app/assets/javascripts/discourse/app/components/sidebar/tags-section.hbs