diff --git a/web/app/src/lib/components/AuthCheck.svelte b/web/app/src/lib/components/checks/AuthCheck.svelte
similarity index 100%
rename from web/app/src/lib/components/AuthCheck.svelte
rename to web/app/src/lib/components/checks/AuthCheck.svelte
diff --git a/web/app/src/lib/components/AuthRequired.svelte b/web/app/src/lib/components/checks/AuthRequired.svelte
similarity index 100%
rename from web/app/src/lib/components/AuthRequired.svelte
rename to web/app/src/lib/components/checks/AuthRequired.svelte
diff --git a/web/app/src/lib/components/EditPostPanel.svelte b/web/app/src/lib/components/panels/EditPostPanel.svelte
similarity index 100%
rename from web/app/src/lib/components/EditPostPanel.svelte
rename to web/app/src/lib/components/panels/EditPostPanel.svelte
diff --git a/web/app/src/lib/components/TagNotes/EditTagNotesPanel.svelte b/web/app/src/lib/components/panels/EditTagNotesPanel.svelte
similarity index 100%
rename from web/app/src/lib/components/TagNotes/EditTagNotesPanel.svelte
rename to web/app/src/lib/components/panels/EditTagNotesPanel.svelte
diff --git a/web/app/src/lib/components/Tag/EditTagPanel.svelte b/web/app/src/lib/components/panels/EditTagPanel.svelte
similarity index 100%
rename from web/app/src/lib/components/Tag/EditTagPanel.svelte
rename to web/app/src/lib/components/panels/EditTagPanel.svelte
diff --git a/web/app/src/lib/components/ViewPostPanel.svelte b/web/app/src/lib/components/panels/ViewPostPanel.svelte
similarity index 93%
rename from web/app/src/lib/components/ViewPostPanel.svelte
rename to web/app/src/lib/components/panels/ViewPostPanel.svelte
index d6f91a8..21d737d 100644
--- a/web/app/src/lib/components/ViewPostPanel.svelte
+++ b/web/app/src/lib/components/panels/ViewPostPanel.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-    import AuthCheck from "./AuthCheck.svelte";
-    import TagLinkNumbered from "./TagLinkNumbered.svelte";
+    import AuthCheck from "$lib/components/checks/AuthCheck.svelte";
+    import TagLinkNumbered from "$lib/components/ui/TagLinkNumbered.svelte";
     let { post, toggleEditMenu, toggleDeleteMenu } = $props();
 
     const trimUrl = (str) => {
diff --git a/web/app/src/lib/components/TagNotes/ViewTagNotesPanel.svelte b/web/app/src/lib/components/panels/ViewTagNotesPanel.svelte
similarity index 87%
rename from web/app/src/lib/components/TagNotes/ViewTagNotesPanel.svelte
rename to web/app/src/lib/components/panels/ViewTagNotesPanel.svelte
index 0eeec03..9ead358 100644
--- a/web/app/src/lib/components/TagNotes/ViewTagNotesPanel.svelte
+++ b/web/app/src/lib/components/panels/ViewTagNotesPanel.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import AuthCheck from "$lib/components/AuthCheck.svelte";
+    import AuthCheck from "$lib/components/checks/AuthCheck.svelte";
 
     let { data, toggleEditMenu } = $props();
 </script>
diff --git a/web/app/src/lib/components/Tag/ViewTagPanel.svelte b/web/app/src/lib/components/panels/ViewTagPanel.svelte
similarity index 93%
rename from web/app/src/lib/components/Tag/ViewTagPanel.svelte
rename to web/app/src/lib/components/panels/ViewTagPanel.svelte
index 91c5285..f2ac959 100644
--- a/web/app/src/lib/components/Tag/ViewTagPanel.svelte
+++ b/web/app/src/lib/components/panels/ViewTagPanel.svelte
@@ -2,8 +2,8 @@
     import { onMount } from "svelte";
 
     import { getRelatedTags } from "$lib/api";
-    import AuthCheck from "$lib/components/AuthCheck.svelte";
-    import TagLinkNumbered from "$lib/components/TagLinkNumbered.svelte";
+    import AuthCheck from "$lib/components/checks/AuthCheck.svelte";
+    import TagLinkNumbered from "$lib/components/ui/TagLinkNumbered.svelte";
 
     let { tag, data, toggleRenameMenu } = $props();
     let related_tags = $state([]);
diff --git a/web/app/src/lib/components/Navbar.svelte b/web/app/src/lib/components/ui/Navbar.svelte
similarity index 100%
rename from web/app/src/lib/components/Navbar.svelte
rename to web/app/src/lib/components/ui/Navbar.svelte
diff --git a/web/app/src/lib/components/Post/PostGallery.svelte b/web/app/src/lib/components/ui/PostGallery.svelte
similarity index 100%
rename from web/app/src/lib/components/Post/PostGallery.svelte
rename to web/app/src/lib/components/ui/PostGallery.svelte
diff --git a/web/app/src/lib/components/TagLinkNumbered.svelte b/web/app/src/lib/components/ui/TagLinkNumbered.svelte
similarity index 100%
rename from web/app/src/lib/components/TagLinkNumbered.svelte
rename to web/app/src/lib/components/ui/TagLinkNumbered.svelte
diff --git a/web/app/src/routes/+layout.svelte b/web/app/src/routes/+layout.svelte
index 0970b3f..1dfa00c 100644
--- a/web/app/src/routes/+layout.svelte
+++ b/web/app/src/routes/+layout.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import "../app.scss";
-    import Navbar from "$lib/components/Navbar.svelte";
+    import Navbar from "$lib/components/ui/Navbar.svelte";
     interface Props {
         children?: import('svelte').Snippet;
     }
diff --git a/web/app/src/routes/post/[id]/+page.svelte b/web/app/src/routes/post/[id]/+page.svelte
index a4e9feb..70a3f36 100644
--- a/web/app/src/routes/post/[id]/+page.svelte
+++ b/web/app/src/routes/post/[id]/+page.svelte
@@ -4,8 +4,8 @@
     import { onMount } from "svelte";
     import { getPost, postDelete } from "$lib/api";
     import { goto } from "$app/navigation";
-    import EditPostPanel from "$lib/components/EditPostPanel.svelte";
-    import ViewPostPanel from "$lib/components/ViewPostPanel.svelte";
+    import EditPostPanel from "$lib/components/panels/EditPostPanel.svelte";
+    import ViewPostPanel from "$lib/components/panels/ViewPostPanel.svelte";
     
     import { page } from "$app/stores";
     const { id } = $page.params;
diff --git a/web/app/src/routes/posts/+page.svelte b/web/app/src/routes/posts/+page.svelte
index 774688e..a79d814 100644
--- a/web/app/src/routes/posts/+page.svelte
+++ b/web/app/src/routes/posts/+page.svelte
@@ -2,8 +2,8 @@
     import { run } from 'svelte/legacy';
 
     import { getPostSearchTag, getTag, getTagAutocomplete } from "$lib/api";
-    import TagLinkNumbered from "$lib/components/TagLinkNumbered.svelte";
-    import PostGallery from "$lib/components/Post/PostGallery.svelte";
+    import TagLinkNumbered from "$lib/components/ui/TagLinkNumbered.svelte";
+    import PostGallery from "$lib/components/ui/PostGallery.svelte";
     import queryString from "query-string";
     import Tags from "svelte-tags-input";
     import { paginate } from "$lib/simple-pagination";
diff --git a/web/app/src/routes/tags/[tag]/+page.svelte b/web/app/src/routes/tags/[tag]/+page.svelte
index 94f6979..ee79169 100644
--- a/web/app/src/routes/tags/[tag]/+page.svelte
+++ b/web/app/src/routes/tags/[tag]/+page.svelte
@@ -2,11 +2,11 @@
     import { onMount } from "svelte";
 
     import { getTag, getPostSearchTag } from "$lib/api";
-    import EditTagNotesPanel from "$lib/components/TagNotes/EditTagNotesPanel.svelte";
-    import ViewTagNotesPanel from "$lib/components/TagNotes/ViewTagNotesPanel.svelte";
-    import ViewTagPanel from "$lib/components/Tag/ViewTagPanel.svelte";
-    import EditTagPanel from "$lib/components/Tag/EditTagPanel.svelte";
-    import PostGallery from "$lib/components/Post/PostGallery.svelte";
+    import EditTagNotesPanel from "$lib/components/panels/EditTagNotesPanel.svelte";
+    import ViewTagNotesPanel from "$lib/components/panels/ViewTagNotesPanel.svelte";
+    import ViewTagPanel from "$lib/components/panels/ViewTagPanel.svelte";
+    import EditTagPanel from "$lib/components/panels/EditTagPanel.svelte";
+    import PostGallery from "$lib/components/ui/PostGallery.svelte";
 
 
     import { page } from "$app/stores";
diff --git a/web/app/src/routes/upload/+page.svelte b/web/app/src/routes/upload/+page.svelte
index 8cd608e..2fc2ef6 100644
--- a/web/app/src/routes/upload/+page.svelte
+++ b/web/app/src/routes/upload/+page.svelte
@@ -2,7 +2,7 @@
     import { uploadBlob, postCreate, getTagAutocomplete } from "$lib/api";
     import { goto } from "$app/navigation";
     import Tags from "svelte-tags-input";
-    import AuthRequired from "$lib/components/AuthRequired.svelte";
+    import AuthRequired from "$lib/components/checks/AuthRequired.svelte";
 
     let currentProgress = $state(0);
 
diff --git a/web/app/src/routes/user/profile/+page.svelte b/web/app/src/routes/user/profile/+page.svelte
index a7f129a..0df9bf9 100644
--- a/web/app/src/routes/user/profile/+page.svelte
+++ b/web/app/src/routes/user/profile/+page.svelte
@@ -1,7 +1,7 @@
 <script>
     import { onMount } from "svelte";
     import { getUserProfile } from "$lib/api";
-    import AuthRequired from "$lib/components/AuthRequired.svelte";
+    import AuthRequired from "$lib/components/checks/AuthRequired.svelte";
 
     let user = $state();