diff --git a/backend/src/main.ts b/backend/src/main.ts
index d05b809..e2d0572 100644
--- a/backend/src/main.ts
+++ b/backend/src/main.ts
@@ -48,7 +48,9 @@ async function bootstrap() {
   await createAdminUser(app.get(UsersService));
 
   await app.listen(9494);
-  console.log(`Application is running on: ${await app.getUrl()} in ${NODE_ENV} mode`);
+  console.log(
+    `Application is running on: ${await app.getUrl()} in ${NODE_ENV} mode`,
+  );
 }
 
 bootstrap();
diff --git a/src/TestElement.svelte b/src/TestElement.svelte
index 51c65de..8acff66 100644
--- a/src/TestElement.svelte
+++ b/src/TestElement.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { onMount } from 'svelte';
-	import Container from './Container.svelte';
+	import Container from '$components/Container.svelte';
 	import type { Readable } from 'svelte/store';
 	import classNames from 'classnames';
 
diff --git a/src/lib/components-old/Carousel/CarouselPlaceholderItems.svelte b/src/lib/components-old/Carousel/CarouselPlaceholderItems.svelte
index d6a5ea7..3977579 100644
--- a/src/lib/components-old/Carousel/CarouselPlaceholderItems.svelte
+++ b/src/lib/components-old/Carousel/CarouselPlaceholderItems.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import CardPlaceholder from '../Card/CardPlaceholder.svelte';
-	import Container from '../../../Container.svelte';
+	import Container from '$components/Container.svelte';
 	export let size: 'dynamic' | 'md' | 'lg' = 'md';
 	export let orientation: 'landscape' | 'portrait' = 'landscape';
 </script>
diff --git a/src/lib/components/Button.svelte b/src/lib/components/Button.svelte
index 1f7eb1f..93454a9 100644
--- a/src/lib/components/Button.svelte
+++ b/src/lib/components/Button.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../Container.svelte';
+	import Container from './Container.svelte';
 	import type { Readable } from 'svelte/store';
 	import classNames from 'classnames';
 	import AnimatedSelection from './AnimateScale.svelte';
diff --git a/src/lib/components/Card/Card.svelte b/src/lib/components/Card/Card.svelte
index 9f99a1d..570f661 100644
--- a/src/lib/components/Card/Card.svelte
+++ b/src/lib/components/Card/Card.svelte
@@ -4,7 +4,7 @@
 	import ProgressBar from '../ProgressBar.svelte';
 	import LazyImg from '../LazyImg.svelte';
 	import type { TitleType } from '../../types';
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 	import type { Readable } from 'svelte/store';
 	import AnimatedSelection from '../AnimateScale.svelte';
 	import { navigate } from '../StackRouter/StackRouter';
diff --git a/src/lib/components/CardGrid.svelte b/src/lib/components/CardGrid.svelte
index a73d724..ce4711d 100644
--- a/src/lib/components/CardGrid.svelte
+++ b/src/lib/components/CardGrid.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../Container.svelte';
+	import Container from './Container.svelte';
 	import { onMount } from 'svelte';
 	import classNames from 'classnames';
 	import { getCardDimensions } from '../utils';
diff --git a/src/lib/components/Carousel/Carousel.svelte b/src/lib/components/Carousel/Carousel.svelte
index 39d4d0e..984010f 100644
--- a/src/lib/components/Carousel/Carousel.svelte
+++ b/src/lib/components/Carousel/Carousel.svelte
@@ -2,7 +2,7 @@
 	import IconButton from '../IconButton.svelte';
 	import { ChevronLeft, ChevronRight } from 'radix-icons-svelte';
 	import classNames from 'classnames';
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 	import { PLATFORM_TV } from '../../constants';
 	import type { BackEvent } from '../../selectable';
 	import { get } from 'svelte/store';
diff --git a/src/lib/components/Carousel/CarouselPlaceholderItems.svelte b/src/lib/components/Carousel/CarouselPlaceholderItems.svelte
index d6a5ea7..cf8037c 100644
--- a/src/lib/components/Carousel/CarouselPlaceholderItems.svelte
+++ b/src/lib/components/Carousel/CarouselPlaceholderItems.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import CardPlaceholder from '../Card/CardPlaceholder.svelte';
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 	export let size: 'dynamic' | 'md' | 'lg' = 'md';
 	export let orientation: 'landscape' | 'portrait' = 'landscape';
 </script>
diff --git a/src/lib/components/Carousel/UICarousel.svelte b/src/lib/components/Carousel/UICarousel.svelte
index f9b5f8c..e1789dc 100644
--- a/src/lib/components/Carousel/UICarousel.svelte
+++ b/src/lib/components/Carousel/UICarousel.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import classNames from 'classnames';
 	import { onMount } from 'svelte';
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 
 	let element: Container;
 	let scrollX = 0;
diff --git a/src/lib/components/Checkbox.svelte b/src/lib/components/Checkbox.svelte
index ba03996..cbadc0b 100644
--- a/src/lib/components/Checkbox.svelte
+++ b/src/lib/components/Checkbox.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../Container.svelte';
+	import Container from './Container.svelte';
 	import { createEventDispatcher } from 'svelte';
 	import { Check } from 'radix-icons-svelte';
 	import classNames from 'classnames';
diff --git a/src/Container.svelte b/src/lib/components/Container.svelte
similarity index 98%
rename from src/Container.svelte
rename to src/lib/components/Container.svelte
index 83d0f57..b6feb32 100644
--- a/src/Container.svelte
+++ b/src/lib/components/Container.svelte
@@ -2,7 +2,7 @@
 
 <script lang="ts">
 	import { createEventDispatcher, onMount } from 'svelte';
-	import { Selectable, type EnterEvent, type NavigateEvent, type KeyEvent } from './lib/selectable';
+	import { Selectable, type EnterEvent, type NavigateEvent, type KeyEvent } from '../selectable';
 	import classNames from 'classnames';
 
 	/**
diff --git a/src/lib/components/DetachedPage/DetachedPage.svelte b/src/lib/components/DetachedPage/DetachedPage.svelte
index 5fabe17..4a64dd2 100644
--- a/src/lib/components/DetachedPage/DetachedPage.svelte
+++ b/src/lib/components/DetachedPage/DetachedPage.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 	import { type KeyEvent, type NavigateEvent, useRegistrar } from '../../selectable.js';
 	import { get } from 'svelte/store';
 	import Sidebar from '../Sidebar/Sidebar.svelte';
diff --git a/src/lib/components/Dialog/ConfirmDialog.svelte b/src/lib/components/Dialog/ConfirmDialog.svelte
index 8e6fa8b..46574b9 100644
--- a/src/lib/components/Dialog/ConfirmDialog.svelte
+++ b/src/lib/components/Dialog/ConfirmDialog.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 	import Button from '../Button.svelte';
 	import { modalStack } from '../Modal/modal.store';
 	import Dialog from './Dialog.svelte';
diff --git a/src/lib/components/Dialog/CreateOrEditProfileModal.svelte b/src/lib/components/Dialog/CreateOrEditProfileModal.svelte
index bac0bcb..54b0608 100644
--- a/src/lib/components/Dialog/CreateOrEditProfileModal.svelte
+++ b/src/lib/components/Dialog/CreateOrEditProfileModal.svelte
@@ -4,7 +4,7 @@
 	import TextField from '../TextField.svelte';
 	import Button from '../Button.svelte';
 	import { ArrowUp, EyeClosed, EyeOpen, Trash, Upload } from 'radix-icons-svelte';
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 	import IconToggle from '../IconToggle.svelte';
 	import Tab from '../Tab/Tab.svelte';
 	import { useTabs } from '../Tab/Tab';
diff --git a/src/lib/components/Dialog/UpdateDialog.svelte b/src/lib/components/Dialog/UpdateDialog.svelte
index c3e5987..5e46181 100644
--- a/src/lib/components/Dialog/UpdateDialog.svelte
+++ b/src/lib/components/Dialog/UpdateDialog.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import Dialog from './Dialog.svelte';
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 	import Button from '../Button.svelte';
 	import { PLATFORM_WEB } from '../../constants';
 	import { ExternalLink, InfoCircled } from 'radix-icons-svelte';
diff --git a/src/lib/components/EpisodeCard/EpisodeCard.svelte b/src/lib/components/EpisodeCard/EpisodeCard.svelte
index db4986e..d6d23bb 100644
--- a/src/lib/components/EpisodeCard/EpisodeCard.svelte
+++ b/src/lib/components/EpisodeCard/EpisodeCard.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 	import classNames from 'classnames';
 	import { ArrowDown, Check, TriangleRight } from 'radix-icons-svelte';
 	import type { Readable } from 'svelte/store';
@@ -9,7 +9,7 @@
 	export let episodeNumber: number;
 	export let episodeName: string;
 	export let backdropUrl: string;
-	export let handlePlay: (() => void) | undefined = undefined
+	export let handlePlay: (() => void) | undefined = undefined;
 	export let isWatched = false;
 	export let playbackProgress = 0;
 
diff --git a/src/FocusableButton.svelte b/src/lib/components/FocusableButton.svelte
similarity index 87%
rename from src/FocusableButton.svelte
rename to src/lib/components/FocusableButton.svelte
index c8dd7d7..6cc841f 100644
--- a/src/FocusableButton.svelte
+++ b/src/lib/components/FocusableButton.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { onMount } from 'svelte';
-	import { Selectable, type FlowDirection } from './lib/selectable';
+	import { Selectable, type FlowDirection } from '../selectable';
 
 	export let name: string = '';
 	export let direction: FlowDirection = 'vertical';
diff --git a/src/lib/components/FocusableSection.svelte b/src/lib/components/FocusableSection.svelte
index cd37097..f122253 100644
--- a/src/lib/components/FocusableSection.svelte
+++ b/src/lib/components/FocusableSection.svelte
@@ -1,5 +1,5 @@
 <script>
-	import Container from '../../Container.svelte';
+	import Container from './Container.svelte';
 </script>
 
 <Container>
diff --git a/src/lib/components/Ghosts/ButtonGhost.svelte b/src/lib/components/Ghosts/ButtonGhost.svelte
index 4fff89a..a5bfa4e 100644
--- a/src/lib/components/Ghosts/ButtonGhost.svelte
+++ b/src/lib/components/Ghosts/ButtonGhost.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 </script>
 
 <Container
diff --git a/src/lib/components/HeroCarousel/HeroCarousel.svelte b/src/lib/components/HeroCarousel/HeroCarousel.svelte
index f49c642..16e676d 100644
--- a/src/lib/components/HeroCarousel/HeroCarousel.svelte
+++ b/src/lib/components/HeroCarousel/HeroCarousel.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 	import HeroShowcaseBackground from './HeroBackground.svelte';
 	import IconButton from '../IconButton.svelte';
 	import { ChevronRight } from 'radix-icons-svelte';
diff --git a/src/lib/components/IconToggle.svelte b/src/lib/components/IconToggle.svelte
index f8d8c41..e936b52 100644
--- a/src/lib/components/IconToggle.svelte
+++ b/src/lib/components/IconToggle.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../Container.svelte';
+	import Container from './Container.svelte';
 	import classNames from 'classnames';
 	import type { Readable } from 'svelte/store';
 	import type { ComponentType } from 'svelte';
diff --git a/src/lib/components/Integrations/TmdbIntegrationConnect.svelte b/src/lib/components/Integrations/TmdbIntegrationConnect.svelte
index 0e41e63..112f737 100644
--- a/src/lib/components/Integrations/TmdbIntegrationConnect.svelte
+++ b/src/lib/components/Integrations/TmdbIntegrationConnect.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 	import { tmdbApi } from '../../apis/tmdb/tmdb-api';
 	import Button from '../Button.svelte';
 	import { createEventDispatcher, onMount } from 'svelte';
diff --git a/src/lib/components/Login.svelte b/src/lib/components/Login.svelte
index 84456d6..3907e24 100644
--- a/src/lib/components/Login.svelte
+++ b/src/lib/components/Login.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../Container.svelte';
+	import Container from './Container.svelte';
 	import TextField from '../components/TextField.svelte';
 	import Button from '../components/Button.svelte';
 	import { createLocalStorageStore } from '../stores/localstorage.store';
diff --git a/src/lib/components/MediaManager/DownloadList.svelte b/src/lib/components/MediaManager/DownloadList.svelte
index 172a655..768e02b 100644
--- a/src/lib/components/MediaManager/DownloadList.svelte
+++ b/src/lib/components/MediaManager/DownloadList.svelte
@@ -4,7 +4,7 @@
 	import { formatSize } from '../../utils';
 	import { ChevronRight } from 'radix-icons-svelte';
 	import type { Download } from '../../apis/combined-types';
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 
 	export let downloads: Promise<Download[]>;
 	export let cancelDownload: (downloadId: number) => Promise<any>;
diff --git a/src/lib/components/MediaManager/MediaManagerMenuLayout.svelte b/src/lib/components/MediaManager/MediaManagerMenuLayout.svelte
index ef5bca8..91f6bdc 100644
--- a/src/lib/components/MediaManager/MediaManagerMenuLayout.svelte
+++ b/src/lib/components/MediaManager/MediaManagerMenuLayout.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 
 	export let focusOnMount = false;
 </script>
diff --git a/src/lib/components/MediaManager/modals/FileActionsModal.svelte b/src/lib/components/MediaManager/modals/FileActionsModal.svelte
index 7af66ed..63205d1 100644
--- a/src/lib/components/MediaManager/modals/FileActionsModal.svelte
+++ b/src/lib/components/MediaManager/modals/FileActionsModal.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../../../Container.svelte';
+	import Container from '../../Container.svelte';
 	import { formatSize } from '../../../utils';
 	import Button from '../../Button.svelte';
 	import FullScreenModal from '../../Modal/FullScreenModal.svelte';
diff --git a/src/lib/components/MediaManager/modals/ReleaseActionsModal.svelte b/src/lib/components/MediaManager/modals/ReleaseActionsModal.svelte
index 69219bc..3c3b2a1 100644
--- a/src/lib/components/MediaManager/modals/ReleaseActionsModal.svelte
+++ b/src/lib/components/MediaManager/modals/ReleaseActionsModal.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../../../Container.svelte';
+	import Container from '../../Container.svelte';
 	import { formatSize } from '../../../utils';
 	import Button from '../../Button.svelte';
 	import FullScreenModal from '../../Modal/FullScreenModal.svelte';
diff --git a/src/lib/components/MediaManagerModal/Downloads/MMDownloadRow.svelte b/src/lib/components/MediaManagerModal/Downloads/MMDownloadRow.svelte
index caf3c76..4274cf1 100644
--- a/src/lib/components/MediaManagerModal/Downloads/MMDownloadRow.svelte
+++ b/src/lib/components/MediaManagerModal/Downloads/MMDownloadRow.svelte
@@ -4,7 +4,7 @@
 	import type { Download } from '../../../apis/combined-types';
 	import type { CancelDownloadFn } from '../MediaManagerModal';
 	import { scrollIntoView } from '../../../selectable';
-	import Container from '../../../../Container.svelte';
+	import Container from '../../Container.svelte';
 	import classNames from 'classnames';
 	import { modalStack } from '../../Modal/modal.store';
 	import MMConfirmDeleteFileDialog from '../Dialogs/MMConfirmDeleteFileDialog.svelte';
diff --git a/src/lib/components/MediaManagerModal/LocalFiles/MMLocalFilesTab.svelte b/src/lib/components/MediaManagerModal/LocalFiles/MMLocalFilesTab.svelte
index bb04dd1..1e7336c 100644
--- a/src/lib/components/MediaManagerModal/LocalFiles/MMLocalFilesTab.svelte
+++ b/src/lib/components/MediaManagerModal/LocalFiles/MMLocalFilesTab.svelte
@@ -5,7 +5,7 @@
 	import TableHeaderRow from '../../Table/TableHeaderRow.svelte';
 	import TableHeaderSortBy from '../../Table/TableHeaderSortBy.svelte';
 	import TableHeaderCell from '../../Table/TableHeaderCell.svelte';
-	import Container from '../../../../Container.svelte';
+	import Container from '../../Container.svelte';
 	import Button from '../../Button.svelte';
 	import { Cross1, Trash } from 'radix-icons-svelte';
 	import { scrollIntoView } from '../../../selectable';
diff --git a/src/lib/components/MediaManagerModal/MMAddToRadarrDialog.svelte b/src/lib/components/MediaManagerModal/MMAddToRadarrDialog.svelte
index 9baf4b7..a55c8d8 100644
--- a/src/lib/components/MediaManagerModal/MMAddToRadarrDialog.svelte
+++ b/src/lib/components/MediaManagerModal/MMAddToRadarrDialog.svelte
@@ -11,7 +11,7 @@
 	import { modalStack } from '../Modal/modal.store';
 	import classNames from 'classnames';
 	import { fade } from 'svelte/transition';
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 	import { capitalize, formatSize } from '../../utils';
 	import { ArrowRight, Check, Plus } from 'radix-icons-svelte';
 	import Button from '../Button.svelte';
diff --git a/src/lib/components/MediaManagerModal/MMAddToSonarrDialog.svelte b/src/lib/components/MediaManagerModal/MMAddToSonarrDialog.svelte
index 73fedd2..e7cd4bd 100644
--- a/src/lib/components/MediaManagerModal/MMAddToSonarrDialog.svelte
+++ b/src/lib/components/MediaManagerModal/MMAddToSonarrDialog.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import Dialog from '../Dialog/Dialog.svelte';
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 	import Button from '../Button.svelte';
 	import { ArrowRight, Check, Plus, Trash } from 'radix-icons-svelte';
 	import { modalStack } from '../Modal/modal.store';
diff --git a/src/lib/components/MediaManagerModal/MMMainLayout.svelte b/src/lib/components/MediaManagerModal/MMMainLayout.svelte
index e89a108..86097e5 100644
--- a/src/lib/components/MediaManagerModal/MMMainLayout.svelte
+++ b/src/lib/components/MediaManagerModal/MMMainLayout.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 	import classNames from 'classnames';
 	import MMTitle from './MMTitle.svelte';
 
diff --git a/src/lib/components/MediaManagerModal/MMModal.svelte b/src/lib/components/MediaManagerModal/MMModal.svelte
index d4e8ec6..2a6ff40 100644
--- a/src/lib/components/MediaManagerModal/MMModal.svelte
+++ b/src/lib/components/MediaManagerModal/MMModal.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import classNames from 'classnames';
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 	import { modalStack } from '../Modal/modal.store';
 	import Modal from '../Modal/Modal.svelte';
 
diff --git a/src/lib/components/MediaManagerModal/Releases/MMReleasesTab.svelte b/src/lib/components/MediaManagerModal/Releases/MMReleasesTab.svelte
index e8c37da..7edd46e 100644
--- a/src/lib/components/MediaManagerModal/Releases/MMReleasesTab.svelte
+++ b/src/lib/components/MediaManagerModal/Releases/MMReleasesTab.svelte
@@ -6,7 +6,7 @@
 	import TableHeaderRow from '../../Table/TableHeaderRow.svelte';
 	import TableHeaderSortBy from '../../Table/TableHeaderSortBy.svelte';
 	import type { GrabReleaseFn } from '../MediaManagerModal';
-	import Container from '../../../../Container.svelte';
+	import Container from '../../Container.svelte';
 	import TableHeaderCell from '../../Table/TableHeaderCell.svelte';
 	import MMTitle from '../MMTitle.svelte';
 
diff --git a/src/lib/components/Modal/FullScreenModal.svelte b/src/lib/components/Modal/FullScreenModal.svelte
index 9d33f53..8a0f4c6 100644
--- a/src/lib/components/Modal/FullScreenModal.svelte
+++ b/src/lib/components/Modal/FullScreenModal.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import classNames from 'classnames';
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 	import { modalStack } from './modal.store';
 
 	export let modalId: symbol;
diff --git a/src/lib/components/Modal/Modal.svelte b/src/lib/components/Modal/Modal.svelte
index da3d075..9018d30 100644
--- a/src/lib/components/Modal/Modal.svelte
+++ b/src/lib/components/Modal/Modal.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 	import { modalStack } from './modal.store';
 	import classNames from 'classnames';
 </script>
diff --git a/src/lib/components/PersonCard/PersonCard.svelte b/src/lib/components/PersonCard/PersonCard.svelte
index b173cf5..35a12a1 100644
--- a/src/lib/components/PersonCard/PersonCard.svelte
+++ b/src/lib/components/PersonCard/PersonCard.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import classNames from 'classnames';
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 	import AnimateScale from '../AnimateScale.svelte';
 	import type { Readable } from 'svelte/store';
 	import { navigate } from '../StackRouter/StackRouter';
diff --git a/src/lib/components/ProfileIcon.svelte b/src/lib/components/ProfileIcon.svelte
index 4fa75d4..5e76645 100644
--- a/src/lib/components/ProfileIcon.svelte
+++ b/src/lib/components/ProfileIcon.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import classNames from 'classnames';
-	import Container from '../../Container.svelte';
+	import Container from './Container.svelte';
 	import type { Readable } from 'svelte/store';
 	import AnimateScale from './AnimateScale.svelte';
 	import type { ComponentType } from 'svelte';
diff --git a/src/lib/components/SelectField.svelte b/src/lib/components/SelectField.svelte
index 6154cfb..cf552be 100644
--- a/src/lib/components/SelectField.svelte
+++ b/src/lib/components/SelectField.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../Container.svelte';
+	import Container from './Container.svelte';
 	import { ArrowRight } from 'radix-icons-svelte';
 	import classNames from 'classnames';
 	import { createEventDispatcher } from 'svelte';
diff --git a/src/lib/components/SelectItem.svelte b/src/lib/components/SelectItem.svelte
index dca7559..85b6bc5 100644
--- a/src/lib/components/SelectItem.svelte
+++ b/src/lib/components/SelectItem.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../Container.svelte';
+	import Container from './Container.svelte';
 	import { ArrowRight, Check } from 'radix-icons-svelte';
 	import classNames from 'classnames';
 
diff --git a/src/lib/components/Sidebar/Sidebar.svelte b/src/lib/components/Sidebar/Sidebar.svelte
index 7c8113a..09ccc21 100644
--- a/src/lib/components/Sidebar/Sidebar.svelte
+++ b/src/lib/components/Sidebar/Sidebar.svelte
@@ -10,7 +10,7 @@
 	} from 'radix-icons-svelte';
 	import classNames from 'classnames';
 	import { get, type Readable, writable, type Writable } from 'svelte/store';
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 	import { registrars, Selectable } from '../../selectable';
 	import { stackRouter, navigate } from '../StackRouter/StackRouter';
 	import { onMount } from 'svelte';
diff --git a/src/lib/components/StackRouter/StackRouter.ts b/src/lib/components/StackRouter/StackRouter.ts
index 603fd4c..5c6fea6 100644
--- a/src/lib/components/StackRouter/StackRouter.ts
+++ b/src/lib/components/StackRouter/StackRouter.ts
@@ -1,19 +1,19 @@
 import { derived, get, writable } from 'svelte/store';
 import { type ComponentType } from 'svelte';
 import SeriesHomePage from '../../pages/SeriesHomePage.svelte';
-import SeriesPage from '../SeriesPage/SeriesPage.svelte';
-import EpisodePage from '../../pages/EpisodePage.svelte';
+import EpisodePage from '../../pages/TitlePages/EpisodePage.svelte';
 import { modalStack } from '../Modal/modal.store';
 import MoviesHomePage from '../../pages/MoviesHomePage.svelte';
-import MoviePage from '../../pages/MoviePage/MoviePage.svelte';
 import LibraryPage from '../../pages/LibraryPage.svelte';
 import SearchPage from '../../pages/SearchPage.svelte';
 import PageNotFound from '../../pages/PageNotFound.svelte';
 import ManagePage from '../../pages/ManagePage/ManagePage.svelte';
 import PersonPage from '../../pages/PersonPage.svelte';
 import UsersPage from '../../pages/UsersPage.svelte';
-import UiComponents from '../../pages/UiComponents.svelte';
-import StreamSelectorPage from '../../pages/StreamSelectorPage/StreamSelectorPage.svelte';
+import StreamSelectorPage from '../../pages/TitlePages/StreamSelectorModal.svelte';
+import SeriesPage from '../../pages/TitlePages/SeriesPage/SeriesPage.svelte';
+import MoviePage from '../../pages/TitlePages/MoviePage/MoviePage.svelte';
+import UiComponents from '../../pages/UIComponents.svelte';
 
 interface Page {
 	id: symbol;
diff --git a/src/lib/components/Tab/Tab.svelte b/src/lib/components/Tab/Tab.svelte
index 5bac96a..915d199 100644
--- a/src/lib/components/Tab/Tab.svelte
+++ b/src/lib/components/Tab/Tab.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 	import classNames from 'classnames';
 	import type { NavigateEvent, Selectable } from '../../selectable';
 	import type { Writable } from 'svelte/store';
diff --git a/src/lib/components/Tab/TabContainer.svelte b/src/lib/components/Tab/TabContainer.svelte
index e430945..be1e3d7 100644
--- a/src/lib/components/Tab/TabContainer.svelte
+++ b/src/lib/components/Tab/TabContainer.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 	import type { NavigateEvent } from '../../selectable';
 
 	function handleNavigate({ detail }: CustomEvent<NavigateEvent>) {}
diff --git a/src/lib/components/Table/Table.svelte b/src/lib/components/Table/Table.svelte
index d8d7618..825e409 100644
--- a/src/lib/components/Table/Table.svelte
+++ b/src/lib/components/Table/Table.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 
 	export let rows: number;
 </script>
diff --git a/src/lib/components/Table/TableButton.svelte b/src/lib/components/Table/TableButton.svelte
index 4bc85e3..b5e70f0 100644
--- a/src/lib/components/Table/TableButton.svelte
+++ b/src/lib/components/Table/TableButton.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 	import classNames from 'classnames';
 
 	export let disabled = false;
diff --git a/src/lib/components/Table/TableHeaderRow.svelte b/src/lib/components/Table/TableHeaderRow.svelte
index 4a98363..a52c1d8 100644
--- a/src/lib/components/Table/TableHeaderRow.svelte
+++ b/src/lib/components/Table/TableHeaderRow.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 </script>
 
 <Container
diff --git a/src/lib/components/Table/TableHeaderSortBy.svelte b/src/lib/components/Table/TableHeaderSortBy.svelte
index dc5f65e..0a4e4a4 100644
--- a/src/lib/components/Table/TableHeaderSortBy.svelte
+++ b/src/lib/components/Table/TableHeaderSortBy.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 	import classNames from 'classnames';
 	import { ChevronDown, ChevronUp } from 'radix-icons-svelte';
 	import type { Readable } from 'svelte/store';
diff --git a/src/lib/components/Table/TableRow.svelte b/src/lib/components/Table/TableRow.svelte
index 81a0d22..99bd5f9 100644
--- a/src/lib/components/Table/TableRow.svelte
+++ b/src/lib/components/Table/TableRow.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 	import classNames from 'classnames';
 	import type { Readable } from 'svelte/store';
 
diff --git a/src/lib/components/TextField.svelte b/src/lib/components/TextField.svelte
index a8a4782..6cdd89a 100644
--- a/src/lib/components/TextField.svelte
+++ b/src/lib/components/TextField.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../Container.svelte';
+	import Container from './Container.svelte';
 	import type { FormEventHandler, HTMLInputTypeAttribute } from 'svelte/elements';
 	import { type ComponentType, createEventDispatcher } from 'svelte';
 	import { PLATFORM_TV } from '../constants';
diff --git a/src/lib/components/Toggle.svelte b/src/lib/components/Toggle.svelte
index f75e51c..906a32c 100644
--- a/src/lib/components/Toggle.svelte
+++ b/src/lib/components/Toggle.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../Container.svelte';
+	import Container from './Container.svelte';
 	import { createEventDispatcher } from 'svelte';
 
 	const dispatch = createEventDispatcher<{
diff --git a/src/lib/components/VideoPlayer/IconButton.svelte b/src/lib/components/VideoPlayer/IconButton.svelte
index 55e41db..35759b8 100644
--- a/src/lib/components/VideoPlayer/IconButton.svelte
+++ b/src/lib/components/VideoPlayer/IconButton.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 	import classNames from 'classnames';
 </script>
 
diff --git a/src/lib/components/VideoPlayer/JellyfinVideoPlayerModal.svelte b/src/lib/components/VideoPlayer/JellyfinVideoPlayerModal.svelte
index bcacaf2..038bbaa 100644
--- a/src/lib/components/VideoPlayer/JellyfinVideoPlayerModal.svelte
+++ b/src/lib/components/VideoPlayer/JellyfinVideoPlayerModal.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import classNames from 'classnames';
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 	import VideoPlayer from './VideoPlayer.svelte';
 	import type { PlaybackInfo, Subtitles, SubtitleInfo, AudioTrack } from './VideoPlayer';
 	import { jellyfinApi } from '../../apis/jellyfin/jellyfin-api';
diff --git a/src/lib/components/VideoPlayer/ProgressBar.svelte b/src/lib/components/VideoPlayer/ProgressBar.svelte
index d654998..da600bd 100644
--- a/src/lib/components/VideoPlayer/ProgressBar.svelte
+++ b/src/lib/components/VideoPlayer/ProgressBar.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 	import { createEventDispatcher } from 'svelte';
 	import classNames from 'classnames';
 	import type { NavigateEvent } from '../../selectable';
diff --git a/src/lib/components/VideoPlayer/VideoPlayer.svelte b/src/lib/components/VideoPlayer/VideoPlayer.svelte
index 20ceb0c..3721820 100644
--- a/src/lib/components/VideoPlayer/VideoPlayer.svelte
+++ b/src/lib/components/VideoPlayer/VideoPlayer.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 	import VideoElement from './VideoElement.svelte';
 	import type { PlaybackInfo, SubtitleInfo, Subtitles } from './VideoPlayer';
 	import classNames from 'classnames';
diff --git a/src/lib/components/VideoPlayer/VideoPlayerModal.svelte b/src/lib/components/VideoPlayer/VideoPlayerModal.svelte
index 989ffc1..ae41a35 100644
--- a/src/lib/components/VideoPlayer/VideoPlayerModal.svelte
+++ b/src/lib/components/VideoPlayer/VideoPlayerModal.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import classNames from 'classnames';
-	import Container from '../../../Container.svelte';
+	import Container from '../Container.svelte';
 	import VideoPlayer from './VideoPlayer.svelte';
 	import type { PlaybackInfo, Subtitles, SubtitleInfo, AudioTrack } from './VideoPlayer';
 	import { jellyfinApi } from '../../apis/jellyfin/jellyfin-api';
@@ -58,7 +58,7 @@
 
 	$: videoStreamP && asd();
 
-	const asd = () => 
+	const asd = () =>
 		videoStreamP.then((stream) => {
 			// async function loadPlaybackInfo(
 			// 		options: { audioStreamIndex?: number; bitrate?: number; playbackPosition?: number } = {}
diff --git a/src/lib/pages/ManagePage/EditPluginDialog.ManagePage.svelte b/src/lib/pages/ManagePage/EditPluginDialog.ManagePage.svelte
index d118967..2d30115 100644
--- a/src/lib/pages/ManagePage/EditPluginDialog.ManagePage.svelte
+++ b/src/lib/pages/ManagePage/EditPluginDialog.ManagePage.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { get, writable } from 'svelte/store';
-	import Container from '../../../Container.svelte';
+	import Container from '$components/Container.svelte';
 	import Button from '../../components/Button.svelte';
 	import Dialog from '../../components/Dialog/Dialog.svelte';
 	import { modalStack } from '../../components/Modal/modal.store';
diff --git a/src/lib/pages/ManagePage/ManagePage.svelte b/src/lib/pages/ManagePage/ManagePage.svelte
index 90b70e5..719ef32 100644
--- a/src/lib/pages/ManagePage/ManagePage.svelte
+++ b/src/lib/pages/ManagePage/ManagePage.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../../Container.svelte';
+	import Container from '$components/Container.svelte';
 	import Button from '../../components/Button.svelte';
 	import Toggle from '../../components/Toggle.svelte';
 	import { localSettings } from '../../stores/localstorage.store';
@@ -216,7 +216,7 @@
 				</Container>
 			</div>
 
-<Plugins />
+			<Plugins />
 
 			<div>
 				<h1 class="font-semibold text-2xl text-secondary-100 mb-8">Integrations</h1>
diff --git a/src/lib/pages/ManagePage/PluginButton.ManagePage.svelte b/src/lib/pages/ManagePage/PluginButton.ManagePage.svelte
index 85a83a9..2203398 100644
--- a/src/lib/pages/ManagePage/PluginButton.ManagePage.svelte
+++ b/src/lib/pages/ManagePage/PluginButton.ManagePage.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { ArrowRight, ChevronRight } from 'radix-icons-svelte';
-	import Container from '../../../Container.svelte';
+	import Container from '$components/Container.svelte';
 	import Button from '../../components/Button.svelte';
 	import { createModal, modalStack } from '../../components/Modal/modal.store';
 	import EditPluginDialog from './EditPluginDialog.ManagePage.svelte';
diff --git a/src/lib/pages/ManagePage/Plugins.ManagePage.svelte b/src/lib/pages/ManagePage/Plugins.ManagePage.svelte
index cca1bda..48e580e 100644
--- a/src/lib/pages/ManagePage/Plugins.ManagePage.svelte
+++ b/src/lib/pages/ManagePage/Plugins.ManagePage.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { Plus } from 'radix-icons-svelte';
 
-	import Container from '../../../Container.svelte';
+	import Container from '$components/Container.svelte';
 	import Button from '../../components/Button.svelte';
 	import { reiverrApiNew, user } from '../../stores/user.store';
 	import { createModal } from '../../components/Modal/modal.store';
diff --git a/src/lib/pages/MoviesHomePage.svelte b/src/lib/pages/MoviesHomePage.svelte
index 0fd1686..fde022a 100644
--- a/src/lib/pages/MoviesHomePage.svelte
+++ b/src/lib/pages/MoviesHomePage.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../Container.svelte';
+	import Container from '$components/Container.svelte';
 	import HeroShowcase from '../components/HeroShowcase/HeroShowcase.svelte';
 	import { TMDB_MOVIE_GENRES, TmdbApi, tmdbApi } from '../apis/tmdb/tmdb-api';
 	import { getShowcasePropsFromTmdbMovie } from '../components/HeroShowcase/HeroShowcase';
diff --git a/src/lib/pages/OnboardingPage.svelte b/src/lib/pages/OnboardingPage.svelte
index a2a4cd3..4c135c6 100644
--- a/src/lib/pages/OnboardingPage.svelte
+++ b/src/lib/pages/OnboardingPage.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../Container.svelte';
+	import Container from '$components/Container.svelte';
 	import Tab from '../components/Tab/Tab.svelte';
 	import Button from '../components/Button.svelte';
 	import { tmdbApi } from '../apis/tmdb/tmdb-api';
diff --git a/src/lib/pages/PageNotFound.svelte b/src/lib/pages/PageNotFound.svelte
index 44ccb79..ba78b54 100644
--- a/src/lib/pages/PageNotFound.svelte
+++ b/src/lib/pages/PageNotFound.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { useLocation, useNavigate } from 'svelte-navigator';
-	import Container from '../../Container.svelte';
+	import Container from '$components/Container.svelte';
 	import { navigate } from '../components/StackRouter/StackRouter';
 	import { onMount } from 'svelte';
 
diff --git a/src/lib/pages/PersonPage.svelte b/src/lib/pages/PersonPage.svelte
index 5aafe5b..705a164 100644
--- a/src/lib/pages/PersonPage.svelte
+++ b/src/lib/pages/PersonPage.svelte
@@ -6,7 +6,7 @@
 	import { DotFilled } from 'radix-icons-svelte';
 	import CardGrid from '../components/CardGrid.svelte';
 	import TmdbCard from '../components/Card/TmdbCard.svelte';
-	import Container from '../../Container.svelte';
+	import Container from '$components/Container.svelte';
 	import { scrollIntoView } from '../selectable';
 
 	export let id: string;
diff --git a/src/lib/pages/SearchPage.svelte b/src/lib/pages/SearchPage.svelte
index 77729cb..4dd1aa4 100644
--- a/src/lib/pages/SearchPage.svelte
+++ b/src/lib/pages/SearchPage.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Container from '../../Container.svelte';
+	import Container from '$components/Container.svelte';
 	import { MagnifyingGlass } from 'radix-icons-svelte';
 	import classNames from 'classnames';
 	import { tmdbApi } from '../apis/tmdb/tmdb-api';
diff --git a/src/lib/pages/EpisodePage.svelte b/src/lib/pages/TitlePages/EpisodePage.svelte
similarity index 87%
rename from src/lib/pages/EpisodePage.svelte
rename to src/lib/pages/TitlePages/EpisodePage.svelte
index 97efb20..2a4b688 100644
--- a/src/lib/pages/EpisodePage.svelte
+++ b/src/lib/pages/TitlePages/EpisodePage.svelte
@@ -1,32 +1,32 @@
 <script lang="ts">
-	import Container from '../../Container.svelte';
-	import { tmdbApi } from '../apis/tmdb/tmdb-api';
-	import DetachedPage from '../components/DetachedPage/DetachedPage.svelte';
-	import { useActionRequest } from '../stores/data.store';
-	import { PLATFORM_WEB, TMDB_IMAGES_ORIGINAL } from '../constants';
+	import Container from '$components/Container.svelte';
+	import { tmdbApi } from '../../apis/tmdb/tmdb-api';
+	import DetachedPage from '../../components/DetachedPage/DetachedPage.svelte';
+	import { useActionRequest } from '../../stores/data.store';
+	import { PLATFORM_WEB, TMDB_IMAGES_ORIGINAL } from '../../constants';
 	import { Check, DotFilled, ExternalLink, Play, Plus, Trash } from 'radix-icons-svelte';
-	import HeroInfoTitle from '../components/HeroInfo/HeroInfoTitle.svelte';
-	import Button from '../components/Button.svelte';
-	import { jellyfinApi } from '../apis/jellyfin/jellyfin-api';
-	import { playerState } from '../components/VideoPlayer/VideoPlayer';
-	import { formatSize, retry, timeout } from '../utils';
-	import { createModal, modalStack } from '../components/Modal/modal.store';
-	import ButtonGhost from '../components/Ghosts/ButtonGhost.svelte';
+	import HeroInfoTitle from '../../components/HeroInfo/HeroInfoTitle.svelte';
+	import Button from '../../components/Button.svelte';
+	import { jellyfinApi } from '../../apis/jellyfin/jellyfin-api';
+	import { playerState } from '../../components/VideoPlayer/VideoPlayer';
+	import { formatSize, retry, timeout } from '../../utils';
+	import { createModal, modalStack } from '../../components/Modal/modal.store';
+	import ButtonGhost from '../../components/Ghosts/ButtonGhost.svelte';
 	import {
 		type EpisodeFileResource,
 		sonarrApi,
 		type SonarrEpisode,
 		type SonarrSeries
-	} from '../apis/sonarr/sonarr-api';
-	import MMAddToSonarrDialog from '../components/MediaManagerModal/MMAddToSonarrDialog.svelte';
-	import SonarrMediaManagerModal from '../components/MediaManagerModal/SonarrMediaManagerModal.svelte';
-	import ConfirmDialog from '../components/Dialog/ConfirmDialog.svelte';
+	} from '../../apis/sonarr/sonarr-api';
+	import MMAddToSonarrDialog from '../../components/MediaManagerModal/MMAddToSonarrDialog.svelte';
+	import SonarrMediaManagerModal from '../../components/MediaManagerModal/SonarrMediaManagerModal.svelte';
+	import ConfirmDialog from '../../components/Dialog/ConfirmDialog.svelte';
 	import { tick } from 'svelte';
-	import { useUserData } from '../stores/library.store';
+	import { useUserData } from '../../stores/library.store';
 	import { get, writable } from 'svelte/store';
-	import { reiverrApiNew, sources, user } from '../stores/user.store';
-	import type { MediaSource, VideoStreamCandidateDto } from '../apis/reiverr/reiverr.openapi';
-	import SelectDialog from '../components/Dialog/SelectDialog.svelte';
+	import { reiverrApiNew, sources, user } from '../../stores/user.store';
+	import type { MediaSource, VideoStreamCandidateDto } from '../../apis/reiverr/reiverr.openapi';
+	import SelectDialog from '../../components/Dialog/SelectDialog.svelte';
 	import { handleOpenStreamSelector } from './MoviePage/MoviePage.shared';
 
 	export let id: string; // Series tmdbId
diff --git a/src/lib/pages/MoviePage/MoviePage.shared.ts b/src/lib/pages/TitlePages/MoviePage/MoviePage.shared.ts
similarity index 78%
rename from src/lib/pages/MoviePage/MoviePage.shared.ts
rename to src/lib/pages/TitlePages/MoviePage/MoviePage.shared.ts
index 3bb2aa9..d951f69 100644
--- a/src/lib/pages/MoviePage/MoviePage.shared.ts
+++ b/src/lib/pages/TitlePages/MoviePage/MoviePage.shared.ts
@@ -2,12 +2,12 @@ import type {
 	MediaSource,
 	MediaUserDataDto,
 	VideoStreamCandidateDto
-} from '../../apis/reiverr/reiverr.openapi';
-import type { TmdbMovieFull2, TmdbSeason, TmdbSeriesFull2 } from '../../apis/tmdb/tmdb-api';
-import { createModal } from '../../components/Modal/modal.store';
-import { playerState } from '../../components/VideoPlayer/VideoPlayer';
-import { reiverrApiNew } from '../../stores/user.store';
-import StreamSelectorPage from '../StreamSelectorPage/StreamSelectorPage.svelte';
+} from '../../../apis/reiverr/reiverr.openapi';
+import type { TmdbMovieFull2, TmdbSeason } from '../../../apis/tmdb/tmdb-api';
+import { createModal } from '../../../components/Modal/modal.store';
+import { playerState } from '../../../components/VideoPlayer/VideoPlayer';
+import { reiverrApiNew } from '../../../stores/user.store';
+import StreamSelectorModal from '../StreamSelectorModal.svelte';
 
 type Episode = Pick<
 	NonNullable<TmdbSeason['episodes']>[0],
@@ -66,7 +66,7 @@ async function playStream(
 }
 
 export function handleOpenStreamSelector(tmdbItem: TmdbItem, userData: MediaUserDataDto) {
-	createModal(StreamSelectorPage, {
+	createModal(StreamSelectorModal, {
 		getStreams: (s) => getStreams(tmdbItem, s),
 		selectStream: (source, stream) => playStream(tmdbItem, userData, source, stream)
 	});
diff --git a/src/lib/pages/MoviePage/MoviePage.svelte b/src/lib/pages/TitlePages/MoviePage/MoviePage.svelte
similarity index 89%
rename from src/lib/pages/MoviePage/MoviePage.svelte
rename to src/lib/pages/TitlePages/MoviePage/MoviePage.svelte
index a05d4fd..0a1870b 100644
--- a/src/lib/pages/MoviePage/MoviePage.svelte
+++ b/src/lib/pages/TitlePages/MoviePage/MoviePage.svelte
@@ -2,38 +2,36 @@
 	import classNames from 'classnames';
 	import { Bookmark, DotFilled, ExternalLink, Minus, Play, Plus } from 'radix-icons-svelte';
 	import { get, writable } from 'svelte/store';
-	import Container from '../../../Container.svelte';
-	import { jellyfinApi } from '../../apis/jellyfin/jellyfin-api';
+	import { jellyfinApi } from '$lib/apis/jellyfin/jellyfin-api';
 	import {
 		type MovieDownload,
 		type MovieFileResource,
 		radarrApi
-	} from '../../apis/radarr/radarr-api';
-	import type { MediaSource, VideoStreamCandidateDto } from '../../apis/reiverr/reiverr.openapi';
-	import { tmdbApi } from '../../apis/tmdb/tmdb-api';
-	import Button from '../../components/Button.svelte';
-	import TmdbCard from '../../components/Card/TmdbCard.svelte';
-	import Carousel from '../../components/Carousel/Carousel.svelte';
-	import DetachedPage from '../../components/DetachedPage/DetachedPage.svelte';
-	import ConfirmDialog from '../../components/Dialog/ConfirmDialog.svelte';
-	import HeroCarousel from '../../components/HeroCarousel/HeroCarousel.svelte';
-	import MMAddToRadarrDialog from '../../components/MediaManagerModal/MMAddToRadarrDialog.svelte';
-	import MovieMediaManagerModal from '../../components/MediaManagerModal/RadarrMediaManagerModal.svelte';
-	import { createModal, modalStack } from '../../components/Modal/modal.store';
-	import TmdbPersonCard from '../../components/PersonCard/TmdbPersonCard.svelte';
-	import { playerState } from '../../components/VideoPlayer/VideoPlayer';
-	import { PLATFORM_WEB, TMDB_IMAGES_ORIGINAL } from '../../constants';
-	import { TMDB_BACKDROP_SMALL } from '../../constants.js';
-	import { scrollIntoView } from '../../selectable';
-	import { useActionRequests, useRequest } from '../../stores/data.store';
-	import { reiverrApiNew, sources, user } from '../../stores/user.store';
+	} from '$lib/apis/radarr/radarr-api';
+	import type { MediaSource, VideoStreamCandidateDto } from '$lib/apis/reiverr/reiverr.openapi';
+	import { tmdbApi } from '$lib/apis/tmdb/tmdb-api';
+	import Button from '$lib/components/Button.svelte';
+	import TmdbCard from '$lib/components/Card/TmdbCard.svelte';
+	import Carousel from '$lib/components/Carousel/Carousel.svelte';
+	import DetachedPage from '$lib/components/DetachedPage/DetachedPage.svelte';
+	import ConfirmDialog from '$lib/components/Dialog/ConfirmDialog.svelte';
+	import HeroCarousel from '$lib/components/HeroCarousel/HeroCarousel.svelte';
+	import MMAddToRadarrDialog from '$lib/components/MediaManagerModal/MMAddToRadarrDialog.svelte';
+	import MovieMediaManagerModal from '$lib/components/MediaManagerModal/RadarrMediaManagerModal.svelte';
+	import { createModal, modalStack } from '$lib/components/Modal/modal.store';
+	import TmdbPersonCard from '$lib/components/PersonCard/TmdbPersonCard.svelte';
+	import { playerState } from '$lib/components/VideoPlayer/VideoPlayer';
+	import { PLATFORM_WEB, TMDB_IMAGES_ORIGINAL } from '$lib/constants';
+	import { TMDB_BACKDROP_SMALL } from '$lib/constants.js';
+	import { scrollIntoView } from '$lib/selectable';
+	import { useActionRequests, useRequest } from '$lib/stores/data.store';
+	import { reiverrApiNew, sources, user } from '$lib/stores/user.store';
 	import MovieStreams from './MovieStreams.MoviePage.svelte';
 	import StreamDetailsDialog from './StreamDetailsDialog.MoviePage.svelte';
-	import SelectDialog from '../../components/Dialog/SelectDialog.svelte';
-	import { useUserData } from '../../stores/library.store';
-	import { navigate } from '../../components/StackRouter/StackRouter';
-	import StreamSelectorPage from '../StreamSelectorPage/StreamSelectorPage.svelte';
+	import SelectDialog from '$lib/components/Dialog/SelectDialog.svelte';
 	import { handleOpenStreamSelector } from './MoviePage.shared';
+	import Container from '$components/Container.svelte';
+	import { useUserData } from '$lib/stores/library.store';
 
 	export let id: string;
 	const tmdbId = Number(id);
diff --git a/src/lib/pages/MoviePage/MovieStreams.MoviePage.svelte b/src/lib/pages/TitlePages/MoviePage/MovieStreams.MoviePage.svelte
similarity index 89%
rename from src/lib/pages/MoviePage/MovieStreams.MoviePage.svelte
rename to src/lib/pages/TitlePages/MoviePage/MovieStreams.MoviePage.svelte
index 47749d8..6693a92 100644
--- a/src/lib/pages/MoviePage/MovieStreams.MoviePage.svelte
+++ b/src/lib/pages/TitlePages/MoviePage/MovieStreams.MoviePage.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
 	import classNames from 'classnames';
-	import Container from '../../../Container.svelte';
-	import type { VideoStreamCandidateDto, MediaSource } from '../../apis/reiverr/reiverr.openapi';
-	import { scrollIntoView } from '../../selectable';
-	import { capitalize } from '../../utils';
+	import Container from '$components/Container.svelte';
+	import type { VideoStreamCandidateDto, MediaSource } from '../../../apis/reiverr/reiverr.openapi';
+	import { scrollIntoView } from '../../../selectable';
+	import { capitalize } from '../../../utils';
 	import StreamDetailsDialog from './StreamDetailsDialog.MoviePage.svelte';
-	import { modalStack } from '../../components/Modal/modal.store';
+	import { modalStack } from '../../../components/Modal/modal.store';
 
 	export let sources: { source: MediaSource; streams: Promise<VideoStreamCandidateDto[]> }[];
 	export let createStreamDetailsDialog: (
diff --git a/src/lib/pages/MoviePage/StreamDetailsDialog.MoviePage.svelte b/src/lib/pages/TitlePages/MoviePage/StreamDetailsDialog.MoviePage.svelte
similarity index 82%
rename from src/lib/pages/MoviePage/StreamDetailsDialog.MoviePage.svelte
rename to src/lib/pages/TitlePages/MoviePage/StreamDetailsDialog.MoviePage.svelte
index cf98131..9626f47 100644
--- a/src/lib/pages/MoviePage/StreamDetailsDialog.MoviePage.svelte
+++ b/src/lib/pages/TitlePages/MoviePage/StreamDetailsDialog.MoviePage.svelte
@@ -1,13 +1,9 @@
 <script lang="ts">
-	import { sonarrApi } from '../../apis/sonarr/sonarr-api';
-	import Container from '../../../Container.svelte';
-	import { formatSize } from '../../utils';
 	import { Play, Trash } from 'radix-icons-svelte';
-	import type { FileResource } from '../../apis/combined-types';
-	import type { VideoStreamCandidateDto } from '../../apis/reiverr/reiverr.openapi';
-	import Dialog from '../../components/Dialog/Dialog.svelte';
-	import Button from '../../components/Button.svelte';
-	import { playerState } from '../../components/VideoPlayer/VideoPlayer';
+	import Container from '$components/Container.svelte';
+	import type { VideoStreamCandidateDto } from '../../../apis/reiverr/reiverr.openapi';
+	import Button from '../../../components/Button.svelte';
+	import Dialog from '../../../components/Dialog/Dialog.svelte';
 
 	export let stream: VideoStreamCandidateDto;
 
diff --git a/src/lib/components/SeriesPage/DownloadDetailsDialog.svelte b/src/lib/pages/TitlePages/SeriesPage/DownloadDetailsDialog.svelte
similarity index 84%
rename from src/lib/components/SeriesPage/DownloadDetailsDialog.svelte
rename to src/lib/pages/TitlePages/SeriesPage/DownloadDetailsDialog.svelte
index 86b6b24..5eb0a25 100644
--- a/src/lib/components/SeriesPage/DownloadDetailsDialog.svelte
+++ b/src/lib/pages/TitlePages/SeriesPage/DownloadDetailsDialog.svelte
@@ -1,16 +1,16 @@
 <script lang="ts">
-	import Dialog from '../Dialog/Dialog.svelte';
+	import Dialog from '../../../components/Dialog/Dialog.svelte';
 	import {
 		type EpisodeDownload,
 		sonarrApi,
 		type SonarrEpisode
-	} from '../../apis/sonarr/sonarr-api';
-	import Button from '../Button.svelte';
-	import Container from '../../../Container.svelte';
-	import { formatSize } from '../../utils';
+	} from '../../../apis/sonarr/sonarr-api';
+	import Button from '../../../components/Button.svelte';
+	import Container from '$components/Container.svelte';
+	import { formatSize } from '../../../utils';
 	import { Cross1 } from 'radix-icons-svelte';
-	import { capitalize } from '../../utils.js';
-	import type { Download } from '../../apis/combined-types';
+	import { capitalize } from '../../../utils.js';
+	import type { Download } from '../../../apis/combined-types';
 
 	export let download: Download;
 	export let title: string;
diff --git a/src/lib/components/SeriesPage/EpisodeCarousel.svelte b/src/lib/pages/TitlePages/SeriesPage/EpisodeCarousel.svelte
similarity index 84%
rename from src/lib/components/SeriesPage/EpisodeCarousel.svelte
rename to src/lib/pages/TitlePages/SeriesPage/EpisodeCarousel.svelte
index 1d87c16..025acfc 100644
--- a/src/lib/components/SeriesPage/EpisodeCarousel.svelte
+++ b/src/lib/pages/TitlePages/SeriesPage/EpisodeCarousel.svelte
@@ -1,22 +1,27 @@
 <script lang="ts">
-	import type { JellyfinItem } from '../../apis/jellyfin/jellyfin-api';
-	import EpisodeCard from '../EpisodeCard/EpisodeCard.svelte';
-	import { useDependantRequest } from '../../stores/data.store';
+	import type { JellyfinItem } from '../../../apis/jellyfin/jellyfin-api';
+	import EpisodeCard from '../../../components/EpisodeCard/EpisodeCard.svelte';
+	import { useDependantRequest } from '../../../stores/data.store';
 	import { derived, get, type Readable } from 'svelte/store';
 	import {
 		tmdbApi,
 		type TmdbSeasonEpisode,
 		type TmdbSeason,
 		type TmdbSeriesFull2
-	} from '../../apis/tmdb/tmdb-api';
-	import Carousel from '../Carousel/Carousel.svelte';
-	import Container from '../../../Container.svelte';
-	import { registrars, scrollElementIntoView, scrollIntoView, Selectable } from '../../selectable';
-	import UICarousel from '../Carousel/UICarousel.svelte';
+	} from '../../../apis/tmdb/tmdb-api';
+	import Carousel from '../../../components/Carousel/Carousel.svelte';
+	import Container from '$components/Container.svelte';
+	import {
+		registrars,
+		scrollElementIntoView,
+		scrollIntoView,
+		Selectable
+	} from '../../../selectable';
+	import UICarousel from '../../../components/Carousel/UICarousel.svelte';
 	import classNames from 'classnames';
-	import ScrollHelper from '../ScrollHelper.svelte';
-	import TmdbEpisodeCard from '../EpisodeCard/TmdbEpisodeCard.svelte';
-	import { playerState } from '../VideoPlayer/VideoPlayer';
+	import ScrollHelper from '../../../components/ScrollHelper.svelte';
+	import TmdbEpisodeCard from '../../../components/EpisodeCard/TmdbEpisodeCard.svelte';
+	import { playerState } from '../../../components/VideoPlayer/VideoPlayer';
 
 	export let id: number;
 	export let tmdbSeries: Readable<TmdbSeriesFull2 | undefined>;
diff --git a/src/lib/components/SeriesPage/EpisodeGrid.svelte b/src/lib/pages/TitlePages/SeriesPage/EpisodeGrid.svelte
similarity index 83%
rename from src/lib/components/SeriesPage/EpisodeGrid.svelte
rename to src/lib/pages/TitlePages/SeriesPage/EpisodeGrid.svelte
index a35b83f..5f49c63 100644
--- a/src/lib/components/SeriesPage/EpisodeGrid.svelte
+++ b/src/lib/pages/TitlePages/SeriesPage/EpisodeGrid.svelte
@@ -5,20 +5,20 @@
 		type TmdbEpisode,
 		type TmdbSeasonEpisode,
 		type TmdbSeriesFull2
-	} from '../../apis/tmdb/tmdb-api';
-	import Container from '../../../Container.svelte';
-	import { useDependantRequest } from '../../stores/data.store';
-	import type { JellyfinItem } from '../../apis/jellyfin/jellyfin-api';
-	import TmdbEpisodeCard from '../EpisodeCard/TmdbEpisodeCard.svelte';
-	import { scrollIntoView, Selectable } from '../../selectable';
-	import { playerState } from '../VideoPlayer/VideoPlayer';
-	import CardGrid from '../CardGrid.svelte';
-	import UICarousel from '../Carousel/UICarousel.svelte';
+	} from '../../../apis/tmdb/tmdb-api';
+	import { useDependantRequest } from '../../../stores/data.store';
+	import type { JellyfinItem } from '../../../apis/jellyfin/jellyfin-api';
+	import TmdbEpisodeCard from '../../../components/EpisodeCard/TmdbEpisodeCard.svelte';
+	import { scrollIntoView, Selectable } from '../../../selectable';
+	import { playerState } from '../../../components/VideoPlayer/VideoPlayer';
+	import CardGrid from '../../../components/CardGrid.svelte';
+	import UICarousel from '../../../components/Carousel/UICarousel.svelte';
 	import classNames from 'classnames';
-	import ScrollHelper from '../ScrollHelper.svelte';
+	import ScrollHelper from '../../../components/ScrollHelper.svelte';
 	import ManageSeasonCard from './ManageSeasonCard.svelte';
-	import { TMDB_BACKDROP_SMALL } from '../../constants';
-	import { navigate } from '../StackRouter/StackRouter';
+	import { TMDB_BACKDROP_SMALL } from '../../../constants';
+	import { navigate } from '../../../components/StackRouter/StackRouter';
+	import Container from '$components/Container.svelte';
 
 	export let id: number;
 	export let tmdbSeries: Promise<TmdbSeriesFull2 | undefined>;
diff --git a/src/lib/components/SeriesPage/FileDetailsDialog.svelte b/src/lib/pages/TitlePages/SeriesPage/FileDetailsDialog.svelte
similarity index 81%
rename from src/lib/components/SeriesPage/FileDetailsDialog.svelte
rename to src/lib/pages/TitlePages/SeriesPage/FileDetailsDialog.svelte
index d0e71d1..f4e391d 100644
--- a/src/lib/components/SeriesPage/FileDetailsDialog.svelte
+++ b/src/lib/pages/TitlePages/SeriesPage/FileDetailsDialog.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
-	import Dialog from '../Dialog/Dialog.svelte';
-	import { sonarrApi } from '../../apis/sonarr/sonarr-api';
-	import Button from '../Button.svelte';
-	import Container from '../../../Container.svelte';
-	import { formatSize } from '../../utils';
+	import { sonarrApi } from '../../../apis/sonarr/sonarr-api';
+	import Container from '$components/Container.svelte';
+	import { formatSize } from '../../../utils';
 	import { Trash } from 'radix-icons-svelte';
-	import type { FileResource } from '../../apis/combined-types';
+	import type { FileResource } from '../../../apis/combined-types';
+	import Dialog from '../../../components/Dialog/Dialog.svelte';
+	import Button from '../../../components/Button.svelte';
 
 	export let file: FileResource;
 	export let title = '';
diff --git a/src/lib/components/SeriesPage/ManageSeasonCard.svelte b/src/lib/pages/TitlePages/SeriesPage/ManageSeasonCard.svelte
similarity index 78%
rename from src/lib/components/SeriesPage/ManageSeasonCard.svelte
rename to src/lib/pages/TitlePages/SeriesPage/ManageSeasonCard.svelte
index a5ed11c..355abc6 100644
--- a/src/lib/components/SeriesPage/ManageSeasonCard.svelte
+++ b/src/lib/pages/TitlePages/SeriesPage/ManageSeasonCard.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
-	import Container from '../../../Container.svelte';
+	import Container from '$components/Container.svelte';
 	import type { Readable } from 'svelte/store';
-	import AnimateScale from '../AnimateScale.svelte';
+	import AnimateScale from '../../../components/AnimateScale.svelte';
 	import classNames from 'classnames';
 	import { Plus } from 'radix-icons-svelte';
-	import { getCardDimensions } from '../../utils';
-	import IconOverlay from '../IconOverlay.svelte';
+	import { getCardDimensions } from '../../../utils';
+	import IconOverlay from '../../../components/IconOverlay.svelte';
 
 	export let backdropUrl: string;
 
diff --git a/src/lib/components/SeriesPage/SeriesPage.svelte b/src/lib/pages/TitlePages/SeriesPage/SeriesPage.svelte
similarity index 89%
rename from src/lib/components/SeriesPage/SeriesPage.svelte
rename to src/lib/pages/TitlePages/SeriesPage/SeriesPage.svelte
index f6fe1cd..6b16fc9 100644
--- a/src/lib/components/SeriesPage/SeriesPage.svelte
+++ b/src/lib/pages/TitlePages/SeriesPage/SeriesPage.svelte
@@ -1,10 +1,7 @@
 <script lang="ts">
-	import Container from '../../../Container.svelte';
-	import HeroCarousel from '../HeroCarousel/HeroCarousel.svelte';
-	import DetachedPage from '../DetachedPage/DetachedPage.svelte';
-	import { useRequest } from '../../stores/data.store';
-	import { tmdbApi } from '../../apis/tmdb/tmdb-api';
-	import { PLATFORM_WEB, TMDB_IMAGES_ORIGINAL } from '../../constants';
+	import { useRequest } from '$lib/stores/data.store';
+	import { tmdbApi } from '$lib/apis/tmdb/tmdb-api';
+	import { PLATFORM_WEB, TMDB_IMAGES_ORIGINAL } from '$lib/constants';
 	import classNames from 'classnames';
 	import {
 		Bookmark,
@@ -16,34 +13,37 @@
 		Plus,
 		Trash
 	} from 'radix-icons-svelte';
-	import { jellyfinApi } from '../../apis/jellyfin/jellyfin-api';
+	import { jellyfinApi } from '$lib/apis/jellyfin/jellyfin-api';
 	import {
 		type EpisodeDownload,
 		type EpisodeFileResource,
 		sonarrApi
-	} from '../../apis/sonarr/sonarr-api';
-	import Button from '../Button.svelte';
-	import { playerState } from '../VideoPlayer/VideoPlayer';
-	import { createModal, modalStack } from '../Modal/modal.store';
+	} from '$lib/apis/sonarr/sonarr-api';
+	import { playerState } from '$lib/components/VideoPlayer/VideoPlayer';
+	import { createModal, modalStack } from '$lib/components/Modal/modal.store';
 	import { get, writable } from 'svelte/store';
-	import { scrollIntoView, useRegistrar } from '../../selectable';
-	import ScrollHelper from '../ScrollHelper.svelte';
-	import Carousel from '../Carousel/Carousel.svelte';
-	import TmdbPersonCard from '../PersonCard/TmdbPersonCard.svelte';
-	import TmdbCard from '../Card/TmdbCard.svelte';
-	import EpisodeGrid from './EpisodeGrid.svelte';
-	import { formatSize } from '../../utils';
+	import { scrollIntoView, useRegistrar } from '$lib/selectable';
+	import EpisodeGrid from '$lib/pages/TitlePages/SeriesPage/EpisodeGrid.svelte';
+	import { formatSize } from '$lib/utils';
 	import FileDetailsDialog from './FileDetailsDialog.svelte';
-	import SonarrMediaManagerModal from '../MediaManagerModal/SonarrMediaManagerModal.svelte';
-	import MMAddToSonarrDialog from '../MediaManagerModal/MMAddToSonarrDialog.svelte';
-	import ConfirmDialog from '../Dialog/ConfirmDialog.svelte';
 	import DownloadDetailsDialog from './DownloadDetailsDialog.svelte';
-	import { reiverrApiNew, sources, user } from '../../stores/user.store';
-	import type { VideoStreamCandidateDto } from '../../apis/reiverr/reiverr.openapi';
-	import type { MediaSource } from '../../apis/reiverr/reiverr.openapi';
-	import SelectDialog from '../Dialog/SelectDialog.svelte';
-	import { useUserData } from '../../stores/library.store';
-	import { handleOpenStreamSelector } from '../../pages/MoviePage/MoviePage.shared';
+	import { reiverrApiNew, sources, user } from '$lib/stores/user.store';
+	import type { VideoStreamCandidateDto } from '$lib/apis/reiverr/reiverr.openapi';
+	import type { MediaSource } from '$lib/apis/reiverr/reiverr.openapi';
+	import { useUserData } from '$lib/stores/library.store';
+	import { handleOpenStreamSelector } from '../MoviePage/MoviePage.shared';
+	import DetachedPage from '$lib/components/DetachedPage/DetachedPage.svelte';
+	import ScrollHelper from '$lib/components/ScrollHelper.svelte';
+	import Container from '$components/Container.svelte';
+	import HeroCarousel from '$lib/components/HeroCarousel/HeroCarousel.svelte';
+	import SelectDialog from '$lib/components/Dialog/SelectDialog.svelte';
+	import ConfirmDialog from '$lib/components/Dialog/ConfirmDialog.svelte';
+	import SonarrMediaManagerModal from '$lib/components/MediaManagerModal/SonarrMediaManagerModal.svelte';
+	import Button from '$lib/components/Button.svelte';
+	import Carousel from '$lib/components/Carousel/Carousel.svelte';
+	import TmdbPersonCard from '$lib/components/PersonCard/TmdbPersonCard.svelte';
+	import TmdbCard from '$lib/components/Card/TmdbCard.svelte';
+	import MmAddToSonarrDialog from '$lib/components/MediaManagerModal/MMAddToSonarrDialog.svelte';
 
 	export let id: string;
 	const tmdbId = Number(id);
@@ -153,7 +153,7 @@
 					onGrabRelease
 				});
 			} else if (tmdbSeries) {
-				createModal(MMAddToSonarrDialog, {
+				createModal(MmAddToSonarrDialog, {
 					title: tmdbSeries.name || '',
 					tmdbId: tmdbSeries.id || -1,
 					backdropUri: tmdbSeries.backdrop_path || '',
@@ -213,9 +213,7 @@
 							id,
 							userData.playState?.season ?? 1,
 							userData.playState?.episode ?? 1,
-							userData,
-							sourceId,
-							key
+							{ userData, sourceId, key }
 						)
 					);
 				}
@@ -230,9 +228,7 @@
 					id,
 					userData.playState?.season ?? 1,
 					userData.playState?.episode ?? 1,
-					userData,
-					sourceId,
-					key
+					{ userData, sourceId, key }
 				)
 			);
 		}
diff --git a/src/lib/pages/StreamSelectorPage/StreamSelectorPage.svelte b/src/lib/pages/TitlePages/StreamSelectorModal.svelte
similarity index 98%
rename from src/lib/pages/StreamSelectorPage/StreamSelectorPage.svelte
rename to src/lib/pages/TitlePages/StreamSelectorModal.svelte
index 522d18b..4eeee76 100644
--- a/src/lib/pages/StreamSelectorPage/StreamSelectorPage.svelte
+++ b/src/lib/pages/TitlePages/StreamSelectorModal.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { get } from 'svelte/store';
-	import Container from '../../../Container.svelte';
+	import Container from '$components/Container.svelte';
 	import FullScreenModal from '../../components/Modal/FullScreenModal.svelte';
 	import Modal from '../../components/Modal/Modal.svelte';
 	import { reiverrApiNew, sources } from '../../stores/user.store';
diff --git a/src/lib/pages/UIComponents.svelte b/src/lib/pages/UIComponents.svelte
index 89b4bab..e4a135f 100644
--- a/src/lib/pages/UIComponents.svelte
+++ b/src/lib/pages/UIComponents.svelte
@@ -1,5 +1,5 @@
 <script>
-	import Container from '../../Container.svelte';
+	import Container from '$components/Container.svelte';
 	import Button from '../components/Button.svelte';
 </script>
 
diff --git a/src/lib/pages/UsersPage.svelte b/src/lib/pages/UsersPage.svelte
index 8852a76..08014f3 100644
--- a/src/lib/pages/UsersPage.svelte
+++ b/src/lib/pages/UsersPage.svelte
@@ -2,7 +2,7 @@
 	import DetachedPage from '../components/DetachedPage/DetachedPage.svelte';
 	import { type Session, sessions } from '../stores/session.store.js';
 	import { reiverrApi } from '../apis/reiverr/reiverr-api';
-	import Container from '../../Container.svelte';
+	import Container from '$components/Container.svelte';
 	import Button from '../components/Button.svelte';
 	import classNames from 'classnames';
 	import { navigate } from '../components/StackRouter/StackRouter';
diff --git a/tsconfig.json b/tsconfig.json
index 8c46bc4..bfcc631 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,11 +14,13 @@
 		"allowJs": true,
 		"checkJs": true,
 		"isolatedModules": true,
-		"noUncheckedIndexedAccess": true
-		//    "paths": {
-		//        "$lib/*": ["src/lib/*"],
-		//    }
+		"noUncheckedIndexedAccess": true,
+		"baseUrl": "./src",
+		"paths": {
+			"$lib/*": ["lib/*"],
+			"$components/*": ["lib/components/*"],
+			"$pages/*": ["lib/pages/*"]
+		}
 	},
-	"include": ["src/**/*.ts", "src/**/*.js", "src/**/*.svelte"],
-	"references": [{ "path": "./tsconfig.node.json" }]
+	"include": ["src/**/*.ts", "src/**/*.js", "src/**/*.svelte"]
 }
diff --git a/vite.config.ts b/vite.config.ts
index 898b1af..b5532d7 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -4,6 +4,7 @@ import { viteSingleFile } from 'vite-plugin-singlefile';
 import viteLegacyPlugin from '@vitejs/plugin-legacy';
 import { readFileSync } from 'fs';
 import { fileURLToPath } from 'url';
+import path from 'path';
 
 const file = fileURLToPath(new URL('package.json', import.meta.url));
 const json = readFileSync(file, 'utf8');
@@ -25,6 +26,13 @@ export default defineConfig({
 	optimizeDeps: { exclude: ['svelte-navigator'] },
 	define: {
 		REIVERR_VERSION: `"${pkg.version}"`
+	},
+	resolve: {
+		alias: {
+			$lib: path.resolve(__dirname, './src/lib'),
+			$components: path.resolve(__dirname, './src/lib/components'),
+			$pages: path.resolve(__dirname, './src/lib/pages')
+		}
 	}
 
 	// base: '/dist',