diff --git a/src/lib/apis/combined-types.d.ts b/src/lib/apis/combined-types.d.ts
index a0214ea..2131498 100644
--- a/src/lib/apis/combined-types.d.ts
+++ b/src/lib/apis/combined-types.d.ts
@@ -1,6 +1,6 @@
 import type { MovieDownload, MovieFileResource, RadarrRelease } from './radarr/radarr-api';
 import type { EpisodeFileResource, EpisodeDownload, SonarrRelease } from './sonarr/sonarr-api';
 
-export type Release = RadarrRelease & SonarrRelease;
-export type FileResource = MovieFileResource & EpisodeFileResource;
-export type Download = MovieDownload & EpisodeDownload;
+export type Release = RadarrRelease | SonarrRelease;
+export type FileResource = MovieFileResource | EpisodeFileResource;
+export type Download = MovieDownload | EpisodeDownload;
diff --git a/src/lib/components-old/SeriesPage.svelte b/src/lib/components-old/SeriesPage.svelte
index 3c657cd..a9777da 100644
--- a/src/lib/components-old/SeriesPage.svelte
+++ b/src/lib/components-old/SeriesPage.svelte
@@ -16,7 +16,7 @@
 	import UiCarousel from '../../lib/components/Carousel/UICarousel.svelte';
 	import EpisodeCard from '../../lib/components/EpisodeCard/EpisodeCard.svelte';
 	import PersonCard from '../../lib/components/PersonCard/PersonCard.svelte';
-	import SeriesRequestModal from '../components/ManageMedia/SeriesRequestModal.svelte';
+	import SeriesRequestModal from '../components/MediaManager/SeriesRequestModal.svelte';
 	import OpenInButton from '../../lib/components/TitlePageLayout/OpenInButton.svelte';
 	import TitlePageLayout from '../../lib/components/TitlePageLayout/TitlePageLayout.svelte';
 	import { playerState } from '../../lib/components/VideoPlayer/VideoPlayer';
diff --git a/src/lib/components/ManageMedia/DownloadsList.svelte b/src/lib/components/MediaManager/DownloadList.svelte
similarity index 95%
rename from src/lib/components/ManageMedia/DownloadsList.svelte
rename to src/lib/components/MediaManager/DownloadList.svelte
index 2026b2c..5515f4b 100644
--- a/src/lib/components/ManageMedia/DownloadsList.svelte
+++ b/src/lib/components/MediaManager/DownloadList.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-	import type { MovieDownload } from '../../apis/radarr/radarr-api';
 	import ButtonGhost from '../Ghosts/ButtonGhost.svelte';
 	import Button from '../Button.svelte';
 	import { formatSize } from '../../utils';
diff --git a/src/lib/components/ManageMedia/LocalFiles/FilesList.svelte b/src/lib/components/MediaManager/FileList.svelte
similarity index 71%
rename from src/lib/components/ManageMedia/LocalFiles/FilesList.svelte
rename to src/lib/components/MediaManager/FileList.svelte
index 1b4204f..601bae2 100644
--- a/src/lib/components/ManageMedia/LocalFiles/FilesList.svelte
+++ b/src/lib/components/MediaManager/FileList.svelte
@@ -1,12 +1,10 @@
 <script lang="ts">
-	import type { MovieFileResource } from '../../../apis/radarr/radarr-api';
-	import ButtonGhost from '../../Ghosts/ButtonGhost.svelte';
-	import Button from '../../Button.svelte';
+	import ButtonGhost from '../Ghosts/ButtonGhost.svelte';
+	import Button from '../Button.svelte';
 	import { ChevronRight } from 'radix-icons-svelte';
-	import { formatSize } from '../../../utils.js';
-	import type { EpisodeFileResource } from '../../../apis/sonarr/sonarr-api';
-	import type { FileResource } from '../../../apis/combined-types';
-	import { scrollIntoView } from '../../../selectable';
+	import { formatSize } from '../../utils.js';
+	import type { FileResource } from '../../apis/combined-types';
+	import { scrollIntoView } from '../../selectable';
 
 	export let files: Promise<FileResource[]>;
 	export let handleSelectFile: (file: FileResource) => void;
diff --git a/src/lib/components/ManageMedia/ManageMediaMenuLayout.svelte b/src/lib/components/MediaManager/MediaManagerMenuLayout.svelte
similarity index 100%
rename from src/lib/components/ManageMedia/ManageMediaMenuLayout.svelte
rename to src/lib/components/MediaManager/MediaManagerMenuLayout.svelte
diff --git a/src/lib/components/ManageMedia/Releases/ReleaseList.svelte b/src/lib/components/MediaManager/ReleaseList.svelte
similarity index 89%
rename from src/lib/components/ManageMedia/Releases/ReleaseList.svelte
rename to src/lib/components/MediaManager/ReleaseList.svelte
index 4e0b7d0..00e7d31 100644
--- a/src/lib/components/ManageMedia/Releases/ReleaseList.svelte
+++ b/src/lib/components/MediaManager/ReleaseList.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
-	import { type RadarrRelease } from '../../../apis/radarr/radarr-api';
+	import { type RadarrRelease } from '../../apis/radarr/radarr-api';
 	import classNames from 'classnames';
-	import { useRequest } from '../../../stores/data.store';
-	import Button from '../../Button.svelte';
+	import { useRequest } from '../../stores/data.store';
+	import Button from '../Button.svelte';
 	import { ChevronRight, DotFilled } from 'radix-icons-svelte';
-	import { formatMinutesToTime, formatSize } from '../../../utils';
+	import { formatMinutesToTime, formatSize } from '../../utils';
 	import { derived } from 'svelte/store';
-	import ButtonGhost from '../../Ghosts/ButtonGhost.svelte';
-	import type { SonarrRelease } from '../../../apis/sonarr/sonarr-api';
+	import ButtonGhost from '../Ghosts/ButtonGhost.svelte';
+	import type { SonarrRelease } from '../../apis/sonarr/sonarr-api';
 
 	type Release = RadarrRelease | SonarrRelease;
 
diff --git a/src/lib/components/ManageMedia/LocalFiles/FileActionsModal.svelte b/src/lib/components/MediaManager/modals/FileActionsModal.svelte
similarity index 85%
rename from src/lib/components/ManageMedia/LocalFiles/FileActionsModal.svelte
rename to src/lib/components/MediaManager/modals/FileActionsModal.svelte
index 0cebdf6..7af66ed 100644
--- a/src/lib/components/ManageMedia/LocalFiles/FileActionsModal.svelte
+++ b/src/lib/components/MediaManager/modals/FileActionsModal.svelte
@@ -1,10 +1,9 @@
 <script lang="ts">
 	import Container from '../../../../Container.svelte';
-	import type { MovieFileResource } from '../../../apis/radarr/radarr-api';
 	import { formatSize } from '../../../utils';
 	import Button from '../../Button.svelte';
 	import FullScreenModal from '../../Modal/FullScreenModal.svelte';
-	import FullScreenModalContainer from '../ManageMediaMenuLayout.svelte';
+	import FullScreenModalContainer from '../MediaManagerMenuLayout.svelte';
 	import type { FileResource } from '../../../apis/combined-types';
 
 	export let modalId: symbol;
diff --git a/src/lib/components/ManageMedia/Releases/ReleaseActionsModal.svelte b/src/lib/components/MediaManager/modals/ReleaseActionsModal.svelte
similarity index 83%
rename from src/lib/components/ManageMedia/Releases/ReleaseActionsModal.svelte
rename to src/lib/components/MediaManager/modals/ReleaseActionsModal.svelte
index 3815139..c8f6a9c 100644
--- a/src/lib/components/ManageMedia/Releases/ReleaseActionsModal.svelte
+++ b/src/lib/components/MediaManager/modals/ReleaseActionsModal.svelte
@@ -1,13 +1,11 @@
 <script lang="ts">
 	import Container from '../../../../Container.svelte';
-	import type { MovieFileResource, RadarrRelease } from '../../../apis/radarr/radarr-api';
 	import { formatSize } from '../../../utils';
 	import Button from '../../Button.svelte';
 	import FullScreenModal from '../../Modal/FullScreenModal.svelte';
-	import FullScreenModalContainer from '../ManageMediaMenuLayout.svelte';
-	import { useActionRequest, useRequest } from '../../../stores/data.store';
+	import FullScreenModalContainer from '../MediaManagerMenuLayout.svelte';
+	import { useActionRequest } from '../../../stores/data.store';
 	import { Download, Plus } from 'radix-icons-svelte';
-	import type { SonarrRelease } from '../../../apis/sonarr/sonarr-api';
 	import type { Release } from '../../../apis/combined-types';
 
 	export let modalId: symbol;
diff --git a/src/lib/components/ManageMedia/Releases/ReleaseListModal.svelte b/src/lib/components/MediaManager/modals/ReleaseListModal.svelte
similarity index 89%
rename from src/lib/components/ManageMedia/Releases/ReleaseListModal.svelte
rename to src/lib/components/MediaManager/modals/ReleaseListModal.svelte
index e1d7bc5..81ba294 100644
--- a/src/lib/components/ManageMedia/Releases/ReleaseListModal.svelte
+++ b/src/lib/components/MediaManager/modals/ReleaseListModal.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import FullScreenModal from '../../Modal/FullScreenModal.svelte';
-	import ReleaseList from './ReleaseList.svelte';
+	import ReleaseList from '../ReleaseList.svelte';
 	import type { Release } from '../../../apis/combined-types';
 
 	export let modalId: symbol;
diff --git a/src/lib/components/ManageMedia/RadarrMediaMangerModal.svelte b/src/lib/components/MediaManager/radarr/RadarrMediaMangerModal.svelte
similarity index 74%
rename from src/lib/components/ManageMedia/RadarrMediaMangerModal.svelte
rename to src/lib/components/MediaManager/radarr/RadarrMediaMangerModal.svelte
index 041b38f..79ea7e7 100644
--- a/src/lib/components/ManageMedia/RadarrMediaMangerModal.svelte
+++ b/src/lib/components/MediaManager/radarr/RadarrMediaMangerModal.svelte
@@ -1,22 +1,22 @@
 <script lang="ts">
-	import FullScreenModal from '../Modal/FullScreenModal.svelte';
-	import ManageMediaMenuLayout from './ManageMediaMenuLayout.svelte';
+	import FullScreenModal from '../../Modal/FullScreenModal.svelte';
+	import ManageMediaMenuLayout from '../MediaManagerMenuLayout.svelte';
 	import {
 		type MovieFileResource,
 		radarrApi,
 		type RadarrRelease
-	} from '../../apis/radarr/radarr-api';
-	import ReleaseList from './Releases/ReleaseList.svelte';
-	import FilesList from './LocalFiles/FilesList.svelte';
-	import { modalStack } from '../Modal/modal.store';
-	import FileActionsModal from './LocalFiles/FileActionsModal.svelte';
-	import DownloadsList from './DownloadsList.svelte';
-	import { useRequest } from '../../stores/data.store';
+	} from '../../../apis/radarr/radarr-api';
+	import ReleaseList from '../ReleaseList.svelte';
+	import FilesList from '../FileList.svelte';
+	import { modalStack } from '../../Modal/modal.store';
+	import FileActionsModal from '../modals/FileActionsModal.svelte';
+	import DownloadsList from '../DownloadList.svelte';
+	import { useRequest } from '../../../stores/data.store';
 	import { derived, type Readable } from 'svelte/store';
-	import ReleaseActionsModal from './Releases/ReleaseActionsModal.svelte';
-	import type { SonarrRelease } from '../../apis/sonarr/sonarr-api';
-	import Button from '../Button.svelte';
-	import type { FileResource } from '../../apis/combined-types';
+	import ReleaseActionsModal from '../modals/ReleaseActionsModal.svelte';
+	import type { SonarrRelease } from '../../../apis/sonarr/sonarr-api';
+	import Button from '../../Button.svelte';
+	import type { FileResource } from '../../../apis/combined-types';
 
 	export let modalId: symbol;
 	export let hidden: boolean;
diff --git a/src/lib/components/ManageMedia/SeasonList.svelte b/src/lib/components/MediaManager/sonarr/SeasonList.svelte
similarity index 77%
rename from src/lib/components/ManageMedia/SeasonList.svelte
rename to src/lib/components/MediaManager/sonarr/SeasonList.svelte
index 41529ae..4d4def3 100644
--- a/src/lib/components/ManageMedia/SeasonList.svelte
+++ b/src/lib/components/MediaManager/sonarr/SeasonList.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-	import { sonarrApi, type SonarrSeason } from '../../apis/sonarr/sonarr-api';
-	import { useRequest } from '../../stores/data.store';
-	import Button from '../Button.svelte';
-	import { scrollIntoView } from '../../selectable';
+	import { sonarrApi, type SonarrSeason } from '../../../apis/sonarr/sonarr-api';
+	import { useRequest } from '../../../stores/data.store';
+	import Button from '../../Button.svelte';
+	import { scrollIntoView } from '../../../selectable';
 
 	export let id: number;
 	export let selectSeason: (seasonNumber: number) => void;
diff --git a/src/lib/components/ManageMedia/SonarrMediaMangerModal.svelte b/src/lib/components/MediaManager/sonarr/SonarrMediaMangerModal.svelte
similarity index 67%
rename from src/lib/components/ManageMedia/SonarrMediaMangerModal.svelte
rename to src/lib/components/MediaManager/sonarr/SonarrMediaMangerModal.svelte
index b3836cb..8a39e90 100644
--- a/src/lib/components/ManageMedia/SonarrMediaMangerModal.svelte
+++ b/src/lib/components/MediaManager/sonarr/SonarrMediaMangerModal.svelte
@@ -1,19 +1,16 @@
 <script lang="ts">
-	import FullScreenModal from '../Modal/FullScreenModal.svelte';
-	import ManageMediaMenuLayout from './ManageMediaMenuLayout.svelte';
-	import { radarrApi } from '../../apis/radarr/radarr-api';
-	import FilesList from './LocalFiles/FilesList.svelte';
-	import { modalStack } from '../Modal/modal.store';
-	import FileActionsModal from './LocalFiles/FileActionsModal.svelte';
-	import DownloadsList from './DownloadsList.svelte';
-	import { useRequest } from '../../stores/data.store';
+	import FullScreenModal from '../../Modal/FullScreenModal.svelte';
+	import ManageMediaMenuLayout from '../MediaManagerMenuLayout.svelte';
+	import FilesList from '../FileList.svelte';
+	import { modalStack } from '../../Modal/modal.store';
+	import FileActionsModal from '../modals/FileActionsModal.svelte';
+	import DownloadsList from '../DownloadList.svelte';
+	import { useRequest } from '../../../stores/data.store';
 	import { derived, type Readable } from 'svelte/store';
 	import SeasonList from './SeasonList.svelte';
-	import { sonarrApi } from '../../apis/sonarr/sonarr-api';
-	import SeasonReleasesModal from './Releases/SeasonReleasesModal.svelte';
-	import type { FileResource, Release } from '../../apis/combined-types';
-	import ReleaseActionsModal from './Releases/ReleaseActionsModal.svelte';
-	import Button from '../Button.svelte';
+	import { sonarrApi } from '../../../apis/sonarr/sonarr-api';
+	import SeasonReleasesModal from './modals/EpisodeListModal.svelte';
+	import type { FileResource } from '../../../apis/combined-types';
 
 	export let modalId: symbol;
 	export let groupId: symbol;
@@ -63,18 +60,6 @@
 		);
 	}
 
-	const handleSelectRelease = (release: Release) => {
-		modalStack.create(
-			ReleaseActionsModal,
-			{
-				release,
-				grabRelease: handleGrabRelease,
-				status: undefined
-			},
-			groupId
-		);
-	};
-
 	function handleSelectFile(file: FileResource) {
 		modalStack.create(
 			FileActionsModal,
diff --git a/src/lib/components/ManageMedia/Releases/SeasonReleasesModal.svelte b/src/lib/components/MediaManager/sonarr/modals/EpisodeListModal.svelte
similarity index 72%
rename from src/lib/components/ManageMedia/Releases/SeasonReleasesModal.svelte
rename to src/lib/components/MediaManager/sonarr/modals/EpisodeListModal.svelte
index 3592b80..d999733 100644
--- a/src/lib/components/ManageMedia/Releases/SeasonReleasesModal.svelte
+++ b/src/lib/components/MediaManager/sonarr/modals/EpisodeListModal.svelte
@@ -1,18 +1,13 @@
 <script lang="ts">
-	import FullScreenModal from '../../Modal/FullScreenModal.svelte';
-	import ManageMediaMenuLayout from '../ManageMediaMenuLayout.svelte';
-	import {
-		sonarrApi,
-		type SonarrEpisode,
-		type SonarrRelease
-	} from '../../../apis/sonarr/sonarr-api';
-	import { useRequest } from '../../../stores/data.store';
-	import Button from '../../Button.svelte';
-	import { modalStack } from '../../Modal/modal.store';
-	import ReleaseListModal from './ReleaseListModal.svelte';
-	import type { RadarrRelease } from '../../../apis/radarr/radarr-api';
-	import ReleaseActionsModal from './ReleaseActionsModal.svelte';
-	import type { Release } from '../../../apis/combined-types';
+	import FullScreenModal from '../../../Modal/FullScreenModal.svelte';
+	import ManageMediaMenuLayout from '../../MediaManagerMenuLayout.svelte';
+	import { sonarrApi, type SonarrEpisode } from '../../../../apis/sonarr/sonarr-api';
+	import { useRequest } from '../../../../stores/data.store';
+	import Button from '../../../Button.svelte';
+	import { modalStack } from '../../../Modal/modal.store';
+	import ReleaseListModal from '../../modals/ReleaseListModal.svelte';
+	import ReleaseActionsModal from '../../modals/ReleaseActionsModal.svelte';
+	import type { Release } from '../../../../apis/combined-types';
 
 	export let modalId: symbol;
 	export let groupId: symbol;
diff --git a/src/lib/components/SeriesPage/SeriesPage.svelte b/src/lib/components/SeriesPage/SeriesPage.svelte
index 0f22b1c..ac80304 100644
--- a/src/lib/components/SeriesPage/SeriesPage.svelte
+++ b/src/lib/components/SeriesPage/SeriesPage.svelte
@@ -12,12 +12,12 @@
 	import Button from '../Button.svelte';
 	import { playerState } from '../VideoPlayer/VideoPlayer';
 	import { modalStack } from '../Modal/modal.store';
-	import ManageMediaModal from '../ManageMedia/RadarrMediaMangerModal.svelte';
+	import ManageMediaModal from '../MediaManager/radarr/RadarrMediaMangerModal.svelte';
 	import { derived } from 'svelte/store';
 	import EpisodeCarousel from './EpisodeCarousel.svelte';
 	import { scrollIntoView, Selectable } from '../../selectable';
 	import ScrollHelper from '../ScrollHelper.svelte';
-	import SonarrMediaMangerModal from '../ManageMedia/SonarrMediaMangerModal.svelte';
+	import SonarrMediaMangerModal from '../MediaManager/sonarr/SonarrMediaMangerModal.svelte';
 
 	export let id: string;
 
diff --git a/src/lib/pages/MoviePage.svelte b/src/lib/pages/MoviePage.svelte
index 088e227..58f0909 100644
--- a/src/lib/pages/MoviePage.svelte
+++ b/src/lib/pages/MoviePage.svelte
@@ -12,7 +12,7 @@
 	import DetachedPage from '../components/DetachedPage/DetachedPage.svelte';
 	import { modalStack } from '../components/Modal/modal.store';
 	import { playerState } from '../components/VideoPlayer/VideoPlayer';
-	import ManageMediaModal from '../components/ManageMedia/RadarrMediaMangerModal.svelte';
+	import ManageMediaModal from '../components/MediaManager/radarr/RadarrMediaMangerModal.svelte';
 
 	export let id: string;