diff --git a/docs/src/COMPONENT_API.json b/docs/src/COMPONENT_API.json
index 57038afb..6628b170 100644
--- a/docs/src/COMPONENT_API.json
+++ b/docs/src/COMPONENT_API.json
@@ -4336,7 +4336,7 @@
     },
     {
       "moduleName": "Header",
-      "filePath": "src/UIShell/GlobalHeader/Header.svelte",
+      "filePath": "src/UIShell/Header.svelte",
       "props": [
         {
           "name": "expandedByDefault",
@@ -4472,7 +4472,7 @@
     },
     {
       "moduleName": "HeaderAction",
-      "filePath": "src/UIShell/GlobalHeader/HeaderAction.svelte",
+      "filePath": "src/UIShell/HeaderAction.svelte",
       "props": [
         {
           "name": "isOpen",
@@ -4569,7 +4569,7 @@
     },
     {
       "moduleName": "HeaderActionLink",
-      "filePath": "src/UIShell/GlobalHeader/HeaderActionLink.svelte",
+      "filePath": "src/UIShell/HeaderActionLink.svelte",
       "props": [
         {
           "name": "linkIsActive",
@@ -4679,7 +4679,7 @@
     },
     {
       "moduleName": "HeaderNav",
-      "filePath": "src/UIShell/GlobalHeader/HeaderNav.svelte",
+      "filePath": "src/UIShell/HeaderNav.svelte",
       "props": [],
       "moduleExports": [],
       "slots": [{ "name": "__default__", "default": true, "slot_props": "{}" }],
@@ -4689,7 +4689,7 @@
     },
     {
       "moduleName": "HeaderNavItem",
-      "filePath": "src/UIShell/GlobalHeader/HeaderNavItem.svelte",
+      "filePath": "src/UIShell/HeaderNavItem.svelte",
       "props": [
         {
           "name": "href",
@@ -4751,7 +4751,7 @@
     },
     {
       "moduleName": "HeaderNavMenu",
-      "filePath": "src/UIShell/GlobalHeader/HeaderNavMenu.svelte",
+      "filePath": "src/UIShell/HeaderNavMenu.svelte",
       "props": [
         {
           "name": "expanded",
@@ -4814,7 +4814,7 @@
     },
     {
       "moduleName": "HeaderPanelDivider",
-      "filePath": "src/UIShell/GlobalHeader/HeaderPanelDivider.svelte",
+      "filePath": "src/UIShell/HeaderPanelDivider.svelte",
       "props": [],
       "moduleExports": [],
       "slots": [{ "name": "__default__", "default": true, "slot_props": "{}" }],
@@ -4823,7 +4823,7 @@
     },
     {
       "moduleName": "HeaderPanelLink",
-      "filePath": "src/UIShell/GlobalHeader/HeaderPanelLink.svelte",
+      "filePath": "src/UIShell/HeaderPanelLink.svelte",
       "props": [
         {
           "name": "href",
@@ -4855,7 +4855,7 @@
     },
     {
       "moduleName": "HeaderPanelLinks",
-      "filePath": "src/UIShell/GlobalHeader/HeaderPanelLinks.svelte",
+      "filePath": "src/UIShell/HeaderPanelLinks.svelte",
       "props": [],
       "moduleExports": [],
       "slots": [{ "name": "__default__", "default": true, "slot_props": "{}" }],
@@ -4957,7 +4957,7 @@
     },
     {
       "moduleName": "HeaderUtilities",
-      "filePath": "src/UIShell/GlobalHeader/HeaderUtilities.svelte",
+      "filePath": "src/UIShell/HeaderUtilities.svelte",
       "props": [],
       "moduleExports": [],
       "slots": [{ "name": "__default__", "default": true, "slot_props": "{}" }],
@@ -9730,7 +9730,7 @@
     },
     {
       "moduleName": "SideNav",
-      "filePath": "src/UIShell/SideNav/SideNav.svelte",
+      "filePath": "src/UIShell/SideNav.svelte",
       "props": [
         {
           "name": "fixed",
@@ -9809,7 +9809,7 @@
     },
     {
       "moduleName": "SideNavItems",
-      "filePath": "src/UIShell/SideNav/SideNavItems.svelte",
+      "filePath": "src/UIShell/SideNavItems.svelte",
       "props": [],
       "moduleExports": [],
       "slots": [{ "name": "__default__", "default": true, "slot_props": "{}" }],
@@ -9818,7 +9818,7 @@
     },
     {
       "moduleName": "SideNavLink",
-      "filePath": "src/UIShell/SideNav/SideNavLink.svelte",
+      "filePath": "src/UIShell/SideNavLink.svelte",
       "props": [
         {
           "name": "isSelected",
@@ -9894,7 +9894,7 @@
     },
     {
       "moduleName": "SideNavMenu",
-      "filePath": "src/UIShell/SideNav/SideNavMenu.svelte",
+      "filePath": "src/UIShell/SideNavMenu.svelte",
       "props": [
         {
           "name": "expanded",
@@ -9955,7 +9955,7 @@
     },
     {
       "moduleName": "SideNavMenuItem",
-      "filePath": "src/UIShell/SideNav/SideNavMenuItem.svelte",
+      "filePath": "src/UIShell/SideNavMenuItem.svelte",
       "props": [
         {
           "name": "isSelected",
diff --git a/src/UIShell/SideNav/HamburgerMenu.svelte b/src/UIShell/HamburgerMenu.svelte
similarity index 90%
rename from src/UIShell/SideNav/HamburgerMenu.svelte
rename to src/UIShell/HamburgerMenu.svelte
index f43b413f..7e53049a 100644
--- a/src/UIShell/SideNav/HamburgerMenu.svelte
+++ b/src/UIShell/HamburgerMenu.svelte
@@ -25,8 +25,8 @@
   /** Obtain a reference to the HTML button element */
   export let ref = null;
 
-  import Close20 from "../../icons/Close20.svelte";
-  import Menu20 from "../../icons/Menu20.svelte";
+  import Close20 from "../icons/Close20.svelte";
+  import Menu20 from "../icons/Menu20.svelte";
 </script>
 
 <button
diff --git a/src/UIShell/GlobalHeader/Header.svelte b/src/UIShell/Header.svelte
similarity index 91%
rename from src/UIShell/GlobalHeader/Header.svelte
rename to src/UIShell/Header.svelte
index 878326cd..62eae55b 100644
--- a/src/UIShell/GlobalHeader/Header.svelte
+++ b/src/UIShell/Header.svelte
@@ -60,10 +60,10 @@
    */
   export let iconClose = Close20;
 
-  import Close20 from "../../icons/Close20.svelte";
-  import Menu20 from "../../icons/Menu20.svelte";
-  import { shouldRenderHamburgerMenu } from "../navStore";
-  import HamburgerMenu from "../SideNav/HamburgerMenu.svelte";
+  import Close20 from "../icons/Close20.svelte";
+  import Menu20 from "../icons/Menu20.svelte";
+  import { shouldRenderHamburgerMenu } from "./navStore";
+  import HamburgerMenu from "./HamburgerMenu.svelte";
 
   let winWidth = undefined;
 
diff --git a/src/UIShell/GlobalHeader/HeaderAction.svelte b/src/UIShell/HeaderAction.svelte
similarity index 95%
rename from src/UIShell/GlobalHeader/HeaderAction.svelte
rename to src/UIShell/HeaderAction.svelte
index fdf8958e..f918e6f4 100644
--- a/src/UIShell/GlobalHeader/HeaderAction.svelte
+++ b/src/UIShell/HeaderAction.svelte
@@ -33,8 +33,8 @@
 
   import { createEventDispatcher } from "svelte";
   import { slide } from "svelte/transition";
-  import Close20 from "../../icons/Close20.svelte";
-  import AppSwitcher20 from "../../icons/AppSwitcher20.svelte";
+  import Close20 from "../icons/Close20.svelte";
+  import AppSwitcher20 from "../icons/AppSwitcher20.svelte";
 
   const dispatch = createEventDispatcher();
 
diff --git a/src/UIShell/GlobalHeader/HeaderActionLink.svelte b/src/UIShell/HeaderActionLink.svelte
similarity index 100%
rename from src/UIShell/GlobalHeader/HeaderActionLink.svelte
rename to src/UIShell/HeaderActionLink.svelte
diff --git a/src/UIShell/GlobalHeader/HeaderNav.svelte b/src/UIShell/HeaderNav.svelte
similarity index 100%
rename from src/UIShell/GlobalHeader/HeaderNav.svelte
rename to src/UIShell/HeaderNav.svelte
diff --git a/src/UIShell/GlobalHeader/HeaderNavItem.svelte b/src/UIShell/HeaderNavItem.svelte
similarity index 100%
rename from src/UIShell/GlobalHeader/HeaderNavItem.svelte
rename to src/UIShell/HeaderNavItem.svelte
diff --git a/src/UIShell/GlobalHeader/HeaderNavMenu.svelte b/src/UIShell/HeaderNavMenu.svelte
similarity index 97%
rename from src/UIShell/GlobalHeader/HeaderNavMenu.svelte
rename to src/UIShell/HeaderNavMenu.svelte
index fc3bcd3f..eab88b54 100644
--- a/src/UIShell/GlobalHeader/HeaderNavMenu.svelte
+++ b/src/UIShell/HeaderNavMenu.svelte
@@ -16,7 +16,7 @@
 
   import { setContext } from "svelte";
   import { writable } from "svelte/store";
-  import ChevronDown16 from "../../icons/ChevronDown16.svelte";
+  import ChevronDown16 from "../icons/ChevronDown16.svelte";
 
   const selectedItems = writable({});
 
diff --git a/src/UIShell/GlobalHeader/HeaderPanelDivider.svelte b/src/UIShell/HeaderPanelDivider.svelte
similarity index 100%
rename from src/UIShell/GlobalHeader/HeaderPanelDivider.svelte
rename to src/UIShell/HeaderPanelDivider.svelte
diff --git a/src/UIShell/GlobalHeader/HeaderPanelLink.svelte b/src/UIShell/HeaderPanelLink.svelte
similarity index 100%
rename from src/UIShell/GlobalHeader/HeaderPanelLink.svelte
rename to src/UIShell/HeaderPanelLink.svelte
diff --git a/src/UIShell/GlobalHeader/HeaderPanelLinks.svelte b/src/UIShell/HeaderPanelLinks.svelte
similarity index 100%
rename from src/UIShell/GlobalHeader/HeaderPanelLinks.svelte
rename to src/UIShell/HeaderPanelLinks.svelte
diff --git a/src/UIShell/GlobalHeader/HeaderUtilities.svelte b/src/UIShell/HeaderUtilities.svelte
similarity index 100%
rename from src/UIShell/GlobalHeader/HeaderUtilities.svelte
rename to src/UIShell/HeaderUtilities.svelte
diff --git a/src/UIShell/SideNav/SideNav.svelte b/src/UIShell/SideNav.svelte
similarity index 96%
rename from src/UIShell/SideNav/SideNav.svelte
rename to src/UIShell/SideNav.svelte
index 929aa0f0..30aad9b3 100644
--- a/src/UIShell/SideNav/SideNav.svelte
+++ b/src/UIShell/SideNav.svelte
@@ -32,7 +32,7 @@
   export let expansionBreakpoint = 1056;
 
   import { onMount, createEventDispatcher } from "svelte";
-  import { shouldRenderHamburgerMenu } from "../navStore";
+  import { shouldRenderHamburgerMenu } from "./navStore";
 
   const dispatch = createEventDispatcher();
 
diff --git a/src/UIShell/SideNav/SideNavItems.svelte b/src/UIShell/SideNavItems.svelte
similarity index 100%
rename from src/UIShell/SideNav/SideNavItems.svelte
rename to src/UIShell/SideNavItems.svelte
diff --git a/src/UIShell/SideNav/SideNavLink.svelte b/src/UIShell/SideNavLink.svelte
similarity index 100%
rename from src/UIShell/SideNav/SideNavLink.svelte
rename to src/UIShell/SideNavLink.svelte
diff --git a/src/UIShell/SideNav/SideNavMenu.svelte b/src/UIShell/SideNavMenu.svelte
similarity index 95%
rename from src/UIShell/SideNav/SideNavMenu.svelte
rename to src/UIShell/SideNavMenu.svelte
index 56ee55cb..b5621330 100644
--- a/src/UIShell/SideNav/SideNavMenu.svelte
+++ b/src/UIShell/SideNavMenu.svelte
@@ -17,7 +17,7 @@
   /** Obtain a reference to the HTML button element */
   export let ref = null;
 
-  import ChevronDown16 from "../../icons/ChevronDown16.svelte";
+  import ChevronDown16 from "../icons/ChevronDown16.svelte";
 </script>
 
 <li class:bx--side-nav__item="{true}" class:bx--side-nav__item--icon="{icon}">
diff --git a/src/UIShell/SideNav/SideNavMenuItem.svelte b/src/UIShell/SideNavMenuItem.svelte
similarity index 100%
rename from src/UIShell/SideNav/SideNavMenuItem.svelte
rename to src/UIShell/SideNavMenuItem.svelte
diff --git a/src/UIShell/index.js b/src/UIShell/index.js
index ed9d3773..4c22a5da 100644
--- a/src/UIShell/index.js
+++ b/src/UIShell/index.js
@@ -1,18 +1,18 @@
-export { default as Header } from "./GlobalHeader/Header.svelte";
-export { default as HeaderAction } from "./GlobalHeader/HeaderAction.svelte";
-export { default as HeaderActionLink } from "./GlobalHeader/HeaderActionLink.svelte";
-export { default as HeaderNav } from "./GlobalHeader/HeaderNav.svelte";
-export { default as HeaderNavItem } from "./GlobalHeader/HeaderNavItem.svelte";
-export { default as HeaderNavMenu } from "./GlobalHeader/HeaderNavMenu.svelte";
-export { default as HeaderPanelDivider } from "./GlobalHeader/HeaderPanelDivider.svelte";
-export { default as HeaderPanelLink } from "./GlobalHeader/HeaderPanelLink.svelte";
-export { default as HeaderPanelLinks } from "./GlobalHeader/HeaderPanelLinks.svelte";
-export { default as HeaderUtilities } from "./GlobalHeader/HeaderUtilities.svelte";
-export { default as SideNav } from "./SideNav/SideNav.svelte";
-export { default as SideNavItems } from "./SideNav/SideNavItems.svelte";
-export { default as SideNavLink } from "./SideNav/SideNavLink.svelte";
-export { default as SideNavMenu } from "./SideNav/SideNavMenu.svelte";
-export { default as SideNavMenuItem } from "./SideNav/SideNavMenuItem.svelte";
+export { default as Header } from "./Header.svelte";
+export { default as HeaderAction } from "./HeaderAction.svelte";
+export { default as HeaderActionLink } from "./HeaderActionLink.svelte";
+export { default as HeaderNav } from "./HeaderNav.svelte";
+export { default as HeaderNavItem } from "./HeaderNavItem.svelte";
+export { default as HeaderNavMenu } from "./HeaderNavMenu.svelte";
+export { default as HeaderPanelDivider } from "./HeaderPanelDivider.svelte";
+export { default as HeaderPanelLink } from "./HeaderPanelLink.svelte";
+export { default as HeaderPanelLinks } from "./HeaderPanelLinks.svelte";
+export { default as HeaderUtilities } from "./HeaderUtilities.svelte";
+export { default as SideNav } from "./SideNav.svelte";
+export { default as SideNavItems } from "./SideNavItems.svelte";
+export { default as SideNavLink } from "./SideNavLink.svelte";
+export { default as SideNavMenu } from "./SideNavMenu.svelte";
+export { default as SideNavMenuItem } from "./SideNavMenuItem.svelte";
 export { default as Content } from "./Content.svelte";
 export { default as SkipToContent } from "./SkipToContent.svelte";
 export { default as HeaderGlobalAction } from "./HeaderGlobalAction.svelte";
diff --git a/types/UIShell/GlobalHeader/Header.svelte.d.ts b/types/UIShell/Header.svelte.d.ts
similarity index 100%
rename from types/UIShell/GlobalHeader/Header.svelte.d.ts
rename to types/UIShell/Header.svelte.d.ts
diff --git a/types/UIShell/GlobalHeader/HeaderAction.svelte.d.ts b/types/UIShell/HeaderAction.svelte.d.ts
similarity index 100%
rename from types/UIShell/GlobalHeader/HeaderAction.svelte.d.ts
rename to types/UIShell/HeaderAction.svelte.d.ts
diff --git a/types/UIShell/GlobalHeader/HeaderActionLink.svelte.d.ts b/types/UIShell/HeaderActionLink.svelte.d.ts
similarity index 100%
rename from types/UIShell/GlobalHeader/HeaderActionLink.svelte.d.ts
rename to types/UIShell/HeaderActionLink.svelte.d.ts
diff --git a/types/UIShell/GlobalHeader/HeaderNav.svelte.d.ts b/types/UIShell/HeaderNav.svelte.d.ts
similarity index 100%
rename from types/UIShell/GlobalHeader/HeaderNav.svelte.d.ts
rename to types/UIShell/HeaderNav.svelte.d.ts
diff --git a/types/UIShell/GlobalHeader/HeaderNavItem.svelte.d.ts b/types/UIShell/HeaderNavItem.svelte.d.ts
similarity index 100%
rename from types/UIShell/GlobalHeader/HeaderNavItem.svelte.d.ts
rename to types/UIShell/HeaderNavItem.svelte.d.ts
diff --git a/types/UIShell/GlobalHeader/HeaderNavMenu.svelte.d.ts b/types/UIShell/HeaderNavMenu.svelte.d.ts
similarity index 100%
rename from types/UIShell/GlobalHeader/HeaderNavMenu.svelte.d.ts
rename to types/UIShell/HeaderNavMenu.svelte.d.ts
diff --git a/types/UIShell/GlobalHeader/HeaderPanelDivider.svelte.d.ts b/types/UIShell/HeaderPanelDivider.svelte.d.ts
similarity index 100%
rename from types/UIShell/GlobalHeader/HeaderPanelDivider.svelte.d.ts
rename to types/UIShell/HeaderPanelDivider.svelte.d.ts
diff --git a/types/UIShell/GlobalHeader/HeaderPanelLink.svelte.d.ts b/types/UIShell/HeaderPanelLink.svelte.d.ts
similarity index 100%
rename from types/UIShell/GlobalHeader/HeaderPanelLink.svelte.d.ts
rename to types/UIShell/HeaderPanelLink.svelte.d.ts
diff --git a/types/UIShell/GlobalHeader/HeaderPanelLinks.svelte.d.ts b/types/UIShell/HeaderPanelLinks.svelte.d.ts
similarity index 100%
rename from types/UIShell/GlobalHeader/HeaderPanelLinks.svelte.d.ts
rename to types/UIShell/HeaderPanelLinks.svelte.d.ts
diff --git a/types/UIShell/GlobalHeader/HeaderUtilities.svelte.d.ts b/types/UIShell/HeaderUtilities.svelte.d.ts
similarity index 100%
rename from types/UIShell/GlobalHeader/HeaderUtilities.svelte.d.ts
rename to types/UIShell/HeaderUtilities.svelte.d.ts
diff --git a/types/UIShell/SideNav/SideNav.svelte.d.ts b/types/UIShell/SideNav.svelte.d.ts
similarity index 100%
rename from types/UIShell/SideNav/SideNav.svelte.d.ts
rename to types/UIShell/SideNav.svelte.d.ts
diff --git a/types/UIShell/SideNav/SideNavItems.svelte.d.ts b/types/UIShell/SideNavItems.svelte.d.ts
similarity index 100%
rename from types/UIShell/SideNav/SideNavItems.svelte.d.ts
rename to types/UIShell/SideNavItems.svelte.d.ts
diff --git a/types/UIShell/SideNav/SideNavLink.svelte.d.ts b/types/UIShell/SideNavLink.svelte.d.ts
similarity index 100%
rename from types/UIShell/SideNav/SideNavLink.svelte.d.ts
rename to types/UIShell/SideNavLink.svelte.d.ts
diff --git a/types/UIShell/SideNav/SideNavMenu.svelte.d.ts b/types/UIShell/SideNavMenu.svelte.d.ts
similarity index 100%
rename from types/UIShell/SideNav/SideNavMenu.svelte.d.ts
rename to types/UIShell/SideNavMenu.svelte.d.ts
diff --git a/types/UIShell/SideNav/SideNavMenuItem.svelte.d.ts b/types/UIShell/SideNavMenuItem.svelte.d.ts
similarity index 100%
rename from types/UIShell/SideNav/SideNavMenuItem.svelte.d.ts
rename to types/UIShell/SideNavMenuItem.svelte.d.ts
diff --git a/types/index.d.ts b/types/index.d.ts
index 40399657..598b9f0b 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -144,21 +144,21 @@ export { default as TooltipDefinition } from "./TooltipDefinition/TooltipDefinit
 export { default as TooltipIcon } from "./TooltipIcon/TooltipIcon.svelte";
 export { default as TreeView } from "./TreeView/TreeView.svelte";
 export { default as Truncate } from "./Truncate/Truncate.svelte";
-export { default as Header } from "./UIShell/GlobalHeader/Header.svelte";
-export { default as HeaderAction } from "./UIShell/GlobalHeader/HeaderAction.svelte";
-export { default as HeaderActionLink } from "./UIShell/GlobalHeader/HeaderActionLink.svelte";
-export { default as HeaderNav } from "./UIShell/GlobalHeader/HeaderNav.svelte";
-export { default as HeaderNavItem } from "./UIShell/GlobalHeader/HeaderNavItem.svelte";
-export { default as HeaderNavMenu } from "./UIShell/GlobalHeader/HeaderNavMenu.svelte";
-export { default as HeaderPanelDivider } from "./UIShell/GlobalHeader/HeaderPanelDivider.svelte";
-export { default as HeaderPanelLink } from "./UIShell/GlobalHeader/HeaderPanelLink.svelte";
-export { default as HeaderPanelLinks } from "./UIShell/GlobalHeader/HeaderPanelLinks.svelte";
-export { default as HeaderUtilities } from "./UIShell/GlobalHeader/HeaderUtilities.svelte";
-export { default as SideNav } from "./UIShell/SideNav/SideNav.svelte";
-export { default as SideNavItems } from "./UIShell/SideNav/SideNavItems.svelte";
-export { default as SideNavLink } from "./UIShell/SideNav/SideNavLink.svelte";
-export { default as SideNavMenu } from "./UIShell/SideNav/SideNavMenu.svelte";
-export { default as SideNavMenuItem } from "./UIShell/SideNav/SideNavMenuItem.svelte";
+export { default as Header } from "./UIShell/Header.svelte";
+export { default as HeaderAction } from "./UIShell/HeaderAction.svelte";
+export { default as HeaderActionLink } from "./UIShell/HeaderActionLink.svelte";
+export { default as HeaderNav } from "./UIShell/HeaderNav.svelte";
+export { default as HeaderNavItem } from "./UIShell/HeaderNavItem.svelte";
+export { default as HeaderNavMenu } from "./UIShell/HeaderNavMenu.svelte";
+export { default as HeaderPanelDivider } from "./UIShell/HeaderPanelDivider.svelte";
+export { default as HeaderPanelLink } from "./UIShell/HeaderPanelLink.svelte";
+export { default as HeaderPanelLinks } from "./UIShell/HeaderPanelLinks.svelte";
+export { default as HeaderUtilities } from "./UIShell/HeaderUtilities.svelte";
+export { default as SideNav } from "./UIShell/SideNav.svelte";
+export { default as SideNavItems } from "./UIShell/SideNavItems.svelte";
+export { default as SideNavLink } from "./UIShell/SideNavLink.svelte";
+export { default as SideNavMenu } from "./UIShell/SideNavMenu.svelte";
+export { default as SideNavMenuItem } from "./UIShell/SideNavMenuItem.svelte";
 export { default as SideNavDivider } from "./UIShell/SideNavDivider.svelte";
 export { default as Content } from "./UIShell/Content.svelte";
 export { default as SkipToContent } from "./UIShell/SkipToContent.svelte";