From 160020c551f71441fec093f5a6b2ca2650d9a74d Mon Sep 17 00:00:00 2001
From: JPVenson <github@jpb.email>
Date: Tue, 25 Mar 2025 15:30:22 +0000
Subject: WIP fixed namespaces

---
 .../DatabaseConfigurationOptions.cs                |   4 +-
 .../Entities/AccessSchedule.cs                     |   2 +-
 .../Entities/ActivityLog.cs                        |   2 +-
 .../Entities/BaseItemEntity.cs                     |   2 -
 .../Entities/BaseItemImageInfo.cs                  |   1 -
 .../Entities/BaseItemProvider.cs                   |   3 -
 .../Entities/DisplayPreferences.cs                 |   2 +-
 .../Entities/Group.cs                              |   4 +-
 .../Entities/HomeSection.cs                        |   2 +-
 .../Entities/ItemDisplayPreferences.cs             |   2 +-
 .../Entities/ItemValueMap.cs                       |   1 -
 .../Entities/Libraries/Artwork.cs                  |   4 +-
 .../Entities/Libraries/Book.cs                     |   2 +-
 .../Entities/Libraries/BookMetadata.cs             |   2 +-
 .../Entities/Libraries/Chapter.cs                  |   2 +-
 .../Entities/Libraries/Collection.cs               |   2 +-
 .../Entities/Libraries/CollectionItem.cs           |   2 +-
 .../Entities/Libraries/Company.cs                  |   2 +-
 .../Entities/Libraries/CustomItem.cs               |   2 +-
 .../Entities/Libraries/Episode.cs                  |   2 +-
 .../Entities/Libraries/Genre.cs                    |   2 +-
 .../Entities/Libraries/ItemMetadata.cs             |   2 +-
 .../Entities/Libraries/Library.cs                  |   2 +-
 .../Entities/Libraries/LibraryItem.cs              |   2 +-
 .../Entities/Libraries/MediaFile.cs                |   4 +-
 .../Entities/Libraries/MediaFileStream.cs          |   2 +-
 .../Entities/Libraries/MetadataProvider.cs         |   2 +-
 .../Entities/Libraries/MetadataProviderId.cs       |   2 +-
 .../Entities/Libraries/Movie.cs                    |   2 +-
 .../Entities/Libraries/MovieMetadata.cs            |   2 +-
 .../Entities/Libraries/Person.cs                   |   2 +-
 .../Entities/Libraries/PersonRole.cs               |   4 +-
 .../Entities/Libraries/Photo.cs                    |   2 +-
 .../Entities/Libraries/Rating.cs                   |   2 +-
 .../Entities/Libraries/RatingSource.cs             |   2 +-
 .../Entities/Libraries/Release.cs                  |   2 +-
 .../Entities/Libraries/SeriesMetadata.cs           |   2 +-
 .../Entities/Libraries/Track.cs                    |   2 +-
 .../Entities/MediaSegment.cs                       |   2 +-
 .../Entities/MediaStreamInfo.cs                    |   1 -
 .../Entities/Permission.cs                         |   4 +-
 .../Entities/Preference.cs                         |   4 +-
 .../Entities/User.cs                               |   6 +-
 .../Entities/UserData.cs                           |   1 -
 .../Enums/ArtKind.cs                               |  49 ++--
 .../Enums/ChromecastVersion.cs                     |  25 +--
 .../Enums/DynamicDayOfWeek.cs                      | 109 +++++----
 .../Enums/HomeSectionType.cs                       | 109 +++++----
 .../Enums/IndexingKind.cs                          |  33 ++-
 .../Enums/MediaFileKind.cs                         |  49 ++--
 .../Enums/MediaSegmentType.cs                      |   2 +-
 .../Enums/PermissionKind.cs                        | 249 ++++++++++-----------
 .../Enums/PersonRoleType.cs                        | 105 +++++----
 .../Enums/PreferenceKind.cs                        | 113 +++++-----
 .../Enums/ScrollDirection.cs                       |  25 +--
 .../Enums/SortOrder.cs                             |  25 +--
 .../Enums/SubtitlePlaybackMode.cs                  |  49 ++--
 .../Enums/SyncPlayUserAccessType.cs                |  33 ++-
 .../Enums/ViewType.cs                              | 219 +++++++++---------
 .../IJellyfinDatabaseProvider.cs                   |   3 +-
 .../Interfaces/IHasArtwork.cs                      |   2 +-
 .../Interfaces/IHasCompanies.cs                    |   2 +-
 .../Interfaces/IHasConcurrencyToken.cs             |  25 +--
 .../Interfaces/IHasPermissions.cs                  |  18 +-
 .../Interfaces/IHasReleases.cs                     |  17 +-
 .../JellyfinDatabaseProviderKeyAttribute.cs        |   4 +-
 .../JellyfinDbContext.cs                           |   6 +-
 .../ModelConfiguration/ActivityLogConfiguration.cs |   2 +-
 .../ModelConfiguration/AncestorIdConfiguration.cs  |   3 +-
 .../ModelConfiguration/ApiKeyConfiguration.cs      |   2 +-
 .../AttachmentStreamInfoConfiguration.cs           |   2 +-
 .../ModelConfiguration/BaseItemConfiguration.cs    |   2 +-
 .../BaseItemMetadataFieldConfiguration.cs          |   2 +-
 .../BaseItemProviderConfiguration.cs               |   3 +-
 .../BaseItemTrailerTypeConfiguration.cs            |   2 +-
 .../ModelConfiguration/ChapterConfiguration.cs     |   3 +-
 .../CustomItemDisplayPreferencesConfiguration.cs   |   2 +-
 .../ModelConfiguration/DeviceConfiguration.cs      |   2 +-
 .../DeviceOptionsConfiguration.cs                  |   2 +-
 .../DisplayPreferencesConfiguration.cs             |   2 +-
 .../ModelConfiguration/ItemValuesConfiguration.cs  |   3 +-
 .../ItemValuesMapConfiguration.cs                  |   3 +-
 .../MediaStreamInfoConfiguration.cs                |   3 +-
 .../PeopleBaseItemMapConfiguration.cs              |   3 +-
 .../ModelConfiguration/PeopleConfiguration.cs      |   3 +-
 .../ModelConfiguration/PermissionConfiguration.cs  |   2 +-
 .../ModelConfiguration/PreferenceConfiguration.cs  |   2 +-
 .../TrickplayInfoConfiguration.cs                  |   2 +-
 .../ModelConfiguration/UserConfiguration.cs        |   2 +-
 .../ModelConfiguration/UserDataConfiguration.cs    |   3 +-
 .../20200514181226_AddActivityLog.Designer.cs      |   2 +-
 .../Migrations/20200613202153_AddUsers.Designer.cs |   2 +-
 ...0200728005145_AddDisplayPreferences.Designer.cs |   2 +-
 ...05220533_FixDisplayPreferencesIndex.Designer.cs |   2 +-
 ...20201004171403_AddMaxActiveSessions.Designer.cs |   2 +-
 ...4223655_AddCustomDisplayPreferences.Designer.cs |   2 +-
 ...10320181425_AddIndexesAndCollations.Designer.cs |   2 +-
 ...10407110544_NullableCustomPrefValue.Designer.cs |   2 +-
 .../20210814002109_AddDevices.Designer.cs          |   2 +-
 ...052_AddIndexActivityLogsDateCreated.Designer.cs |   2 +-
 .../20230526173516_RemoveEasyPassword.Designer.cs  |   2 +-
 .../20230626233818_AddTrickplayInfos.Designer.cs   |   2 +-
 .../20230923170422_UserCastReceiver.Designer.cs    |   2 +-
 .../20240729140605_AddMediaSegments.Designer.cs    |   2 +-
 ...30_MarkSegmentProviderIdNonNullable.Designer.cs |   2 +-
 .../20241020103111_LibraryDbMigration.Designer.cs  |   2 +-
 .../20241111131257_AddedCustomDataKey.Designer.cs  |   2 +-
 ...0241111135439_AddedCustomDataKeyKey.Designer.cs |   2 +-
 .../20241112152323_FixAncestorIdConfig.Designer.cs |   2 +-
 .../20241112232041_fixMediaStreams.Designer.cs     |   2 +-
 .../20241112234144_FixMediaStreams2.Designer.cs    |   2 +-
 ...241113133548_EnforceUniqueItemValue.Designer.cs |   2 +-
 .../20250202021306_FixedCollation.Designer.cs      |   2 +-
 ...0204092455_MakeStartEndDateNullable.Designer.cs |   2 +-
 .../20250214031148_ChannelIdGuid.Designer.cs       |   2 +-
 .../Migrations/JellyfinDbModelSnapshot.cs          |   2 +-
 .../SqliteDesignTimeJellyfinDbFactory.cs           |   1 +
 .../ModelBuilderExtensions.cs                      |  59 +++--
 .../SqliteDatabaseProvider.cs                      |   2 +-
 src/Jellyfin.LiveTv/Channels/ChannelManager.cs     |   1 +
 src/Jellyfin.LiveTv/DefaultLiveTvService.cs        |   1 +
 src/Jellyfin.LiveTv/LiveTvManager.cs               |   1 +
 .../Recordings/RecordingNotifier.cs                |   2 +-
 .../Recordings/RecordingsManager.cs                |   1 +
 124 files changed, 754 insertions(+), 795 deletions(-)

(limited to 'src')

diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/DbConfiguration/DatabaseConfigurationOptions.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/DbConfiguration/DatabaseConfigurationOptions.cs
index af2ede7010..b481a106fd 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/DbConfiguration/DatabaseConfigurationOptions.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/DbConfiguration/DatabaseConfigurationOptions.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Jellyfin.Server.Implementations.DatabaseConfiguration;
+namespace Jellyfin.Database.Implementations.DbConfiguration;
 
 /// <summary>
 /// Options to configure jellyfins managed database.
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/AccessSchedule.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/AccessSchedule.cs
index f534e49f3f..909e8750f8 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/AccessSchedule.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/AccessSchedule.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Xml.Serialization;
-using Jellyfin.Data.Enums;
+using Jellyfin.Database.Implementations.Enums;
 
 namespace Jellyfin.Data.Entities
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/ActivityLog.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/ActivityLog.cs
index 51dd0ffb8e..3a76784052 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/ActivityLog.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/ActivityLog.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Interfaces;
 using Microsoft.Extensions.Logging;
 
 namespace Jellyfin.Data.Entities
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/BaseItemEntity.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/BaseItemEntity.cs
index e3e0e0861e..42be5b3b99 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/BaseItemEntity.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/BaseItemEntity.cs
@@ -3,8 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Jellyfin.Data.Entities;
 
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/BaseItemImageInfo.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/BaseItemImageInfo.cs
index 37723df116..ac6b72acea 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/BaseItemImageInfo.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/BaseItemImageInfo.cs
@@ -1,7 +1,6 @@
 #pragma warning disable CA2227
 
 using System;
-using System.Collections.Generic;
 
 namespace Jellyfin.Data.Entities;
 
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/BaseItemProvider.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/BaseItemProvider.cs
index 9a1565728d..c0c5e3147f 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/BaseItemProvider.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/BaseItemProvider.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Jellyfin.Data.Entities;
 
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/DisplayPreferences.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/DisplayPreferences.cs
index f0be657691..82bf007a8a 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/DisplayPreferences.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/DisplayPreferences.cs
@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Jellyfin.Data.Enums;
+using Jellyfin.Database.Implementations.Enums;
 
 namespace Jellyfin.Data.Entities
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Group.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Group.cs
index 09f2372893..4b343c164a 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Group.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Group.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using Jellyfin.Data.Enums;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Interfaces;
 
 namespace Jellyfin.Data.Entities
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/HomeSection.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/HomeSection.cs
index 8dd6e647e2..edffec4aba 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/HomeSection.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/HomeSection.cs
@@ -1,5 +1,5 @@
 using System.ComponentModel.DataAnnotations.Schema;
-using Jellyfin.Data.Enums;
+using Jellyfin.Database.Implementations.Enums;
 
 namespace Jellyfin.Data.Entities
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/ItemDisplayPreferences.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/ItemDisplayPreferences.cs
index 93e6664ea4..7e75a200b6 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/ItemDisplayPreferences.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/ItemDisplayPreferences.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Jellyfin.Data.Enums;
+using Jellyfin.Database.Implementations.Enums;
 
 namespace Jellyfin.Data.Entities
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/ItemValueMap.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/ItemValueMap.cs
index 94db6a011b..e80a9aec34 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/ItemValueMap.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/ItemValueMap.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 
 namespace Jellyfin.Data.Entities;
 
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Artwork.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Artwork.cs
index fc3c1036f0..b529da8fa7 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Artwork.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Artwork.cs
@@ -1,8 +1,8 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Jellyfin.Data.Enums;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Enums;
+using Jellyfin.Database.Implementations.Interfaces;
 
 namespace Jellyfin.Data.Entities.Libraries
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Book.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Book.cs
index a838686d05..54c30d92ce 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Book.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Book.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Interfaces;
 
 namespace Jellyfin.Data.Entities.Libraries
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/BookMetadata.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/BookMetadata.cs
index 4a350d200e..7b1a68bb55 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/BookMetadata.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/BookMetadata.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Interfaces;
 
 namespace Jellyfin.Data.Entities.Libraries
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Chapter.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Chapter.cs
index f068338f92..cbcb9a5f54 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Chapter.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Chapter.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Interfaces;
 
 namespace Jellyfin.Data.Entities.Libraries
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Collection.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Collection.cs
index 7de6019692..8da9793f9d 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Collection.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Collection.cs
@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Interfaces;
 
 namespace Jellyfin.Data.Entities.Libraries
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/CollectionItem.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/CollectionItem.cs
index 15b356a74e..4bd99d83a7 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/CollectionItem.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/CollectionItem.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Interfaces;
 
 namespace Jellyfin.Data.Entities.Libraries
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Company.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Company.cs
index 1abbee4458..5dc1039a1f 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Company.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Company.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Interfaces;
 
 namespace Jellyfin.Data.Entities.Libraries
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/CustomItem.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/CustomItem.cs
index e27d01d860..92307afecd 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/CustomItem.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/CustomItem.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Interfaces;
 
 namespace Jellyfin.Data.Entities.Libraries
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Episode.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Episode.cs
index ce2f0c6178..6379755264 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Episode.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Episode.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Interfaces;
 
 namespace Jellyfin.Data.Entities.Libraries
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Genre.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Genre.cs
index 3b822ee828..329b8973f5 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Genre.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Genre.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Interfaces;
 
 namespace Jellyfin.Data.Entities.Libraries
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/ItemMetadata.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/ItemMetadata.cs
index fa9276c669..401d58ff22 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/ItemMetadata.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/ItemMetadata.cs
@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Interfaces;
 
 namespace Jellyfin.Data.Entities.Libraries
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Library.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Library.cs
index 0db42a1c7b..17673cb1d9 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Library.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Library.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Interfaces;
 
 namespace Jellyfin.Data.Entities.Libraries
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/LibraryItem.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/LibraryItem.cs
index d889b871ed..975614be10 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/LibraryItem.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/LibraryItem.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Interfaces;
 
 namespace Jellyfin.Data.Entities.Libraries
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/MediaFile.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/MediaFile.cs
index 7b5a3af64c..0913f95be1 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/MediaFile.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/MediaFile.cs
@@ -2,8 +2,8 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Jellyfin.Data.Enums;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Enums;
+using Jellyfin.Database.Implementations.Interfaces;
 
 namespace Jellyfin.Data.Entities.Libraries
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/MediaFileStream.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/MediaFileStream.cs
index e24e73ecb7..3170653fec 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/MediaFileStream.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/MediaFileStream.cs
@@ -2,7 +2,7 @@
 
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Interfaces;
 
 namespace Jellyfin.Data.Entities.Libraries
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/MetadataProvider.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/MetadataProvider.cs
index b38d6a4f1f..afaebb8e86 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/MetadataProvider.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/MetadataProvider.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Interfaces;
 
 namespace Jellyfin.Data.Entities.Libraries
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/MetadataProviderId.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/MetadataProviderId.cs
index a198f53ba3..fa36e58db7 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/MetadataProviderId.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/MetadataProviderId.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Interfaces;
 
 namespace Jellyfin.Data.Entities.Libraries
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Movie.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Movie.cs
index 499fafd0e1..beae325ec5 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Movie.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Movie.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Interfaces;
 
 namespace Jellyfin.Data.Entities.Libraries
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/MovieMetadata.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/MovieMetadata.cs
index 44b5f34d7f..df48ebf279 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/MovieMetadata.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/MovieMetadata.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Interfaces;
 
 namespace Jellyfin.Data.Entities.Libraries
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Person.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Person.cs
index 90dc55b70d..d9609f1cc0 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Person.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Person.cs
@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Interfaces;
 
 namespace Jellyfin.Data.Entities.Libraries
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/PersonRole.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/PersonRole.cs
index 7d40bdf448..627f74140b 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/PersonRole.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/PersonRole.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Jellyfin.Data.Enums;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Enums;
+using Jellyfin.Database.Implementations.Interfaces;
 
 namespace Jellyfin.Data.Entities.Libraries
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Photo.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Photo.cs
index 4b459432bc..094d57139c 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Photo.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Photo.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Interfaces;
 
 namespace Jellyfin.Data.Entities.Libraries
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Rating.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Rating.cs
index 58c8fa49ef..6b792ffb48 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Rating.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Rating.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Interfaces;
 
 namespace Jellyfin.Data.Entities.Libraries
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/RatingSource.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/RatingSource.cs
index 0f3a073244..91ee8caa16 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/RatingSource.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/RatingSource.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Interfaces;
 
 namespace Jellyfin.Data.Entities.Libraries
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Release.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Release.cs
index e68ab9105a..40466def1d 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Release.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Release.cs
@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Interfaces;
 
 namespace Jellyfin.Data.Entities.Libraries
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/SeriesMetadata.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/SeriesMetadata.cs
index 42115802c5..28da91e472 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/SeriesMetadata.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/SeriesMetadata.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Interfaces;
 
 namespace Jellyfin.Data.Entities.Libraries
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Track.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Track.cs
index d354000337..6d6a920225 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Track.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Libraries/Track.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Interfaces;
 
 namespace Jellyfin.Data.Entities.Libraries
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/MediaSegment.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/MediaSegment.cs
index 90120d7721..8c1c071e63 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/MediaSegment.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/MediaSegment.cs
@@ -1,6 +1,6 @@
 using System;
 using System.ComponentModel.DataAnnotations.Schema;
-using Jellyfin.Data.Enums;
+using Jellyfin.Database.Implementations.Enums;
 
 namespace Jellyfin.Data.Entities;
 
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/MediaStreamInfo.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/MediaStreamInfo.cs
index 77816565af..b16b62b104 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/MediaStreamInfo.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/MediaStreamInfo.cs
@@ -1,7 +1,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 
 using System;
-using System.Diagnostics.CodeAnalysis;
 
 namespace Jellyfin.Data.Entities;
 
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Permission.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Permission.cs
index 6d2e68077c..c488b90e1c 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Permission.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Permission.cs
@@ -3,8 +3,8 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Jellyfin.Data.Enums;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Enums;
+using Jellyfin.Database.Implementations.Interfaces;
 
 namespace Jellyfin.Data.Entities
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Preference.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Preference.cs
index a6ab275d31..f4f9dd17ac 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Preference.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/Preference.cs
@@ -1,8 +1,8 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Jellyfin.Data.Enums;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Enums;
+using Jellyfin.Database.Implementations.Interfaces;
 
 namespace Jellyfin.Data.Entities
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/User.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/User.cs
index f3398eeeac..aafa92b4a6 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/User.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/User.cs
@@ -1,12 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
 using System.Text.Json.Serialization;
-using Jellyfin.Data.Enums;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Enums;
+using Jellyfin.Database.Implementations.Interfaces;
 
 namespace Jellyfin.Data.Entities
 {
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/UserData.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/UserData.cs
index 05ab6dd2d2..ced12b9e62 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/UserData.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/UserData.cs
@@ -1,5 +1,4 @@
 using System;
-using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Jellyfin.Data.Entities;
 
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/ArtKind.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/ArtKind.cs
index f7a73848c8..218e97bcc0 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/ArtKind.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/ArtKind.cs
@@ -1,33 +1,32 @@
-namespace Jellyfin.Data.Enums
+namespace Jellyfin.Database.Implementations.Enums;
+
+/// <summary>
+/// An enum representing types of art.
+/// </summary>
+public enum ArtKind
 {
     /// <summary>
-    /// An enum representing types of art.
+    /// Another type of art, not covered by the other members.
     /// </summary>
-    public enum ArtKind
-    {
-        /// <summary>
-        /// Another type of art, not covered by the other members.
-        /// </summary>
-        Other = 0,
+    Other = 0,
 
-        /// <summary>
-        /// A poster.
-        /// </summary>
-        Poster = 1,
+    /// <summary>
+    /// A poster.
+    /// </summary>
+    Poster = 1,
 
-        /// <summary>
-        /// A banner.
-        /// </summary>
-        Banner = 2,
+    /// <summary>
+    /// A banner.
+    /// </summary>
+    Banner = 2,
 
-        /// <summary>
-        /// A thumbnail.
-        /// </summary>
-        Thumbnail = 3,
+    /// <summary>
+    /// A thumbnail.
+    /// </summary>
+    Thumbnail = 3,
 
-        /// <summary>
-        /// A logo.
-        /// </summary>
-        Logo = 4
-    }
+    /// <summary>
+    /// A logo.
+    /// </summary>
+    Logo = 4
 }
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/ChromecastVersion.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/ChromecastVersion.cs
index c9c8a4a625..123f2fe438 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/ChromecastVersion.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/ChromecastVersion.cs
@@ -1,18 +1,17 @@
-namespace Jellyfin.Data.Enums
+namespace Jellyfin.Database.Implementations.Enums;
+
+/// <summary>
+/// An enum representing the version of Chromecast to be used by clients.
+/// </summary>
+public enum ChromecastVersion
 {
     /// <summary>
-    /// An enum representing the version of Chromecast to be used by clients.
+    /// Stable Chromecast version.
     /// </summary>
-    public enum ChromecastVersion
-    {
-        /// <summary>
-        /// Stable Chromecast version.
-        /// </summary>
-        Stable = 0,
+    Stable = 0,
 
-        /// <summary>
-        /// Unstable Chromecast version.
-        /// </summary>
-        Unstable = 1
-    }
+    /// <summary>
+    /// Unstable Chromecast version.
+    /// </summary>
+    Unstable = 1
 }
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/DynamicDayOfWeek.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/DynamicDayOfWeek.cs
index d3d8dd8227..69a9b5816a 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/DynamicDayOfWeek.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/DynamicDayOfWeek.cs
@@ -1,58 +1,57 @@
-namespace Jellyfin.Data.Enums
+namespace Jellyfin.Database.Implementations.Enums;
+
+/// <summary>
+/// An enum that represents a day of the week, weekdays, weekends, or all days.
+/// </summary>
+public enum DynamicDayOfWeek
 {
     /// <summary>
-    /// An enum that represents a day of the week, weekdays, weekends, or all days.
-    /// </summary>
-    public enum DynamicDayOfWeek
-    {
-        /// <summary>
-        /// Sunday.
-        /// </summary>
-        Sunday = 0,
-
-        /// <summary>
-        /// Monday.
-        /// </summary>
-        Monday = 1,
-
-        /// <summary>
-        /// Tuesday.
-        /// </summary>
-        Tuesday = 2,
-
-        /// <summary>
-        /// Wednesday.
-        /// </summary>
-        Wednesday = 3,
-
-        /// <summary>
-        /// Thursday.
-        /// </summary>
-        Thursday = 4,
-
-        /// <summary>
-        /// Friday.
-        /// </summary>
-        Friday = 5,
-
-        /// <summary>
-        /// Saturday.
-        /// </summary>
-        Saturday = 6,
-
-        /// <summary>
-        /// All days of the week.
-        /// </summary>
-        Everyday = 7,
-
-        /// <summary>
-        /// A week day, or Monday-Friday.
-        /// </summary>
-        Weekday = 8,
-
-        /// <summary>
-        /// Saturday and Sunday.
-        /// </summary>
-        Weekend = 9
-    }
+    /// Sunday.
+    /// </summary>
+    Sunday = 0,
+
+    /// <summary>
+    /// Monday.
+    /// </summary>
+    Monday = 1,
+
+    /// <summary>
+    /// Tuesday.
+    /// </summary>
+    Tuesday = 2,
+
+    /// <summary>
+    /// Wednesday.
+    /// </summary>
+    Wednesday = 3,
+
+    /// <summary>
+    /// Thursday.
+    /// </summary>
+    Thursday = 4,
+
+    /// <summary>
+    /// Friday.
+    /// </summary>
+    Friday = 5,
+
+    /// <summary>
+    /// Saturday.
+    /// </summary>
+    Saturday = 6,
+
+    /// <summary>
+    /// All days of the week.
+    /// </summary>
+    Everyday = 7,
+
+    /// <summary>
+    /// A week day, or Monday-Friday.
+    /// </summary>
+    Weekday = 8,
+
+    /// <summary>
+    /// Saturday and Sunday.
+    /// </summary>
+    Weekend = 9
 }
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/HomeSectionType.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/HomeSectionType.cs
index 62da8c3fff..6ba57e74d5 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/HomeSectionType.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/HomeSectionType.cs
@@ -1,58 +1,57 @@
-namespace Jellyfin.Data.Enums
+namespace Jellyfin.Database.Implementations.Enums;
+
+/// <summary>
+/// An enum representing the different options for the home screen sections.
+/// </summary>
+public enum HomeSectionType
 {
     /// <summary>
-    /// An enum representing the different options for the home screen sections.
-    /// </summary>
-    public enum HomeSectionType
-    {
-        /// <summary>
-        /// None.
-        /// </summary>
-        None = 0,
-
-        /// <summary>
-        /// My Media.
-        /// </summary>
-        SmallLibraryTiles = 1,
-
-        /// <summary>
-        /// My Media Small.
-        /// </summary>
-        LibraryButtons = 2,
-
-        /// <summary>
-        /// Active Recordings.
-        /// </summary>
-        ActiveRecordings = 3,
-
-        /// <summary>
-        /// Continue Watching.
-        /// </summary>
-        Resume = 4,
-
-        /// <summary>
-        /// Continue Listening.
-        /// </summary>
-        ResumeAudio = 5,
-
-        /// <summary>
-        /// Latest Media.
-        /// </summary>
-        LatestMedia = 6,
-
-        /// <summary>
-        /// Next Up.
-        /// </summary>
-        NextUp = 7,
-
-        /// <summary>
-        /// Live TV.
-        /// </summary>
-        LiveTv = 8,
-
-        /// <summary>
-        /// Continue Reading.
-        /// </summary>
-        ResumeBook = 9
-    }
+    /// None.
+    /// </summary>
+    None = 0,
+
+    /// <summary>
+    /// My Media.
+    /// </summary>
+    SmallLibraryTiles = 1,
+
+    /// <summary>
+    /// My Media Small.
+    /// </summary>
+    LibraryButtons = 2,
+
+    /// <summary>
+    /// Active Recordings.
+    /// </summary>
+    ActiveRecordings = 3,
+
+    /// <summary>
+    /// Continue Watching.
+    /// </summary>
+    Resume = 4,
+
+    /// <summary>
+    /// Continue Listening.
+    /// </summary>
+    ResumeAudio = 5,
+
+    /// <summary>
+    /// Latest Media.
+    /// </summary>
+    LatestMedia = 6,
+
+    /// <summary>
+    /// Next Up.
+    /// </summary>
+    NextUp = 7,
+
+    /// <summary>
+    /// Live TV.
+    /// </summary>
+    LiveTv = 8,
+
+    /// <summary>
+    /// Continue Reading.
+    /// </summary>
+    ResumeBook = 9
 }
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/IndexingKind.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/IndexingKind.cs
index 3967712b03..72ac1140cb 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/IndexingKind.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/IndexingKind.cs
@@ -1,23 +1,22 @@
-namespace Jellyfin.Data.Enums
+namespace Jellyfin.Database.Implementations.Enums;
+
+/// <summary>
+/// An enum representing a type of indexing in a user's display preferences.
+/// </summary>
+public enum IndexingKind
 {
     /// <summary>
-    /// An enum representing a type of indexing in a user's display preferences.
+    /// Index by the premiere date.
     /// </summary>
-    public enum IndexingKind
-    {
-        /// <summary>
-        /// Index by the premiere date.
-        /// </summary>
-        PremiereDate = 0,
+    PremiereDate = 0,
 
-        /// <summary>
-        /// Index by the production year.
-        /// </summary>
-        ProductionYear = 1,
+    /// <summary>
+    /// Index by the production year.
+    /// </summary>
+    ProductionYear = 1,
 
-        /// <summary>
-        /// Index by the community rating.
-        /// </summary>
-        CommunityRating = 2
-    }
+    /// <summary>
+    /// Index by the community rating.
+    /// </summary>
+    CommunityRating = 2
 }
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/MediaFileKind.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/MediaFileKind.cs
index 797c26ec27..8e6f677dca 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/MediaFileKind.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/MediaFileKind.cs
@@ -1,33 +1,32 @@
-namespace Jellyfin.Data.Enums
+namespace Jellyfin.Database.Implementations.Enums;
+
+/// <summary>
+/// An enum representing the type of media file.
+/// </summary>
+public enum MediaFileKind
 {
     /// <summary>
-    /// An enum representing the type of media file.
+    /// The main file.
     /// </summary>
-    public enum MediaFileKind
-    {
-        /// <summary>
-        /// The main file.
-        /// </summary>
-        Main = 0,
+    Main = 0,
 
-        /// <summary>
-        /// A sidecar file.
-        /// </summary>
-        Sidecar = 1,
+    /// <summary>
+    /// A sidecar file.
+    /// </summary>
+    Sidecar = 1,
 
-        /// <summary>
-        /// An additional part to the main file.
-        /// </summary>
-        AdditionalPart = 2,
+    /// <summary>
+    /// An additional part to the main file.
+    /// </summary>
+    AdditionalPart = 2,
 
-        /// <summary>
-        /// An alternative format to the main file.
-        /// </summary>
-        AlternativeFormat = 3,
+    /// <summary>
+    /// An alternative format to the main file.
+    /// </summary>
+    AlternativeFormat = 3,
 
-        /// <summary>
-        /// An additional stream for the main file.
-        /// </summary>
-        AdditionalStream = 4
-    }
+    /// <summary>
+    /// An additional stream for the main file.
+    /// </summary>
+    AdditionalStream = 4
 }
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/MediaSegmentType.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/MediaSegmentType.cs
index 4586354504..fed092b978 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/MediaSegmentType.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/MediaSegmentType.cs
@@ -1,6 +1,6 @@
 using Jellyfin.Data.Entities;
 
-namespace Jellyfin.Data.Enums;
+namespace Jellyfin.Database.Implementations.Enums;
 
 /// <summary>
 /// Defines the types of content an individual <see cref="MediaSegment"/> represents.
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/PermissionKind.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/PermissionKind.cs
index c3d6705c24..0818639636 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/PermissionKind.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/PermissionKind.cs
@@ -1,128 +1,127 @@
-namespace Jellyfin.Data.Enums
+namespace Jellyfin.Database.Implementations.Enums;
+
+/// <summary>
+/// The types of user permissions.
+/// </summary>
+public enum PermissionKind
 {
     /// <summary>
-    /// The types of user permissions.
-    /// </summary>
-    public enum PermissionKind
-    {
-        /// <summary>
-        /// Whether the user is an administrator.
-        /// </summary>
-        IsAdministrator = 0,
-
-        /// <summary>
-        /// Whether the user is hidden.
-        /// </summary>
-        IsHidden = 1,
-
-        /// <summary>
-        /// Whether the user is disabled.
-        /// </summary>
-        IsDisabled = 2,
-
-        /// <summary>
-        /// Whether the user can control shared devices.
-        /// </summary>
-        EnableSharedDeviceControl = 3,
-
-        /// <summary>
-        /// Whether the user can access the server remotely.
-        /// </summary>
-        EnableRemoteAccess = 4,
-
-        /// <summary>
-        /// Whether the user can manage live tv.
-        /// </summary>
-        EnableLiveTvManagement = 5,
-
-        /// <summary>
-        /// Whether the user can access live tv.
-        /// </summary>
-        EnableLiveTvAccess = 6,
-
-        /// <summary>
-        /// Whether the user can play media.
-        /// </summary>
-        EnableMediaPlayback = 7,
-
-        /// <summary>
-        /// Whether the server should transcode audio for the user if requested.
-        /// </summary>
-        EnableAudioPlaybackTranscoding = 8,
-
-        /// <summary>
-        /// Whether the server should transcode video for the user if requested.
-        /// </summary>
-        EnableVideoPlaybackTranscoding = 9,
-
-        /// <summary>
-        /// Whether the user can delete content.
-        /// </summary>
-        EnableContentDeletion = 10,
-
-        /// <summary>
-        /// Whether the user can download content.
-        /// </summary>
-        EnableContentDownloading = 11,
-
-        /// <summary>
-        /// Whether to enable sync transcoding for the user.
-        /// </summary>
-        EnableSyncTranscoding = 12,
-
-        /// <summary>
-        /// Whether the user can do media conversion.
-        /// </summary>
-        EnableMediaConversion = 13,
-
-        /// <summary>
-        /// Whether the user has access to all devices.
-        /// </summary>
-        EnableAllDevices = 14,
-
-        /// <summary>
-        /// Whether the user has access to all channels.
-        /// </summary>
-        EnableAllChannels = 15,
-
-        /// <summary>
-        /// Whether the user has access to all folders.
-        /// </summary>
-        EnableAllFolders = 16,
-
-        /// <summary>
-        /// Whether to enable public sharing for the user.
-        /// </summary>
-        EnablePublicSharing = 17,
-
-        /// <summary>
-        /// Whether the user can remotely control other users.
-        /// </summary>
-        EnableRemoteControlOfOtherUsers = 18,
-
-        /// <summary>
-        /// Whether the user is permitted to do playback remuxing.
-        /// </summary>
-        EnablePlaybackRemuxing = 19,
-
-        /// <summary>
-        /// Whether the server should force transcoding on remote connections for the user.
-        /// </summary>
-        ForceRemoteSourceTranscoding = 20,
-
-        /// <summary>
-        /// Whether the user can create, modify and delete collections.
-        /// </summary>
-        EnableCollectionManagement = 21,
-
-        /// <summary>
-        /// Whether the user can edit subtitles.
-        /// </summary>
-        EnableSubtitleManagement = 22,
-
-        /// <summary>
-        /// Whether the user can edit lyrics.
-        /// </summary>
-        EnableLyricManagement = 23,
-    }
+    /// Whether the user is an administrator.
+    /// </summary>
+    IsAdministrator = 0,
+
+    /// <summary>
+    /// Whether the user is hidden.
+    /// </summary>
+    IsHidden = 1,
+
+    /// <summary>
+    /// Whether the user is disabled.
+    /// </summary>
+    IsDisabled = 2,
+
+    /// <summary>
+    /// Whether the user can control shared devices.
+    /// </summary>
+    EnableSharedDeviceControl = 3,
+
+    /// <summary>
+    /// Whether the user can access the server remotely.
+    /// </summary>
+    EnableRemoteAccess = 4,
+
+    /// <summary>
+    /// Whether the user can manage live tv.
+    /// </summary>
+    EnableLiveTvManagement = 5,
+
+    /// <summary>
+    /// Whether the user can access live tv.
+    /// </summary>
+    EnableLiveTvAccess = 6,
+
+    /// <summary>
+    /// Whether the user can play media.
+    /// </summary>
+    EnableMediaPlayback = 7,
+
+    /// <summary>
+    /// Whether the server should transcode audio for the user if requested.
+    /// </summary>
+    EnableAudioPlaybackTranscoding = 8,
+
+    /// <summary>
+    /// Whether the server should transcode video for the user if requested.
+    /// </summary>
+    EnableVideoPlaybackTranscoding = 9,
+
+    /// <summary>
+    /// Whether the user can delete content.
+    /// </summary>
+    EnableContentDeletion = 10,
+
+    /// <summary>
+    /// Whether the user can download content.
+    /// </summary>
+    EnableContentDownloading = 11,
+
+    /// <summary>
+    /// Whether to enable sync transcoding for the user.
+    /// </summary>
+    EnableSyncTranscoding = 12,
+
+    /// <summary>
+    /// Whether the user can do media conversion.
+    /// </summary>
+    EnableMediaConversion = 13,
+
+    /// <summary>
+    /// Whether the user has access to all devices.
+    /// </summary>
+    EnableAllDevices = 14,
+
+    /// <summary>
+    /// Whether the user has access to all channels.
+    /// </summary>
+    EnableAllChannels = 15,
+
+    /// <summary>
+    /// Whether the user has access to all folders.
+    /// </summary>
+    EnableAllFolders = 16,
+
+    /// <summary>
+    /// Whether to enable public sharing for the user.
+    /// </summary>
+    EnablePublicSharing = 17,
+
+    /// <summary>
+    /// Whether the user can remotely control other users.
+    /// </summary>
+    EnableRemoteControlOfOtherUsers = 18,
+
+    /// <summary>
+    /// Whether the user is permitted to do playback remuxing.
+    /// </summary>
+    EnablePlaybackRemuxing = 19,
+
+    /// <summary>
+    /// Whether the server should force transcoding on remote connections for the user.
+    /// </summary>
+    ForceRemoteSourceTranscoding = 20,
+
+    /// <summary>
+    /// Whether the user can create, modify and delete collections.
+    /// </summary>
+    EnableCollectionManagement = 21,
+
+    /// <summary>
+    /// Whether the user can edit subtitles.
+    /// </summary>
+    EnableSubtitleManagement = 22,
+
+    /// <summary>
+    /// Whether the user can edit lyrics.
+    /// </summary>
+    EnableLyricManagement = 23,
 }
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/PersonRoleType.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/PersonRoleType.cs
index 1e619f5eef..5b913385e8 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/PersonRoleType.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/PersonRoleType.cs
@@ -1,68 +1,67 @@
-namespace Jellyfin.Data.Enums
+namespace Jellyfin.Database.Implementations.Enums;
+
+/// <summary>
+/// An enum representing a person's role in a specific media item.
+/// </summary>
+public enum PersonRoleType
 {
     /// <summary>
-    /// An enum representing a person's role in a specific media item.
+    /// Another role, not covered by the other types.
     /// </summary>
-    public enum PersonRoleType
-    {
-        /// <summary>
-        /// Another role, not covered by the other types.
-        /// </summary>
-        Other = 0,
+    Other = 0,
 
-        /// <summary>
-        /// The director of the media.
-        /// </summary>
-        Director = 1,
+    /// <summary>
+    /// The director of the media.
+    /// </summary>
+    Director = 1,
 
-        /// <summary>
-        /// An artist.
-        /// </summary>
-        Artist = 2,
+    /// <summary>
+    /// An artist.
+    /// </summary>
+    Artist = 2,
 
-        /// <summary>
-        /// The original artist.
-        /// </summary>
-        OriginalArtist = 3,
+    /// <summary>
+    /// The original artist.
+    /// </summary>
+    OriginalArtist = 3,
 
-        /// <summary>
-        /// An actor.
-        /// </summary>
-        Actor = 4,
+    /// <summary>
+    /// An actor.
+    /// </summary>
+    Actor = 4,
 
-        /// <summary>
-        /// A voice actor.
-        /// </summary>
-        VoiceActor = 5,
+    /// <summary>
+    /// A voice actor.
+    /// </summary>
+    VoiceActor = 5,
 
-        /// <summary>
-        /// A producer.
-        /// </summary>
-        Producer = 6,
+    /// <summary>
+    /// A producer.
+    /// </summary>
+    Producer = 6,
 
-        /// <summary>
-        /// A remixer.
-        /// </summary>
-        Remixer = 7,
+    /// <summary>
+    /// A remixer.
+    /// </summary>
+    Remixer = 7,
 
-        /// <summary>
-        /// A conductor.
-        /// </summary>
-        Conductor = 8,
+    /// <summary>
+    /// A conductor.
+    /// </summary>
+    Conductor = 8,
 
-        /// <summary>
-        /// A composer.
-        /// </summary>
-        Composer = 9,
+    /// <summary>
+    /// A composer.
+    /// </summary>
+    Composer = 9,
 
-        /// <summary>
-        /// An author.
-        /// </summary>
-        Author = 10,
+    /// <summary>
+    /// An author.
+    /// </summary>
+    Author = 10,
 
-        /// <summary>
-        /// An editor.
-        /// </summary>
-        Editor = 11
-    }
+    /// <summary>
+    /// An editor.
+    /// </summary>
+    Editor = 11
 }
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/PreferenceKind.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/PreferenceKind.cs
index d2b412e459..f70e3e2c23 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/PreferenceKind.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/PreferenceKind.cs
@@ -1,73 +1,72 @@
-namespace Jellyfin.Data.Enums
+namespace Jellyfin.Database.Implementations.Enums;
+
+/// <summary>
+/// The types of user preferences.
+/// </summary>
+public enum PreferenceKind
 {
     /// <summary>
-    /// The types of user preferences.
+    /// A list of blocked tags.
     /// </summary>
-    public enum PreferenceKind
-    {
-        /// <summary>
-        /// A list of blocked tags.
-        /// </summary>
-        BlockedTags = 0,
+    BlockedTags = 0,
 
-        /// <summary>
-        /// A list of blocked channels.
-        /// </summary>
-        BlockedChannels = 1,
+    /// <summary>
+    /// A list of blocked channels.
+    /// </summary>
+    BlockedChannels = 1,
 
-        /// <summary>
-        /// A list of blocked media folders.
-        /// </summary>
-        BlockedMediaFolders = 2,
+    /// <summary>
+    /// A list of blocked media folders.
+    /// </summary>
+    BlockedMediaFolders = 2,
 
-        /// <summary>
-        /// A list of enabled devices.
-        /// </summary>
-        EnabledDevices = 3,
+    /// <summary>
+    /// A list of enabled devices.
+    /// </summary>
+    EnabledDevices = 3,
 
-        /// <summary>
-        /// A list of enabled channels.
-        /// </summary>
-        EnabledChannels = 4,
+    /// <summary>
+    /// A list of enabled channels.
+    /// </summary>
+    EnabledChannels = 4,
 
-        /// <summary>
-        /// A list of enabled folders.
-        /// </summary>
-        EnabledFolders = 5,
+    /// <summary>
+    /// A list of enabled folders.
+    /// </summary>
+    EnabledFolders = 5,
 
-        /// <summary>
-        /// A list of folders to allow content deletion from.
-        /// </summary>
-        EnableContentDeletionFromFolders = 6,
+    /// <summary>
+    /// A list of folders to allow content deletion from.
+    /// </summary>
+    EnableContentDeletionFromFolders = 6,
 
-        /// <summary>
-        /// A list of latest items to exclude.
-        /// </summary>
-        LatestItemExcludes = 7,
+    /// <summary>
+    /// A list of latest items to exclude.
+    /// </summary>
+    LatestItemExcludes = 7,
 
-        /// <summary>
-        /// A list of media to exclude.
-        /// </summary>
-        MyMediaExcludes = 8,
+    /// <summary>
+    /// A list of media to exclude.
+    /// </summary>
+    MyMediaExcludes = 8,
 
-        /// <summary>
-        /// A list of grouped folders.
-        /// </summary>
-        GroupedFolders = 9,
+    /// <summary>
+    /// A list of grouped folders.
+    /// </summary>
+    GroupedFolders = 9,
 
-        /// <summary>
-        /// A list of unrated items to block.
-        /// </summary>
-        BlockUnratedItems = 10,
+    /// <summary>
+    /// A list of unrated items to block.
+    /// </summary>
+    BlockUnratedItems = 10,
 
-        /// <summary>
-        /// A list of ordered views.
-        /// </summary>
-        OrderedViews = 11,
+    /// <summary>
+    /// A list of ordered views.
+    /// </summary>
+    OrderedViews = 11,
 
-        /// <summary>
-        /// A list of allowed tags.
-        /// </summary>
-        AllowedTags = 12
-    }
+    /// <summary>
+    /// A list of allowed tags.
+    /// </summary>
+    AllowedTags = 12
 }
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/ScrollDirection.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/ScrollDirection.cs
index 29c50e2c4e..3ff3c45faf 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/ScrollDirection.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/ScrollDirection.cs
@@ -1,18 +1,17 @@
-namespace Jellyfin.Data.Enums
+namespace Jellyfin.Database.Implementations.Enums;
+
+/// <summary>
+/// An enum representing the axis that should be scrolled.
+/// </summary>
+public enum ScrollDirection
 {
     /// <summary>
-    /// An enum representing the axis that should be scrolled.
+    /// Horizontal scrolling direction.
     /// </summary>
-    public enum ScrollDirection
-    {
-        /// <summary>
-        /// Horizontal scrolling direction.
-        /// </summary>
-        Horizontal = 0,
+    Horizontal = 0,
 
-        /// <summary>
-        /// Vertical scrolling direction.
-        /// </summary>
-        Vertical = 1
-    }
+    /// <summary>
+    /// Vertical scrolling direction.
+    /// </summary>
+    Vertical = 1
 }
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/SortOrder.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/SortOrder.cs
index 4151448e4e..c865b75f11 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/SortOrder.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/SortOrder.cs
@@ -1,18 +1,17 @@
-namespace Jellyfin.Data.Enums
+namespace Jellyfin.Database.Implementations.Enums;
+
+/// <summary>
+/// An enum representing the sorting order.
+/// </summary>
+public enum SortOrder
 {
     /// <summary>
-    /// An enum representing the sorting order.
+    /// Sort in increasing order.
     /// </summary>
-    public enum SortOrder
-    {
-        /// <summary>
-        /// Sort in increasing order.
-        /// </summary>
-        Ascending = 0,
+    Ascending = 0,
 
-        /// <summary>
-        /// Sort in decreasing order.
-        /// </summary>
-        Descending = 1
-    }
+    /// <summary>
+    /// Sort in decreasing order.
+    /// </summary>
+    Descending = 1
 }
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/SubtitlePlaybackMode.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/SubtitlePlaybackMode.cs
index 79693d321a..c394c209bb 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/SubtitlePlaybackMode.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/SubtitlePlaybackMode.cs
@@ -1,33 +1,32 @@
-namespace Jellyfin.Data.Enums
+namespace Jellyfin.Database.Implementations.Enums;
+
+/// <summary>
+/// An enum representing a subtitle playback mode.
+/// </summary>
+public enum SubtitlePlaybackMode
 {
     /// <summary>
-    /// An enum representing a subtitle playback mode.
+    /// The default subtitle playback mode.
     /// </summary>
-    public enum SubtitlePlaybackMode
-    {
-        /// <summary>
-        /// The default subtitle playback mode.
-        /// </summary>
-        Default = 0,
+    Default = 0,
 
-        /// <summary>
-        /// Always show subtitles.
-        /// </summary>
-        Always = 1,
+    /// <summary>
+    /// Always show subtitles.
+    /// </summary>
+    Always = 1,
 
-        /// <summary>
-        /// Only show forced subtitles.
-        /// </summary>
-        OnlyForced = 2,
+    /// <summary>
+    /// Only show forced subtitles.
+    /// </summary>
+    OnlyForced = 2,
 
-        /// <summary>
-        /// Don't show subtitles.
-        /// </summary>
-        None = 3,
+    /// <summary>
+    /// Don't show subtitles.
+    /// </summary>
+    None = 3,
 
-        /// <summary>
-        /// Only show subtitles when the current audio stream is in a different language.
-        /// </summary>
-        Smart = 4
-    }
+    /// <summary>
+    /// Only show subtitles when the current audio stream is in a different language.
+    /// </summary>
+    Smart = 4
 }
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/SyncPlayUserAccessType.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/SyncPlayUserAccessType.cs
index 030d16fb90..311642e0d7 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/SyncPlayUserAccessType.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/SyncPlayUserAccessType.cs
@@ -1,23 +1,22 @@
-namespace Jellyfin.Data.Enums
+namespace Jellyfin.Database.Implementations.Enums;
+
+/// <summary>
+/// Enum SyncPlayUserAccessType.
+/// </summary>
+public enum SyncPlayUserAccessType
 {
     /// <summary>
-    /// Enum SyncPlayUserAccessType.
+    /// User can create groups and join them.
     /// </summary>
-    public enum SyncPlayUserAccessType
-    {
-        /// <summary>
-        /// User can create groups and join them.
-        /// </summary>
-        CreateAndJoinGroups = 0,
+    CreateAndJoinGroups = 0,
 
-        /// <summary>
-        /// User can only join already existing groups.
-        /// </summary>
-        JoinGroups = 1,
+    /// <summary>
+    /// User can only join already existing groups.
+    /// </summary>
+    JoinGroups = 1,
 
-        /// <summary>
-        /// SyncPlay is disabled for the user.
-        /// </summary>
-        None = 2
-    }
+    /// <summary>
+    /// SyncPlay is disabled for the user.
+    /// </summary>
+    None = 2
 }
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/ViewType.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/ViewType.cs
index c0fd7d448b..b2bcbf2bb6 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/ViewType.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Enums/ViewType.cs
@@ -1,113 +1,112 @@
-namespace Jellyfin.Data.Enums
+namespace Jellyfin.Database.Implementations.Enums;
+
+/// <summary>
+/// An enum representing the type of view for a library or collection.
+/// </summary>
+public enum ViewType
 {
     /// <summary>
-    /// An enum representing the type of view for a library or collection.
-    /// </summary>
-    public enum ViewType
-    {
-        /// <summary>
-        /// Shows albums.
-        /// </summary>
-        Albums = 0,
-
-        /// <summary>
-        /// Shows album artists.
-        /// </summary>
-        AlbumArtists = 1,
-
-        /// <summary>
-        /// Shows artists.
-        /// </summary>
-        Artists = 2,
-
-        /// <summary>
-        /// Shows channels.
-        /// </summary>
-        Channels = 3,
-
-        /// <summary>
-        /// Shows collections.
-        /// </summary>
-        Collections = 4,
-
-        /// <summary>
-        /// Shows episodes.
-        /// </summary>
-        Episodes = 5,
-
-        /// <summary>
-        /// Shows favorites.
-        /// </summary>
-        Favorites = 6,
-
-        /// <summary>
-        /// Shows genres.
-        /// </summary>
-        Genres = 7,
-
-        /// <summary>
-        /// Shows guide.
-        /// </summary>
-        Guide = 8,
-
-        /// <summary>
-        /// Shows movies.
-        /// </summary>
-        Movies = 9,
-
-        /// <summary>
-        /// Shows networks.
-        /// </summary>
-        Networks = 10,
-
-        /// <summary>
-        /// Shows playlists.
-        /// </summary>
-        Playlists = 11,
-
-        /// <summary>
-        /// Shows programs.
-        /// </summary>
-        Programs = 12,
-
-        /// <summary>
-        /// Shows recordings.
-        /// </summary>
-        Recordings = 13,
-
-        /// <summary>
-        /// Shows schedule.
-        /// </summary>
-        Schedule = 14,
-
-        /// <summary>
-        /// Shows series.
-        /// </summary>
-        Series = 15,
-
-        /// <summary>
-        /// Shows shows.
-        /// </summary>
-        Shows = 16,
-
-        /// <summary>
-        /// Shows songs.
-        /// </summary>
-        Songs = 17,
-
-        /// <summary>
-        /// Shows songs.
-        /// </summary>
-        Suggestions = 18,
-
-        /// <summary>
-        /// Shows trailers.
-        /// </summary>
-        Trailers = 19,
-
-        /// <summary>
-        /// Shows upcoming.
-        /// </summary>
-        Upcoming = 20
-    }
+    /// Shows albums.
+    /// </summary>
+    Albums = 0,
+
+    /// <summary>
+    /// Shows album artists.
+    /// </summary>
+    AlbumArtists = 1,
+
+    /// <summary>
+    /// Shows artists.
+    /// </summary>
+    Artists = 2,
+
+    /// <summary>
+    /// Shows channels.
+    /// </summary>
+    Channels = 3,
+
+    /// <summary>
+    /// Shows collections.
+    /// </summary>
+    Collections = 4,
+
+    /// <summary>
+    /// Shows episodes.
+    /// </summary>
+    Episodes = 5,
+
+    /// <summary>
+    /// Shows favorites.
+    /// </summary>
+    Favorites = 6,
+
+    /// <summary>
+    /// Shows genres.
+    /// </summary>
+    Genres = 7,
+
+    /// <summary>
+    /// Shows guide.
+    /// </summary>
+    Guide = 8,
+
+    /// <summary>
+    /// Shows movies.
+    /// </summary>
+    Movies = 9,
+
+    /// <summary>
+    /// Shows networks.
+    /// </summary>
+    Networks = 10,
+
+    /// <summary>
+    /// Shows playlists.
+    /// </summary>
+    Playlists = 11,
+
+    /// <summary>
+    /// Shows programs.
+    /// </summary>
+    Programs = 12,
+
+    /// <summary>
+    /// Shows recordings.
+    /// </summary>
+    Recordings = 13,
+
+    /// <summary>
+    /// Shows schedule.
+    /// </summary>
+    Schedule = 14,
+
+    /// <summary>
+    /// Shows series.
+    /// </summary>
+    Series = 15,
+
+    /// <summary>
+    /// Shows shows.
+    /// </summary>
+    Shows = 16,
+
+    /// <summary>
+    /// Shows songs.
+    /// </summary>
+    Songs = 17,
+
+    /// <summary>
+    /// Shows songs.
+    /// </summary>
+    Suggestions = 18,
+
+    /// <summary>
+    /// Shows trailers.
+    /// </summary>
+    Trailers = 19,
+
+    /// <summary>
+    /// Shows upcoming.
+    /// </summary>
+    Upcoming = 20
 }
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/IJellyfinDatabaseProvider.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/IJellyfinDatabaseProvider.cs
index cc96792e64..0740165530 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/IJellyfinDatabaseProvider.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/IJellyfinDatabaseProvider.cs
@@ -1,9 +1,8 @@
-using System;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 
-namespace Jellyfin.Server.Implementations;
+namespace Jellyfin.Database.Implementations;
 
 /// <summary>
 /// Defines the type and extension points for multi database support.
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Interfaces/IHasArtwork.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Interfaces/IHasArtwork.cs
index a4d9c54af4..03c2ca4a47 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Interfaces/IHasArtwork.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Interfaces/IHasArtwork.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Jellyfin.Data.Entities.Libraries;
 
-namespace Jellyfin.Data.Interfaces
+namespace Jellyfin.Database.Implementations.Interfaces
 {
     /// <summary>
     /// An interface abstracting an entity that has artwork.
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Interfaces/IHasCompanies.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Interfaces/IHasCompanies.cs
index 8f19ce04fa..ed449a8f14 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Interfaces/IHasCompanies.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Interfaces/IHasCompanies.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Jellyfin.Data.Entities.Libraries;
 
-namespace Jellyfin.Data.Interfaces
+namespace Jellyfin.Database.Implementations.Interfaces
 {
     /// <summary>
     /// An abstraction representing an entity that has companies.
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Interfaces/IHasConcurrencyToken.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Interfaces/IHasConcurrencyToken.cs
index 2c4091493e..196d2680db 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Interfaces/IHasConcurrencyToken.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Interfaces/IHasConcurrencyToken.cs
@@ -1,18 +1,17 @@
-namespace Jellyfin.Data.Interfaces
+namespace Jellyfin.Database.Implementations.Interfaces;
+
+/// <summary>
+/// An interface abstracting an entity that has a concurrency token.
+/// </summary>
+public interface IHasConcurrencyToken
 {
     /// <summary>
-    /// An interface abstracting an entity that has a concurrency token.
+    /// Gets the version of this row. Acts as a concurrency token.
     /// </summary>
-    public interface IHasConcurrencyToken
-    {
-        /// <summary>
-        /// Gets the version of this row. Acts as a concurrency token.
-        /// </summary>
-        uint RowVersion { get; }
+    uint RowVersion { get; }
 
-        /// <summary>
-        /// Called when saving changes to this entity.
-        /// </summary>
-        void OnSavingChanges();
-    }
+    /// <summary>
+    /// Called when saving changes to this entity.
+    /// </summary>
+    void OnSavingChanges();
 }
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Interfaces/IHasPermissions.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Interfaces/IHasPermissions.cs
index 6d1eb59f67..606b1169b8 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Interfaces/IHasPermissions.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Interfaces/IHasPermissions.cs
@@ -1,17 +1,15 @@
 using System.Collections.Generic;
 using Jellyfin.Data.Entities;
-using Jellyfin.Data.Enums;
 
-namespace Jellyfin.Data.Interfaces
+namespace Jellyfin.Database.Implementations.Interfaces;
+
+/// <summary>
+/// An abstraction representing an entity that has permissions.
+/// </summary>
+public interface IHasPermissions
 {
     /// <summary>
-    /// An abstraction representing an entity that has permissions.
+    /// Gets a collection containing this entity's permissions.
     /// </summary>
-    public interface IHasPermissions
-    {
-        /// <summary>
-        /// Gets a collection containing this entity's permissions.
-        /// </summary>
-        ICollection<Permission> Permissions { get; }
-    }
+    ICollection<Permission> Permissions { get; }
 }
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Interfaces/IHasReleases.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Interfaces/IHasReleases.cs
index 3b615893ed..653572b6e9 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Interfaces/IHasReleases.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Interfaces/IHasReleases.cs
@@ -1,16 +1,15 @@
 using System.Collections.Generic;
 using Jellyfin.Data.Entities.Libraries;
 
-namespace Jellyfin.Data.Interfaces
+namespace Jellyfin.Database.Implementations.Interfaces;
+
+/// <summary>
+/// An abstraction representing an entity that has releases.
+/// </summary>
+public interface IHasReleases
 {
     /// <summary>
-    /// An abstraction representing an entity that has releases.
+    /// Gets a collection containing this entity's releases.
     /// </summary>
-    public interface IHasReleases
-    {
-        /// <summary>
-        /// Gets a collection containing this entity's releases.
-        /// </summary>
-        ICollection<Release> Releases { get; }
-    }
+    ICollection<Release> Releases { get; }
 }
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/JellyfinDatabaseProviderKeyAttribute.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/JellyfinDatabaseProviderKeyAttribute.cs
index b3ab3d0944..778aca373e 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/JellyfinDatabaseProviderKeyAttribute.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/JellyfinDatabaseProviderKeyAttribute.cs
@@ -1,4 +1,4 @@
-namespace Jellyfin.Server.Implementations;
+namespace Jellyfin.Database.Implementations;
 
 /// <summary>
 /// Defines the key of the database provider.
@@ -16,7 +16,7 @@ public sealed class JellyfinDatabaseProviderKeyAttribute : System.Attribute
     /// <param name="databaseProviderKey">The key on which to identify the annotated provider.</param>
     public JellyfinDatabaseProviderKeyAttribute(string databaseProviderKey)
     {
-        this._databaseProviderKey = databaseProviderKey;
+        _databaseProviderKey = databaseProviderKey;
     }
 
     /// <summary>
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/JellyfinDbContext.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/JellyfinDbContext.cs
index 024d595d58..5cdc853319 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/JellyfinDbContext.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/JellyfinDbContext.cs
@@ -2,13 +2,11 @@ using System;
 using System.Linq;
 using Jellyfin.Data.Entities;
 using Jellyfin.Data.Entities.Security;
-using Jellyfin.Data.Interfaces;
+using Jellyfin.Database.Implementations.Interfaces;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
-using Microsoft.EntityFrameworkCore.Metadata.Conventions;
 using Microsoft.Extensions.Logging;
 
-namespace Jellyfin.Server.Implementations;
+namespace Jellyfin.Database.Implementations;
 
 /// <inheritdoc/>
 /// <summary>
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/ActivityLogConfiguration.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/ActivityLogConfiguration.cs
index 9a63ed9f21..be99b46d56 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/ActivityLogConfiguration.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/ActivityLogConfiguration.cs
@@ -2,7 +2,7 @@ using Jellyfin.Data.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Jellyfin.Server.Implementations.ModelConfiguration;
+namespace Jellyfin.Database.Implementations.ModelConfiguration;
 
 /// <summary>
 /// FluentAPI configuration for the ActivityLog entity.
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/AncestorIdConfiguration.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/AncestorIdConfiguration.cs
index 8cc817fb8b..146df5546c 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/AncestorIdConfiguration.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/AncestorIdConfiguration.cs
@@ -1,9 +1,8 @@
-using System;
 using Jellyfin.Data.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Jellyfin.Server.Implementations.ModelConfiguration;
+namespace Jellyfin.Database.Implementations.ModelConfiguration;
 
 /// <summary>
 /// AncestorId configuration.
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/ApiKeyConfiguration.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/ApiKeyConfiguration.cs
index 3f19b6986a..7c15f064d8 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/ApiKeyConfiguration.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/ApiKeyConfiguration.cs
@@ -2,7 +2,7 @@ using Jellyfin.Data.Entities.Security;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Jellyfin.Server.Implementations.ModelConfiguration
+namespace Jellyfin.Database.Implementations.ModelConfiguration
 {
     /// <summary>
     /// FluentAPI configuration for the ApiKey entity.
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/AttachmentStreamInfoConfiguration.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/AttachmentStreamInfoConfiguration.cs
index 057b6689ac..b5fae4053c 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/AttachmentStreamInfoConfiguration.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/AttachmentStreamInfoConfiguration.cs
@@ -2,7 +2,7 @@ using Jellyfin.Data.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Jellyfin.Server.Implementations.ModelConfiguration;
+namespace Jellyfin.Database.Implementations.ModelConfiguration;
 
 /// <summary>
 /// FluentAPI configuration for the AttachmentStreamInfo entity.
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/BaseItemConfiguration.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/BaseItemConfiguration.cs
index 08f2a33566..67a071039f 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/BaseItemConfiguration.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/BaseItemConfiguration.cs
@@ -2,7 +2,7 @@ using Jellyfin.Data.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Jellyfin.Server.Implementations.ModelConfiguration;
+namespace Jellyfin.Database.Implementations.ModelConfiguration;
 
 /// <summary>
 /// Configuration for BaseItem.
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/BaseItemMetadataFieldConfiguration.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/BaseItemMetadataFieldConfiguration.cs
index b4c6511bf2..c101e0085e 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/BaseItemMetadataFieldConfiguration.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/BaseItemMetadataFieldConfiguration.cs
@@ -2,7 +2,7 @@ using Jellyfin.Data.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Jellyfin.Server.Implementations.ModelConfiguration;
+namespace Jellyfin.Database.Implementations.ModelConfiguration;
 
 /// <summary>
 /// Provides configuration for the BaseItemMetadataField entity.
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/BaseItemProviderConfiguration.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/BaseItemProviderConfiguration.cs
index d15049a1fa..175a82e091 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/BaseItemProviderConfiguration.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/BaseItemProviderConfiguration.cs
@@ -1,9 +1,8 @@
-using System;
 using Jellyfin.Data.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Jellyfin.Server.Implementations.ModelConfiguration;
+namespace Jellyfin.Database.Implementations.ModelConfiguration;
 
 /// <summary>
 /// BaseItemProvider configuration.
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/BaseItemTrailerTypeConfiguration.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/BaseItemTrailerTypeConfiguration.cs
index e9564b854b..c7efef2390 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/BaseItemTrailerTypeConfiguration.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/BaseItemTrailerTypeConfiguration.cs
@@ -2,7 +2,7 @@ using Jellyfin.Data.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Jellyfin.Server.Implementations.ModelConfiguration;
+namespace Jellyfin.Database.Implementations.ModelConfiguration;
 
 /// <summary>
 /// Provides configuration for the BaseItemMetadataField entity.
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/ChapterConfiguration.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/ChapterConfiguration.cs
index 5a84f7750a..5935b632a7 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/ChapterConfiguration.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/ChapterConfiguration.cs
@@ -1,9 +1,8 @@
-using System;
 using Jellyfin.Data.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Jellyfin.Server.Implementations.ModelConfiguration;
+namespace Jellyfin.Database.Implementations.ModelConfiguration;
 
 /// <summary>
 /// Chapter configuration.
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/CustomItemDisplayPreferencesConfiguration.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/CustomItemDisplayPreferencesConfiguration.cs
index 779aec986b..550fa5073b 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/CustomItemDisplayPreferencesConfiguration.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/CustomItemDisplayPreferencesConfiguration.cs
@@ -2,7 +2,7 @@ using Jellyfin.Data.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Jellyfin.Server.Implementations.ModelConfiguration
+namespace Jellyfin.Database.Implementations.ModelConfiguration
 {
     /// <summary>
     /// FluentAPI configuration for the CustomItemDisplayPreferences entity.
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/DeviceConfiguration.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/DeviceConfiguration.cs
index a750b65c03..5f87c8d403 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/DeviceConfiguration.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/DeviceConfiguration.cs
@@ -2,7 +2,7 @@ using Jellyfin.Data.Entities.Security;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Jellyfin.Server.Implementations.ModelConfiguration
+namespace Jellyfin.Database.Implementations.ModelConfiguration
 {
     /// <summary>
     /// FluentAPI configuration for the Device entity.
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/DeviceOptionsConfiguration.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/DeviceOptionsConfiguration.cs
index 038afd7524..923a53acaf 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/DeviceOptionsConfiguration.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/DeviceOptionsConfiguration.cs
@@ -2,7 +2,7 @@ using Jellyfin.Data.Entities.Security;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Jellyfin.Server.Implementations.ModelConfiguration
+namespace Jellyfin.Database.Implementations.ModelConfiguration
 {
     /// <summary>
     /// FluentAPI configuration for the DeviceOptions entity.
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/DisplayPreferencesConfiguration.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/DisplayPreferencesConfiguration.cs
index 9b437861bb..92068c8f29 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/DisplayPreferencesConfiguration.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/DisplayPreferencesConfiguration.cs
@@ -2,7 +2,7 @@ using Jellyfin.Data.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Jellyfin.Server.Implementations.ModelConfiguration
+namespace Jellyfin.Database.Implementations.ModelConfiguration
 {
     /// <summary>
     /// FluentAPI configuration for the DisplayPreferencesConfiguration entity.
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/ItemValuesConfiguration.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/ItemValuesConfiguration.cs
index abeeb09c9b..0e63c130e3 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/ItemValuesConfiguration.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/ItemValuesConfiguration.cs
@@ -1,9 +1,8 @@
-using System;
 using Jellyfin.Data.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Jellyfin.Server.Implementations.ModelConfiguration;
+namespace Jellyfin.Database.Implementations.ModelConfiguration;
 
 /// <summary>
 /// itemvalues Configuration.
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/ItemValuesMapConfiguration.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/ItemValuesMapConfiguration.cs
index 9c22b114c7..3860b0e161 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/ItemValuesMapConfiguration.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/ItemValuesMapConfiguration.cs
@@ -1,9 +1,8 @@
-using System;
 using Jellyfin.Data.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Jellyfin.Server.Implementations.ModelConfiguration;
+namespace Jellyfin.Database.Implementations.ModelConfiguration;
 
 /// <summary>
 /// itemvalues Configuration.
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/MediaStreamInfoConfiguration.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/MediaStreamInfoConfiguration.cs
index 7e572f9a39..37e15f5e72 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/MediaStreamInfoConfiguration.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/MediaStreamInfoConfiguration.cs
@@ -1,9 +1,8 @@
-using System;
 using Jellyfin.Data.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Jellyfin.Server.Implementations.ModelConfiguration;
+namespace Jellyfin.Database.Implementations.ModelConfiguration;
 
 /// <summary>
 /// People configuration.
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/PeopleBaseItemMapConfiguration.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/PeopleBaseItemMapConfiguration.cs
index cdaee9161c..125b9e92cd 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/PeopleBaseItemMapConfiguration.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/PeopleBaseItemMapConfiguration.cs
@@ -1,9 +1,8 @@
-using System;
 using Jellyfin.Data.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Jellyfin.Server.Implementations.ModelConfiguration;
+namespace Jellyfin.Database.Implementations.ModelConfiguration;
 
 /// <summary>
 /// People configuration.
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/PeopleConfiguration.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/PeopleConfiguration.cs
index f3cccb13fe..fe25d3064d 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/PeopleConfiguration.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/PeopleConfiguration.cs
@@ -1,9 +1,8 @@
-using System;
 using Jellyfin.Data.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Jellyfin.Server.Implementations.ModelConfiguration;
+namespace Jellyfin.Database.Implementations.ModelConfiguration;
 
 /// <summary>
 /// People configuration.
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/PermissionConfiguration.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/PermissionConfiguration.cs
index 240e284c0c..90a3ec5d00 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/PermissionConfiguration.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/PermissionConfiguration.cs
@@ -2,7 +2,7 @@ using Jellyfin.Data.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Jellyfin.Server.Implementations.ModelConfiguration
+namespace Jellyfin.Database.Implementations.ModelConfiguration
 {
     /// <summary>
     /// FluentAPI configuration for the Permission entity.
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/PreferenceConfiguration.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/PreferenceConfiguration.cs
index 49c869c6a8..d6d3fadfc4 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/PreferenceConfiguration.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/PreferenceConfiguration.cs
@@ -2,7 +2,7 @@ using Jellyfin.Data.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Jellyfin.Server.Implementations.ModelConfiguration
+namespace Jellyfin.Database.Implementations.ModelConfiguration
 {
     /// <summary>
     /// FluentAPI configuration for the Permission entity.
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/TrickplayInfoConfiguration.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/TrickplayInfoConfiguration.cs
index dc1c17e5ef..a198c80f7e 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/TrickplayInfoConfiguration.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/TrickplayInfoConfiguration.cs
@@ -2,7 +2,7 @@ using Jellyfin.Data.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Jellyfin.Server.Implementations.ModelConfiguration
+namespace Jellyfin.Database.Implementations.ModelConfiguration
 {
     /// <summary>
     /// FluentAPI configuration for the TrickplayInfo entity.
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/UserConfiguration.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/UserConfiguration.cs
index bcaa3634ed..4e830801ee 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/UserConfiguration.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/UserConfiguration.cs
@@ -2,7 +2,7 @@ using Jellyfin.Data.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Jellyfin.Server.Implementations.ModelConfiguration
+namespace Jellyfin.Database.Implementations.ModelConfiguration
 {
     /// <summary>
     /// FluentAPI configuration for the User entity.
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/UserDataConfiguration.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/UserDataConfiguration.cs
index 7bbb28d431..a7e223c435 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/UserDataConfiguration.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/ModelConfiguration/UserDataConfiguration.cs
@@ -1,9 +1,8 @@
-using System;
 using Jellyfin.Data.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Jellyfin.Server.Implementations.ModelConfiguration;
+namespace Jellyfin.Database.Implementations.ModelConfiguration;
 
 /// <summary>
 /// FluentAPI configuration for the UserData entity.
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20200514181226_AddActivityLog.Designer.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20200514181226_AddActivityLog.Designer.cs
index 80fe784dd7..7891006430 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20200514181226_AddActivityLog.Designer.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20200514181226_AddActivityLog.Designer.cs
@@ -2,7 +2,7 @@
 
 // <auto-generated />
 using System;
-using Jellyfin.Server.Implementations;
+using Jellyfin.Database.Implementations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20200613202153_AddUsers.Designer.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20200613202153_AddUsers.Designer.cs
index 7aa4479b3d..eab3cd3e7e 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20200613202153_AddUsers.Designer.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20200613202153_AddUsers.Designer.cs
@@ -2,7 +2,7 @@
 
 // <auto-generated />
 using System;
-using Jellyfin.Server.Implementations;
+using Jellyfin.Database.Implementations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20200728005145_AddDisplayPreferences.Designer.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20200728005145_AddDisplayPreferences.Designer.cs
index 3860c851d0..91dd0ff7ab 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20200728005145_AddDisplayPreferences.Designer.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20200728005145_AddDisplayPreferences.Designer.cs
@@ -2,7 +2,7 @@
 
 // <auto-generated />
 using System;
-using Jellyfin.Server.Implementations;
+using Jellyfin.Database.Implementations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20200905220533_FixDisplayPreferencesIndex.Designer.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20200905220533_FixDisplayPreferencesIndex.Designer.cs
index 1134f7aa42..8ec9231030 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20200905220533_FixDisplayPreferencesIndex.Designer.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20200905220533_FixDisplayPreferencesIndex.Designer.cs
@@ -2,7 +2,7 @@
 
 // <auto-generated />
 using System;
-using Jellyfin.Server.Implementations;
+using Jellyfin.Database.Implementations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20201004171403_AddMaxActiveSessions.Designer.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20201004171403_AddMaxActiveSessions.Designer.cs
index 607310caae..499faa9c47 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20201004171403_AddMaxActiveSessions.Designer.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20201004171403_AddMaxActiveSessions.Designer.cs
@@ -2,7 +2,7 @@
 
 // <auto-generated />
 using System;
-using Jellyfin.Server.Implementations;
+using Jellyfin.Database.Implementations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20201204223655_AddCustomDisplayPreferences.Designer.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20201204223655_AddCustomDisplayPreferences.Designer.cs
index 02c3fc7532..7ab851689a 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20201204223655_AddCustomDisplayPreferences.Designer.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20201204223655_AddCustomDisplayPreferences.Designer.cs
@@ -1,7 +1,7 @@
 #pragma warning disable CS1591
 // <auto-generated />
 using System;
-using Jellyfin.Server.Implementations;
+using Jellyfin.Database.Implementations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20210320181425_AddIndexesAndCollations.Designer.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20210320181425_AddIndexesAndCollations.Designer.cs
index 1cfd7112ce..e14ed9380e 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20210320181425_AddIndexesAndCollations.Designer.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20210320181425_AddIndexesAndCollations.Designer.cs
@@ -2,7 +2,7 @@
 
 // <auto-generated />
 using System;
-using Jellyfin.Server.Implementations;
+using Jellyfin.Database.Implementations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20210407110544_NullableCustomPrefValue.Designer.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20210407110544_NullableCustomPrefValue.Designer.cs
index ecf7af4952..05f2c80a25 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20210407110544_NullableCustomPrefValue.Designer.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20210407110544_NullableCustomPrefValue.Designer.cs
@@ -1,7 +1,7 @@
 #pragma warning disable CS1591
 // <auto-generated />
 using System;
-using Jellyfin.Server.Implementations;
+using Jellyfin.Database.Implementations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20210814002109_AddDevices.Designer.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20210814002109_AddDevices.Designer.cs
index dccba6f773..c9f3cf696c 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20210814002109_AddDevices.Designer.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20210814002109_AddDevices.Designer.cs
@@ -2,7 +2,7 @@
 
 // <auto-generated />
 using System;
-using Jellyfin.Server.Implementations;
+using Jellyfin.Database.Implementations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20221022080052_AddIndexActivityLogsDateCreated.Designer.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20221022080052_AddIndexActivityLogsDateCreated.Designer.cs
index e821c106e3..ab7781d155 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20221022080052_AddIndexActivityLogsDateCreated.Designer.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20221022080052_AddIndexActivityLogsDateCreated.Designer.cs
@@ -2,7 +2,7 @@
 
 // <auto-generated />
 using System;
-using Jellyfin.Server.Implementations;
+using Jellyfin.Database.Implementations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20230526173516_RemoveEasyPassword.Designer.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20230526173516_RemoveEasyPassword.Designer.cs
index 360fa03768..8a2806113f 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20230526173516_RemoveEasyPassword.Designer.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20230526173516_RemoveEasyPassword.Designer.cs
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using Jellyfin.Server.Implementations;
+using Jellyfin.Database.Implementations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20230626233818_AddTrickplayInfos.Designer.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20230626233818_AddTrickplayInfos.Designer.cs
index 17d33845f5..a11507bd5d 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20230626233818_AddTrickplayInfos.Designer.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20230626233818_AddTrickplayInfos.Designer.cs
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using Jellyfin.Server.Implementations;
+using Jellyfin.Database.Implementations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20230923170422_UserCastReceiver.Designer.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20230923170422_UserCastReceiver.Designer.cs
index 4c09176691..ddea37f6dd 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20230923170422_UserCastReceiver.Designer.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20230923170422_UserCastReceiver.Designer.cs
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using Jellyfin.Server.Implementations;
+using Jellyfin.Database.Implementations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20240729140605_AddMediaSegments.Designer.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20240729140605_AddMediaSegments.Designer.cs
index 35a3cdad2d..ab7065ee65 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20240729140605_AddMediaSegments.Designer.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20240729140605_AddMediaSegments.Designer.cs
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using Jellyfin.Server.Implementations;
+using Jellyfin.Database.Implementations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20240928082930_MarkSegmentProviderIdNonNullable.Designer.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20240928082930_MarkSegmentProviderIdNonNullable.Designer.cs
index 8dba31a67f..aa60bff324 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20240928082930_MarkSegmentProviderIdNonNullable.Designer.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20240928082930_MarkSegmentProviderIdNonNullable.Designer.cs
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using Jellyfin.Server.Implementations;
+using Jellyfin.Database.Implementations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20241020103111_LibraryDbMigration.Designer.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20241020103111_LibraryDbMigration.Designer.cs
index 27745f601a..2ea6dafe13 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20241020103111_LibraryDbMigration.Designer.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20241020103111_LibraryDbMigration.Designer.cs
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using Jellyfin.Server.Implementations;
+using Jellyfin.Database.Implementations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20241111131257_AddedCustomDataKey.Designer.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20241111131257_AddedCustomDataKey.Designer.cs
index 1fbf21492d..d589a4afd7 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20241111131257_AddedCustomDataKey.Designer.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20241111131257_AddedCustomDataKey.Designer.cs
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using Jellyfin.Server.Implementations;
+using Jellyfin.Database.Implementations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20241111135439_AddedCustomDataKeyKey.Designer.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20241111135439_AddedCustomDataKeyKey.Designer.cs
index bac6fd5b5a..3d70bb0296 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20241111135439_AddedCustomDataKeyKey.Designer.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20241111135439_AddedCustomDataKeyKey.Designer.cs
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using Jellyfin.Server.Implementations;
+using Jellyfin.Database.Implementations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20241112152323_FixAncestorIdConfig.Designer.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20241112152323_FixAncestorIdConfig.Designer.cs
index ad622d44c5..1e0d3b129f 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20241112152323_FixAncestorIdConfig.Designer.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20241112152323_FixAncestorIdConfig.Designer.cs
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using Jellyfin.Server.Implementations;
+using Jellyfin.Database.Implementations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20241112232041_fixMediaStreams.Designer.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20241112232041_fixMediaStreams.Designer.cs
index dc4c8212ba..ccf67d899f 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20241112232041_fixMediaStreams.Designer.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20241112232041_fixMediaStreams.Designer.cs
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using Jellyfin.Server.Implementations;
+using Jellyfin.Database.Implementations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20241112234144_FixMediaStreams2.Designer.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20241112234144_FixMediaStreams2.Designer.cs
index 5714120b5c..d3ba8c96a9 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20241112234144_FixMediaStreams2.Designer.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20241112234144_FixMediaStreams2.Designer.cs
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using Jellyfin.Server.Implementations;
+using Jellyfin.Database.Implementations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20241113133548_EnforceUniqueItemValue.Designer.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20241113133548_EnforceUniqueItemValue.Designer.cs
index 855f02fd3f..2c0058c720 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20241113133548_EnforceUniqueItemValue.Designer.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20241113133548_EnforceUniqueItemValue.Designer.cs
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using Jellyfin.Server.Implementations;
+using Jellyfin.Database.Implementations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20250202021306_FixedCollation.Designer.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20250202021306_FixedCollation.Designer.cs
index d7b806d7a3..da4bab3fd3 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20250202021306_FixedCollation.Designer.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20250202021306_FixedCollation.Designer.cs
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using Jellyfin.Server.Implementations;
+using Jellyfin.Database.Implementations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20250204092455_MakeStartEndDateNullable.Designer.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20250204092455_MakeStartEndDateNullable.Designer.cs
index a329f1ef16..9b72d9688a 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20250204092455_MakeStartEndDateNullable.Designer.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20250204092455_MakeStartEndDateNullable.Designer.cs
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using Jellyfin.Server.Implementations;
+using Jellyfin.Database.Implementations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20250214031148_ChannelIdGuid.Designer.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20250214031148_ChannelIdGuid.Designer.cs
index 48919c9b5d..f5cfe86c44 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20250214031148_ChannelIdGuid.Designer.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20250214031148_ChannelIdGuid.Designer.cs
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using Jellyfin.Server.Implementations;
+using Jellyfin.Database.Implementations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/JellyfinDbModelSnapshot.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/JellyfinDbModelSnapshot.cs
index 79587a9c33..5d8ddde082 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/JellyfinDbModelSnapshot.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/JellyfinDbModelSnapshot.cs
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using Jellyfin.Server.Implementations;
+using Jellyfin.Database.Implementations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/SqliteDesignTimeJellyfinDbFactory.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/SqliteDesignTimeJellyfinDbFactory.cs
index 448bd2fc8b..1629c732c6 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/SqliteDesignTimeJellyfinDbFactory.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/SqliteDesignTimeJellyfinDbFactory.cs
@@ -1,3 +1,4 @@
+using Jellyfin.Database.Implementations;
 using Jellyfin.Database.Providers.Sqlite;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/ModelBuilderExtensions.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/ModelBuilderExtensions.cs
index 79ae1661aa..0d75686198 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/ModelBuilderExtensions.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/ModelBuilderExtensions.cs
@@ -3,46 +3,45 @@ using Jellyfin.Server.Implementations.ValueConverters;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
-namespace Jellyfin.Server.Implementations
+namespace Jellyfin.Database.Providers.Sqlite;
+
+/// <summary>
+/// Model builder extensions.
+/// </summary>
+public static class ModelBuilderExtensions
 {
     /// <summary>
-    /// Model builder extensions.
+    /// Specify value converter for the object type.
     /// </summary>
-    public static class ModelBuilderExtensions
+    /// <param name="modelBuilder">The model builder.</param>
+    /// <param name="converter">The <see cref="ValueConverter{TModel,TProvider}"/>.</param>
+    /// <typeparam name="T">The type to convert.</typeparam>
+    /// <returns>The modified <see cref="ModelBuilder"/>.</returns>
+    public static ModelBuilder UseValueConverterForType<T>(this ModelBuilder modelBuilder, ValueConverter converter)
     {
-        /// <summary>
-        /// Specify value converter for the object type.
-        /// </summary>
-        /// <param name="modelBuilder">The model builder.</param>
-        /// <param name="converter">The <see cref="ValueConverter{TModel,TProvider}"/>.</param>
-        /// <typeparam name="T">The type to convert.</typeparam>
-        /// <returns>The modified <see cref="ModelBuilder"/>.</returns>
-        public static ModelBuilder UseValueConverterForType<T>(this ModelBuilder modelBuilder, ValueConverter converter)
+        var type = typeof(T);
+        foreach (var entityType in modelBuilder.Model.GetEntityTypes())
         {
-            var type = typeof(T);
-            foreach (var entityType in modelBuilder.Model.GetEntityTypes())
+            foreach (var property in entityType.GetProperties())
             {
-                foreach (var property in entityType.GetProperties())
+                if (property.ClrType == type)
                 {
-                    if (property.ClrType == type)
-                    {
-                        property.SetValueConverter(converter);
-                    }
+                    property.SetValueConverter(converter);
                 }
             }
-
-            return modelBuilder;
         }
 
-        /// <summary>
-        /// Specify the default <see cref="DateTimeKind"/>.
-        /// </summary>
-        /// <param name="modelBuilder">The model builder to extend.</param>
-        /// <param name="kind">The <see cref="DateTimeKind"/> to specify.</param>
-        public static void SetDefaultDateTimeKind(this ModelBuilder modelBuilder, DateTimeKind kind)
-        {
-            modelBuilder.UseValueConverterForType<DateTime>(new DateTimeKindValueConverter(kind));
-            modelBuilder.UseValueConverterForType<DateTime?>(new DateTimeKindValueConverter(kind));
-        }
+        return modelBuilder;
+    }
+
+    /// <summary>
+    /// Specify the default <see cref="DateTimeKind"/>.
+    /// </summary>
+    /// <param name="modelBuilder">The model builder to extend.</param>
+    /// <param name="kind">The <see cref="DateTimeKind"/> to specify.</param>
+    public static void SetDefaultDateTimeKind(this ModelBuilder modelBuilder, DateTimeKind kind)
+    {
+        modelBuilder.UseValueConverterForType<DateTime>(new DateTimeKindValueConverter(kind));
+        modelBuilder.UseValueConverterForType<DateTime?>(new DateTimeKindValueConverter(kind));
     }
 }
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/SqliteDatabaseProvider.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/SqliteDatabaseProvider.cs
index 2aa3522d8a..d9eb0ae7a4 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/SqliteDatabaseProvider.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/SqliteDatabaseProvider.cs
@@ -2,7 +2,7 @@ using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using Jellyfin.Server.Implementations;
+using Jellyfin.Database.Implementations;
 using MediaBrowser.Common.Configuration;
 using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
diff --git a/src/Jellyfin.LiveTv/Channels/ChannelManager.cs b/src/Jellyfin.LiveTv/Channels/ChannelManager.cs
index 83f68ab509..402a3f3b0e 100644
--- a/src/Jellyfin.LiveTv/Channels/ChannelManager.cs
+++ b/src/Jellyfin.LiveTv/Channels/ChannelManager.cs
@@ -11,6 +11,7 @@ using System.Threading.Tasks;
 using AsyncKeyedLock;
 using Jellyfin.Data.Entities;
 using Jellyfin.Data.Enums;
+using Jellyfin.Database.Implementations.Enums;
 using Jellyfin.Extensions;
 using Jellyfin.Extensions.Json;
 using MediaBrowser.Common.Extensions;
diff --git a/src/Jellyfin.LiveTv/DefaultLiveTvService.cs b/src/Jellyfin.LiveTv/DefaultLiveTvService.cs
index 318cc7acd0..d8f873abe6 100644
--- a/src/Jellyfin.LiveTv/DefaultLiveTvService.cs
+++ b/src/Jellyfin.LiveTv/DefaultLiveTvService.cs
@@ -11,6 +11,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Jellyfin.Data.Enums;
 using Jellyfin.Data.Events;
+using Jellyfin.Database.Implementations.Enums;
 using Jellyfin.Extensions;
 using Jellyfin.LiveTv.Configuration;
 using Jellyfin.LiveTv.Timers;
diff --git a/src/Jellyfin.LiveTv/LiveTvManager.cs b/src/Jellyfin.LiveTv/LiveTvManager.cs
index da98606a4b..7ebcc48834 100644
--- a/src/Jellyfin.LiveTv/LiveTvManager.cs
+++ b/src/Jellyfin.LiveTv/LiveTvManager.cs
@@ -12,6 +12,7 @@ using Jellyfin.Data;
 using Jellyfin.Data.Entities;
 using Jellyfin.Data.Enums;
 using Jellyfin.Data.Events;
+using Jellyfin.Database.Implementations.Enums;
 using Jellyfin.LiveTv.Configuration;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Channels;
diff --git a/src/Jellyfin.LiveTv/Recordings/RecordingNotifier.cs b/src/Jellyfin.LiveTv/Recordings/RecordingNotifier.cs
index 1d571805b8..a5d186ce18 100644
--- a/src/Jellyfin.LiveTv/Recordings/RecordingNotifier.cs
+++ b/src/Jellyfin.LiveTv/Recordings/RecordingNotifier.cs
@@ -3,8 +3,8 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Jellyfin.Data;
-using Jellyfin.Data.Enums;
 using Jellyfin.Data.Events;
+using Jellyfin.Database.Implementations.Enums;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.Session;
diff --git a/src/Jellyfin.LiveTv/Recordings/RecordingsManager.cs b/src/Jellyfin.LiveTv/Recordings/RecordingsManager.cs
index 2f4caa3867..9ca5d7420b 100644
--- a/src/Jellyfin.LiveTv/Recordings/RecordingsManager.cs
+++ b/src/Jellyfin.LiveTv/Recordings/RecordingsManager.cs
@@ -10,6 +10,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using AsyncKeyedLock;
 using Jellyfin.Data.Enums;
+using Jellyfin.Database.Implementations.Enums;
 using Jellyfin.LiveTv.Configuration;
 using Jellyfin.LiveTv.IO;
 using Jellyfin.LiveTv.Timers;
-- 
cgit v1.2.3