diff --git a/web/src/lib/components/app-sidebar.svelte b/web/src/lib/components/nav/app-sidebar.svelte
similarity index 92%
rename from web/src/lib/components/app-sidebar.svelte
rename to web/src/lib/components/nav/app-sidebar.svelte
index b51a0ce..7cd5018 100644
--- a/web/src/lib/components/app-sidebar.svelte
+++ b/web/src/lib/components/nav/app-sidebar.svelte
@@ -93,10 +93,10 @@
 </script>
 
 <script lang="ts">
-	import NavMain from '$lib/components/nav-main.svelte';
-	import NavSecondary from '$lib/components/nav-secondary.svelte';
-	import NavUser from '$lib/components/nav-user.svelte';
-	import * as Sidebar from '$lib/components/ui/sidebar/index.js';
+	import NavMain from '$lib/components/nav/nav-main.svelte';
+	import NavSecondary from '$lib/components/nav/nav-secondary.svelte';
+	import NavUser from '$lib/components/nav/nav-user.svelte';
+	import * as Sidebar from '$lib/components/ui/sidebar';
 	import type { ComponentProps } from 'svelte';
 	import logo from '$lib/images/logo.svg';
 
diff --git a/web/src/lib/components/nav-main.svelte b/web/src/lib/components/nav/nav-main.svelte
similarity index 93%
rename from web/src/lib/components/nav-main.svelte
rename to web/src/lib/components/nav/nav-main.svelte
index c16c05c..85e589e 100644
--- a/web/src/lib/components/nav-main.svelte
+++ b/web/src/lib/components/nav/nav-main.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-	import * as Collapsible from '$lib/components/ui/collapsible/index.js';
-	import * as Sidebar from '$lib/components/ui/sidebar/index.js';
+	import * as Collapsible from '$lib/components/ui/collapsible';
+	import * as Sidebar from '$lib/components/ui/sidebar';
 	import ChevronRight from '@lucide/svelte/icons/chevron-right';
 
 	let {
diff --git a/web/src/lib/components/nav-projects.svelte b/web/src/lib/components/nav/nav-projects.svelte
similarity index 93%
rename from web/src/lib/components/nav-projects.svelte
rename to web/src/lib/components/nav/nav-projects.svelte
index 5a9f3f8..d372f65 100644
--- a/web/src/lib/components/nav-projects.svelte
+++ b/web/src/lib/components/nav/nav-projects.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-	import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
-	import * as Sidebar from '$lib/components/ui/sidebar/index.js';
-	import { useSidebar } from '$lib/components/ui/sidebar/index.js';
+	import * as DropdownMenu from '$lib/components/ui/dropdown-menu';
+	import * as Sidebar from '$lib/components/ui/sidebar';
+	import { useSidebar } from '$lib/components/ui/sidebar';
 	import Ellipsis from '@lucide/svelte/icons/ellipsis';
 	import Folder from '@lucide/svelte/icons/folder';
 	import Share from '@lucide/svelte/icons/share';
diff --git a/web/src/lib/components/nav-secondary.svelte b/web/src/lib/components/nav/nav-secondary.svelte
similarity index 95%
rename from web/src/lib/components/nav-secondary.svelte
rename to web/src/lib/components/nav/nav-secondary.svelte
index 99759d3..a765dbc 100644
--- a/web/src/lib/components/nav-secondary.svelte
+++ b/web/src/lib/components/nav/nav-secondary.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import * as Sidebar from '$lib/components/ui/sidebar/index.js';
+	import * as Sidebar from '$lib/components/ui/sidebar';
 	import type { ComponentProps } from 'svelte';
 	import Sun from '@lucide/svelte/icons/sun';
 	import Moon from '@lucide/svelte/icons/moon';
diff --git a/web/src/lib/components/nav-user.svelte b/web/src/lib/components/nav/nav-user.svelte
similarity index 91%
rename from web/src/lib/components/nav-user.svelte
rename to web/src/lib/components/nav/nav-user.svelte
index 6db0b03..fa3382c 100644
--- a/web/src/lib/components/nav-user.svelte
+++ b/web/src/lib/components/nav/nav-user.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
 	import ChevronsUpDown from '@lucide/svelte/icons/chevrons-up-down';
 	import LogOut from '@lucide/svelte/icons/log-out';
-	import * as Avatar from '$lib/components/ui/avatar/index.js';
-	import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
-	import * as Sidebar from '$lib/components/ui/sidebar/index.js';
-	import { useSidebar } from '$lib/components/ui/sidebar/index.js';
+	import * as Avatar from '$lib/components/ui/avatar';
+	import * as DropdownMenu from '$lib/components/ui/dropdown-menu';
+	import * as Sidebar from '$lib/components/ui/sidebar';
+	import { useSidebar } from '$lib/components/ui/sidebar';
 	import UserDetails from './user-details.svelte';
 	import UserRound from '@lucide/svelte/icons/user-round';
 	import { handleLogout } from '$lib/utils.ts';
diff --git a/web/src/lib/components/user-details.svelte b/web/src/lib/components/nav/user-details.svelte
similarity index 100%
rename from web/src/lib/components/user-details.svelte
rename to web/src/lib/components/nav/user-details.svelte
diff --git a/web/src/routes/dashboard/+layout.svelte b/web/src/routes/dashboard/+layout.svelte
index 4d4ca94..088daf7 100644
--- a/web/src/routes/dashboard/+layout.svelte
+++ b/web/src/routes/dashboard/+layout.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import AppSidebar from '$lib/components/app-sidebar.svelte';
+	import AppSidebar from '$lib/components/nav/app-sidebar.svelte';
 	import * as Sidebar from '$lib/components/ui/sidebar/index.js';
 	import type { LayoutProps } from './$types';
 	import { setContext } from 'svelte';