Refactor navigation sidebar directory structure

Because navigation panel and navigation toggle live outside the header and body, we place both components in their own navigation sidebar directory

packages/edit-site/src/components/editor/index.js

@@ -38,8 +38,7 @@ import KeyboardShortcuts from '../keyboard-shortcuts';
 import GlobalStylesProvider from './global-styles-provider';
 import LeftSidebar from '../left-sidebar';
 // TODO: Refactor directory and file structure
-import NavigationPanel from '../left-sidebar/navigation-panel';
-import NavigationToggle from '../header/navigation-toggle';
+import NavigationSidebar from '../navigation-sidebar';
 
 const interfaceLabels = {
 	leftSidebar: __( 'Block Library' ),
@@ -204,21 +203,19 @@ function Editor() {
 											<InterfaceSkeleton
 												labels={ interfaceLabels }
 												navigationSidebar={
-													<>
-														<NavigationToggle
-															isOpen={
-																isNavigationOpen
-															}
-															onClick={ () =>
-																toggleLeftSidebarContent(
-																	'navigation'
-																)
-															}
-														/>
-														{ isNavigationOpen && (
-															<NavigationPanel />
-														) }
-													</>
+													<NavigationSidebar
+														content={
+															leftSidebarContent
+														}
+														isOpen={
+															isNavigationOpen
+														}
+														onNavigationToggle={ () =>
+															toggleLeftSidebarContent(
+																'navigation'
+															)
+														}
+													/>
 												}
 												leftSidebar={
 													<LeftSidebar

packages/edit-site/src/components/left-sidebar/index.js

@@ -3,12 +3,7 @@
  */
 import InserterPanel from './inserter-panel';
 
-// TODO: Remove remnants of conditional rendering for nav sidebar
 const LeftSidebar = ( { content, setContent } ) => {
-	// if ( content === 'navigation' ) {
-	// 	return <NavigationPanel />;
-	// }
-
 	if ( content === 'inserter' ) {
 		return <InserterPanel closeInserter={ () => setContent( null ) } />;
 	}

packages/edit-site/src/components/navigation-sidebar/index.js

@@ -0,0 +1,19 @@
+/**
+ * Internal dependencies
+ */
+import NavigationPanel from './navigation-panel';
+import NavigationToggle from './navigation-toggle';
+
+const NavigationSidebar = ( { content, isOpen, onNavigationToggle } ) => {
+	return (
+		<>
+			<NavigationToggle
+				isOpen={ isOpen }
+				onClick={ onNavigationToggle }
+			/>
+			{ content === 'navigation' && isOpen && <NavigationPanel /> }
+		</>
+	);
+};
+
+export default NavigationSidebar;