diff --git a/MediaBrowser.Server.Startup.Common/Configuration/ServerConfigurationManager.cs b/Emby.Server.Core/Configuration/ServerConfigurationManager.cs
similarity index 99%
rename from MediaBrowser.Server.Startup.Common/Configuration/ServerConfigurationManager.cs
rename to Emby.Server.Core/Configuration/ServerConfigurationManager.cs
index 756a8d0bf..f98c096ca 100644
--- a/MediaBrowser.Server.Startup.Common/Configuration/ServerConfigurationManager.cs
+++ b/Emby.Server.Core/Configuration/ServerConfigurationManager.cs
@@ -17,7 +17,7 @@ using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Serialization;
 
-namespace MediaBrowser.Server.Startup.Common.Configuration
+namespace Emby.Server.Core.Configuration
 {
     /// <summary>
     /// Class ServerConfigurationManager
diff --git a/MediaBrowser.Server.Startup.Common/ServerApplicationPaths.cs b/Emby.Server.Core/ServerApplicationPaths.cs
similarity index 99%
rename from MediaBrowser.Server.Startup.Common/ServerApplicationPaths.cs
rename to Emby.Server.Core/ServerApplicationPaths.cs
index 11de1c4ab..d59dd89d9 100644
--- a/MediaBrowser.Server.Startup.Common/ServerApplicationPaths.cs
+++ b/Emby.Server.Core/ServerApplicationPaths.cs
@@ -2,7 +2,7 @@
 using Emby.Common.Implementations;
 using MediaBrowser.Controller;
 
-namespace MediaBrowser.Server.Startup.Common
+namespace Emby.Server.Core
 {
     /// <summary>
     /// Extends BaseApplicationPaths to add paths that are only applicable on the server
diff --git a/Emby.Server.Core/project.json b/Emby.Server.Core/project.json
index ae3ff5203..4f5adf09f 100644
--- a/Emby.Server.Core/project.json
+++ b/Emby.Server.Core/project.json
@@ -19,6 +19,9 @@
         },
         "MediaBrowser.Controller": {
           "target": "project"
+        },
+        "Emby.Common.Implementations": {
+          "target": "project"
         }
       }
     },
@@ -34,6 +37,9 @@
         },
         "MediaBrowser.Controller": {
           "target": "project"
+        },
+        "Emby.Common.Implementations": {
+          "target": "project"
         }
       }
     }
diff --git a/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj b/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj
index 7d6df52c2..6196a74a2 100644
--- a/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj
+++ b/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj
@@ -96,7 +96,6 @@
     <Compile Include="Activity\ActivityRepository.cs" />
     <Compile Include="ApplicationHost.cs" />
     <Compile Include="ApplicationPathHelper.cs" />
-    <Compile Include="Configuration\ServerConfigurationManager.cs" />
     <Compile Include="Devices\DeviceRepository.cs" />
     <Compile Include="EntryPoints\ExternalPortForwarding.cs" />
     <Compile Include="FFMpeg\FFMpegLoader.cs" />
@@ -165,7 +164,6 @@
     <Compile Include="Cryptography\X509Extension.cs" />
     <Compile Include="Cryptography\X509Extensions.cs" />
     <Compile Include="Cryptography\X520Attributes.cs" />
-    <Compile Include="ServerApplicationPaths.cs" />
     <Compile Include="Social\SharingRepository.cs" />
     <Compile Include="Sync\SyncRepository.cs" />
     <Compile Include="SystemEvents.cs" />