diff --git a/Jellyfin.Server/Jellyfin.Server.csproj b/Jellyfin.Server/Jellyfin.Server.csproj
index 1cd65ea825..bff886cf50 100644
--- a/Jellyfin.Server/Jellyfin.Server.csproj
+++ b/Jellyfin.Server/Jellyfin.Server.csproj
@@ -54,7 +54,7 @@
   <ItemGroup>
     <ProjectReference Include="..\src\Jellyfin.Drawing\Jellyfin.Drawing.csproj" />
     <ProjectReference Include="..\Emby.Server.Implementations\Emby.Server.Implementations.csproj" />
-    <ProjectReference Include="..\Jellyfin.Drawing.Skia\Jellyfin.Drawing.Skia.csproj" />
+    <ProjectReference Include="..\src\Jellyfin.Drawing.Skia\Jellyfin.Drawing.Skia.csproj" />
     <ProjectReference Include="..\Jellyfin.Server.Implementations\Jellyfin.Server.Implementations.csproj" />
     <ProjectReference Include="..\src\Jellyfin.MediaEncoding.Hls\Jellyfin.MediaEncoding.Hls.csproj" />
   </ItemGroup>
diff --git a/Jellyfin.sln b/Jellyfin.sln
index 347716eb9a..c0d2ec0687 100644
--- a/Jellyfin.sln
+++ b/Jellyfin.sln
@@ -42,7 +42,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		SharedVersion.cs = SharedVersion.cs
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Jellyfin.Drawing.Skia", "Jellyfin.Drawing.Skia\Jellyfin.Drawing.Skia.csproj", "{154872D9-6C12-4007-96E3-8F70A58386CE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Jellyfin.Drawing.Skia", "src\Jellyfin.Drawing.Skia\Jellyfin.Drawing.Skia.csproj", "{154872D9-6C12-4007-96E3-8F70A58386CE}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Jellyfin.Api", "Jellyfin.Api\Jellyfin.Api.csproj", "{DFBEFB4C-DA19-4143-98B7-27320C7F7163}"
 EndProject
@@ -288,6 +288,7 @@ Global
 		{FE47334C-EFDE-4519-BD50-F24430FF360B} = {FBBB5129-006E-4AD7-BAD5-8B7CA1D10ED6}
 		{24960660-DE6C-47BF-AEEF-CEE8F19FE6C2} = {FBBB5129-006E-4AD7-BAD5-8B7CA1D10ED6}
 		{08FFF49B-F175-4807-A2B5-73B0EBD9F716} = {C9F0AB5D-F4D7-40C8-A353-3305C86D6D4C}
+		{154872D9-6C12-4007-96E3-8F70A58386CE} = {C9F0AB5D-F4D7-40C8-A353-3305C86D6D4C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3448830C-EBDC-426C-85CD-7BBB9651A7FE}
diff --git a/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj b/src/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj
similarity index 82%
rename from Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj
rename to src/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj
index dac3d0a61a..c686b229a6 100644
--- a/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj
+++ b/src/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\SharedVersion.cs" />
+    <Compile Include="..\..\SharedVersion.cs" />
   </ItemGroup>
 
   <ItemGroup>
@@ -24,9 +24,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-    <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
-    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
+    <ProjectReference Include="..\..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+    <ProjectReference Include="..\..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
+    <ProjectReference Include="..\..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
   </ItemGroup>
 
   <!-- Code analysers-->
diff --git a/Jellyfin.Drawing.Skia/PercentPlayedDrawer.cs b/src/Jellyfin.Drawing.Skia/PercentPlayedDrawer.cs
similarity index 100%
rename from Jellyfin.Drawing.Skia/PercentPlayedDrawer.cs
rename to src/Jellyfin.Drawing.Skia/PercentPlayedDrawer.cs
diff --git a/Jellyfin.Drawing.Skia/PlayedIndicatorDrawer.cs b/src/Jellyfin.Drawing.Skia/PlayedIndicatorDrawer.cs
similarity index 100%
rename from Jellyfin.Drawing.Skia/PlayedIndicatorDrawer.cs
rename to src/Jellyfin.Drawing.Skia/PlayedIndicatorDrawer.cs
diff --git a/Jellyfin.Drawing.Skia/Properties/AssemblyInfo.cs b/src/Jellyfin.Drawing.Skia/Properties/AssemblyInfo.cs
similarity index 100%
rename from Jellyfin.Drawing.Skia/Properties/AssemblyInfo.cs
rename to src/Jellyfin.Drawing.Skia/Properties/AssemblyInfo.cs
diff --git a/Jellyfin.Drawing.Skia/SkiaCodecException.cs b/src/Jellyfin.Drawing.Skia/SkiaCodecException.cs
similarity index 100%
rename from Jellyfin.Drawing.Skia/SkiaCodecException.cs
rename to src/Jellyfin.Drawing.Skia/SkiaCodecException.cs
diff --git a/Jellyfin.Drawing.Skia/SkiaEncoder.cs b/src/Jellyfin.Drawing.Skia/SkiaEncoder.cs
similarity index 100%
rename from Jellyfin.Drawing.Skia/SkiaEncoder.cs
rename to src/Jellyfin.Drawing.Skia/SkiaEncoder.cs
diff --git a/Jellyfin.Drawing.Skia/SkiaException.cs b/src/Jellyfin.Drawing.Skia/SkiaException.cs
similarity index 100%
rename from Jellyfin.Drawing.Skia/SkiaException.cs
rename to src/Jellyfin.Drawing.Skia/SkiaException.cs
diff --git a/Jellyfin.Drawing.Skia/SkiaHelper.cs b/src/Jellyfin.Drawing.Skia/SkiaHelper.cs
similarity index 100%
rename from Jellyfin.Drawing.Skia/SkiaHelper.cs
rename to src/Jellyfin.Drawing.Skia/SkiaHelper.cs
diff --git a/Jellyfin.Drawing.Skia/SplashscreenBuilder.cs b/src/Jellyfin.Drawing.Skia/SplashscreenBuilder.cs
similarity index 100%
rename from Jellyfin.Drawing.Skia/SplashscreenBuilder.cs
rename to src/Jellyfin.Drawing.Skia/SplashscreenBuilder.cs
diff --git a/Jellyfin.Drawing.Skia/StripCollageBuilder.cs b/src/Jellyfin.Drawing.Skia/StripCollageBuilder.cs
similarity index 100%
rename from Jellyfin.Drawing.Skia/StripCollageBuilder.cs
rename to src/Jellyfin.Drawing.Skia/StripCollageBuilder.cs
diff --git a/Jellyfin.Drawing.Skia/UnplayedCountIndicator.cs b/src/Jellyfin.Drawing.Skia/UnplayedCountIndicator.cs
similarity index 100%
rename from Jellyfin.Drawing.Skia/UnplayedCountIndicator.cs
rename to src/Jellyfin.Drawing.Skia/UnplayedCountIndicator.cs