diff --git a/web/app.react.js b/web/app.react.js
--- a/web/app.react.js
+++ b/web/app.react.js
@@ -39,6 +39,8 @@
 import LoadingIndicator from './loading-indicator.react.js';
 import { MenuProvider } from './menu-provider.react.js';
 import UpdateModalHandler from './modals/update-modal.react.js';
+import SettingsSwitcher from './navigation-panels/settings-switcher.react.js';
+import Topbar from './navigation-panels/topbar.react.js';
 import { updateNavInfoActionType } from './redux/action-types.js';
 import DeviceIDUpdater from './redux/device-id-updater.js';
 import DisconnectedBarVisibilityHandler from './redux/disconnected-bar-visibility-handler.js';
@@ -51,12 +53,10 @@
 import AccountSettings from './settings/account-settings.react.js';
 import DangerZone from './settings/danger-zone.react.js';
 import CommunityPicker from './sidebar/community-picker.react.js';
-import SettingsSwitcher from './sidebar/settings-switcher.react.js';
 import Splash from './splash/splash.react.js';
 import './typography.css';
 import css from './style.css';
 import getTitle from './title/getTitle.js';
-import Topbar from './topbar/topbar.react.js';
 import { type NavInfo } from './types/nav-types.js';
 import { canonicalURLFromReduxState, navInfoFromURL } from './url-utils.js';
 import { WagmiENSCacheProvider, wagmiClient } from './utils/wagmi-utils.js';
diff --git a/web/topbar/app-switcher.react.js b/web/navigation-panels/app-switcher.react.js
rename from web/topbar/app-switcher.react.js
rename to web/navigation-panels/app-switcher.react.js
--- a/web/topbar/app-switcher.react.js
+++ b/web/navigation-panels/app-switcher.react.js
@@ -9,11 +9,11 @@
   unreadCount,
 } from 'lib/selectors/thread-selectors.js';
 
+import NavigationPanel from './navigation-panel.react.js';
 import css from './topbar.css';
 import { updateNavInfoActionType } from '../redux/action-types.js';
 import { useSelector } from '../redux/redux-utils.js';
 import { navTabSelector } from '../selectors/nav-selectors.js';
-import NavigationPanel from '../sidebar/navigation-panel.react.js';
 
 function AppSwitcher(): React.Node {
   const activeChatThreadID = useSelector(
diff --git a/web/sidebar/navigation-panel.react.js b/web/navigation-panels/navigation-panel.react.js
rename from web/sidebar/navigation-panel.react.js
rename to web/navigation-panels/navigation-panel.react.js
--- a/web/sidebar/navigation-panel.react.js
+++ b/web/navigation-panels/navigation-panel.react.js
@@ -3,10 +3,10 @@
 import classNames from 'classnames';
 import * as React from 'react';
 
-import verticalCSS from './left-layout-aside.css';
+import verticalCSS from './settings-switcher.css';
+import horizontalCSS from './topbar.css';
 import type { AppState } from '../redux/redux-setup.js';
 import { useSelector } from '../redux/redux-utils.js';
-import horizontalCSS from '../topbar/topbar.css';
 
 type NavigationPanelItemProps = {
   +tab: string,
diff --git a/web/sidebar/left-layout-aside.css b/web/navigation-panels/settings-switcher.css
rename from web/sidebar/left-layout-aside.css
rename to web/navigation-panels/settings-switcher.css
diff --git a/web/sidebar/settings-switcher.react.js b/web/navigation-panels/settings-switcher.react.js
rename from web/sidebar/settings-switcher.react.js
rename to web/navigation-panels/settings-switcher.react.js
--- a/web/sidebar/settings-switcher.react.js
+++ b/web/navigation-panels/settings-switcher.react.js
@@ -3,8 +3,8 @@
 import * as React from 'react';
 import { useDispatch } from 'react-redux';
 
-import css from './left-layout-aside.css';
 import NavigationPanel from './navigation-panel.react.js';
+import css from './settings-switcher.css';
 import { updateNavInfoActionType } from '../redux/action-types.js';
 import { navSettingsSectionSelector } from '../selectors/nav-selectors.js';
 
diff --git a/web/topbar/topbar.css b/web/navigation-panels/topbar.css
rename from web/topbar/topbar.css
rename to web/navigation-panels/topbar.css
diff --git a/web/topbar/topbar.react.js b/web/navigation-panels/topbar.react.js
rename from web/topbar/topbar.react.js
rename to web/navigation-panels/topbar.react.js