diff --git a/src/lib/client/alerts/store.ts b/src/lib/client/alerts/store.ts
index 759cba2..0c06260 100644
--- a/src/lib/client/alerts/store.ts
+++ b/src/lib/client/alerts/store.ts
@@ -1,5 +1,5 @@
 import { writable } from 'svelte/store';
-import { uuid } from '$shared/uuid';
+import { uuid } from '$shared/utils/uuid';
 
 export type AlertType = 'success' | 'error' | 'warning' | 'info';
 
diff --git a/src/lib/client/ui/navigation/pageNav/version.svelte b/src/lib/client/ui/navigation/pageNav/version.svelte
index 66d4d96..28d1ee2 100644
--- a/src/lib/client/ui/navigation/pageNav/version.svelte
+++ b/src/lib/client/ui/navigation/pageNav/version.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { getPlatformLabel, getChannelLabel, shouldShowVersion } from '$shared/version.ts';
+	import { getPlatformLabel, getChannelLabel, shouldShowVersion } from '$shared/utils/version.ts';
 	import logo from '$assets/logo-512.png';
 
 	export let version: string = '';
diff --git a/src/lib/server/db/queries/upgradeConfigs.ts b/src/lib/server/db/queries/upgradeConfigs.ts
index b804c32..8f2f426 100644
--- a/src/lib/server/db/queries/upgradeConfigs.ts
+++ b/src/lib/server/db/queries/upgradeConfigs.ts
@@ -1,5 +1,5 @@
 import { db } from '../db.ts';
-import type { FilterConfig, FilterMode, UpgradeConfig } from '$lib/shared/filters.ts';
+import type { FilterConfig, FilterMode, UpgradeConfig } from '$shared/upgrades/filters.ts';
 
 /**
  * Database row type for upgrade_configs table
diff --git a/src/lib/server/jobs/logic/upgradeManager.ts b/src/lib/server/jobs/logic/upgradeManager.ts
index d20fce9..c1544da 100644
--- a/src/lib/server/jobs/logic/upgradeManager.ts
+++ b/src/lib/server/jobs/logic/upgradeManager.ts
@@ -7,7 +7,7 @@ import { upgradeConfigsQueries } from '$db/queries/upgradeConfigs.ts';
 import { arrInstancesQueries } from '$db/queries/arrInstances.ts';
 import { logger } from '$logger/logger.ts';
 import { processUpgradeConfig } from '$lib/server/upgrades/processor.ts';
-import type { UpgradeConfig } from '$lib/shared/filters.ts';
+import type { UpgradeConfig } from '$shared/upgrades/filters.ts';
 
 export interface UpgradeInstanceStatus {
 	instanceId: number;
diff --git a/src/lib/server/pcd/entities/customFormats/evaluator.ts b/src/lib/server/pcd/entities/customFormats/evaluator.ts
index 881c93d..3447a8d 100644
--- a/src/lib/server/pcd/entities/customFormats/evaluator.ts
+++ b/src/lib/server/pcd/entities/customFormats/evaluator.ts
@@ -49,7 +49,7 @@ function normalize(value: string): string {
 	return value.toLowerCase().replace(/[-_\s]/g, '');
 }
 
-// Canonical value mappings (matches src/lib/shared/conditionTypes.ts)
+// Canonical value mappings (matches src/lib/shared/conditions.ts)
 const sourceNames: Record<QualitySource, string> = {
 	[QualitySource.Unknown]: 'unknown',
 	[QualitySource.Cam]: 'cam',
diff --git a/src/lib/server/pcd/entities/mediaManagement/naming/create.ts b/src/lib/server/pcd/entities/mediaManagement/naming/create.ts
index ab99ef3..639264f 100644
--- a/src/lib/server/pcd/entities/mediaManagement/naming/create.ts
+++ b/src/lib/server/pcd/entities/mediaManagement/naming/create.ts
@@ -5,7 +5,7 @@
 import type { PCDCache } from '../../../cache.ts';
 import { writeOperation, type OperationLayer } from '../../../writer.ts';
 import type { RadarrNamingRow, SonarrNamingRow } from '$shared/pcd/display.ts';
-import { colonReplacementToDb, multiEpisodeStyleToDb } from '$shared/pcd/conversions.ts';
+import { colonReplacementToDb, multiEpisodeStyleToDb } from '$shared/pcd/mediaManagement.ts';
 
 export interface CreateRadarrNamingInput {
 	name: string;
diff --git a/src/lib/server/pcd/entities/mediaManagement/naming/read.ts b/src/lib/server/pcd/entities/mediaManagement/naming/read.ts
index f334642..dd17663 100644
--- a/src/lib/server/pcd/entities/mediaManagement/naming/read.ts
+++ b/src/lib/server/pcd/entities/mediaManagement/naming/read.ts
@@ -4,7 +4,7 @@
 
 import type { PCDCache } from '../../../cache.ts';
 import type { RadarrNamingRow, SonarrNamingRow, NamingListItem } from '$shared/pcd/display.ts';
-import { colonReplacementFromDb, multiEpisodeStyleFromDb } from '$shared/pcd/conversions.ts';
+import { colonReplacementFromDb, multiEpisodeStyleFromDb } from '$shared/pcd/mediaManagement.ts';
 
 // Note: name is PRIMARY KEY so never null, but Kysely types it as nullable
 // because the generator doesn't detect non-INTEGER primary keys
diff --git a/src/lib/server/pcd/entities/mediaManagement/naming/update.ts b/src/lib/server/pcd/entities/mediaManagement/naming/update.ts
index b2de949..5cedd30 100644
--- a/src/lib/server/pcd/entities/mediaManagement/naming/update.ts
+++ b/src/lib/server/pcd/entities/mediaManagement/naming/update.ts
@@ -5,7 +5,7 @@
 import type { PCDCache } from '../../../cache.ts';
 import { writeOperation, type OperationLayer } from '../../../writer.ts';
 import type { RadarrNamingRow, SonarrNamingRow } from '$shared/pcd/display.ts';
-import { colonReplacementToDb, multiEpisodeStyleToDb } from '$shared/pcd/conversions.ts';
+import { colonReplacementToDb, multiEpisodeStyleToDb } from '$shared/pcd/mediaManagement.ts';
 
 export interface UpdateRadarrNamingInput {
 	name: string;
diff --git a/src/lib/server/sync/mediaManagement/syncer.ts b/src/lib/server/sync/mediaManagement/syncer.ts
index 04e8177..41375ef 100644
--- a/src/lib/server/sync/mediaManagement/syncer.ts
+++ b/src/lib/server/sync/mediaManagement/syncer.ts
@@ -21,7 +21,7 @@ import { getRadarrByName as getRadarrMediaSettings, getSonarrByName as getSonarr
 import { getRadarrByName as getRadarrNaming, getSonarrByName as getSonarrNaming } from '$pcd/entities/mediaManagement/naming/read.ts';
 import { getRadarrByName as getRadarrQualityDefs, getSonarrByName as getSonarrQualityDefs } from '$pcd/entities/mediaManagement/quality-definitions/read.ts';
 import type { RadarrMediaSettingsRow, SonarrMediaSettingsRow, RadarrNamingRow, SonarrNamingRow } from '$shared/pcd/display.ts';
-import { colonReplacementToDb, multiEpisodeStyleToDb } from '$shared/pcd/conversions.ts';
+import { colonReplacementToDb, multiEpisodeStyleToDb } from '$shared/pcd/mediaManagement.ts';
 import type {
 	ArrType,
 	ArrPropersAndRepacks,
diff --git a/src/lib/server/upgrades/processor.ts b/src/lib/server/upgrades/processor.ts
index d8b21e2..dc6ef17 100644
--- a/src/lib/server/upgrades/processor.ts
+++ b/src/lib/server/upgrades/processor.ts
@@ -5,9 +5,9 @@
 
 import { RadarrClient } from '$lib/server/utils/arr/clients/radarr.ts';
 import type { ArrInstance } from '$lib/server/db/queries/arrInstances.ts';
-import type { UpgradeConfig, FilterConfig } from '$lib/shared/filters.ts';
-import { evaluateGroup } from '$lib/shared/filters.ts';
-import { getSelector } from '$lib/shared/selectors.ts';
+import type { UpgradeConfig, FilterConfig } from '$shared/upgrades/filters.ts';
+import { evaluateGroup } from '$shared/upgrades/filters.ts';
+import { getSelector } from '$shared/upgrades/selectors.ts';
 import type { UpgradeItem, UpgradeJobLog, UpgradeSelectionItem } from './types.ts';
 import { normalizeRadarrItems } from './normalize.ts';
 import {
diff --git a/src/lib/server/upgrades/types.ts b/src/lib/server/upgrades/types.ts
index 3701e8b..04a54f1 100644
--- a/src/lib/server/upgrades/types.ts
+++ b/src/lib/server/upgrades/types.ts
@@ -3,7 +3,7 @@
  */
 
 import type { RadarrMovie } from '$lib/server/utils/arr/types.ts';
-import type { FilterGroup } from '$lib/shared/filters.ts';
+import type { FilterGroup } from '$shared/upgrades/filters.ts';
 
 /**
  * Normalized item interface that matches filter field names
diff --git a/src/lib/shared/notificationTypes.ts b/src/lib/shared/notifications/types.ts
similarity index 100%
rename from src/lib/shared/notificationTypes.ts
rename to src/lib/shared/notifications/types.ts
diff --git a/src/lib/shared/conditionTypes.ts b/src/lib/shared/pcd/conditions.ts
similarity index 98%
rename from src/lib/shared/conditionTypes.ts
rename to src/lib/shared/pcd/conditions.ts
index f6e7dd1..d2e1500 100644
--- a/src/lib/shared/conditionTypes.ts
+++ b/src/lib/shared/pcd/conditions.ts
@@ -2,8 +2,7 @@
  * Condition types and their valid values for custom formats
  */
 
-// Arr type for filtering
-export type ArrType = 'all' | 'radarr' | 'sonarr';
+import type { ArrType } from './types.ts';
 
 // Condition type definitions (ordered for display sorting)
 export const CONDITION_TYPES = [
diff --git a/src/lib/shared/pcd/conversions.ts b/src/lib/shared/pcd/mediaManagement.ts
similarity index 100%
rename from src/lib/shared/pcd/conversions.ts
rename to src/lib/shared/pcd/mediaManagement.ts
diff --git a/src/lib/shared/filters.ts b/src/lib/shared/upgrades/filters.ts
similarity index 99%
rename from src/lib/shared/filters.ts
rename to src/lib/shared/upgrades/filters.ts
index 8771557..675dd22 100644
--- a/src/lib/shared/filters.ts
+++ b/src/lib/shared/upgrades/filters.ts
@@ -3,7 +3,7 @@
  * Defines all available filter fields for upgrade filtering
  */
 
-import { uuid } from './uuid.ts';
+import { uuid } from '../utils/uuid.ts';
 
 export interface FilterOperator {
 	id: string;
diff --git a/src/lib/shared/selectors.ts b/src/lib/shared/upgrades/selectors.ts
similarity index 100%
rename from src/lib/shared/selectors.ts
rename to src/lib/shared/upgrades/selectors.ts
diff --git a/src/lib/shared/dates.ts b/src/lib/shared/utils/dates.ts
similarity index 100%
rename from src/lib/shared/dates.ts
rename to src/lib/shared/utils/dates.ts
diff --git a/src/lib/shared/uuid.ts b/src/lib/shared/utils/uuid.ts
similarity index 100%
rename from src/lib/shared/uuid.ts
rename to src/lib/shared/utils/uuid.ts
diff --git a/src/lib/shared/version.ts b/src/lib/shared/utils/version.ts
similarity index 100%
rename from src/lib/shared/version.ts
rename to src/lib/shared/utils/version.ts
diff --git a/src/routes/arr/[id]/rename/components/RenameSettings.svelte b/src/routes/arr/[id]/rename/components/RenameSettings.svelte
index ec96032..40960a9 100644
--- a/src/routes/arr/[id]/rename/components/RenameSettings.svelte
+++ b/src/routes/arr/[id]/rename/components/RenameSettings.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { onMount, onDestroy } from 'svelte';
-	import { parseUTC } from '$shared/dates';
+	import { parseUTC } from '$shared/utils/dates';
 	import Input from '$ui/form/Input.svelte';
 	import DropdownSelect from '$ui/dropdown/DropdownSelect.svelte';
 
diff --git a/src/routes/arr/[id]/upgrades/+page.server.ts b/src/routes/arr/[id]/upgrades/+page.server.ts
index ccc516b..ae488ab 100644
--- a/src/routes/arr/[id]/upgrades/+page.server.ts
+++ b/src/routes/arr/[id]/upgrades/+page.server.ts
@@ -4,7 +4,7 @@ import { arrInstancesQueries } from '$db/queries/arrInstances.ts';
 import { upgradeConfigsQueries } from '$db/queries/upgradeConfigs.ts';
 import { upgradeRunsQueries } from '$db/queries/upgradeRuns.ts';
 import { logger } from '$logger/logger.ts';
-import type { FilterConfig, FilterMode } from '$lib/shared/filters.ts';
+import type { FilterConfig, FilterMode } from '$shared/upgrades/filters.ts';
 import { processUpgradeConfig, clearDryRunExclusions } from '$lib/server/upgrades/processor.ts';
 import { logDryRunCacheCleared } from '$lib/server/upgrades/logger.ts';
 
diff --git a/src/routes/arr/[id]/upgrades/+page.svelte b/src/routes/arr/[id]/upgrades/+page.svelte
index f058cc6..4565e29 100644
--- a/src/routes/arr/[id]/upgrades/+page.svelte
+++ b/src/routes/arr/[id]/upgrades/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { PageData, ActionData } from './$types';
-	import type { FilterConfig, FilterMode } from '$lib/shared/filters';
+	import type { FilterConfig, FilterMode } from '$shared/upgrades/filters';
 	import { enhance } from '$app/forms';
 	import { onMount } from 'svelte';
 	import { alertStore } from '$lib/client/alerts/store';
diff --git a/src/routes/arr/[id]/upgrades/components/CoreSettings.svelte b/src/routes/arr/[id]/upgrades/components/CoreSettings.svelte
index c3ff419..d135804 100644
--- a/src/routes/arr/[id]/upgrades/components/CoreSettings.svelte
+++ b/src/routes/arr/[id]/upgrades/components/CoreSettings.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { onMount, onDestroy } from 'svelte';
-	import { filterModes, type FilterMode } from '$lib/shared/filters';
-	import { parseUTC } from '$shared/dates';
+	import { filterModes, type FilterMode } from '$shared/upgrades/filters';
+	import { parseUTC } from '$shared/utils/dates';
 	import DropdownSelect from '$ui/dropdown/DropdownSelect.svelte';
 
 	export let enabled: boolean = true;
diff --git a/src/routes/arr/[id]/upgrades/components/FilterGroup.svelte b/src/routes/arr/[id]/upgrades/components/FilterGroup.svelte
index f85c587..7d687f4 100644
--- a/src/routes/arr/[id]/upgrades/components/FilterGroup.svelte
+++ b/src/routes/arr/[id]/upgrades/components/FilterGroup.svelte
@@ -10,7 +10,7 @@
 		isGroup,
 		type FilterGroup,
 		type FilterRule
-	} from '$lib/shared/filters';
+	} from '$shared/upgrades/filters';
 	import Input from '$ui/form/Input.svelte';
 	import NumberInput from '$ui/form/NumberInput.svelte';
 	import Button from '$ui/button/Button.svelte';
diff --git a/src/routes/arr/[id]/upgrades/components/FilterSettings.svelte b/src/routes/arr/[id]/upgrades/components/FilterSettings.svelte
index 4808baa..87f52c4 100644
--- a/src/routes/arr/[id]/upgrades/components/FilterSettings.svelte
+++ b/src/routes/arr/[id]/upgrades/components/FilterSettings.svelte
@@ -9,9 +9,9 @@
 		ClipboardPaste,
 		Trash2
 	} from 'lucide-svelte';
-	import { createEmptyFilterConfig, type FilterConfig } from '$lib/shared/filters';
-	import { uuid } from '$shared/uuid';
-	import { selectors } from '$lib/shared/selectors';
+	import { createEmptyFilterConfig, type FilterConfig } from '$shared/upgrades/filters';
+	import { uuid } from '$shared/utils/uuid';
+	import { selectors } from '$shared/upgrades/selectors';
 	import { createSearchStore } from '$lib/client/stores/search';
 	import FilterGroupComponent from './FilterGroup.svelte';
 	import NumberInput from '$ui/form/NumberInput.svelte';
diff --git a/src/routes/arr/upgrades/info/+page.svelte b/src/routes/arr/upgrades/info/+page.svelte
index 4e8cd8c..7299b09 100644
--- a/src/routes/arr/upgrades/info/+page.svelte
+++ b/src/routes/arr/upgrades/info/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-	import { filterFields, filterModes } from '$lib/shared/filters';
-	import { selectors } from '$lib/shared/selectors';
+	import { filterFields, filterModes } from '$shared/upgrades/filters';
+	import { selectors } from '$shared/upgrades/selectors';
 	import { ArrowLeft } from 'lucide-svelte';
 	import StickyCard from '$ui/card/StickyCard.svelte';
 	import Button from '$ui/button/Button.svelte';
diff --git a/src/routes/custom-formats/[databaseId]/[id]/conditions/+page.svelte b/src/routes/custom-formats/[databaseId]/[id]/conditions/+page.svelte
index 415186f..a6cd390 100644
--- a/src/routes/custom-formats/[databaseId]/[id]/conditions/+page.svelte
+++ b/src/routes/custom-formats/[databaseId]/[id]/conditions/+page.svelte
@@ -8,7 +8,7 @@
 	import StickyCard from '$ui/card/StickyCard.svelte';
 	import SaveTargetModal from '$ui/modal/SaveTargetModal.svelte';
 	import { alertStore } from '$alerts/store';
-	import { sortConditions } from '$lib/shared/conditionTypes';
+	import { sortConditions } from '$shared/pcd/conditions';
 	import { current, isDirty, initEdit, update } from '$lib/client/stores/dirty';
 	import type { PageData } from './$types';
 	import type { ConditionData } from '$shared/pcd/display.ts';
diff --git a/src/routes/custom-formats/[databaseId]/[id]/conditions/components/ConditionCard.svelte b/src/routes/custom-formats/[databaseId]/[id]/conditions/components/ConditionCard.svelte
index 7868270..ef59e34 100644
--- a/src/routes/custom-formats/[databaseId]/[id]/conditions/components/ConditionCard.svelte
+++ b/src/routes/custom-formats/[databaseId]/[id]/conditions/components/ConditionCard.svelte
@@ -14,9 +14,9 @@
 		RESOLUTION_VALUES,
 		QUALITY_MODIFIER_VALUES,
 		RELEASE_TYPE_VALUES,
-		INDEXER_FLAG_VALUES,
-		type ArrType
-	} from '$lib/shared/conditionTypes';
+		INDEXER_FLAG_VALUES
+	} from '$shared/pcd/conditions';
+	import type { ArrType } from '$shared/pcd/types.ts';
 	import type { ConditionData } from '$shared/pcd/display.ts';
 
 	const dispatch = createEventDispatcher<{
diff --git a/src/routes/custom-formats/[databaseId]/views/TableView.svelte b/src/routes/custom-formats/[databaseId]/views/TableView.svelte
index c15e8a6..57a9e49 100644
--- a/src/routes/custom-formats/[databaseId]/views/TableView.svelte
+++ b/src/routes/custom-formats/[databaseId]/views/TableView.svelte
@@ -6,7 +6,7 @@
 	import { marked } from 'marked';
 	import { goto } from '$app/navigation';
 	import { page } from '$app/stores';
-	import { sortConditions } from '$lib/shared/conditionTypes';
+	import { sortConditions } from '$shared/pcd/conditions';
 
 	export let formats: CustomFormatTableRow[];
 
diff --git a/src/routes/databases/+page.svelte b/src/routes/databases/+page.svelte
index 1447b06..4a42085 100644
--- a/src/routes/databases/+page.svelte
+++ b/src/routes/databases/+page.svelte
@@ -22,7 +22,7 @@
 	import SearchAction from '$ui/actions/SearchAction.svelte';
 	import { createSearchStore } from '$stores/search';
 	import { alertStore } from '$alerts/store';
-	import { parseUTC } from '$shared/dates';
+	import { parseUTC } from '$shared/utils/dates';
 	import type { PageData } from './$types';
 	import type { Column } from '$ui/table/types';
 	import type { DatabaseInstance } from '$db/queries/databaseInstances.ts';
diff --git a/src/routes/delay-profiles/[databaseId]/views/TableView.svelte b/src/routes/delay-profiles/[databaseId]/views/TableView.svelte
index 766b446..cc61e9d 100644
--- a/src/routes/delay-profiles/[databaseId]/views/TableView.svelte
+++ b/src/routes/delay-profiles/[databaseId]/views/TableView.svelte
@@ -5,7 +5,7 @@
 	import { Tag, Clock, Zap, Shield, Calendar } from 'lucide-svelte';
 	import { goto } from '$app/navigation';
 	import { page } from '$app/stores';
-	import { parseUTC } from '$shared/dates';
+	import { parseUTC } from '$shared/utils/dates';
 
 	export let profiles: DelayProfilesRow[];
 
diff --git a/src/routes/media-management/[databaseId]/media-settings/components/MediaSettingsForm.svelte b/src/routes/media-management/[databaseId]/media-settings/components/MediaSettingsForm.svelte
index 1c8e52e..9bf1b3f 100644
--- a/src/routes/media-management/[databaseId]/media-settings/components/MediaSettingsForm.svelte
+++ b/src/routes/media-management/[databaseId]/media-settings/components/MediaSettingsForm.svelte
@@ -10,7 +10,7 @@
 	import { current, isDirty, initEdit, initCreate, update } from '$lib/client/stores/dirty';
 	import type { RadarrMediaSettingsRow } from '$shared/pcd/display.ts';
 	import type { ArrType } from '$shared/pcd/types.ts';
-	import { PROPERS_REPACKS_OPTIONS, type PropersRepacks } from '$shared/pcd/conversions.ts';
+	import { PROPERS_REPACKS_OPTIONS, type PropersRepacks } from '$shared/pcd/mediaManagement.ts';
 
 	interface RadarrMediaSettingsRowFormData {
 		name: string;
diff --git a/src/routes/media-management/[databaseId]/media-settings/new/+page.server.ts b/src/routes/media-management/[databaseId]/media-settings/new/+page.server.ts
index 3ce6220..7c5aa08 100644
--- a/src/routes/media-management/[databaseId]/media-settings/new/+page.server.ts
+++ b/src/routes/media-management/[databaseId]/media-settings/new/+page.server.ts
@@ -4,7 +4,7 @@ import { pcdManager } from '$pcd/pcd.ts';
 import { canWriteToBase } from '$pcd/writer.ts';
 import type { OperationLayer } from '$pcd/writer.ts';
 import type { ArrType } from '$shared/pcd/types.ts';
-import type { PropersRepacks } from '$shared/pcd/conversions.ts';
+import type { PropersRepacks } from '$shared/pcd/mediaManagement.ts';
 import { createRadarrMediaSettings, createSonarrMediaSettings } from '$pcd/entities/mediaManagement/media-settings/index.ts';
 
 export const load: PageServerLoad = async ({ parent }) => {
diff --git a/src/routes/media-management/[databaseId]/media-settings/radarr/[name]/+page.server.ts b/src/routes/media-management/[databaseId]/media-settings/radarr/[name]/+page.server.ts
index fe7547c..3f0d58a 100644
--- a/src/routes/media-management/[databaseId]/media-settings/radarr/[name]/+page.server.ts
+++ b/src/routes/media-management/[databaseId]/media-settings/radarr/[name]/+page.server.ts
@@ -4,7 +4,7 @@ import { pcdManager } from '$pcd/pcd.ts';
 import { canWriteToBase } from '$pcd/writer.ts';
 import type { OperationLayer } from '$pcd/writer.ts';
 import { getRadarrByName, updateRadarrMediaSettings, removeRadarrMediaSettings } from '$pcd/entities/mediaManagement/media-settings/index.ts';
-import type { PropersRepacks } from '$shared/pcd/conversions.ts';
+import type { PropersRepacks } from '$shared/pcd/mediaManagement.ts';
 
 export const load: PageServerLoad = async ({ params, parent }) => {
 	const { databaseId, name } = params;
diff --git a/src/routes/media-management/[databaseId]/media-settings/sonarr/[name]/+page.server.ts b/src/routes/media-management/[databaseId]/media-settings/sonarr/[name]/+page.server.ts
index b2cf25b..14da81f 100644
--- a/src/routes/media-management/[databaseId]/media-settings/sonarr/[name]/+page.server.ts
+++ b/src/routes/media-management/[databaseId]/media-settings/sonarr/[name]/+page.server.ts
@@ -4,7 +4,7 @@ import { pcdManager } from '$pcd/pcd.ts';
 import { canWriteToBase } from '$pcd/writer.ts';
 import type { OperationLayer } from '$pcd/writer.ts';
 import { getSonarrByName, updateSonarrMediaSettings, removeSonarrMediaSettings } from '$pcd/entities/mediaManagement/media-settings/index.ts';
-import type { PropersRepacks } from '$shared/pcd/conversions.ts';
+import type { PropersRepacks } from '$shared/pcd/mediaManagement.ts';
 
 export const load: PageServerLoad = async ({ params, parent }) => {
 	const { databaseId, name } = params;
diff --git a/src/routes/media-management/[databaseId]/naming/components/RadarrNamingForm.svelte b/src/routes/media-management/[databaseId]/naming/components/RadarrNamingForm.svelte
index 2e92ce2..b3d1d60 100644
--- a/src/routes/media-management/[databaseId]/naming/components/RadarrNamingForm.svelte
+++ b/src/routes/media-management/[databaseId]/naming/components/RadarrNamingForm.svelte
@@ -9,7 +9,7 @@
 	import { Check, Save, Trash2 } from 'lucide-svelte';
 	import { current, isDirty, initEdit, initCreate, update } from '$lib/client/stores/dirty';
 	import type { RadarrNamingRow } from '$shared/pcd/display.ts';
-	import { RADARR_COLON_REPLACEMENT_OPTIONS, type RadarrColonReplacementFormat } from '$shared/pcd/conversions.ts';
+	import { RADARR_COLON_REPLACEMENT_OPTIONS, type RadarrColonReplacementFormat } from '$shared/pcd/mediaManagement.ts';
 
 	interface RadarrNamingFormData {
 		name: string;
diff --git a/src/routes/media-management/[databaseId]/naming/components/SonarrNamingForm.svelte b/src/routes/media-management/[databaseId]/naming/components/SonarrNamingForm.svelte
index 225a23d..ba33a27 100644
--- a/src/routes/media-management/[databaseId]/naming/components/SonarrNamingForm.svelte
+++ b/src/routes/media-management/[databaseId]/naming/components/SonarrNamingForm.svelte
@@ -9,7 +9,7 @@
 	import { Check, Save, Trash2 } from 'lucide-svelte';
 	import { current, isDirty, initEdit, initCreate, update } from '$lib/client/stores/dirty';
 	import type { SonarrNamingRow } from '$shared/pcd/display.ts';
-	import { SONARR_COLON_REPLACEMENT_OPTIONS, MULTI_EPISODE_STYLE_OPTIONS, type SonarrColonReplacementFormat, type MultiEpisodeStyle } from '$shared/pcd/conversions.ts';
+	import { SONARR_COLON_REPLACEMENT_OPTIONS, MULTI_EPISODE_STYLE_OPTIONS, type SonarrColonReplacementFormat, type MultiEpisodeStyle } from '$shared/pcd/mediaManagement.ts';
 
 	interface SonarrNamingFormData {
 		name: string;
diff --git a/src/routes/regular-expressions/[databaseId]/views/TableView.svelte b/src/routes/regular-expressions/[databaseId]/views/TableView.svelte
index 0e099e7..f414d6b 100644
--- a/src/routes/regular-expressions/[databaseId]/views/TableView.svelte
+++ b/src/routes/regular-expressions/[databaseId]/views/TableView.svelte
@@ -6,7 +6,7 @@
 	import { marked } from 'marked';
 	import { goto } from '$app/navigation';
 	import { page } from '$app/stores';
-	import { parseUTC } from '$shared/dates';
+	import { parseUTC } from '$shared/utils/dates';
 
 	export let expressions: RegularExpressionWithTags[];
 
diff --git a/src/routes/settings/notifications/components/NotificationHistory.svelte b/src/routes/settings/notifications/components/NotificationHistory.svelte
index 8cee86c..9c9743b 100644
--- a/src/routes/settings/notifications/components/NotificationHistory.svelte
+++ b/src/routes/settings/notifications/components/NotificationHistory.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Bell } from 'lucide-svelte';
-	import { parseUTC } from '$shared/dates';
+	import { parseUTC } from '$shared/utils/dates';
 	import type { NotificationHistoryRecord } from '$db/queries/notificationHistory.ts';
 
 	export let history: NotificationHistoryRecord[];
diff --git a/src/routes/settings/notifications/components/NotificationServiceForm.svelte b/src/routes/settings/notifications/components/NotificationServiceForm.svelte
index 99212db..f14f891 100644
--- a/src/routes/settings/notifications/components/NotificationServiceForm.svelte
+++ b/src/routes/settings/notifications/components/NotificationServiceForm.svelte
@@ -3,7 +3,7 @@
 	import { alertStore } from '$alerts/store';
 	import DiscordConfiguration from './DiscordConfiguration.svelte';
 	import { siDiscord } from 'simple-icons';
-	import { groupNotificationTypesByCategory } from '$shared/notificationTypes';
+	import { groupNotificationTypesByCategory } from '$shared/notifications/types';
 	import { Plus, Save, Check } from 'lucide-svelte';
 	import IconCheckbox from '$ui/form/IconCheckbox.svelte';
 
diff --git a/src/routes/settings/notifications/edit/[id]/+page.server.ts b/src/routes/settings/notifications/edit/[id]/+page.server.ts
index fe05a48..cc092ab 100644
--- a/src/routes/settings/notifications/edit/[id]/+page.server.ts
+++ b/src/routes/settings/notifications/edit/[id]/+page.server.ts
@@ -2,7 +2,7 @@ import type { Actions, RequestEvent } from '@sveltejs/kit';
 import { error, fail, redirect } from '@sveltejs/kit';
 import { logger } from '$logger/logger.ts';
 import { notificationServicesQueries } from '$db/queries/notificationServices.ts';
-import { getAllNotificationTypeIds } from '$shared/notificationTypes.ts';
+import { getAllNotificationTypeIds } from '$shared/notifications/types.ts';
 
 export const load = ({ params }: { params: { id: string } }) => {
 	const { id } = params;
diff --git a/src/routes/settings/notifications/new/+page.server.ts b/src/routes/settings/notifications/new/+page.server.ts
index 2ac7ee9..251ad41 100644
--- a/src/routes/settings/notifications/new/+page.server.ts
+++ b/src/routes/settings/notifications/new/+page.server.ts
@@ -2,7 +2,7 @@ import type { Actions, RequestEvent } from '@sveltejs/kit';
 import { fail, redirect } from '@sveltejs/kit';
 import { logger } from '$logger/logger.ts';
 import { notificationServicesQueries } from '$db/queries/notificationServices.ts';
-import { getAllNotificationTypeIds } from '$shared/notificationTypes.ts';
+import { getAllNotificationTypeIds } from '$shared/notifications/types.ts';
 
 export const actions: Actions = {
 	create: async ({ request }: RequestEvent) => {
diff --git a/src/routes/settings/security/+page.svelte b/src/routes/settings/security/+page.svelte
index 01e3ca9..0f40ac6 100644
--- a/src/routes/settings/security/+page.svelte
+++ b/src/routes/settings/security/+page.svelte
@@ -3,7 +3,7 @@
 	import { enhance } from '$app/forms';
 	import { invalidateAll } from '$app/navigation';
 	import { Copy, RefreshCw, LogOut, Check, Globe, Monitor, Smartphone, Network, Clock } from 'lucide-svelte';
-	import { parseUTC } from '$shared/dates';
+	import { parseUTC } from '$shared/utils/dates';
 	import Button from '$ui/button/Button.svelte';
 	import FormInput from '$ui/form/FormInput.svelte';
 	import Table from '$ui/table/Table.svelte';