diff --git a/src/lib/components/stories/Logo.stories.svelte b/src/lib/components/common/stories/Logo.stories.svelte
similarity index 86%
rename from src/lib/components/stories/Logo.stories.svelte
rename to src/lib/components/common/stories/Logo.stories.svelte
index bca05293a..caa81b356 100644
--- a/src/lib/components/stories/Logo.stories.svelte
+++ b/src/lib/components/common/stories/Logo.stories.svelte
@@ -1,6 +1,6 @@
 <script context="module" lang="ts">
   import { Story } from "@storybook/addon-svelte-csf";
-  import Logo from "../common/Logo.svelte";
+  import Logo from "../Logo.svelte";
 
   export const meta = {
     title: "Components / Common / Logo",
diff --git a/src/lib/components/ContentLayout.svelte b/src/lib/components/layouts/ContentLayout.svelte
similarity index 100%
rename from src/lib/components/ContentLayout.svelte
rename to src/lib/components/layouts/ContentLayout.svelte
diff --git a/src/lib/components/MainLayout.svelte b/src/lib/components/layouts/MainLayout.svelte
similarity index 92%
rename from src/lib/components/MainLayout.svelte
rename to src/lib/components/layouts/MainLayout.svelte
index 6226ac849..34cb56160 100644
--- a/src/lib/components/MainLayout.svelte
+++ b/src/lib/components/layouts/MainLayout.svelte
@@ -6,16 +6,16 @@
   import { getContext } from "svelte";
   import { SidebarCollapse16, SidebarExpand16 } from "svelte-octicons";
 
-  import Button from "./common/Button.svelte";
-  import Flex from "./common/Flex.svelte";
-  import SignedIn from "./common/SignedIn.svelte";
-  import UserMenu from "./navigation/UserMenu.svelte";
-  import OrgMenu from "./navigation/OrgMenu.svelte";
+  import Button from "../common/Button.svelte";
+  import Flex from "../common/Flex.svelte";
+  import SignedIn from "../common/SignedIn.svelte";
+  import UserMenu from "../navigation/UserMenu.svelte";
+  import OrgMenu from "../navigation/OrgMenu.svelte";
 
   import { SIGN_IN_URL } from "@/config/config";
-  import Breadcrumbs from "./navigation/Breadcrumbs.svelte";
-  import LanguageMenu from "./navigation/LanguageMenu.svelte";
-  import HelpMenu from "./navigation/HelpMenu.svelte";
+  import Breadcrumbs from "../navigation/Breadcrumbs.svelte";
+  import LanguageMenu from "../navigation/LanguageMenu.svelte";
+  import HelpMenu from "../navigation/HelpMenu.svelte";
 
   export let modal: boolean = false;
 
diff --git a/src/lib/components/stories/MainLayout.stories.svelte b/src/lib/components/layouts/stories/MainLayout.stories.svelte
similarity index 91%
rename from src/lib/components/stories/MainLayout.stories.svelte
rename to src/lib/components/layouts/stories/MainLayout.stories.svelte
index af5247e2a..903837bbc 100644
--- a/src/lib/components/stories/MainLayout.stories.svelte
+++ b/src/lib/components/layouts/stories/MainLayout.stories.svelte
@@ -19,15 +19,15 @@
   import Button from "$lib/components/common/Button.svelte";
   import SidebarItem from "$lib/components/sidebar/SidebarItem.svelte";
 
-  import documents from "../../api/fixtures/documents/documents.json";
-  import Flex from "../common/Flex.svelte";
-  import SidebarGroup from "../sidebar/SidebarGroup.svelte";
-  import Action from "../common/Action.svelte";
+  import documents from "../../../api/fixtures/documents/documents.json";
+  import Flex from "../../common/Flex.svelte";
+  import SidebarGroup from "../../sidebar/SidebarGroup.svelte";
+  import Action from "../../common/Action.svelte";
   import Pin from "@/common/Pin.svelte";
-  import ResultsList from "../documents/ResultsList.svelte";
+  import ResultsList from "../../documents/ResultsList.svelte";
   import ContentLayout from "../ContentLayout.svelte";
-  import PageToolbar from "../common/PageToolbar.svelte";
-  import Search from "../inputs/Search.svelte";
+  import PageToolbar from "../../common/PageToolbar.svelte";
+  import Search from "../../inputs/Search.svelte";
 
   import { addons } from "@/test/handlers/addons";
 
diff --git a/src/routes/app/+page.svelte b/src/routes/app/+page.svelte
index 66cb3ba50..08844ea96 100644
--- a/src/routes/app/+page.svelte
+++ b/src/routes/app/+page.svelte
@@ -6,12 +6,12 @@
     total,
     visible,
   } from "$lib/components/documents/ResultsList.svelte";
-  import ContentLayout from "$lib/components/ContentLayout.svelte";
+  import MainLayout from "$lib/components/layouts/MainLayout.svelte";
+  import ContentLayout from "$lib/components/layouts/ContentLayout.svelte";
   import PageToolbar from "$lib/components/common/PageToolbar.svelte";
   import Search from "$lib/components/inputs/Search.svelte";
   import Empty from "$lib/components/common/Empty.svelte";
   import Button from "$lib/components/common/Button.svelte";
-  import MainLayout from "$lib/components/MainLayout.svelte";
   import SignedIn from "$lib/components/common/SignedIn.svelte";
   import Actions from "./sidebar/Actions.svelte";
   import AddOns from "./sidebar/AddOns.svelte";
diff --git a/src/routes/app/add-ons/+page.svelte b/src/routes/app/add-ons/+page.svelte
index c272e6ee8..82d97bd49 100644
--- a/src/routes/app/add-ons/+page.svelte
+++ b/src/routes/app/add-ons/+page.svelte
@@ -9,10 +9,9 @@
   import Search from "@/lib/components/inputs/Search.svelte";
   import Pin from "@/common/icons/Pin.svelte";
   import Star from "@/common/icons/Star.svelte";
-  import Credit from "@/common/icons/Credit.svelte";
-  import ContentLayout from "$lib/components/ContentLayout.svelte";
+  import ContentLayout from "$lib/components/layouts/ContentLayout.svelte";
   import Empty from "$lib/components/common/Empty.svelte";
-  import MainLayout from "$lib/components/MainLayout.svelte";
+  import MainLayout from "$lib/components/layouts/MainLayout.svelte";
   import PageToolbar from "$lib/components/common/PageToolbar.svelte";
   import Error from "@/lib/components/common/Error.svelte";
   import ListItem from "$lib/components/addons/AddOnListItem.svelte";
diff --git a/src/routes/app/add-ons/[owner]/[repo]/+page.svelte b/src/routes/app/add-ons/[owner]/[repo]/+page.svelte
index f7cb5f44b..8a48dc757 100644
--- a/src/routes/app/add-ons/[owner]/[repo]/+page.svelte
+++ b/src/routes/app/add-ons/[owner]/[repo]/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import MainLayout from "@/lib/components/MainLayout.svelte";
+  import MainLayout from "@/lib/components/layouts/MainLayout.svelte";
 
   export let data;
 </script>
diff --git a/src/routes/app/upload/+layout@.svelte b/src/routes/app/upload/+layout@.svelte
index 3cf2af273..79c44edc8 100644
--- a/src/routes/app/upload/+layout@.svelte
+++ b/src/routes/app/upload/+layout@.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import "@/style/kit.css";
 
-  import MainLayout from "@/lib/components/MainLayout.svelte";
+  import MainLayout from "@/lib/components/layouts/MainLayout.svelte";
   import SignedIn from "@/lib/components/common/SignedIn.svelte";
 
   import Documents from "../sidebar/Documents.svelte";
diff --git a/src/routes/documents/[id]-[slug]/+layout.svelte b/src/routes/documents/[id]-[slug]/+layout.svelte
index 4f764f782..ca604446f 100644
--- a/src/routes/documents/[id]-[slug]/+layout.svelte
+++ b/src/routes/documents/[id]-[slug]/+layout.svelte
@@ -3,7 +3,7 @@
 
   import type { Project } from "$lib/api/types";
 
-  import MainLayout from "$lib/components/MainLayout.svelte";
+  import MainLayout from "$lib/components/layouts/MainLayout.svelte";
   import SignedIn from "$lib/components/common/SignedIn.svelte";
 
   // sidebars