diff --git a/web/src/add_stream_options_popover.ts b/web/src/add_stream_options_popover.ts
index 77a223b8ad..bf596bad56 100644
--- a/web/src/add_stream_options_popover.ts
+++ b/web/src/add_stream_options_popover.ts
@@ -2,7 +2,7 @@ import $ from "jquery";
 import assert from "minimalistic-assert";
 import type {ReferenceElement} from "tippy.js";
 
-import render_left_sidebar_stream_setting_popover from "../templates/popovers/left_sidebar_stream_setting_popover.hbs";
+import render_left_sidebar_stream_setting_popover from "../templates/popovers/left_sidebar/left_sidebar_stream_setting_popover.hbs";
 
 import * as popover_menus from "./popover_menus";
 import * as settings_data from "./settings_data";
diff --git a/web/src/left_sidebar_navigation_area_popovers.js b/web/src/left_sidebar_navigation_area_popovers.js
index ca434363a5..7b09433fb2 100644
--- a/web/src/left_sidebar_navigation_area_popovers.js
+++ b/web/src/left_sidebar_navigation_area_popovers.js
@@ -1,11 +1,11 @@
 import $ from "jquery";
 
-import render_left_sidebar_all_messages_popover from "../templates/popovers/left_sidebar_all_messages_popover.hbs";
-import render_left_sidebar_condensed_views_popover from "../templates/popovers/left_sidebar_condensed_views_popover.hbs";
-import render_left_sidebar_drafts_popover from "../templates/popovers/left_sidebar_drafts_popover.hbs";
-import render_left_sidebar_inbox_popover from "../templates/popovers/left_sidebar_inbox_popover.hbs";
-import render_left_sidebar_recent_view_popover from "../templates/popovers/left_sidebar_recent_view_popover.hbs";
-import render_left_sidebar_starred_messages_popover from "../templates/popovers/left_sidebar_starred_messages_popover.hbs";
+import render_left_sidebar_all_messages_popover from "../templates/popovers/left_sidebar/left_sidebar_all_messages_popover.hbs";
+import render_left_sidebar_condensed_views_popover from "../templates/popovers/left_sidebar/left_sidebar_condensed_views_popover.hbs";
+import render_left_sidebar_drafts_popover from "../templates/popovers/left_sidebar/left_sidebar_drafts_popover.hbs";
+import render_left_sidebar_inbox_popover from "../templates/popovers/left_sidebar/left_sidebar_inbox_popover.hbs";
+import render_left_sidebar_recent_view_popover from "../templates/popovers/left_sidebar/left_sidebar_recent_view_popover.hbs";
+import render_left_sidebar_starred_messages_popover from "../templates/popovers/left_sidebar/left_sidebar_starred_messages_popover.hbs";
 
 import * as channel from "./channel";
 import * as drafts from "./drafts";
diff --git a/web/src/stream_popover.js b/web/src/stream_popover.js
index fa7659c84d..486209a330 100644
--- a/web/src/stream_popover.js
+++ b/web/src/stream_popover.js
@@ -3,7 +3,7 @@ import assert from "minimalistic-assert";
 
 import render_inline_decorated_stream_name from "../templates/inline_decorated_stream_name.hbs";
 import render_move_topic_to_stream from "../templates/move_topic_to_stream.hbs";
-import render_left_sidebar_stream_actions_popover from "../templates/popovers/left_sidebar_stream_actions_popover.hbs";
+import render_left_sidebar_stream_actions_popover from "../templates/popovers/left_sidebar/left_sidebar_stream_actions_popover.hbs";
 
 import * as blueslip from "./blueslip";
 import * as browser_history from "./browser_history";
diff --git a/web/src/topic_popover.js b/web/src/topic_popover.js
index c99b7e4b7e..5d4833138a 100644
--- a/web/src/topic_popover.js
+++ b/web/src/topic_popover.js
@@ -2,7 +2,7 @@ import ClipboardJS from "clipboard";
 import $ from "jquery";
 
 import render_delete_topic_modal from "../templates/confirm_dialog/confirm_delete_topic.hbs";
-import render_left_sidebar_topic_actions_popover from "../templates/popovers/left_sidebar_topic_actions_popover.hbs";
+import render_left_sidebar_topic_actions_popover from "../templates/popovers/left_sidebar/left_sidebar_topic_actions_popover.hbs";
 
 import * as confirm_dialog from "./confirm_dialog";
 import {$t_html} from "./i18n";
diff --git a/web/templates/popovers/left_sidebar_all_messages_popover.hbs b/web/templates/popovers/left_sidebar/left_sidebar_all_messages_popover.hbs
similarity index 100%
rename from web/templates/popovers/left_sidebar_all_messages_popover.hbs
rename to web/templates/popovers/left_sidebar/left_sidebar_all_messages_popover.hbs
diff --git a/web/templates/popovers/left_sidebar_condensed_views_popover.hbs b/web/templates/popovers/left_sidebar/left_sidebar_condensed_views_popover.hbs
similarity index 100%
rename from web/templates/popovers/left_sidebar_condensed_views_popover.hbs
rename to web/templates/popovers/left_sidebar/left_sidebar_condensed_views_popover.hbs
diff --git a/web/templates/popovers/left_sidebar_drafts_popover.hbs b/web/templates/popovers/left_sidebar/left_sidebar_drafts_popover.hbs
similarity index 100%
rename from web/templates/popovers/left_sidebar_drafts_popover.hbs
rename to web/templates/popovers/left_sidebar/left_sidebar_drafts_popover.hbs
diff --git a/web/templates/popovers/left_sidebar_inbox_popover.hbs b/web/templates/popovers/left_sidebar/left_sidebar_inbox_popover.hbs
similarity index 100%
rename from web/templates/popovers/left_sidebar_inbox_popover.hbs
rename to web/templates/popovers/left_sidebar/left_sidebar_inbox_popover.hbs
diff --git a/web/templates/popovers/left_sidebar_recent_view_popover.hbs b/web/templates/popovers/left_sidebar/left_sidebar_recent_view_popover.hbs
similarity index 100%
rename from web/templates/popovers/left_sidebar_recent_view_popover.hbs
rename to web/templates/popovers/left_sidebar/left_sidebar_recent_view_popover.hbs
diff --git a/web/templates/popovers/left_sidebar_starred_messages_popover.hbs b/web/templates/popovers/left_sidebar/left_sidebar_starred_messages_popover.hbs
similarity index 100%
rename from web/templates/popovers/left_sidebar_starred_messages_popover.hbs
rename to web/templates/popovers/left_sidebar/left_sidebar_starred_messages_popover.hbs
diff --git a/web/templates/popovers/left_sidebar_stream_actions_popover.hbs b/web/templates/popovers/left_sidebar/left_sidebar_stream_actions_popover.hbs
similarity index 98%
rename from web/templates/popovers/left_sidebar_stream_actions_popover.hbs
rename to web/templates/popovers/left_sidebar/left_sidebar_stream_actions_popover.hbs
index 83bb6eea02..fd5cbce2ab 100644
--- a/web/templates/popovers/left_sidebar_stream_actions_popover.hbs
+++ b/web/templates/popovers/left_sidebar/left_sidebar_stream_actions_popover.hbs
@@ -5,7 +5,7 @@
             <ul class="popover-menu-inner-list">
                 <li class="popover-stream-header text-item popover-menu-inner-list-item">
                     <span class="stream-privacy-original-color-{{stream.stream_id}} stream-privacy filter-icon" style="color: {{stream.color}}">
-                        {{> ../stream_privacy
+                        {{> ../../stream_privacy
                           invite_only=stream.invite_only
                           is_web_public=stream.is_web_public }}
                     </span>
diff --git a/web/templates/popovers/left_sidebar_stream_setting_popover.hbs b/web/templates/popovers/left_sidebar/left_sidebar_stream_setting_popover.hbs
similarity index 100%
rename from web/templates/popovers/left_sidebar_stream_setting_popover.hbs
rename to web/templates/popovers/left_sidebar/left_sidebar_stream_setting_popover.hbs
diff --git a/web/templates/popovers/left_sidebar_topic_actions_popover.hbs b/web/templates/popovers/left_sidebar/left_sidebar_topic_actions_popover.hbs
similarity index 100%
rename from web/templates/popovers/left_sidebar_topic_actions_popover.hbs
rename to web/templates/popovers/left_sidebar/left_sidebar_topic_actions_popover.hbs