diff --git a/web/src/lib/components/request-movie-dialog.svelte b/web/src/lib/components/requests/request-movie-dialog.svelte
similarity index 96%
rename from web/src/lib/components/request-movie-dialog.svelte
rename to web/src/lib/components/requests/request-movie-dialog.svelte
index d846227..8dd00f7 100644
--- a/web/src/lib/components/request-movie-dialog.svelte
+++ b/web/src/lib/components/requests/request-movie-dialog.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-	import { Button, buttonVariants } from '$lib/components/ui/button/index.js';
-	import * as Dialog from '$lib/components/ui/dialog/index.js';
+	import { Button, buttonVariants } from '$lib/components/ui/button';
+	import * as Dialog from '$lib/components/ui/dialog';
 	import { Label } from '$lib/components/ui/label';
-	import * as Select from '$lib/components/ui/select/index.js';
+	import * as Select from '$lib/components/ui/select';
 	import LoaderCircle from '@lucide/svelte/icons/loader-circle';
 	import { getFullyQualifiedMediaName, getTorrentQualityString } from '$lib/utils.js';
 	import { toast } from 'svelte-sonner';
diff --git a/web/src/lib/components/request-season-dialog.svelte b/web/src/lib/components/requests/request-season-dialog.svelte
similarity index 97%
rename from web/src/lib/components/request-season-dialog.svelte
rename to web/src/lib/components/requests/request-season-dialog.svelte
index 07c2ef8..3180685 100644
--- a/web/src/lib/components/request-season-dialog.svelte
+++ b/web/src/lib/components/requests/request-season-dialog.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-	import { Button, buttonVariants } from '$lib/components/ui/button/index.js';
-	import * as Dialog from '$lib/components/ui/dialog/index.js';
+	import { Button, buttonVariants } from '$lib/components/ui/button';
+	import * as Dialog from '$lib/components/ui/dialog';
 	import { Label } from '$lib/components/ui/label';
-	import * as Select from '$lib/components/ui/select/index.js';
+	import * as Select from '$lib/components/ui/select';
 	import LoaderCircle from '@lucide/svelte/icons/loader-circle';
 	import { getFullyQualifiedMediaName, getTorrentQualityString } from '$lib/utils.js';
 	import { toast } from 'svelte-sonner';
diff --git a/web/src/lib/components/season-requests-table.svelte b/web/src/lib/components/requests/requests-table.svelte
similarity index 97%
rename from web/src/lib/components/season-requests-table.svelte
rename to web/src/lib/components/requests/requests-table.svelte
index 10d1a10..4464bfd 100644
--- a/web/src/lib/components/season-requests-table.svelte
+++ b/web/src/lib/components/requests/requests-table.svelte
@@ -3,9 +3,9 @@
 	import CheckmarkX from '$lib/components/checkmark-x.svelte';
 	import type { components } from '$lib/api/api';
 
-	import * as Table from '$lib/components/ui/table/index.js';
+	import * as Table from '$lib/components/ui/table';
 	import { getContext } from 'svelte';
-	import { Button } from '$lib/components/ui/button/index.js';
+	import { Button } from '$lib/components/ui/button';
 	import { toast } from 'svelte-sonner';
 	import { goto, invalidateAll } from '$app/navigation';
 	import { resolve } from '$app/paths';
diff --git a/web/src/routes/dashboard/movies/[movieId=uuid]/+page.svelte b/web/src/routes/dashboard/movies/[movieId=uuid]/+page.svelte
index c6f2119..d500b55 100644
--- a/web/src/routes/dashboard/movies/[movieId=uuid]/+page.svelte
+++ b/web/src/routes/dashboard/movies/[movieId=uuid]/+page.svelte
@@ -11,7 +11,7 @@
 	import TorrentTable from '$lib/components/torrent-table.svelte';
 	import MediaPicture from '$lib/components/media-picture.svelte';
 	import DownloadMovieDialog from '$lib/components/download-dialogs/download-movie-dialog.svelte';
-	import RequestMovieDialog from '$lib/components/request-movie-dialog.svelte';
+	import RequestMovieDialog from '$lib/components/request-dialogs/request-movie-dialog.svelte';
 	import LibraryCombobox from '$lib/components/library-combobox.svelte';
 	import { resolve } from '$app/paths';
 	import * as Card from '$lib/components/ui/card/index.js';
diff --git a/web/src/routes/dashboard/movies/requests/+page.svelte b/web/src/routes/dashboard/movies/requests/+page.svelte
index 47f96ec..bbb119e 100644
--- a/web/src/routes/dashboard/movies/requests/+page.svelte
+++ b/web/src/routes/dashboard/movies/requests/+page.svelte
@@ -3,7 +3,7 @@
 	import { Separator } from '$lib/components/ui/separator/index.js';
 	import * as Sidebar from '$lib/components/ui/sidebar/index.js';
 	import * as Breadcrumb from '$lib/components/ui/breadcrumb/index.js';
-	import RequestsTable from '$lib/components/season-requests-table.svelte';
+	import RequestsTable from '$lib/components/requests/requests-table.svelte';
 	import { resolve } from '$app/paths';
 
 	let requests = $derived(page.data.requestsData);
diff --git a/web/src/routes/dashboard/tv/[showId=uuid]/+page.svelte b/web/src/routes/dashboard/tv/[showId=uuid]/+page.svelte
index b3017f4..90d18e6 100644
--- a/web/src/routes/dashboard/tv/[showId=uuid]/+page.svelte
+++ b/web/src/routes/dashboard/tv/[showId=uuid]/+page.svelte
@@ -12,7 +12,7 @@
 	import CheckmarkX from '$lib/components/checkmark-x.svelte';
 	import { page } from '$app/state';
 	import TorrentTable from '$lib/components/torrent-table.svelte';
-	import RequestSeasonDialog from '$lib/components/request-season-dialog.svelte';
+	import RequestSeasonDialog from '$lib/components/request-dialogs/request-season-dialog.svelte';
 	import MediaPicture from '$lib/components/media-picture.svelte';
 	import { Switch } from '$lib/components/ui/switch/index.js';
 	import { toast } from 'svelte-sonner';
diff --git a/web/src/routes/dashboard/tv/requests/+page.svelte b/web/src/routes/dashboard/tv/requests/+page.svelte
index deed5b5..19c0109 100644
--- a/web/src/routes/dashboard/tv/requests/+page.svelte
+++ b/web/src/routes/dashboard/tv/requests/+page.svelte
@@ -3,7 +3,7 @@
 	import { Separator } from '$lib/components/ui/separator/index.js';
 	import * as Sidebar from '$lib/components/ui/sidebar/index.js';
 	import * as Breadcrumb from '$lib/components/ui/breadcrumb/index.js';
-	import RequestsTable from '$lib/components/season-requests-table.svelte';
+	import RequestsTable from '$lib/components/requests/requests-table.svelte';
 	import { resolve } from '$app/paths';
 	import type { components } from '$lib/api/api';