diff --git a/Jellyfin.Api/Controllers/ItemsController.cs b/Jellyfin.Api/Controllers/ItemsController.cs
index 1b8b68313b..fdaa47a31f 100644
--- a/Jellyfin.Api/Controllers/ItemsController.cs
+++ b/Jellyfin.Api/Controllers/ItemsController.cs
@@ -4,10 +4,10 @@ using System.Linq;
 using Jellyfin.Api.Constants;
 using Jellyfin.Api.Extensions;
 using Jellyfin.Api.Helpers;
-using Jellyfin.Data.Entities;
 using Jellyfin.Data.Enums;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
diff --git a/Jellyfin.Api/Controllers/LibraryController.cs b/Jellyfin.Api/Controllers/LibraryController.cs
index 796d2d8aa0..a30873e9e4 100644
--- a/Jellyfin.Api/Controllers/LibraryController.cs
+++ b/Jellyfin.Api/Controllers/LibraryController.cs
@@ -19,6 +19,7 @@ using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.Movies;
+using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.Net;
@@ -35,8 +36,6 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using Book = MediaBrowser.Controller.Entities.Book;
-using Movie = Jellyfin.Data.Entities.Movie;
-using MusicAlbum = Jellyfin.Data.Entities.MusicAlbum;
 
 namespace Jellyfin.Api.Controllers
 {
diff --git a/Jellyfin.Api/Controllers/MoviesController.cs b/Jellyfin.Api/Controllers/MoviesController.cs
index 148d8a18e6..7fcfc749de 100644
--- a/Jellyfin.Api/Controllers/MoviesController.cs
+++ b/Jellyfin.Api/Controllers/MoviesController.cs
@@ -10,6 +10,7 @@ using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Model.Dto;
@@ -181,7 +182,7 @@ namespace Jellyfin.Api.Controllers
             DtoOptions dtoOptions,
             RecommendationType type)
         {
-            var itemTypes = new List<string> { nameof(MediaBrowser.Controller.Entities.Movies.Movie) };
+            var itemTypes = new List<string> { nameof(Movie) };
             if (_serverConfigurationManager.Configuration.EnableExternalContentInSuggestions)
             {
                 itemTypes.Add(nameof(Trailer));
diff --git a/Jellyfin.Data/Entities/Artwork.cs b/Jellyfin.Data/Entities/Libraries/Artwork.cs
similarity index 99%
rename from Jellyfin.Data/Entities/Artwork.cs
rename to Jellyfin.Data/Entities/Libraries/Artwork.cs
index 4508f54882..2a34a8dff1 100644
--- a/Jellyfin.Data/Entities/Artwork.cs
+++ b/Jellyfin.Data/Entities/Libraries/Artwork.cs
@@ -3,7 +3,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class Artwork
     {
diff --git a/Jellyfin.Data/Entities/Book.cs b/Jellyfin.Data/Entities/Libraries/Book.cs
similarity index 98%
rename from Jellyfin.Data/Entities/Book.cs
rename to Jellyfin.Data/Entities/Libraries/Book.cs
index b6198ee01c..1ddc5ce8b1 100644
--- a/Jellyfin.Data/Entities/Book.cs
+++ b/Jellyfin.Data/Entities/Libraries/Book.cs
@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class Book : LibraryItem
     {
diff --git a/Jellyfin.Data/Entities/BookMetadata.cs b/Jellyfin.Data/Entities/Libraries/BookMetadata.cs
similarity index 98%
rename from Jellyfin.Data/Entities/BookMetadata.cs
rename to Jellyfin.Data/Entities/Libraries/BookMetadata.cs
index 9734cf20ec..91eecbbf99 100644
--- a/Jellyfin.Data/Entities/BookMetadata.cs
+++ b/Jellyfin.Data/Entities/Libraries/BookMetadata.cs
@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class BookMetadata : Metadata
     {
diff --git a/Jellyfin.Data/Entities/Chapter.cs b/Jellyfin.Data/Entities/Libraries/Chapter.cs
similarity index 99%
rename from Jellyfin.Data/Entities/Chapter.cs
rename to Jellyfin.Data/Entities/Libraries/Chapter.cs
index 52cdeef782..2f36443183 100644
--- a/Jellyfin.Data/Entities/Chapter.cs
+++ b/Jellyfin.Data/Entities/Libraries/Chapter.cs
@@ -4,7 +4,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class Chapter
     {
diff --git a/Jellyfin.Data/Entities/Collection.cs b/Jellyfin.Data/Entities/Libraries/Collection.cs
similarity index 98%
rename from Jellyfin.Data/Entities/Collection.cs
rename to Jellyfin.Data/Entities/Libraries/Collection.cs
index 0c317d71ed..d054d8ff99 100644
--- a/Jellyfin.Data/Entities/Collection.cs
+++ b/Jellyfin.Data/Entities/Libraries/Collection.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class Collection
     {
diff --git a/Jellyfin.Data/Entities/CollectionItem.cs b/Jellyfin.Data/Entities/Libraries/CollectionItem.cs
similarity index 99%
rename from Jellyfin.Data/Entities/CollectionItem.cs
rename to Jellyfin.Data/Entities/Libraries/CollectionItem.cs
index fb589c2baf..4b01d814fb 100644
--- a/Jellyfin.Data/Entities/CollectionItem.cs
+++ b/Jellyfin.Data/Entities/Libraries/CollectionItem.cs
@@ -4,7 +4,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class CollectionItem
     {
diff --git a/Jellyfin.Data/Entities/Company.cs b/Jellyfin.Data/Entities/Libraries/Company.cs
similarity index 99%
rename from Jellyfin.Data/Entities/Company.cs
rename to Jellyfin.Data/Entities/Libraries/Company.cs
index 8bd48045d0..10df429cd7 100644
--- a/Jellyfin.Data/Entities/Company.cs
+++ b/Jellyfin.Data/Entities/Libraries/Company.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class Company
     {
diff --git a/Jellyfin.Data/Entities/CompanyMetadata.cs b/Jellyfin.Data/Entities/Libraries/CompanyMetadata.cs
similarity index 99%
rename from Jellyfin.Data/Entities/CompanyMetadata.cs
rename to Jellyfin.Data/Entities/Libraries/CompanyMetadata.cs
index 48ea4bdc50..f81beb0d58 100644
--- a/Jellyfin.Data/Entities/CompanyMetadata.cs
+++ b/Jellyfin.Data/Entities/Libraries/CompanyMetadata.cs
@@ -3,7 +3,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class CompanyMetadata : Metadata
     {
diff --git a/Jellyfin.Data/Entities/CustomItem.cs b/Jellyfin.Data/Entities/Libraries/CustomItem.cs
similarity index 98%
rename from Jellyfin.Data/Entities/CustomItem.cs
rename to Jellyfin.Data/Entities/Libraries/CustomItem.cs
index 8ea08488f4..ffe06db249 100644
--- a/Jellyfin.Data/Entities/CustomItem.cs
+++ b/Jellyfin.Data/Entities/Libraries/CustomItem.cs
@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class CustomItem : LibraryItem
     {
diff --git a/Jellyfin.Data/Entities/CustomItemMetadata.cs b/Jellyfin.Data/Entities/Libraries/CustomItemMetadata.cs
similarity index 98%
rename from Jellyfin.Data/Entities/CustomItemMetadata.cs
rename to Jellyfin.Data/Entities/Libraries/CustomItemMetadata.cs
index 9c89399e69..8606302d7d 100644
--- a/Jellyfin.Data/Entities/CustomItemMetadata.cs
+++ b/Jellyfin.Data/Entities/Libraries/CustomItemMetadata.cs
@@ -2,7 +2,7 @@
 
 using System;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class CustomItemMetadata : Metadata
     {
diff --git a/Jellyfin.Data/Entities/Episode.cs b/Jellyfin.Data/Entities/Libraries/Episode.cs
similarity index 99%
rename from Jellyfin.Data/Entities/Episode.cs
rename to Jellyfin.Data/Entities/Libraries/Episode.cs
index 1c18944482..3315b3e30b 100644
--- a/Jellyfin.Data/Entities/Episode.cs
+++ b/Jellyfin.Data/Entities/Libraries/Episode.cs
@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class Episode : LibraryItem
     {
diff --git a/Jellyfin.Data/Entities/EpisodeMetadata.cs b/Jellyfin.Data/Entities/Libraries/EpisodeMetadata.cs
similarity index 99%
rename from Jellyfin.Data/Entities/EpisodeMetadata.cs
rename to Jellyfin.Data/Entities/Libraries/EpisodeMetadata.cs
index 26ad7200b8..f20ed3573f 100644
--- a/Jellyfin.Data/Entities/EpisodeMetadata.cs
+++ b/Jellyfin.Data/Entities/Libraries/EpisodeMetadata.cs
@@ -3,7 +3,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class EpisodeMetadata : Metadata
     {
diff --git a/Jellyfin.Data/Entities/Genre.cs b/Jellyfin.Data/Entities/Libraries/Genre.cs
similarity index 99%
rename from Jellyfin.Data/Entities/Genre.cs
rename to Jellyfin.Data/Entities/Libraries/Genre.cs
index 43a180f6b6..c0b391ac8c 100644
--- a/Jellyfin.Data/Entities/Genre.cs
+++ b/Jellyfin.Data/Entities/Libraries/Genre.cs
@@ -4,7 +4,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class Genre
     {
diff --git a/Jellyfin.Data/Entities/Library.cs b/Jellyfin.Data/Entities/Libraries/Library.cs
similarity index 98%
rename from Jellyfin.Data/Entities/Library.cs
rename to Jellyfin.Data/Entities/Libraries/Library.cs
index 23cc9bd7de..9a97a3b00c 100644
--- a/Jellyfin.Data/Entities/Library.cs
+++ b/Jellyfin.Data/Entities/Libraries/Library.cs
@@ -4,7 +4,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class Library
     {
diff --git a/Jellyfin.Data/Entities/LibraryItem.cs b/Jellyfin.Data/Entities/Libraries/LibraryItem.cs
similarity index 99%
rename from Jellyfin.Data/Entities/LibraryItem.cs
rename to Jellyfin.Data/Entities/Libraries/LibraryItem.cs
index 00b2f9497f..b5f0323653 100644
--- a/Jellyfin.Data/Entities/LibraryItem.cs
+++ b/Jellyfin.Data/Entities/Libraries/LibraryItem.cs
@@ -4,7 +4,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public abstract partial class LibraryItem
     {
diff --git a/Jellyfin.Data/Entities/LibraryRoot.cs b/Jellyfin.Data/Entities/Libraries/LibraryRoot.cs
similarity index 99%
rename from Jellyfin.Data/Entities/LibraryRoot.cs
rename to Jellyfin.Data/Entities/Libraries/LibraryRoot.cs
index 07e16fff45..bbd9044477 100644
--- a/Jellyfin.Data/Entities/LibraryRoot.cs
+++ b/Jellyfin.Data/Entities/Libraries/LibraryRoot.cs
@@ -4,7 +4,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class LibraryRoot
     {
diff --git a/Jellyfin.Data/Entities/MediaFile.cs b/Jellyfin.Data/Entities/Libraries/MediaFile.cs
similarity index 99%
rename from Jellyfin.Data/Entities/MediaFile.cs
rename to Jellyfin.Data/Entities/Libraries/MediaFile.cs
index b69dbe2fa7..c9efdb143b 100644
--- a/Jellyfin.Data/Entities/MediaFile.cs
+++ b/Jellyfin.Data/Entities/Libraries/MediaFile.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class MediaFile
     {
diff --git a/Jellyfin.Data/Entities/MediaFileStream.cs b/Jellyfin.Data/Entities/Libraries/MediaFileStream.cs
similarity index 99%
rename from Jellyfin.Data/Entities/MediaFileStream.cs
rename to Jellyfin.Data/Entities/Libraries/MediaFileStream.cs
index 1c59e663d6..f1f26ecbb9 100644
--- a/Jellyfin.Data/Entities/MediaFileStream.cs
+++ b/Jellyfin.Data/Entities/Libraries/MediaFileStream.cs
@@ -4,7 +4,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class MediaFileStream
     {
diff --git a/Jellyfin.Data/Entities/Metadata.cs b/Jellyfin.Data/Entities/Libraries/Metadata.cs
similarity index 99%
rename from Jellyfin.Data/Entities/Metadata.cs
rename to Jellyfin.Data/Entities/Libraries/Metadata.cs
index 42525fa999..449e807dec 100644
--- a/Jellyfin.Data/Entities/Metadata.cs
+++ b/Jellyfin.Data/Entities/Libraries/Metadata.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public abstract partial class Metadata
     {
diff --git a/Jellyfin.Data/Entities/MetadataProvider.cs b/Jellyfin.Data/Entities/Libraries/MetadataProvider.cs
similarity index 99%
rename from Jellyfin.Data/Entities/MetadataProvider.cs
rename to Jellyfin.Data/Entities/Libraries/MetadataProvider.cs
index ebb2c1dbc1..d5462113b0 100644
--- a/Jellyfin.Data/Entities/MetadataProvider.cs
+++ b/Jellyfin.Data/Entities/Libraries/MetadataProvider.cs
@@ -4,7 +4,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class MetadataProvider
     {
diff --git a/Jellyfin.Data/Entities/MetadataProviderId.cs b/Jellyfin.Data/Entities/Libraries/MetadataProviderId.cs
similarity index 99%
rename from Jellyfin.Data/Entities/MetadataProviderId.cs
rename to Jellyfin.Data/Entities/Libraries/MetadataProviderId.cs
index ca3e16b1aa..fed9d4f0bf 100644
--- a/Jellyfin.Data/Entities/MetadataProviderId.cs
+++ b/Jellyfin.Data/Entities/Libraries/MetadataProviderId.cs
@@ -4,7 +4,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class MetadataProviderId
     {
diff --git a/Jellyfin.Data/Entities/Movie.cs b/Jellyfin.Data/Entities/Libraries/Movie.cs
similarity index 98%
rename from Jellyfin.Data/Entities/Movie.cs
rename to Jellyfin.Data/Entities/Libraries/Movie.cs
index 842d5b2b01..e7d27b5519 100644
--- a/Jellyfin.Data/Entities/Movie.cs
+++ b/Jellyfin.Data/Entities/Libraries/Movie.cs
@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class Movie : LibraryItem
     {
diff --git a/Jellyfin.Data/Entities/MovieMetadata.cs b/Jellyfin.Data/Entities/Libraries/MovieMetadata.cs
similarity index 99%
rename from Jellyfin.Data/Entities/MovieMetadata.cs
rename to Jellyfin.Data/Entities/Libraries/MovieMetadata.cs
index a6c82dda8f..f65da11d20 100644
--- a/Jellyfin.Data/Entities/MovieMetadata.cs
+++ b/Jellyfin.Data/Entities/Libraries/MovieMetadata.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class MovieMetadata : Metadata
     {
diff --git a/Jellyfin.Data/Entities/MusicAlbum.cs b/Jellyfin.Data/Entities/Libraries/MusicAlbum.cs
similarity index 98%
rename from Jellyfin.Data/Entities/MusicAlbum.cs
rename to Jellyfin.Data/Entities/Libraries/MusicAlbum.cs
index e03c3bfb0d..52776b12e6 100644
--- a/Jellyfin.Data/Entities/MusicAlbum.cs
+++ b/Jellyfin.Data/Entities/Libraries/MusicAlbum.cs
@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class MusicAlbum : LibraryItem
     {
diff --git a/Jellyfin.Data/Entities/MusicAlbumMetadata.cs b/Jellyfin.Data/Entities/Libraries/MusicAlbumMetadata.cs
similarity index 99%
rename from Jellyfin.Data/Entities/MusicAlbumMetadata.cs
rename to Jellyfin.Data/Entities/Libraries/MusicAlbumMetadata.cs
index 01ad736ce2..f2480a5c54 100644
--- a/Jellyfin.Data/Entities/MusicAlbumMetadata.cs
+++ b/Jellyfin.Data/Entities/Libraries/MusicAlbumMetadata.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class MusicAlbumMetadata : Metadata
     {
diff --git a/Jellyfin.Data/Entities/Person.cs b/Jellyfin.Data/Entities/Libraries/Person.cs
similarity index 99%
rename from Jellyfin.Data/Entities/Person.cs
rename to Jellyfin.Data/Entities/Libraries/Person.cs
index f0cfb73221..f325a07ff8 100644
--- a/Jellyfin.Data/Entities/Person.cs
+++ b/Jellyfin.Data/Entities/Libraries/Person.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class Person
     {
diff --git a/Jellyfin.Data/Entities/PersonRole.cs b/Jellyfin.Data/Entities/Libraries/PersonRole.cs
similarity index 99%
rename from Jellyfin.Data/Entities/PersonRole.cs
rename to Jellyfin.Data/Entities/Libraries/PersonRole.cs
index 895a9f47ac..04d50deaf7 100644
--- a/Jellyfin.Data/Entities/PersonRole.cs
+++ b/Jellyfin.Data/Entities/Libraries/PersonRole.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class PersonRole
     {
diff --git a/Jellyfin.Data/Entities/Photo.cs b/Jellyfin.Data/Entities/Libraries/Photo.cs
similarity index 98%
rename from Jellyfin.Data/Entities/Photo.cs
rename to Jellyfin.Data/Entities/Libraries/Photo.cs
index 7648bc2120..01c39b3ead 100644
--- a/Jellyfin.Data/Entities/Photo.cs
+++ b/Jellyfin.Data/Entities/Libraries/Photo.cs
@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class Photo : LibraryItem
     {
diff --git a/Jellyfin.Data/Entities/PhotoMetadata.cs b/Jellyfin.Data/Entities/Libraries/PhotoMetadata.cs
similarity index 97%
rename from Jellyfin.Data/Entities/PhotoMetadata.cs
rename to Jellyfin.Data/Entities/Libraries/PhotoMetadata.cs
index 3f06d3f2b5..701623fd14 100644
--- a/Jellyfin.Data/Entities/PhotoMetadata.cs
+++ b/Jellyfin.Data/Entities/Libraries/PhotoMetadata.cs
@@ -1,9 +1,8 @@
 #pragma warning disable CS1591
 
 using System;
-using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class PhotoMetadata : Metadata
     {
diff --git a/Jellyfin.Data/Entities/Rating.cs b/Jellyfin.Data/Entities/Libraries/Rating.cs
similarity index 99%
rename from Jellyfin.Data/Entities/Rating.cs
rename to Jellyfin.Data/Entities/Libraries/Rating.cs
index c57b0a0e84..31bee165af 100644
--- a/Jellyfin.Data/Entities/Rating.cs
+++ b/Jellyfin.Data/Entities/Libraries/Rating.cs
@@ -4,7 +4,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class Rating
     {
diff --git a/Jellyfin.Data/Entities/RatingSource.cs b/Jellyfin.Data/Entities/Libraries/RatingSource.cs
similarity index 99%
rename from Jellyfin.Data/Entities/RatingSource.cs
rename to Jellyfin.Data/Entities/Libraries/RatingSource.cs
index 2ea8e3b311..8204e9ff23 100644
--- a/Jellyfin.Data/Entities/RatingSource.cs
+++ b/Jellyfin.Data/Entities/Libraries/RatingSource.cs
@@ -4,7 +4,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     /// <summary>
     /// This is the entity to store review ratings, not age ratings.
diff --git a/Jellyfin.Data/Entities/Release.cs b/Jellyfin.Data/Entities/Libraries/Release.cs
similarity index 99%
rename from Jellyfin.Data/Entities/Release.cs
rename to Jellyfin.Data/Entities/Libraries/Release.cs
index 3e2cf22dba..4b42d65ec5 100644
--- a/Jellyfin.Data/Entities/Release.cs
+++ b/Jellyfin.Data/Entities/Libraries/Release.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class Release
     {
diff --git a/Jellyfin.Data/Entities/Season.cs b/Jellyfin.Data/Entities/Libraries/Season.cs
similarity index 99%
rename from Jellyfin.Data/Entities/Season.cs
rename to Jellyfin.Data/Entities/Libraries/Season.cs
index e5e7d03ab0..90885f0e97 100644
--- a/Jellyfin.Data/Entities/Season.cs
+++ b/Jellyfin.Data/Entities/Libraries/Season.cs
@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class Season : LibraryItem
     {
diff --git a/Jellyfin.Data/Entities/SeasonMetadata.cs b/Jellyfin.Data/Entities/Libraries/SeasonMetadata.cs
similarity index 97%
rename from Jellyfin.Data/Entities/SeasonMetadata.cs
rename to Jellyfin.Data/Entities/Libraries/SeasonMetadata.cs
index cce8cb125d..28105fe2cc 100644
--- a/Jellyfin.Data/Entities/SeasonMetadata.cs
+++ b/Jellyfin.Data/Entities/Libraries/SeasonMetadata.cs
@@ -2,9 +2,8 @@
 
 using System;
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class SeasonMetadata : Metadata
     {
diff --git a/Jellyfin.Data/Entities/Series.cs b/Jellyfin.Data/Entities/Libraries/Series.cs
similarity index 99%
rename from Jellyfin.Data/Entities/Series.cs
rename to Jellyfin.Data/Entities/Libraries/Series.cs
index 33c07ca618..a137f0f687 100644
--- a/Jellyfin.Data/Entities/Series.cs
+++ b/Jellyfin.Data/Entities/Libraries/Series.cs
@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class Series : LibraryItem
     {
diff --git a/Jellyfin.Data/Entities/SeriesMetadata.cs b/Jellyfin.Data/Entities/Libraries/SeriesMetadata.cs
similarity index 99%
rename from Jellyfin.Data/Entities/SeriesMetadata.cs
rename to Jellyfin.Data/Entities/Libraries/SeriesMetadata.cs
index 22be2a59b4..6e61da1e6c 100644
--- a/Jellyfin.Data/Entities/SeriesMetadata.cs
+++ b/Jellyfin.Data/Entities/Libraries/SeriesMetadata.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class SeriesMetadata : Metadata
     {
diff --git a/Jellyfin.Data/Entities/Track.cs b/Jellyfin.Data/Entities/Libraries/Track.cs
similarity index 99%
rename from Jellyfin.Data/Entities/Track.cs
rename to Jellyfin.Data/Entities/Libraries/Track.cs
index d52dd725aa..cdcc22d71a 100644
--- a/Jellyfin.Data/Entities/Track.cs
+++ b/Jellyfin.Data/Entities/Libraries/Track.cs
@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class Track : LibraryItem
     {
diff --git a/Jellyfin.Data/Entities/TrackMetadata.cs b/Jellyfin.Data/Entities/Libraries/TrackMetadata.cs
similarity index 98%
rename from Jellyfin.Data/Entities/TrackMetadata.cs
rename to Jellyfin.Data/Entities/Libraries/TrackMetadata.cs
index 710908eb8b..5c356c768e 100644
--- a/Jellyfin.Data/Entities/TrackMetadata.cs
+++ b/Jellyfin.Data/Entities/Libraries/TrackMetadata.cs
@@ -2,7 +2,7 @@
 
 using System;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class TrackMetadata : Metadata
     {