diff --git a/MediaBrowser.Server.Startup.Common/Activity/ActivityRepository.cs b/Emby.Server.Core/Activity/ActivityRepository.cs
similarity index 98%
rename from MediaBrowser.Server.Startup.Common/Activity/ActivityRepository.cs
rename to Emby.Server.Core/Activity/ActivityRepository.cs
index 128aff5912..c11dcf7238 100644
--- a/MediaBrowser.Server.Startup.Common/Activity/ActivityRepository.cs
+++ b/Emby.Server.Core/Activity/ActivityRepository.cs
@@ -4,13 +4,13 @@ using System.Data;
 using System.Globalization;
 using System.IO;
 using System.Threading.Tasks;
+using Emby.Server.Core.Data;
 using MediaBrowser.Controller;
 using MediaBrowser.Model.Activity;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Querying;
-using MediaBrowser.Server.Startup.Common.Persistence;
 
-namespace MediaBrowser.Server.Startup.Common.Activity
+namespace Emby.Server.Core.Activity
 {
     public class ActivityRepository : BaseSqliteRepository, IActivityRepository
     {
diff --git a/MediaBrowser.Server.Startup.Common/Persistence/BaseSqliteRepository.cs b/Emby.Server.Core/Data/BaseSqliteRepository.cs
similarity index 98%
rename from MediaBrowser.Server.Startup.Common/Persistence/BaseSqliteRepository.cs
rename to Emby.Server.Core/Data/BaseSqliteRepository.cs
index 8dc3e91ad4..8d3cbe10a4 100644
--- a/MediaBrowser.Server.Startup.Common/Persistence/BaseSqliteRepository.cs
+++ b/Emby.Server.Core/Data/BaseSqliteRepository.cs
@@ -4,7 +4,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Model.Logging;
 
-namespace MediaBrowser.Server.Startup.Common.Persistence
+namespace Emby.Server.Core.Data
 {
     public abstract class BaseSqliteRepository : IDisposable
     {
diff --git a/MediaBrowser.Server.Startup.Common/Persistence/DataExtensions.cs b/Emby.Server.Core/Data/DataExtensions.cs
similarity index 98%
rename from MediaBrowser.Server.Startup.Common/Persistence/DataExtensions.cs
rename to Emby.Server.Core/Data/DataExtensions.cs
index 69bf78f496..b633d92178 100644
--- a/MediaBrowser.Server.Startup.Common/Persistence/DataExtensions.cs
+++ b/Emby.Server.Core/Data/DataExtensions.cs
@@ -6,9 +6,9 @@ using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Serialization;
 
-namespace MediaBrowser.Server.Startup.Common.Persistence
+namespace Emby.Server.Core.Data
 {
-    static class DataExtensions
+    public static class DataExtensions
     {
         /// <summary>
         /// Determines whether the specified conn is open.
diff --git a/MediaBrowser.Server.Startup.Common/Persistence/IDbConnector.cs b/Emby.Server.Core/Data/IDbConnector.cs
similarity index 79%
rename from MediaBrowser.Server.Startup.Common/Persistence/IDbConnector.cs
rename to Emby.Server.Core/Data/IDbConnector.cs
index 773d5eaee6..ca6c13daee 100644
--- a/MediaBrowser.Server.Startup.Common/Persistence/IDbConnector.cs
+++ b/Emby.Server.Core/Data/IDbConnector.cs
@@ -1,7 +1,7 @@
 using System.Data;
 using System.Threading.Tasks;
 
-namespace MediaBrowser.Server.Startup.Common.Persistence
+namespace Emby.Server.Core.Data
 {
     public interface IDbConnector
     {
diff --git a/MediaBrowser.Server.Startup.Common/Persistence/MediaStreamColumns.cs b/Emby.Server.Core/Data/MediaStreamColumns.cs
similarity index 99%
rename from MediaBrowser.Server.Startup.Common/Persistence/MediaStreamColumns.cs
rename to Emby.Server.Core/Data/MediaStreamColumns.cs
index 0379c38f85..cb46a56025 100644
--- a/MediaBrowser.Server.Startup.Common/Persistence/MediaStreamColumns.cs
+++ b/Emby.Server.Core/Data/MediaStreamColumns.cs
@@ -3,7 +3,7 @@ using System.Data;
 using System.Text;
 using MediaBrowser.Model.Logging;
 
-namespace MediaBrowser.Server.Startup.Common.Persistence
+namespace Emby.Server.Core.Data
 {
     public class MediaStreamColumns
     {
diff --git a/MediaBrowser.Server.Startup.Common/Persistence/SqliteDisplayPreferencesRepository.cs b/Emby.Server.Core/Data/SqliteDisplayPreferencesRepository.cs
similarity index 99%
rename from MediaBrowser.Server.Startup.Common/Persistence/SqliteDisplayPreferencesRepository.cs
rename to Emby.Server.Core/Data/SqliteDisplayPreferencesRepository.cs
index c6bd07914f..a9e63a11d0 100644
--- a/MediaBrowser.Server.Startup.Common/Persistence/SqliteDisplayPreferencesRepository.cs
+++ b/Emby.Server.Core/Data/SqliteDisplayPreferencesRepository.cs
@@ -12,7 +12,7 @@ using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Serialization;
 
-namespace MediaBrowser.Server.Startup.Common.Persistence
+namespace Emby.Server.Core.Data
 {
     /// <summary>
     /// Class SQLiteDisplayPreferencesRepository
diff --git a/MediaBrowser.Server.Startup.Common/Persistence/SqliteFileOrganizationRepository.cs b/Emby.Server.Core/Data/SqliteFileOrganizationRepository.cs
similarity index 99%
rename from MediaBrowser.Server.Startup.Common/Persistence/SqliteFileOrganizationRepository.cs
rename to Emby.Server.Core/Data/SqliteFileOrganizationRepository.cs
index 7942bd1597..a858db28a7 100644
--- a/MediaBrowser.Server.Startup.Common/Persistence/SqliteFileOrganizationRepository.cs
+++ b/Emby.Server.Core/Data/SqliteFileOrganizationRepository.cs
@@ -12,7 +12,7 @@ using MediaBrowser.Model.FileOrganization;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Querying;
 
-namespace MediaBrowser.Server.Startup.Common.Persistence
+namespace Emby.Server.Core.Data
 {
     public class SqliteFileOrganizationRepository : BaseSqliteRepository, IFileOrganizationRepository, IDisposable
     {
diff --git a/MediaBrowser.Server.Startup.Common/Persistence/SqliteItemRepository.cs b/Emby.Server.Core/Data/SqliteItemRepository.cs
similarity index 99%
rename from MediaBrowser.Server.Startup.Common/Persistence/SqliteItemRepository.cs
rename to Emby.Server.Core/Data/SqliteItemRepository.cs
index 1fbaa0c89d..2ca86c8318 100644
--- a/MediaBrowser.Server.Startup.Common/Persistence/SqliteItemRepository.cs
+++ b/Emby.Server.Core/Data/SqliteItemRepository.cs
@@ -29,7 +29,7 @@ using MediaBrowser.Model.Serialization;
 using MediaBrowser.Server.Implementations.Devices;
 using MediaBrowser.Server.Implementations.Playlists;
 
-namespace MediaBrowser.Server.Startup.Common.Persistence
+namespace Emby.Server.Core.Data
 {
     /// <summary>
     /// Class SQLiteItemRepository
diff --git a/MediaBrowser.Server.Startup.Common/Persistence/SqliteUserDataRepository.cs b/Emby.Server.Core/Data/SqliteUserDataRepository.cs
similarity index 99%
rename from MediaBrowser.Server.Startup.Common/Persistence/SqliteUserDataRepository.cs
rename to Emby.Server.Core/Data/SqliteUserDataRepository.cs
index 6bc9d8801c..2c883e0431 100644
--- a/MediaBrowser.Server.Startup.Common/Persistence/SqliteUserDataRepository.cs
+++ b/Emby.Server.Core/Data/SqliteUserDataRepository.cs
@@ -11,7 +11,7 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Logging;
 
-namespace MediaBrowser.Server.Startup.Common.Persistence
+namespace Emby.Server.Core.Data
 {
     public class SqliteUserDataRepository : BaseSqliteRepository, IUserDataRepository
     {
diff --git a/MediaBrowser.Server.Startup.Common/Persistence/SqliteUserRepository.cs b/Emby.Server.Core/Data/SqliteUserRepository.cs
similarity index 99%
rename from MediaBrowser.Server.Startup.Common/Persistence/SqliteUserRepository.cs
rename to Emby.Server.Core/Data/SqliteUserRepository.cs
index bc87321f10..54851fffbf 100644
--- a/MediaBrowser.Server.Startup.Common/Persistence/SqliteUserRepository.cs
+++ b/Emby.Server.Core/Data/SqliteUserRepository.cs
@@ -11,7 +11,7 @@ using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Serialization;
 
-namespace MediaBrowser.Server.Startup.Common.Persistence
+namespace Emby.Server.Core.Data
 {
     /// <summary>
     /// Class SQLiteUserRepository
diff --git a/MediaBrowser.Server.Startup.Common/Persistence/TypeMapper.cs b/Emby.Server.Core/Data/TypeMapper.cs
similarity index 96%
rename from MediaBrowser.Server.Startup.Common/Persistence/TypeMapper.cs
rename to Emby.Server.Core/Data/TypeMapper.cs
index e2af2dd38a..f8eb5dd2d8 100644
--- a/MediaBrowser.Server.Startup.Common/Persistence/TypeMapper.cs
+++ b/Emby.Server.Core/Data/TypeMapper.cs
@@ -2,7 +2,7 @@
 using System.Collections.Concurrent;
 using System.Linq;
 
-namespace MediaBrowser.Server.Startup.Common.Persistence
+namespace Emby.Server.Core.Data
 {
     /// <summary>
     /// Class TypeMapper
diff --git a/MediaBrowser.Server.Startup.Common/Devices/DeviceRepository.cs b/Emby.Server.Core/Devices/DeviceRepository.cs
similarity index 99%
rename from MediaBrowser.Server.Startup.Common/Devices/DeviceRepository.cs
rename to Emby.Server.Core/Devices/DeviceRepository.cs
index 633faeef9d..63aa7b67a0 100644
--- a/MediaBrowser.Server.Startup.Common/Devices/DeviceRepository.cs
+++ b/Emby.Server.Core/Devices/DeviceRepository.cs
@@ -12,7 +12,7 @@ using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Session;
 
-namespace MediaBrowser.Server.Startup.Common.Devices
+namespace Emby.Server.Core.Devices
 {
     public class DeviceRepository : IDeviceRepository
     {
diff --git a/Emby.Server.Core/Emby.Server.Core.xproj b/Emby.Server.Core/Emby.Server.Core.xproj
index 19bc7babcb..94de75bff9 100644
--- a/Emby.Server.Core/Emby.Server.Core.xproj
+++ b/Emby.Server.Core/Emby.Server.Core.xproj
@@ -16,6 +16,7 @@
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Emby.Server.Implementations\Emby.Server.Implementations.csproj" />
     <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
     <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
     <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
diff --git a/MediaBrowser.Server.Startup.Common/EntryPoints/ExternalPortForwarding.cs b/Emby.Server.Core/EntryPoints/ExternalPortForwarding.cs
similarity index 99%
rename from MediaBrowser.Server.Startup.Common/EntryPoints/ExternalPortForwarding.cs
rename to Emby.Server.Core/EntryPoints/ExternalPortForwarding.cs
index 03e26ee863..c1a19a71fa 100644
--- a/MediaBrowser.Server.Startup.Common/EntryPoints/ExternalPortForwarding.cs
+++ b/Emby.Server.Core/EntryPoints/ExternalPortForwarding.cs
@@ -12,7 +12,7 @@ using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Threading;
 using Mono.Nat;
 
-namespace MediaBrowser.Server.Startup.Common.EntryPoints
+namespace Emby.Server.Core.EntryPoints
 {
     public class ExternalPortForwarding : IServerEntryPoint
     {
diff --git a/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegInfo.cs b/Emby.Server.Core/FFMpeg/FFMpegInfo.cs
similarity index 91%
rename from MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegInfo.cs
rename to Emby.Server.Core/FFMpeg/FFMpegInfo.cs
index d33b12a9a7..fc197cba32 100644
--- a/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegInfo.cs
+++ b/Emby.Server.Core/FFMpeg/FFMpegInfo.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Server.Startup.Common.FFMpeg
+namespace Emby.Server.Core.FFMpeg
 {
     /// <summary>
     /// Class FFMpegInfo
diff --git a/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegInstallInfo.cs b/Emby.Server.Core/FFMpeg/FFMpegInstallInfo.cs
similarity index 90%
rename from MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegInstallInfo.cs
rename to Emby.Server.Core/FFMpeg/FFMpegInstallInfo.cs
index a2a44f805c..f1eaeb8894 100644
--- a/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegInstallInfo.cs
+++ b/Emby.Server.Core/FFMpeg/FFMpegInstallInfo.cs
@@ -1,5 +1,5 @@
 
-namespace MediaBrowser.Server.Startup.Common.FFMpeg
+namespace Emby.Server.Core.FFMpeg
 {
     public class FFMpegInstallInfo
     {
diff --git a/MediaBrowser.Server.Startup.Common/Migrations/DbMigration.cs b/Emby.Server.Core/Migrations/DbMigration.cs
similarity index 94%
rename from MediaBrowser.Server.Startup.Common/Migrations/DbMigration.cs
rename to Emby.Server.Core/Migrations/DbMigration.cs
index 217cdfb4c2..17e0860938 100644
--- a/MediaBrowser.Server.Startup.Common/Migrations/DbMigration.cs
+++ b/Emby.Server.Core/Migrations/DbMigration.cs
@@ -2,9 +2,9 @@
 using Emby.Server.Implementations.Persistence;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Model.Tasks;
-using MediaBrowser.Server.Startup.Common.Persistence;
+using Emby.Server.Core.Data;
 
-namespace MediaBrowser.Server.Startup.Common.Migrations
+namespace Emby.Server.Core.Migrations
 {
     public class DbMigration : IVersionMigration
     {
diff --git a/MediaBrowser.Server.Startup.Common/Migrations/IVersionMigration.cs b/Emby.Server.Core/Migrations/IVersionMigration.cs
similarity index 66%
rename from MediaBrowser.Server.Startup.Common/Migrations/IVersionMigration.cs
rename to Emby.Server.Core/Migrations/IVersionMigration.cs
index 6ef08fae97..0190e289a4 100644
--- a/MediaBrowser.Server.Startup.Common/Migrations/IVersionMigration.cs
+++ b/Emby.Server.Core/Migrations/IVersionMigration.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 
-namespace MediaBrowser.Server.Startup.Common.Migrations
+namespace Emby.Server.Core.Migrations
 {
     public interface IVersionMigration
     {
diff --git a/MediaBrowser.Server.Startup.Common/Migrations/UpdateLevelMigration.cs b/Emby.Server.Core/Migrations/UpdateLevelMigration.cs
similarity index 98%
rename from MediaBrowser.Server.Startup.Common/Migrations/UpdateLevelMigration.cs
rename to Emby.Server.Core/Migrations/UpdateLevelMigration.cs
index b0214041b1..bbedd7b63c 100644
--- a/MediaBrowser.Server.Startup.Common/Migrations/UpdateLevelMigration.cs
+++ b/Emby.Server.Core/Migrations/UpdateLevelMigration.cs
@@ -10,7 +10,7 @@ using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Updates;
 
-namespace MediaBrowser.Server.Startup.Common.Migrations
+namespace Emby.Server.Core.Migrations
 {
     public class UpdateLevelMigration : IVersionMigration
     {
diff --git a/MediaBrowser.Server.Startup.Common/Notifications/SqliteNotificationsRepository.cs b/Emby.Server.Core/Notifications/SqliteNotificationsRepository.cs
similarity index 99%
rename from MediaBrowser.Server.Startup.Common/Notifications/SqliteNotificationsRepository.cs
rename to Emby.Server.Core/Notifications/SqliteNotificationsRepository.cs
index b0f0dd75aa..8a7fc92701 100644
--- a/MediaBrowser.Server.Startup.Common/Notifications/SqliteNotificationsRepository.cs
+++ b/Emby.Server.Core/Notifications/SqliteNotificationsRepository.cs
@@ -5,13 +5,13 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Emby.Server.Core.Data;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Notifications;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Notifications;
-using MediaBrowser.Server.Startup.Common.Persistence;
 
-namespace MediaBrowser.Server.Startup.Common.Notifications
+namespace Emby.Server.Core.Notifications
 {
     public class SqliteNotificationsRepository : BaseSqliteRepository, INotificationsRepository
     {
diff --git a/MediaBrowser.Server.Startup.Common/Social/SharingRepository.cs b/Emby.Server.Core/Social/SharingRepository.cs
similarity index 98%
rename from MediaBrowser.Server.Startup.Common/Social/SharingRepository.cs
rename to Emby.Server.Core/Social/SharingRepository.cs
index 63d608026a..5503b7ab3b 100644
--- a/MediaBrowser.Server.Startup.Common/Social/SharingRepository.cs
+++ b/Emby.Server.Core/Social/SharingRepository.cs
@@ -3,12 +3,12 @@ using System.Data;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using Emby.Server.Core.Data;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Social;
-using MediaBrowser.Server.Startup.Common.Persistence;
 
-namespace MediaBrowser.Server.Startup.Common.Social
+namespace Emby.Server.Core.Social
 {
     public class SharingRepository : BaseSqliteRepository, ISharingRepository
     {
diff --git a/MediaBrowser.Server.Startup.Common/Sync/SyncRepository.cs b/Emby.Server.Core/Sync/SyncRepository.cs
similarity index 99%
rename from MediaBrowser.Server.Startup.Common/Sync/SyncRepository.cs
rename to Emby.Server.Core/Sync/SyncRepository.cs
index 0c2715ce11..bfcf76767c 100644
--- a/MediaBrowser.Server.Startup.Common/Sync/SyncRepository.cs
+++ b/Emby.Server.Core/Sync/SyncRepository.cs
@@ -5,6 +5,7 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using Emby.Server.Core.Data;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Sync;
 using MediaBrowser.Model.Dto;
@@ -12,9 +13,8 @@ using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Sync;
-using MediaBrowser.Server.Startup.Common.Persistence;
 
-namespace MediaBrowser.Server.Startup.Common.Sync
+namespace Emby.Server.Core.Sync
 {
     public class SyncRepository : BaseSqliteRepository, ISyncRepository
     {
diff --git a/Emby.Server.Core/project.json b/Emby.Server.Core/project.json
index 4f5adf09f4..e4e4741b13 100644
--- a/Emby.Server.Core/project.json
+++ b/Emby.Server.Core/project.json
@@ -22,6 +22,12 @@
         },
         "Emby.Common.Implementations": {
           "target": "project"
+        },
+        "Mono.Nat": {
+          "target": "project"
+        },
+        "Emby.Server.Implementations": {
+          "target": "project"
         }
       }
     },
@@ -29,6 +35,7 @@
       "imports": "dnxcore50",
       "dependencies": {
         "NETStandard.Library": "1.6.0",
+		"System.AppDomain": "2.0.11",
 		"MediaBrowser.Model": {
           "target": "project"
         },
@@ -40,6 +47,12 @@
         },
         "Emby.Common.Implementations": {
           "target": "project"
+        },
+        "Mono.Nat": {
+          "target": "project"
+        },
+        "Emby.Server.Implementations": {
+          "target": "project"
         }
       }
     }
diff --git a/MediaBrowser.Server.Implementations/Collections/CollectionsDynamicFolder.cs b/Emby.Server.Implementations/Collections/CollectionsDynamicFolder.cs
similarity index 93%
rename from MediaBrowser.Server.Implementations/Collections/CollectionsDynamicFolder.cs
rename to Emby.Server.Implementations/Collections/CollectionsDynamicFolder.cs
index 2d0c3642ea..4ff33e6451 100644
--- a/MediaBrowser.Server.Implementations/Collections/CollectionsDynamicFolder.cs
+++ b/Emby.Server.Implementations/Collections/CollectionsDynamicFolder.cs
@@ -6,7 +6,7 @@ using MediaBrowser.Model.IO;
 using MediaBrowser.Controller.Collections;
 using MediaBrowser.Controller.IO;
 
-namespace MediaBrowser.Server.Implementations.Collections
+namespace Emby.Server.Implementations.Collections
 {
     public class CollectionsDynamicFolder : IVirtualFolderCreator
     {
diff --git a/Emby.Server.Implementations/Devices/CameraUploadsDynamicFolder.cs b/Emby.Server.Implementations/Devices/CameraUploadsDynamicFolder.cs
new file mode 100644
index 0000000000..e2d5d0272f
--- /dev/null
+++ b/Emby.Server.Implementations/Devices/CameraUploadsDynamicFolder.cs
@@ -0,0 +1,41 @@
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Controller.Entities;
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Common.IO;
+using MediaBrowser.Controller.IO;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Serialization;
+using MediaBrowser.Server.Implementations.Devices;
+
+namespace Emby.Server.Implementations.Devices
+{
+    public class CameraUploadsDynamicFolder : IVirtualFolderCreator
+    {
+        private readonly IApplicationPaths _appPaths;
+        private readonly IFileSystem _fileSystem;
+
+        public CameraUploadsDynamicFolder(IApplicationPaths appPaths, IFileSystem fileSystem)
+        {
+            _appPaths = appPaths;
+            _fileSystem = fileSystem;
+        }
+
+        public BasePluginFolder GetFolder()
+        {
+            var path = Path.Combine(_appPaths.DataPath, "camerauploads");
+
+            _fileSystem.CreateDirectory(path);
+
+            return new CameraUploadsFolder
+            {
+                Path = path
+            };
+        }
+    }
+
+}
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index cb15eca527..438edf212f 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -43,11 +43,13 @@
     <Compile Include="Channels\RefreshChannelsScheduledTask.cs" />
     <Compile Include="Collections\CollectionImageProvider.cs" />
     <Compile Include="Collections\CollectionManager.cs" />
+    <Compile Include="Collections\CollectionsDynamicFolder.cs" />
     <Compile Include="Connect\ConnectData.cs" />
     <Compile Include="Connect\ConnectEntryPoint.cs" />
     <Compile Include="Connect\ConnectManager.cs" />
     <Compile Include="Connect\Responses.cs" />
     <Compile Include="Connect\Validator.cs" />
+    <Compile Include="Devices\CameraUploadsDynamicFolder.cs" />
     <Compile Include="Devices\DeviceManager.cs" />
     <Compile Include="Dto\DtoService.cs" />
     <Compile Include="EntryPoints\AutomaticRestartEntryPoint.cs" />
@@ -175,6 +177,7 @@
     <Compile Include="Photos\PhotoAlbumImageProvider.cs" />
     <Compile Include="Playlists\PlaylistImageProvider.cs" />
     <Compile Include="Playlists\PlaylistManager.cs" />
+    <Compile Include="Playlists\PlaylistsDynamicFolder.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ScheduledTasks\ChapterImagesTask.cs" />
     <Compile Include="ScheduledTasks\PeopleValidationTask.cs" />
@@ -291,114 +294,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\backbone-min.js">
-      <Link>swagger-ui\lib\backbone-min.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\handlebars-2.0.0.js">
-      <Link>swagger-ui\lib\handlebars-2.0.0.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\highlight.7.3.pack.js">
-      <Link>swagger-ui\lib\highlight.7.3.pack.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\jquery-1.8.0.min.js">
-      <Link>swagger-ui\lib\jquery-1.8.0.min.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\jquery.ba-bbq.min.js">
-      <Link>swagger-ui\lib\jquery.ba-bbq.min.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\jquery.slideto.min.js">
-      <Link>swagger-ui\lib\jquery.slideto.min.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\jquery.wiggle.min.js">
-      <Link>swagger-ui\lib\jquery.wiggle.min.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\marked.js">
-      <Link>swagger-ui\lib\marked.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\shred.bundle.js">
-      <Link>swagger-ui\lib\shred.bundle.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\swagger-client.js">
-      <Link>swagger-ui\lib\swagger-client.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\swagger-oauth.js">
-      <Link>swagger-ui\lib\swagger-oauth.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\lib\underscore-min.js">
-      <Link>swagger-ui\lib\underscore-min.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\o2c.html">
-      <Link>swagger-ui\o2c.html</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\patch.js">
-      <Link>swagger-ui\patch.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\swagger-ui.js">
-      <Link>swagger-ui\swagger-ui.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\swagger-ui.min.js">
-      <Link>swagger-ui\swagger-ui.min.js</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\fonts\droid-sans-v6-latin-700.eot">
-      <Link>swagger-ui\fonts\droid-sans-v6-latin-700.eot</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\fonts\droid-sans-v6-latin-700.ttf">
-      <Link>swagger-ui\fonts\droid-sans-v6-latin-700.ttf</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\fonts\droid-sans-v6-latin-700.woff">
-      <Link>swagger-ui\fonts\droid-sans-v6-latin-700.woff</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\fonts\droid-sans-v6-latin-700.woff2">
-      <Link>swagger-ui\fonts\droid-sans-v6-latin-700.woff2</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\fonts\droid-sans-v6-latin-regular.eot">
-      <Link>swagger-ui\fonts\droid-sans-v6-latin-regular.eot</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\fonts\droid-sans-v6-latin-regular.ttf">
-      <Link>swagger-ui\fonts\droid-sans-v6-latin-regular.ttf</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\fonts\droid-sans-v6-latin-regular.woff">
-      <Link>swagger-ui\fonts\droid-sans-v6-latin-regular.woff</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\fonts\droid-sans-v6-latin-regular.woff2">
-      <Link>swagger-ui\fonts\droid-sans-v6-latin-regular.woff2</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\css\reset.css">
-      <Link>swagger-ui\css\reset.css</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\css\screen.css">
-      <Link>swagger-ui\css\screen.css</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\ServiceStack\swagger-ui\css\typography.css">
-      <Link>swagger-ui\css\typography.css</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <EmbeddedResource Include="Localization\Core\ar.json" />
     <EmbeddedResource Include="Localization\Core\bg-BG.json" />
     <EmbeddedResource Include="Localization\Core\ca.json" />
diff --git a/Emby.Server.Implementations/Playlists/PlaylistsDynamicFolder.cs b/Emby.Server.Implementations/Playlists/PlaylistsDynamicFolder.cs
new file mode 100644
index 0000000000..dacc937e1a
--- /dev/null
+++ b/Emby.Server.Implementations/Playlists/PlaylistsDynamicFolder.cs
@@ -0,0 +1,32 @@
+using System.IO;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Server.Implementations.Playlists;
+
+namespace Emby.Server.Implementations.Playlists
+{
+    public class PlaylistsDynamicFolder : IVirtualFolderCreator
+    {
+        private readonly IApplicationPaths _appPaths;
+        private readonly IFileSystem _fileSystem;
+
+        public PlaylistsDynamicFolder(IApplicationPaths appPaths, IFileSystem fileSystem)
+        {
+            _appPaths = appPaths;
+            _fileSystem = fileSystem;
+        }
+
+        public BasePluginFolder GetFolder()
+        {
+            var path = Path.Combine(_appPaths.DataPath, "playlists");
+
+            _fileSystem.CreateDirectory(path);
+
+            return new PlaylistsFolder
+            {
+                Path = path
+            };
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs b/MediaBrowser.Controller/Devices/CameraUploadsFolder.cs
similarity index 75%
rename from MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs
rename to MediaBrowser.Controller/Devices/CameraUploadsFolder.cs
index 4a85ecf086..979a929ca7 100644
--- a/MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs
+++ b/MediaBrowser.Controller/Devices/CameraUploadsFolder.cs
@@ -64,29 +64,4 @@ namespace MediaBrowser.Server.Implementations.Devices
             get { return true; }
         }
     }
-
-    public class CameraUploadsDynamicFolder : IVirtualFolderCreator
-    {
-        private readonly IApplicationPaths _appPaths;
-        private readonly IFileSystem _fileSystem;
-
-        public CameraUploadsDynamicFolder(IApplicationPaths appPaths, IFileSystem fileSystem)
-        {
-            _appPaths = appPaths;
-            _fileSystem = fileSystem;
-        }
-
-        public BasePluginFolder GetFolder()
-        {
-            var path = Path.Combine(_appPaths.DataPath, "camerauploads");
-
-            _fileSystem.CreateDirectory(path);
-
-            return new CameraUploadsFolder
-            {
-                Path = path
-            };
-        }
-    }
-
 }
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 518daa6d75..d867b15123 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -77,6 +77,7 @@
     <Compile Include="Connect\IConnectManager.cs" />
     <Compile Include="Connect\UserLinkResult.cs" />
     <Compile Include="Devices\CameraImageUploadInfo.cs" />
+    <Compile Include="Devices\CameraUploadsFolder.cs" />
     <Compile Include="Devices\IDeviceManager.cs" />
     <Compile Include="Devices\IDeviceRepository.cs" />
     <Compile Include="Dlna\ControlRequest.cs" />
@@ -217,6 +218,7 @@
     <Compile Include="Persistence\IFileOrganizationRepository.cs" />
     <Compile Include="Persistence\MediaStreamQuery.cs" />
     <Compile Include="Playlists\IPlaylistManager.cs" />
+    <Compile Include="Playlists\ManualPlaylistsFolder.cs" />
     <Compile Include="Playlists\Playlist.cs" />
     <Compile Include="Plugins\ILocalizablePlugin.cs" />
     <Compile Include="Providers\AlbumInfo.cs" />
diff --git a/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs b/MediaBrowser.Controller/Playlists/ManualPlaylistsFolder.cs
similarity index 69%
rename from MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
rename to MediaBrowser.Controller/Playlists/ManualPlaylistsFolder.cs
index 6a910a7bfe..07773d846b 100644
--- a/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
+++ b/MediaBrowser.Controller/Playlists/ManualPlaylistsFolder.cs
@@ -49,29 +49,5 @@ namespace MediaBrowser.Server.Implementations.Playlists
             return base.GetItemsInternal(query);
         }
     }
-
-    public class PlaylistsDynamicFolder : IVirtualFolderCreator
-    {
-        private readonly IApplicationPaths _appPaths;
-        private readonly IFileSystem _fileSystem;
-
-        public PlaylistsDynamicFolder(IApplicationPaths appPaths, IFileSystem fileSystem)
-        {
-            _appPaths = appPaths;
-            _fileSystem = fileSystem;
-        }
-
-        public BasePluginFolder GetFolder()
-        {
-            var path = Path.Combine(_appPaths.DataPath, "playlists");
-
-			_fileSystem.CreateDirectory(path);
-
-            return new PlaylistsFolder
-            {
-                Path = path
-            };
-        }
-    }
 }
 
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index c75ab4c1cb..16c45f2e51 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -44,9 +44,6 @@
     <Compile Include="..\SharedVersion.cs">
       <Link>Properties\SharedVersion.cs</Link>
     </Compile>
-    <Compile Include="Collections\CollectionsDynamicFolder.cs" />
-    <Compile Include="Devices\CameraUploadsFolder.cs" />
-    <Compile Include="Playlists\ManualPlaylistsFolder.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/MediaBrowser.Server.Mono/Native/DbConnector.cs b/MediaBrowser.Server.Mono/Native/DbConnector.cs
index b53aecc786..f25955c91e 100644
--- a/MediaBrowser.Server.Mono/Native/DbConnector.cs
+++ b/MediaBrowser.Server.Mono/Native/DbConnector.cs
@@ -1,7 +1,7 @@
 using System.Data;
 using System.Threading.Tasks;
+using Emby.Server.Core.Data;
 using MediaBrowser.Model.Logging;
-using MediaBrowser.Server.Startup.Common.Persistence;
 
 namespace MediaBrowser.Server.Mono.Native
 {
diff --git a/MediaBrowser.Server.Mono/Native/MonoApp.cs b/MediaBrowser.Server.Mono/Native/MonoApp.cs
index 64d8488ab9..59c95316c1 100644
--- a/MediaBrowser.Server.Mono/Native/MonoApp.cs
+++ b/MediaBrowser.Server.Mono/Native/MonoApp.cs
@@ -8,8 +8,9 @@ using System.Collections.Generic;
 using System.Reflection;
 using System.Text.RegularExpressions;
 using Emby.Server.Core;
+using Emby.Server.Core.Data;
+using Emby.Server.Core.FFMpeg;
 using MediaBrowser.Model.System;
-using MediaBrowser.Server.Startup.Common.Persistence;
 using MediaBrowser.Server.Startup.Common.FFMpeg;
 using MediaBrowser.Server.Startup.Common.Networking;
 using OperatingSystem = MediaBrowser.Server.Startup.Common.OperatingSystem;
diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
index f0c134c081..6d7ec699d9 100644
--- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
+++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
@@ -51,7 +51,6 @@ using MediaBrowser.Providers.Subtitles;
 using MediaBrowser.Server.Implementations;
 using MediaBrowser.Server.Implementations.Devices;
 using MediaBrowser.Server.Startup.Common.FFMpeg;
-using MediaBrowser.Server.Startup.Common.Migrations;
 using MediaBrowser.WebDashboard.Api;
 using MediaBrowser.XbmcMetadata.Providers;
 using System;
@@ -90,6 +89,14 @@ using Emby.Dlna.Main;
 using Emby.Dlna.MediaReceiverRegistrar;
 using Emby.Dlna.Ssdp;
 using Emby.Server.Core;
+using Emby.Server.Core.Activity;
+using Emby.Server.Core.Configuration;
+using Emby.Server.Core.Data;
+using Emby.Server.Core.Devices;
+using Emby.Server.Core.Migrations;
+using Emby.Server.Core.Notifications;
+using Emby.Server.Core.Social;
+using Emby.Server.Core.Sync;
 using Emby.Server.Implementations.Activity;
 using Emby.Server.Implementations.Channels;
 using Emby.Server.Implementations.Collections;
@@ -126,15 +133,8 @@ using MediaBrowser.Model.Services;
 using MediaBrowser.Model.Social;
 using MediaBrowser.Model.Text;
 using MediaBrowser.Model.Xml;
-using MediaBrowser.Server.Startup.Common.Activity;
-using MediaBrowser.Server.Startup.Common.Configuration;
-using MediaBrowser.Server.Startup.Common.Devices;
 using MediaBrowser.Server.Startup.Common.IO;
-using MediaBrowser.Server.Startup.Common.Notifications;
-using MediaBrowser.Server.Startup.Common.Persistence;
 using MediaBrowser.Server.Startup.Common.Security;
-using MediaBrowser.Server.Startup.Common.Social;
-using MediaBrowser.Server.Startup.Common.Sync;
 using OpenSubtitlesHandler;
 using ServiceStack;
 using SocketHttpListener.Primitives;
diff --git a/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegLoader.cs b/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegLoader.cs
index e40dfe45f8..08e6b435b5 100644
--- a/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegLoader.cs
+++ b/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegLoader.cs
@@ -10,6 +10,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Emby.Server.Core;
+using Emby.Server.Core.FFMpeg;
 
 namespace MediaBrowser.Server.Startup.Common.FFMpeg
 {
diff --git a/MediaBrowser.Server.Startup.Common/INativeApp.cs b/MediaBrowser.Server.Startup.Common/INativeApp.cs
index 4dd6ecfe1b..182afbf003 100644
--- a/MediaBrowser.Server.Startup.Common/INativeApp.cs
+++ b/MediaBrowser.Server.Startup.Common/INativeApp.cs
@@ -3,8 +3,8 @@ using MediaBrowser.Model.Logging;
 using System.Collections.Generic;
 using System.Reflection;
 using Emby.Server.Core;
-using MediaBrowser.Server.Startup.Common.FFMpeg;
-using MediaBrowser.Server.Startup.Common.Persistence;
+using Emby.Server.Core.Data;
+using Emby.Server.Core.FFMpeg;
 
 namespace MediaBrowser.Server.Startup.Common
 {
diff --git a/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj b/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj
index 6196a74a2b..79c1356de3 100644
--- a/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj
+++ b/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj
@@ -93,14 +93,27 @@
     <Compile Include="..\SharedVersion.cs">
       <Link>Properties\SharedVersion.cs</Link>
     </Compile>
-    <Compile Include="Activity\ActivityRepository.cs" />
     <Compile Include="ApplicationHost.cs" />
     <Compile Include="ApplicationPathHelper.cs" />
-    <Compile Include="Devices\DeviceRepository.cs" />
-    <Compile Include="EntryPoints\ExternalPortForwarding.cs" />
+    <Compile Include="Cryptography\ASN1.cs" />
+    <Compile Include="Cryptography\ASN1Convert.cs" />
+    <Compile Include="Cryptography\BitConverterLE.cs" />
+    <Compile Include="Cryptography\CertificateGenerator.cs" />
+    <Compile Include="Cryptography\CryptoConvert.cs" />
+    <Compile Include="Cryptography\PfxGenerator.cs" />
+    <Compile Include="Cryptography\PKCS1.cs" />
+    <Compile Include="Cryptography\PKCS12.cs" />
+    <Compile Include="Cryptography\PKCS7.cs" />
+    <Compile Include="Cryptography\PKCS8.cs" />
+    <Compile Include="Cryptography\X501Name.cs" />
+    <Compile Include="Cryptography\X509Builder.cs" />
+    <Compile Include="Cryptography\X509Certificate.cs" />
+    <Compile Include="Cryptography\X509CertificateBuilder.cs" />
+    <Compile Include="Cryptography\X509CertificateCollection.cs" />
+    <Compile Include="Cryptography\X509Extension.cs" />
+    <Compile Include="Cryptography\X509Extensions.cs" />
+    <Compile Include="Cryptography\X520Attributes.cs" />
     <Compile Include="FFMpeg\FFMpegLoader.cs" />
-    <Compile Include="FFMpeg\FFMpegInstallInfo.cs" />
-    <Compile Include="FFMpeg\FFMpegInfo.cs" />
     <Compile Include="HttpServerFactory.cs" />
     <Compile Include="INativeApp.cs" />
     <Compile Include="IO\LibraryMonitor.cs" />
@@ -128,44 +141,10 @@
     <Compile Include="LiveTv\TunerHosts\SatIp\TransmissionMode.cs" />
     <Compile Include="LiveTv\TunerHosts\SatIp\Utils.cs" />
     <Compile Include="MbLinkShortcutHandler.cs" />
-    <Compile Include="Migrations\IVersionMigration.cs" />
-    <Compile Include="Migrations\DbMigration.cs" />
-    <Compile Include="Migrations\UpdateLevelMigration.cs" />
     <Compile Include="NativeEnvironment.cs" />
-    <Compile Include="Notifications\SqliteNotificationsRepository.cs" />
-    <Compile Include="Persistence\BaseSqliteRepository.cs" />
-    <Compile Include="Persistence\DataExtensions.cs" />
-    <Compile Include="Persistence\IDbConnector.cs" />
-    <Compile Include="Persistence\MediaStreamColumns.cs" />
-    <Compile Include="Persistence\SqliteDisplayPreferencesRepository.cs" />
-    <Compile Include="Persistence\SqliteFileOrganizationRepository.cs" />
-    <Compile Include="Persistence\SqliteItemRepository.cs" />
-    <Compile Include="Persistence\SqliteUserDataRepository.cs" />
-    <Compile Include="Persistence\SqliteUserRepository.cs" />
-    <Compile Include="Persistence\TypeMapper.cs" />
     <Compile Include="Security\AuthenticationRepository.cs" />
-    <Compile Include="Cryptography\CertificateGenerator.cs" />
     <Compile Include="Networking\NetworkManager.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Cryptography\ASN1.cs" />
-    <Compile Include="Cryptography\ASN1Convert.cs" />
-    <Compile Include="Cryptography\BitConverterLE.cs" />
-    <Compile Include="Cryptography\CryptoConvert.cs" />
-    <Compile Include="Cryptography\PfxGenerator.cs" />
-    <Compile Include="Cryptography\PKCS1.cs" />
-    <Compile Include="Cryptography\PKCS12.cs" />
-    <Compile Include="Cryptography\PKCS7.cs" />
-    <Compile Include="Cryptography\PKCS8.cs" />
-    <Compile Include="Cryptography\X501Name.cs" />
-    <Compile Include="Cryptography\X509Builder.cs" />
-    <Compile Include="Cryptography\X509Certificate.cs" />
-    <Compile Include="Cryptography\X509CertificateBuilder.cs" />
-    <Compile Include="Cryptography\X509CertificateCollection.cs" />
-    <Compile Include="Cryptography\X509Extension.cs" />
-    <Compile Include="Cryptography\X509Extensions.cs" />
-    <Compile Include="Cryptography\X520Attributes.cs" />
-    <Compile Include="Social\SharingRepository.cs" />
-    <Compile Include="Sync\SyncRepository.cs" />
     <Compile Include="SystemEvents.cs" />
     <Compile Include="TextLocalizer.cs" />
   </ItemGroup>
@@ -408,6 +387,9 @@
     <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3594.ini" />
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Persistence\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/MediaBrowser.Server.Startup.Common/Persistence/SqliteExtensions.cs b/MediaBrowser.Server.Startup.Common/Persistence/SqliteExtensions.cs
index b99fbb5d13..72ecfc1bf5 100644
--- a/MediaBrowser.Server.Startup.Common/Persistence/SqliteExtensions.cs
+++ b/MediaBrowser.Server.Startup.Common/Persistence/SqliteExtensions.cs
@@ -4,7 +4,7 @@ using System.Data.SQLite;
 using System.Threading.Tasks;
 using MediaBrowser.Model.Logging;
 
-namespace MediaBrowser.Server.Startup.Common.Persistence
+namespace Emby.Server.Core.Data
 {
     /// <summary>
     /// Class SQLiteExtensions
diff --git a/MediaBrowser.Server.Startup.Common/Security/AuthenticationRepository.cs b/MediaBrowser.Server.Startup.Common/Security/AuthenticationRepository.cs
index 1cad1b1225..0cf9f0879a 100644
--- a/MediaBrowser.Server.Startup.Common/Security/AuthenticationRepository.cs
+++ b/MediaBrowser.Server.Startup.Common/Security/AuthenticationRepository.cs
@@ -5,11 +5,11 @@ using System.Globalization;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using Emby.Server.Core.Data;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Security;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Querying;
-using MediaBrowser.Server.Startup.Common.Persistence;
 
 namespace MediaBrowser.Server.Startup.Common.Security
 {
diff --git a/MediaBrowser.ServerApplication/MainStartup.cs b/MediaBrowser.ServerApplication/MainStartup.cs
index 01657868d2..2d97cbdf7a 100644
--- a/MediaBrowser.ServerApplication/MainStartup.cs
+++ b/MediaBrowser.ServerApplication/MainStartup.cs
@@ -1,7 +1,6 @@
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Server.Implementations;
 using MediaBrowser.Server.Startup.Common;
-using MediaBrowser.Server.Startup.Common.Browser;
 using MediaBrowser.ServerApplication.Native;
 using MediaBrowser.ServerApplication.Splash;
 using MediaBrowser.ServerApplication.Updates;
@@ -21,6 +20,7 @@ using System.Windows.Forms;
 using Emby.Common.Implementations.IO;
 using Emby.Common.Implementations.Logging;
 using Emby.Server.Core;
+using Emby.Server.Core.Browser;
 using ImageMagickSharp;
 using MediaBrowser.Common.Net;
 
diff --git a/MediaBrowser.ServerApplication/Native/DbConnector.cs b/MediaBrowser.ServerApplication/Native/DbConnector.cs
index 99c5225c09..986bc1850e 100644
--- a/MediaBrowser.ServerApplication/Native/DbConnector.cs
+++ b/MediaBrowser.ServerApplication/Native/DbConnector.cs
@@ -1,7 +1,7 @@
 using System.Data;
 using System.Threading.Tasks;
+using Emby.Server.Core.Data;
 using MediaBrowser.Model.Logging;
-using MediaBrowser.Server.Startup.Common.Persistence;
 
 namespace MediaBrowser.ServerApplication.Native
 {
diff --git a/MediaBrowser.ServerApplication/Native/WindowsApp.cs b/MediaBrowser.ServerApplication/Native/WindowsApp.cs
index 82d4489941..8424bf5746 100644
--- a/MediaBrowser.ServerApplication/Native/WindowsApp.cs
+++ b/MediaBrowser.ServerApplication/Native/WindowsApp.cs
@@ -9,11 +9,12 @@ using System.IO;
 using System.Reflection;
 using System.Windows.Forms;
 using Emby.Server.Core;
+using Emby.Server.Core.Data;
+using Emby.Server.Core.FFMpeg;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.System;
-using MediaBrowser.Server.Startup.Common.Persistence;
 using MediaBrowser.Server.Startup.Common.FFMpeg;
 using OperatingSystem = MediaBrowser.Server.Startup.Common.OperatingSystem;
 
diff --git a/MediaBrowser.ServerApplication/ServerNotifyIcon.cs b/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
index bbf2b785c7..139961e6f3 100644
--- a/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
+++ b/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
@@ -1,10 +1,10 @@
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Model.Logging;
-using MediaBrowser.Server.Startup.Common.Browser;
 using System;
 using System.ComponentModel;
 using System.Windows.Forms;
+using Emby.Server.Core.Browser;
 using MediaBrowser.Model.Globalization;
 
 namespace MediaBrowser.ServerApplication