246 files changed, 396 insertions, 410 deletions

diff --git a/MediaBrowser.Server.Implementations/Archiving/ZipClient.cs b/Emby.Common.Implementations/Archiving/ZipClient.cs
index 29b922436..791c6678c 100644
--- a/MediaBrowser.Server.Implementations/Archiving/ZipClient.cs
+++ b/Emby.Common.Implementations/Archiving/ZipClient.cs
@@ -1,13 +1,13 @@
 using System.IO;
 using MediaBrowser.Model.IO;
-using SharpCompress.Archive.Rar;
-using SharpCompress.Archive.SevenZip;
-using SharpCompress.Archive.Tar;
+using SharpCompress.Archives.Rar;
+using SharpCompress.Archives.SevenZip;
+using SharpCompress.Archives.Tar;
 using SharpCompress.Common;
-using SharpCompress.Reader;
-using SharpCompress.Reader.Zip;
+using SharpCompress.Readers;
+using SharpCompress.Readers.Zip;
 
-namespace MediaBrowser.Server.Implementations.Archiving
+namespace Emby.Common.Implementations.Archiving
 {
     /// <summary>
     /// Class DotNetZipClient
@@ -45,11 +45,12 @@ namespace MediaBrowser.Server.Implementations.Archiving
         {
             using (var reader = ReaderFactory.Open(source))
             {
-                var options = ExtractOptions.ExtractFullPath;
+                var options = new ExtractionOptions();
+                options.ExtractFullPath = true;
 
                 if (overwriteExistingFiles)
                 {
-                    options = options | ExtractOptions.Overwrite;
+                    options.Overwrite = true;
                 }
 
                 reader.WriteAllToDirectory(targetPath, options);
@@ -60,11 +61,12 @@ namespace MediaBrowser.Server.Implementations.Archiving
         {
             using (var reader = ZipReader.Open(source))
             {
-                var options = ExtractOptions.ExtractFullPath;
+                var options = new ExtractionOptions();
+                options.ExtractFullPath = true;
 
                 if (overwriteExistingFiles)
                 {
-                    options = options | ExtractOptions.Overwrite;
+                    options.Overwrite = true;
                 }
 
                 reader.WriteAllToDirectory(targetPath, options);
@@ -97,11 +99,12 @@ namespace MediaBrowser.Server.Implementations.Archiving
             {
                 using (var reader = archive.ExtractAllEntries())
                 {
-                    var options = ExtractOptions.ExtractFullPath;
+                    var options = new ExtractionOptions();
+                    options.ExtractFullPath = true;
 
                     if (overwriteExistingFiles)
                     {
-                        options = options | ExtractOptions.Overwrite;
+                        options.Overwrite = true;
                     }
 
                     reader.WriteAllToDirectory(targetPath, options);
@@ -136,11 +139,12 @@ namespace MediaBrowser.Server.Implementations.Archiving
             {
                 using (var reader = archive.ExtractAllEntries())
                 {
-                    var options = ExtractOptions.ExtractFullPath;
+                    var options = new ExtractionOptions();
+                    options.ExtractFullPath = true;
 
                     if (overwriteExistingFiles)
                     {
-                        options = options | ExtractOptions.Overwrite;
+                        options.Overwrite = true;
                     }
 
                     reader.WriteAllToDirectory(targetPath, options);
@@ -174,11 +178,12 @@ namespace MediaBrowser.Server.Implementations.Archiving
             {
                 using (var reader = archive.ExtractAllEntries())
                 {
-                    var options = ExtractOptions.ExtractFullPath;
+                    var options = new ExtractionOptions();
+                    options.ExtractFullPath = true;
 
                     if (overwriteExistingFiles)
                     {
-                        options = options | ExtractOptions.Overwrite;
+                        options.Overwrite = true;
                     }
 
                     reader.WriteAllToDirectory(targetPath, options);
diff --git a/Emby.Common.Implementations/project.json b/Emby.Common.Implementations/project.json
index dd304606b..b0a35bdf3 100644
--- a/Emby.Common.Implementations/project.json
+++ b/Emby.Common.Implementations/project.json
@@ -25,6 +25,7 @@
         "SimpleInjector": "3.2.4",
         "ServiceStack.Text": "4.5.4",
         "NLog": "4.4.0-betaV15",
+        "sharpcompress": "0.14.0",
         "MediaBrowser.Model": {
           "target": "project"
         },
@@ -55,6 +56,7 @@
         "SimpleInjector": "3.2.4",
         "ServiceStack.Text.Core": "1.0.27",
         "NLog": "4.4.0-betaV15",
+        "sharpcompress": "0.14.0",
         "MediaBrowser.Model": {
           "target": "project"
         },
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index ccdecbf7b..cb15eca52 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -173,7 +173,6 @@
     <Compile Include="Notifications\WebSocketNotifier.cs" />
     <Compile Include="Persistence\CleanDatabaseScheduledTask.cs" />
     <Compile Include="Photos\PhotoAlbumImageProvider.cs" />
-    <Compile Include="Playlists\ManualPlaylistsFolder.cs" />
     <Compile Include="Playlists\PlaylistImageProvider.cs" />
     <Compile Include="Playlists\PlaylistManager.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 8d5697c49..7393e8006 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -42,22 +42,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="INIFileParser, Version=2.3.0.0, Culture=neutral, PublicKeyToken=79af7b307b65cf3c, processorArchitecture=MSIL">
-      <HintPath>..\packages\ini-parser.2.3.0\lib\net20\INIFileParser.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.IO.RecyclableMemoryStream, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.IO.RecyclableMemoryStream.1.1.0.0\lib\net45\Microsoft.IO.RecyclableMemoryStream.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Mono.Nat, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\ThirdParty\emby\Mono.Nat.dll</HintPath>
-    </Reference>
-    <Reference Include="SharpCompress, Version=0.10.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\ThirdParty\SharpCompress\SharpCompress.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="Microsoft.CSharp" />
@@ -71,51 +55,10 @@
     <Compile Include="..\SharedVersion.cs">
       <Link>Properties\SharedVersion.cs</Link>
     </Compile>
-    <Compile Include="Activity\ActivityRepository.cs" />
-    <Compile Include="Archiving\ZipClient.cs" />
     <Compile Include="Collections\CollectionsDynamicFolder.cs" />
-    <Compile Include="Devices\DeviceRepository.cs" />
     <Compile Include="Devices\CameraUploadsFolder.cs" />
-    <Compile Include="EntryPoints\ExternalPortForwarding.cs" />
-    <Compile Include="IO\LibraryMonitor.cs" />
-    <Compile Include="IO\MemoryStreamProvider.cs" />
-    <Compile Include="LiveTv\TunerHosts\SatIp\ChannelScan.cs" />
-    <Compile Include="LiveTv\TunerHosts\SatIp\Rtcp\ReportBlock.cs" />
-    <Compile Include="LiveTv\TunerHosts\SatIp\Rtcp\RtcpAppPacket.cs" />
-    <Compile Include="LiveTv\TunerHosts\SatIp\Rtcp\RtcpByePacket.cs" />
-    <Compile Include="LiveTv\TunerHosts\SatIp\Rtcp\RtcpListener.cs" />
-    <Compile Include="LiveTv\TunerHosts\SatIp\Rtcp\RtcpPacket.cs" />
-    <Compile Include="LiveTv\TunerHosts\SatIp\Rtcp\RtcpReceiverReportPacket.cs" />
-    <Compile Include="LiveTv\TunerHosts\SatIp\Rtcp\RtcpSenderReportPacket.cs" />
-    <Compile Include="LiveTv\TunerHosts\SatIp\Rtcp\RtcpSourceDescriptionPacket.cs" />
-    <Compile Include="LiveTv\TunerHosts\SatIp\Rtcp\SourceDescriptionBlock.cs" />
-    <Compile Include="LiveTv\TunerHosts\SatIp\Rtcp\SourceDescriptionItem.cs" />
-    <Compile Include="LiveTv\TunerHosts\SatIp\Rtp\RtpListener.cs" />
-    <Compile Include="LiveTv\TunerHosts\SatIp\Rtp\RtpPacket.cs" />
-    <Compile Include="LiveTv\TunerHosts\SatIp\Rtsp\RtspMethod.cs" />
-    <Compile Include="LiveTv\TunerHosts\SatIp\Rtsp\RtspRequest.cs" />
-    <Compile Include="LiveTv\TunerHosts\SatIp\Rtsp\RtspResponse.cs" />
-    <Compile Include="LiveTv\TunerHosts\SatIp\Rtsp\RtspSession.cs" />
-    <Compile Include="LiveTv\TunerHosts\SatIp\Rtsp\RtspStatusCode.cs" />
-    <Compile Include="LiveTv\TunerHosts\SatIp\SatIpDiscovery.cs" />
-    <Compile Include="LiveTv\TunerHosts\SatIp\SatIpHost.cs" />
-    <Compile Include="LiveTv\TunerHosts\SatIp\TransmissionMode.cs" />
-    <Compile Include="LiveTv\TunerHosts\SatIp\Utils.cs" />
-    <Compile Include="Persistence\BaseSqliteRepository.cs" />
-    <Compile Include="Persistence\DataExtensions.cs" />
-    <Compile Include="Persistence\IDbConnector.cs" />
-    <Compile Include="Persistence\MediaStreamColumns.cs" />
-    <Compile Include="Social\SharingRepository.cs" />
-    <Compile Include="Persistence\SqliteFileOrganizationRepository.cs" />
-    <Compile Include="Notifications\SqliteNotificationsRepository.cs" />
-    <Compile Include="Persistence\TypeMapper.cs" />
+    <Compile Include="Playlists\ManualPlaylistsFolder.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Security\AuthenticationRepository.cs" />
-    <Compile Include="Persistence\SqliteDisplayPreferencesRepository.cs" />
-    <Compile Include="Persistence\SqliteItemRepository.cs" />
-    <Compile Include="Persistence\SqliteUserDataRepository.cs" />
-    <Compile Include="Persistence\SqliteUserRepository.cs" />
-    <Compile Include="Sync\SyncRepository.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Emby.Server.Implementations\Emby.Server.Implementations.csproj">
@@ -137,176 +80,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0030.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0049.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0070.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0090.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0100.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0130.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0160.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0170.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0192.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0200.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0215.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0235.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0255.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0260.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0282.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0305.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0308.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0310.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0315.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0330.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0360.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0380.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0390.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0400.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0420.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0435.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0450.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0460.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0475.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0480.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0490.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0505.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0510.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0520.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0525.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0530.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0549.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0560.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0570.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0600.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0620.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0642.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0650.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0660.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0685.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0705.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0721.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0740.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0750.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0765.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0785.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0830.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0851.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0865.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0875.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0880.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0900.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0915.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0922.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0935.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0950.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0965.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1005.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1030.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1055.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1082.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1100.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1105.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1130.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1155.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1160.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1180.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1195.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1222.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1240.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1250.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1280.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1320.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1340.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1380.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1400.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1440.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1500.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1520.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1540.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1560.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1590.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1600 OPTUS D1 FTA %28160.0E%29.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1600.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1620.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1640.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1660.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1690.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1720.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1800.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1830.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2210.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2230.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2250.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2270.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2290.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2310.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2330.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2350.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2370.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2390.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2410.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2432.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2451.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2470.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2489.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2500.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2527.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2550.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2570.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2590.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2608.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2630.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2650.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2669.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2690.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2710.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2728.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2730.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2750.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2760.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2770.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2780.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2812.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2820.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2830.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2850.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2873.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2880.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2881.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2882.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2900.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2930.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2950.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2970.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2985.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2990.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3020.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3045.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3070.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3100.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3125.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3150.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3169.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3195.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3225.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3255.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3285.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3300.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3325.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3355.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3380.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3400.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3420.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3450.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3460.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3475.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3490.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3520.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3527.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3550.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3560.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3592.ini" />
-    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3594.ini" />
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/Emby.Server.Implementations/Playlists/ManualPlaylistsFolder.cs b/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
index 8e65ccaf7..9ea161256 100644
--- a/Emby.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
+++ b/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
@@ -8,7 +8,7 @@ using MediaBrowser.Controller.Playlists;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Querying;
 
-namespace Emby.Server.Implementations.Playlists
+namespace MediaBrowser.Server.Implementations.Playlists
 {
     public class PlaylistsFolder : BasePluginFolder
     {
diff --git a/MediaBrowser.Server.Implementations/packages.config b/MediaBrowser.Server.Implementations/packages.config
deleted file mode 100644
index c224c3d38..000000000
--- a/MediaBrowser.Server.Implementations/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<packages>

-  <package id="ini-parser" version="2.3.0" targetFramework="net45" />

-  <package id="Microsoft.IO.RecyclableMemoryStream" version="1.1.0.0" targetFramework="net46" />

-</packages>
\ No newline at end of file
diff --git a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
index c7de9a62b..c784f1bb3 100644
--- a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
+++ b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
@@ -92,7 +92,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\MediaBrowser.Server.Implementations\Persistence\SqliteExtensions.cs">
+    <Compile Include="..\MediaBrowser.Server.Startup.Common\Persistence\SqliteExtensions.cs">
       <Link>Native\SqliteExtensions.cs</Link>
     </Compile>
     <Compile Include="..\SharedVersion.cs">
diff --git a/MediaBrowser.Server.Mono/Native/DbConnector.cs b/MediaBrowser.Server.Mono/Native/DbConnector.cs
index 39b53b370..b53aecc78 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 MediaBrowser.Model.Logging;
-using MediaBrowser.Server.Implementations.Persistence;
+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 bc4a9978e..a36475815 100644
--- a/MediaBrowser.Server.Mono/Native/MonoApp.cs
+++ b/MediaBrowser.Server.Mono/Native/MonoApp.cs
@@ -8,7 +8,7 @@ using System.Collections.Generic;
 using System.Reflection;
 using System.Text.RegularExpressions;
 using MediaBrowser.Model.System;
-using MediaBrowser.Server.Implementations.Persistence;
+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.Implementations/Activity/ActivityRepository.cs b/MediaBrowser.Server.Startup.Common/Activity/ActivityRepository.cs
index f3c52088b..128aff591 100644
--- a/MediaBrowser.Server.Implementations/Activity/ActivityRepository.cs
+++ b/MediaBrowser.Server.Startup.Common/Activity/ActivityRepository.cs
@@ -1,16 +1,16 @@
-using MediaBrowser.Controller;
-using MediaBrowser.Model.Activity;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Querying;
-using MediaBrowser.Server.Implementations.Persistence;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Globalization;
 using System.IO;
 using System.Threading.Tasks;
+using MediaBrowser.Controller;
+using MediaBrowser.Model.Activity;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Querying;
+using MediaBrowser.Server.Startup.Common.Persistence;
 
-namespace MediaBrowser.Server.Implementations.Activity
+namespace MediaBrowser.Server.Startup.Common.Activity
 {
     public class ActivityRepository : BaseSqliteRepository, IActivityRepository
     {
diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
index b14378eb8..5cadd99c4 100644
--- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
+++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
@@ -49,14 +49,7 @@ using MediaBrowser.Providers.Chapters;
 using MediaBrowser.Providers.Manager;
 using MediaBrowser.Providers.Subtitles;
 using MediaBrowser.Server.Implementations;
-using MediaBrowser.Server.Implementations.Activity;
 using MediaBrowser.Server.Implementations.Devices;
-using MediaBrowser.Server.Implementations.IO;
-using MediaBrowser.Server.Implementations.Notifications;
-using MediaBrowser.Server.Implementations.Persistence;
-using MediaBrowser.Server.Implementations.Security;
-using MediaBrowser.Server.Implementations.Social;
-using MediaBrowser.Server.Implementations.Sync;
 using MediaBrowser.Server.Startup.Common.FFMpeg;
 using MediaBrowser.Server.Startup.Common.Migrations;
 using MediaBrowser.WebDashboard.Api;
@@ -74,6 +67,7 @@ using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Threading.Tasks;
 using Emby.Common.Implementations;
+using Emby.Common.Implementations.Archiving;
 using Emby.Common.Implementations.Networking;
 using Emby.Common.Implementations.Reflection;
 using Emby.Common.Implementations.Serialization;
@@ -131,8 +125,15 @@ using MediaBrowser.Model.Services;
 using MediaBrowser.Model.Social;
 using MediaBrowser.Model.Text;
 using MediaBrowser.Model.Xml;
-using MediaBrowser.Server.Implementations.Archiving;
+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/Security/ASN1.cs b/MediaBrowser.Server.Startup.Common/Cryptography/ASN1.cs
index a25c27073..a25c27073 100644
--- a/MediaBrowser.Server.Startup.Common/Security/ASN1.cs
+++ b/MediaBrowser.Server.Startup.Common/Cryptography/ASN1.cs
diff --git a/MediaBrowser.Server.Startup.Common/Security/ASN1Convert.cs b/MediaBrowser.Server.Startup.Common/Cryptography/ASN1Convert.cs
index 8a2a487c8..8a2a487c8 100644
--- a/MediaBrowser.Server.Startup.Common/Security/ASN1Convert.cs
+++ b/MediaBrowser.Server.Startup.Common/Cryptography/ASN1Convert.cs
diff --git a/MediaBrowser.Server.Startup.Common/Security/BitConverterLE.cs b/MediaBrowser.Server.Startup.Common/Cryptography/BitConverterLE.cs
index 240c958a3..240c958a3 100644
--- a/MediaBrowser.Server.Startup.Common/Security/BitConverterLE.cs
+++ b/MediaBrowser.Server.Startup.Common/Cryptography/BitConverterLE.cs
diff --git a/MediaBrowser.Server.Startup.Common/Security/CertificateGenerator.cs b/MediaBrowser.Server.Startup.Common/Cryptography/CertificateGenerator.cs
index f36b14cae..f36b14cae 100644
--- a/MediaBrowser.Server.Startup.Common/Security/CertificateGenerator.cs
+++ b/MediaBrowser.Server.Startup.Common/Cryptography/CertificateGenerator.cs
diff --git a/MediaBrowser.Server.Startup.Common/Security/CryptoConvert.cs b/MediaBrowser.Server.Startup.Common/Cryptography/CryptoConvert.cs
index c6e466534..c6e466534 100644
--- a/MediaBrowser.Server.Startup.Common/Security/CryptoConvert.cs
+++ b/MediaBrowser.Server.Startup.Common/Cryptography/CryptoConvert.cs
diff --git a/MediaBrowser.Server.Startup.Common/Security/PKCS1.cs b/MediaBrowser.Server.Startup.Common/Cryptography/PKCS1.cs
index 85bf9db38..85bf9db38 100644
--- a/MediaBrowser.Server.Startup.Common/Security/PKCS1.cs
+++ b/MediaBrowser.Server.Startup.Common/Cryptography/PKCS1.cs
diff --git a/MediaBrowser.Server.Startup.Common/Security/PKCS12.cs b/MediaBrowser.Server.Startup.Common/Cryptography/PKCS12.cs
index 2205a7160..2205a7160 100644
--- a/MediaBrowser.Server.Startup.Common/Security/PKCS12.cs
+++ b/MediaBrowser.Server.Startup.Common/Cryptography/PKCS12.cs
diff --git a/MediaBrowser.Server.Startup.Common/Security/PKCS7.cs b/MediaBrowser.Server.Startup.Common/Cryptography/PKCS7.cs
index 1b1a3295b..1b1a3295b 100644
--- a/MediaBrowser.Server.Startup.Common/Security/PKCS7.cs
+++ b/MediaBrowser.Server.Startup.Common/Cryptography/PKCS7.cs
diff --git a/MediaBrowser.Server.Startup.Common/Security/PKCS8.cs b/MediaBrowser.Server.Startup.Common/Cryptography/PKCS8.cs
index b58ebdaf9..b58ebdaf9 100644
--- a/MediaBrowser.Server.Startup.Common/Security/PKCS8.cs
+++ b/MediaBrowser.Server.Startup.Common/Cryptography/PKCS8.cs
diff --git a/MediaBrowser.Server.Startup.Common/Security/PfxGenerator.cs b/MediaBrowser.Server.Startup.Common/Cryptography/PfxGenerator.cs
index 3f9b90ac1..3f9b90ac1 100644
--- a/MediaBrowser.Server.Startup.Common/Security/PfxGenerator.cs
+++ b/MediaBrowser.Server.Startup.Common/Cryptography/PfxGenerator.cs
diff --git a/MediaBrowser.Server.Startup.Common/Security/X501Name.cs b/MediaBrowser.Server.Startup.Common/Cryptography/X501Name.cs
index 93e1a6bef..93e1a6bef 100644
--- a/MediaBrowser.Server.Startup.Common/Security/X501Name.cs
+++ b/MediaBrowser.Server.Startup.Common/Cryptography/X501Name.cs
diff --git a/MediaBrowser.Server.Startup.Common/Security/X509Builder.cs b/MediaBrowser.Server.Startup.Common/Cryptography/X509Builder.cs
index e16855959..e16855959 100644
--- a/MediaBrowser.Server.Startup.Common/Security/X509Builder.cs
+++ b/MediaBrowser.Server.Startup.Common/Cryptography/X509Builder.cs
diff --git a/MediaBrowser.Server.Startup.Common/Security/X509Certificate.cs b/MediaBrowser.Server.Startup.Common/Cryptography/X509Certificate.cs
index f49445f0e..f49445f0e 100644
--- a/MediaBrowser.Server.Startup.Common/Security/X509Certificate.cs
+++ b/MediaBrowser.Server.Startup.Common/Cryptography/X509Certificate.cs
diff --git a/MediaBrowser.Server.Startup.Common/Security/X509CertificateBuilder.cs b/MediaBrowser.Server.Startup.Common/Cryptography/X509CertificateBuilder.cs
index fb6f8ec72..fb6f8ec72 100644
--- a/MediaBrowser.Server.Startup.Common/Security/X509CertificateBuilder.cs
+++ b/MediaBrowser.Server.Startup.Common/Cryptography/X509CertificateBuilder.cs
diff --git a/MediaBrowser.Server.Startup.Common/Security/X509CertificateCollection.cs b/MediaBrowser.Server.Startup.Common/Cryptography/X509CertificateCollection.cs
index 5d353f9cf..5d353f9cf 100644
--- a/MediaBrowser.Server.Startup.Common/Security/X509CertificateCollection.cs
+++ b/MediaBrowser.Server.Startup.Common/Cryptography/X509CertificateCollection.cs
diff --git a/MediaBrowser.Server.Startup.Common/Security/X509Extension.cs b/MediaBrowser.Server.Startup.Common/Cryptography/X509Extension.cs
index e82f52bac..e82f52bac 100644
--- a/MediaBrowser.Server.Startup.Common/Security/X509Extension.cs
+++ b/MediaBrowser.Server.Startup.Common/Cryptography/X509Extension.cs
diff --git a/MediaBrowser.Server.Startup.Common/Security/X509Extensions.cs b/MediaBrowser.Server.Startup.Common/Cryptography/X509Extensions.cs
index c7d5f0046..c7d5f0046 100644
--- a/MediaBrowser.Server.Startup.Common/Security/X509Extensions.cs
+++ b/MediaBrowser.Server.Startup.Common/Cryptography/X509Extensions.cs
diff --git a/MediaBrowser.Server.Startup.Common/Security/X520Attributes.cs b/MediaBrowser.Server.Startup.Common/Cryptography/X520Attributes.cs
index 5062bf80a..5062bf80a 100644
--- a/MediaBrowser.Server.Startup.Common/Security/X520Attributes.cs
+++ b/MediaBrowser.Server.Startup.Common/Cryptography/X520Attributes.cs
diff --git a/MediaBrowser.Server.Implementations/Devices/DeviceRepository.cs b/MediaBrowser.Server.Startup.Common/Devices/DeviceRepository.cs
index 05e3b68f1..633faeef9 100644
--- a/MediaBrowser.Server.Implementations/Devices/DeviceRepository.cs
+++ b/MediaBrowser.Server.Startup.Common/Devices/DeviceRepository.cs
@@ -1,20 +1,18 @@
-using MediaBrowser.Common.Configuration;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Devices;
 using MediaBrowser.Model.Devices;
+using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Session;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using MediaBrowser.Common.IO;
-using MediaBrowser.Controller.IO;
-using MediaBrowser.Model.IO;
 
-namespace MediaBrowser.Server.Implementations.Devices
+namespace MediaBrowser.Server.Startup.Common.Devices
 {
     public class DeviceRepository : IDeviceRepository
     {
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs b/MediaBrowser.Server.Startup.Common/EntryPoints/ExternalPortForwarding.cs
index dcfa27cc0..03e26ee86 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
+++ b/MediaBrowser.Server.Startup.Common/EntryPoints/ExternalPortForwarding.cs
@@ -1,19 +1,18 @@
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Dlna;
-using MediaBrowser.Controller.Plugins;
-using MediaBrowser.Model.Logging;
-using Mono.Nat;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Net;
 using MediaBrowser.Common.Net;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Events;
+using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Threading;
+using Mono.Nat;
 
-namespace MediaBrowser.Server.Implementations.EntryPoints
+namespace MediaBrowser.Server.Startup.Common.EntryPoints
 {
     public class ExternalPortForwarding : IServerEntryPoint
     {
diff --git a/MediaBrowser.Server.Startup.Common/INativeApp.cs b/MediaBrowser.Server.Startup.Common/INativeApp.cs
index df29dfde4..ca0e9d21e 100644
--- a/MediaBrowser.Server.Startup.Common/INativeApp.cs
+++ b/MediaBrowser.Server.Startup.Common/INativeApp.cs
@@ -2,8 +2,8 @@
 using MediaBrowser.Model.Logging;
 using System.Collections.Generic;
 using System.Reflection;
-using MediaBrowser.Server.Implementations.Persistence;
 using MediaBrowser.Server.Startup.Common.FFMpeg;
+using MediaBrowser.Server.Startup.Common.Persistence;
 
 namespace MediaBrowser.Server.Startup.Common
 {
diff --git a/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs b/MediaBrowser.Server.Startup.Common/IO/LibraryMonitor.cs
index a8363558d..153df6026 100644
--- a/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs
+++ b/MediaBrowser.Server.Startup.Common/IO/LibraryMonitor.cs
@@ -1,25 +1,21 @@
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Plugins;
-using MediaBrowser.Model.Configuration;
-using MediaBrowser.Model.Logging;
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Emby.Server.Implementations.IO;
-using MediaBrowser.Common.IO;
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Model.IO;
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.IO;
+using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.System;
 using MediaBrowser.Model.Tasks;
 using MediaBrowser.Model.Threading;
 
-namespace MediaBrowser.Server.Implementations.IO
+namespace MediaBrowser.Server.Startup.Common.IO
 {
     public class LibraryMonitor : ILibraryMonitor
     {
diff --git a/MediaBrowser.Server.Implementations/IO/MemoryStreamProvider.cs b/MediaBrowser.Server.Startup.Common/IO/MemoryStreamProvider.cs
index cb62ffa98..3ca0f4db5 100644
--- a/MediaBrowser.Server.Implementations/IO/MemoryStreamProvider.cs
+++ b/MediaBrowser.Server.Startup.Common/IO/MemoryStreamProvider.cs
@@ -2,7 +2,7 @@
 using MediaBrowser.Model.IO;
 using Microsoft.IO;
 
-namespace MediaBrowser.Server.Implementations.IO
+namespace MediaBrowser.Server.Startup.Common.IO
 {
     public class RecyclableMemoryStreamProvider : IMemoryStreamFactory
     {
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ChannelScan.cs b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ChannelScan.cs
index fdeae25b0..fdeae25b0 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ChannelScan.cs
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ChannelScan.cs
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtcp/ReportBlock.cs b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtcp/ReportBlock.cs
index dddd77179..dddd77179 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtcp/ReportBlock.cs
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtcp/ReportBlock.cs
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtcp/RtcpAppPacket.cs b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtcp/RtcpAppPacket.cs
index 990b6dd94..990b6dd94 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtcp/RtcpAppPacket.cs
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtcp/RtcpAppPacket.cs
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtcp/RtcpByePacket.cs b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtcp/RtcpByePacket.cs
index c79ea31a8..c79ea31a8 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtcp/RtcpByePacket.cs
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtcp/RtcpByePacket.cs
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtcp/RtcpListener.cs b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtcp/RtcpListener.cs
index 2c54f0665..2c54f0665 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtcp/RtcpListener.cs
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtcp/RtcpListener.cs
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtcp/RtcpPacket.cs b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtcp/RtcpPacket.cs
index 0a949eb7e..0a949eb7e 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtcp/RtcpPacket.cs
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtcp/RtcpPacket.cs
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtcp/RtcpReceiverReportPacket.cs b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtcp/RtcpReceiverReportPacket.cs
index abb863652..abb863652 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtcp/RtcpReceiverReportPacket.cs
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtcp/RtcpReceiverReportPacket.cs
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtcp/RtcpSenderReportPacket.cs b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtcp/RtcpSenderReportPacket.cs
index dda5d6a03..dda5d6a03 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtcp/RtcpSenderReportPacket.cs
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtcp/RtcpSenderReportPacket.cs
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtcp/RtcpSourceDescriptionPacket.cs b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtcp/RtcpSourceDescriptionPacket.cs
index 0a95a4413..0a95a4413 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtcp/RtcpSourceDescriptionPacket.cs
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtcp/RtcpSourceDescriptionPacket.cs
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtcp/SourceDescriptionBlock.cs b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtcp/SourceDescriptionBlock.cs
index bf56087cd..bf56087cd 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtcp/SourceDescriptionBlock.cs
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtcp/SourceDescriptionBlock.cs
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtcp/SourceDescriptionItem.cs b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtcp/SourceDescriptionItem.cs
index 5dd033642..5dd033642 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtcp/SourceDescriptionItem.cs
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtcp/SourceDescriptionItem.cs
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtp/RtpListener.cs b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtp/RtpListener.cs
index ea6a9ba6a..ea6a9ba6a 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtp/RtpListener.cs
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtp/RtpListener.cs
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtp/RtpPacket.cs b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtp/RtpPacket.cs
index 489d7f087..489d7f087 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtp/RtpPacket.cs
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtp/RtpPacket.cs
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtsp/RtspMethod.cs b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtsp/RtspMethod.cs
index 5f286f1db..5f286f1db 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtsp/RtspMethod.cs
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtsp/RtspMethod.cs
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtsp/RtspRequest.cs b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtsp/RtspRequest.cs
index 600eda02d..600eda02d 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtsp/RtspRequest.cs
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtsp/RtspRequest.cs
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtsp/RtspResponse.cs b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtsp/RtspResponse.cs
index 97290623b..97290623b 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtsp/RtspResponse.cs
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtsp/RtspResponse.cs
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtsp/RtspSession.cs b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtsp/RtspSession.cs
index 0f8682b7c..0f8682b7c 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtsp/RtspSession.cs
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtsp/RtspSession.cs
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtsp/RtspStatusCode.cs b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtsp/RtspStatusCode.cs
index 6d6d50623..6d6d50623 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Rtsp/RtspStatusCode.cs
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Rtsp/RtspStatusCode.cs
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/SatIpDiscovery.cs b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/SatIpDiscovery.cs
index 8ecdca46b..8ecdca46b 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/SatIpDiscovery.cs
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/SatIpDiscovery.cs
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/SatIpHost.cs b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/SatIpHost.cs
index 55101ce10f..55101ce10f 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/SatIpHost.cs
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/SatIpHost.cs
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/TransmissionMode.cs b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/TransmissionMode.cs
index 71d7656d9..71d7656d9 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/TransmissionMode.cs
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/TransmissionMode.cs
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Utils.cs b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Utils.cs
index 3595e4b0a..3595e4b0a 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/Utils.cs
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/Utils.cs
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0030.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0030.ini
index 1caa948cf..1caa948cf 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0030.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0030.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0049.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0049.ini
index 92a0e7dda..92a0e7dda 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0049.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0049.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0070.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0070.ini
index 800b097c8..800b097c8 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0070.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0070.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0090.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0090.ini
index 6202569d9..6202569d9 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0090.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0090.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0100.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0100.ini
index 0614ba88c..0614ba88c 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0100.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0100.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0130.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0130.ini
index 265104298..265104298 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0130.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0130.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0160.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0160.ini
index 9a9503eb5..9a9503eb5 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0160.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0160.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0170.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0170.ini
index 52ba9e5f7..52ba9e5f7 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0170.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0170.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0192.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0192.ini
index fbe65c9b5..fbe65c9b5 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0192.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0192.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0200.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0200.ini
index 6eb757f16..6eb757f16 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0200.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0200.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0215.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0215.ini
index 30f3d5c6e..30f3d5c6e 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0215.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0215.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0235.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0235.ini
index b1abb39c6..b1abb39c6 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0235.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0235.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0255.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0255.ini
index f72c91b41..f72c91b41 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0255.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0255.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0260.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0260.ini
index 299779fb5..299779fb5 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0260.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0260.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0282.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0282.ini
index 07c5ccebe..07c5ccebe 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0282.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0282.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0305.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0305.ini
index 196196c95..196196c95 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0305.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0305.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0308.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0308.ini
index fe4f41569..fe4f41569 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0308.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0308.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0310.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0310.ini
index be556fdd2..be556fdd2 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0310.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0310.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0315.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0315.ini
index 6581c9169..6581c9169 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0315.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0315.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0330.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0330.ini
index b395913cc..b395913cc 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0330.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0330.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0360.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0360.ini
index 49042dfb7..49042dfb7 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0360.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0360.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0380.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0380.ini
index 25b53cd3d..25b53cd3d 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0380.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0380.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0390.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0390.ini
index e77919753..e77919753 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0390.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0390.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0400.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0400.ini
index c1a56c845..c1a56c845 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0400.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0400.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0420.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0420.ini
index 3d884a86b..3d884a86b 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0420.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0420.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0435.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0435.ini
index a7e5fdb79..a7e5fdb79 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0435.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0435.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0450.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0450.ini
index 0737fb4f1..0737fb4f1 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0450.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0450.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0460.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0460.ini
index 7611715ec..7611715ec 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0460.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0460.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0475.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0475.ini
index bc671123f..bc671123f 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0475.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0475.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0480.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0480.ini
index fa955de65..fa955de65 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0480.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0480.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0490.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0490.ini
index a85ad11b9..a85ad11b9 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0490.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0490.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0505.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0505.ini
index 5bbfe6297..5bbfe6297 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0505.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0505.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0510.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0510.ini
index 355d0e5b5..355d0e5b5 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0510.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0510.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0520.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0520.ini
index 8631604aa..8631604aa 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0520.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0520.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0525.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0525.ini
index 2eb001a81..2eb001a81 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0525.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0525.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0530.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0530.ini
index 965c41f15..965c41f15 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0530.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0530.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0549.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0549.ini
index b2fdf5a5c..b2fdf5a5c 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0549.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0549.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0560.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0560.ini
index bed5b87b5..bed5b87b5 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0560.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0560.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0570.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0570.ini
index 27df36311..27df36311 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0570.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0570.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0600.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0600.ini
index 1a711cf26..1a711cf26 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0600.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0600.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0620.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0620.ini
index ae5cf34bf..ae5cf34bf 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0620.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0620.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0642.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0642.ini
index 324d99e83..324d99e83 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0642.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0642.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0650.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0650.ini
index 81021a0b2..81021a0b2 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0650.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0650.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0660.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0660.ini
index a118dfa38..a118dfa38 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0660.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0660.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0685.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0685.ini
index 7c2cab681..7c2cab681 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0685.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0685.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0705.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0705.ini
index 0af8237c9..0af8237c9 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0705.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0705.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0721.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0721.ini
index c25a6ecf5..c25a6ecf5 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0721.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0721.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0740.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0740.ini
index 91356547c..91356547c 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0740.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0740.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0750.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0750.ini
index 8cdc07590..8cdc07590 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0750.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0750.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0765.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0765.ini
index 1a6195f9a..1a6195f9a 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0765.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0765.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0785.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0785.ini
index 8dcf19d37..8dcf19d37 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0785.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0785.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0830.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0830.ini
index ac7588e57..ac7588e57 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0830.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0830.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0851.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0851.ini
index faefe54dc..faefe54dc 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0851.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0851.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0865.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0865.ini
index f5a946f00..f5a946f00 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0865.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0865.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0875.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0875.ini
index 3f856ba71..3f856ba71 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0875.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0875.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0880.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0880.ini
index a2716d762..a2716d762 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0880.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0880.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0900.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0900.ini
index d423f69b6..d423f69b6 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0900.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0900.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0915.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0915.ini
index 3c28ff254..3c28ff254 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0915.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0915.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0922.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0922.ini
index 1aaa16641..1aaa16641 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0922.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0922.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0935.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0935.ini
index e47df3277..e47df3277 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0935.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0935.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0950.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0950.ini
index 1b6ba4775..1b6ba4775 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0950.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0950.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0965.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0965.ini
index 45d28a1fe..45d28a1fe 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/0965.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/0965.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1005.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1005.ini
index fe9374bcf..fe9374bcf 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1005.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1005.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1030.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1030.ini
index f4607ef89..f4607ef89 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1030.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1030.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1055.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1055.ini
index 79c54d9d8..79c54d9d8 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1055.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1055.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1082.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1082.ini
index a53b0c2e8..a53b0c2e8 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1082.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1082.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1100.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1100.ini
index 789b56cca..789b56cca 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1100.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1100.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1105.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1105.ini
index aafe00455..aafe00455 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1105.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1105.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1130.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1130.ini
index d9c69d3f7..d9c69d3f7 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1130.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1130.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1155.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1155.ini
index 4bfa66270..4bfa66270 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1155.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1155.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1160.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1160.ini
index 3ef951d9a..3ef951d9a 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1160.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1160.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1180.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1180.ini
index d41e3f5ad..d41e3f5ad 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1180.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1180.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1195.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1195.ini
index 42af4d1c9..42af4d1c9 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1195.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1195.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1222.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1222.ini
index 4d833f21b..4d833f21b 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1222.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1222.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1240.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1240.ini
index ed948c78e..ed948c78e 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1240.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1240.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1250.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1250.ini
index 738a7debe..738a7debe 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1250.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1250.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1280.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1280.ini
index bb2f556c0..bb2f556c0 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1280.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1280.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1320.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1320.ini
index 4694425d3..4694425d3 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1320.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1320.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1340.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1340.ini
index 4ca7c83a0..4ca7c83a0 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1340.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1340.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1380.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1380.ini
index cb952425b..cb952425b 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1380.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1380.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1400.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1400.ini
index b4e6dc7c0..b4e6dc7c0 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1400.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1400.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1440.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1440.ini
index e31e028ab..e31e028ab 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1440.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1440.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1500.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1500.ini
index 6acfb1679..6acfb1679 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1500.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1500.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1520.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1520.ini
index 0034b3e13..0034b3e13 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1520.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1520.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1540.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1540.ini
index 365575a8c..365575a8c 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1540.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1540.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1560.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1560.ini
index be5b9c2f6..be5b9c2f6 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1560.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1560.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1590.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1590.ini
index 567b3cc09..567b3cc09 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1590.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1590.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1600 OPTUS D1 FTA (160.0E).ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1600 OPTUS D1 FTA (160.0E).ini
index 865061739..865061739 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1600 OPTUS D1 FTA (160.0E).ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1600 OPTUS D1 FTA (160.0E).ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1600.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1600.ini
index 08083f62f..08083f62f 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1600.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1600.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1620.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1620.ini
index 9a16504dc..9a16504dc 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1620.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1620.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1640.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1640.ini
index 9650ab47a..9650ab47a 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1640.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1640.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1660.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1660.ini
index 8c040e884..8c040e884 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1660.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1660.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1690.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1690.ini
index c7470a5e4..c7470a5e4 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1690.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1690.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1720.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1720.ini
index 6f0a6f0ea..6f0a6f0ea 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1720.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1720.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1800.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1800.ini
index a3f5044cf..a3f5044cf 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1800.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1800.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1830.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1830.ini
index 8775bb5d3..8775bb5d3 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/1830.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/1830.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2210.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2210.ini
index 123055dd4..123055dd4 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2210.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2210.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2230.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2230.ini
index fe661385b..fe661385b 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2230.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2230.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2250.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2250.ini
index 4f5a9494d..4f5a9494d 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2250.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2250.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2270.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2270.ini
index 18a777c4b..18a777c4b 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2270.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2270.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2290.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2290.ini
index 631af13d2..631af13d2 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2290.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2290.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2310.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2310.ini
index 5915c2365..5915c2365 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2310.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2310.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2330.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2330.ini
index 3ab17e6a1..3ab17e6a1 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2330.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2330.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2350.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2350.ini
index cdaa5042e..cdaa5042e 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2350.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2350.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2370.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2370.ini
index ce1a1f239..ce1a1f239 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2370.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2370.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2390.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2390.ini
index 73ca36a7b..73ca36a7b 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2390.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2390.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2410.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2410.ini
index 188507e9d..188507e9d 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2410.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2410.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2432.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2432.ini
index aacb92c28..aacb92c28 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2432.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2432.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2451.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2451.ini
index 0272503f2..0272503f2 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2451.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2451.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2470.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2470.ini
index 0042e0ef1..0042e0ef1 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2470.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2470.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2489.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2489.ini
index c71cfdd79..c71cfdd79 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2489.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2489.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2500.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2500.ini
index 0fb566b48..0fb566b48 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2500.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2500.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2527.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2527.ini
index 41b4e2981..41b4e2981 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2527.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2527.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2550.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2550.ini
index d573433b8..d573433b8 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2550.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2550.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2570.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2570.ini
index 1fcd35643..1fcd35643 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2570.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2570.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2590.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2590.ini
index 322d683c1..322d683c1 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2590.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2590.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2608.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2608.ini
index e3200b7cd..e3200b7cd 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2608.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2608.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2630.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2630.ini
index 1a888553a..1a888553a 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2630.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2630.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2650.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2650.ini
index f3c4e0de6..f3c4e0de6 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2650.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2650.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2669.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2669.ini
index ccb7e8531..ccb7e8531 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2669.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2669.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2690.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2690.ini
index e3c73e65c..e3c73e65c 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2690.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2690.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2710.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2710.ini
index 8e5aa2688..8e5aa2688 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2710.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2710.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2728.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2728.ini
index 9b148a046..9b148a046 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2728.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2728.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2730.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2730.ini
index fdb17c5c0..fdb17c5c0 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2730.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2730.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2750.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2750.ini
index 8f2358d56..8f2358d56 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2750.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2750.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2760.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2760.ini
index 253d2cced..253d2cced 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2760.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2760.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2770.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2770.ini
index 12cbcc729..12cbcc729 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2770.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2770.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2780.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2780.ini
index 7080fc519..7080fc519 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2780.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2780.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2812.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2812.ini
index 61b29bb93..61b29bb93 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2812.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2812.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2820.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2820.ini
index 0aa5cc903..0aa5cc903 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2820.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2820.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2830.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2830.ini
index c6536b22b..c6536b22b 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2830.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2830.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2850.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2850.ini
index cc6088079..cc6088079 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2850.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2850.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2873.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2873.ini
index 6c39037ae..6c39037ae 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2873.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2873.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2880.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2880.ini
index 2abb9f716..2abb9f716 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2880.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2880.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2881.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2881.ini
index 5a3d34b2c..5a3d34b2c 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2881.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2881.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2882.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2882.ini
index 591ba2fe4..591ba2fe4 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2882.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2882.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2900.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2900.ini
index 3a4144bf6..3a4144bf6 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2900.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2900.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2930.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2930.ini
index b144562e4..b144562e4 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2930.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2930.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2950.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2950.ini
index 3b6a477fc..3b6a477fc 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2950.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2950.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2970.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2970.ini
index 60e1423fd..60e1423fd 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2970.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2970.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2985.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2985.ini
index 1dc03e67f..1dc03e67f 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2985.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2985.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2990.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2990.ini
index ce35c62f5..ce35c62f5 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/2990.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/2990.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3020.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3020.ini
index 3b6673b47..3b6673b47 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3020.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3020.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3045.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3045.ini
index 1d462c1a8..1d462c1a8 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3045.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3045.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3070.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3070.ini
index 16baee6ce..16baee6ce 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3070.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3070.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3100.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3100.ini
index 2155127dc..2155127dc 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3100.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3100.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3125.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3125.ini
index 07c07c7ff..07c07c7ff 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3125.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3125.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3150.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3150.ini
index e322e36f8..e322e36f8 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3150.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3150.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3169.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3169.ini
index 8ed74f2ef..8ed74f2ef 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3169.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3169.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3195.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3195.ini
index b331b7d64..b331b7d64 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3195.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3195.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3225.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3225.ini
index 800e74334..800e74334 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3225.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3225.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3255.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3255.ini
index eb56de14b..eb56de14b 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3255.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3255.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3285.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3285.ini
index c5632384c..c5632384c 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3285.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3285.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3300.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3300.ini
index 7b1595a53..7b1595a53 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3300.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3300.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3325.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3325.ini
index 380ed4072..380ed4072 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3325.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3325.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3355.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3355.ini
index 542d9bd46..542d9bd46 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3355.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3355.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3380.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3380.ini
index 39d26fdbb..39d26fdbb 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3380.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3380.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3400.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3400.ini
index c23fe0b19..c23fe0b19 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3400.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3400.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3420.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3420.ini
index 2470d71f9..2470d71f9 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3420.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3420.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3450.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3450.ini
index cae2fe8b9..cae2fe8b9 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3450.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3450.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3460.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3460.ini
index 46a7c1b62..46a7c1b62 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3460.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3460.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3475.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3475.ini
index e7a7afc1d..e7a7afc1d 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3475.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3475.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3490.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3490.ini
index 7d5737979..7d5737979 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3490.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3490.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3520.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3520.ini
index 6274b967e..6274b967e 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3520.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3520.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3527.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3527.ini
index b5aa21780..b5aa21780 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3527.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3527.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3550.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3550.ini
index 5ae30b778..5ae30b778 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3550.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3550.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3560.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3560.ini
index bf3006b2e..bf3006b2e 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3560.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3560.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3592.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3592.ini
index b1118d4fb..b1118d4fb 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3592.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3592.ini
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3594.ini b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3594.ini
index f762d2f6f..f762d2f6f 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/ini/satellite/3594.ini
+++ b/MediaBrowser.Server.Startup.Common/LiveTv/TunerHosts/SatIp/ini/satellite/3594.ini
diff --git a/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj b/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj
index 7ac020cc4..272ad3b09 100644
--- a/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj
+++ b/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj
@@ -37,10 +37,22 @@
     <Reference Include="Emby.Common.Implementations">
       <HintPath>..\ThirdParty\emby\Emby.Common.Implementations.dll</HintPath>
     </Reference>
+    <Reference Include="INIFileParser, Version=2.3.0.0, Culture=neutral, PublicKeyToken=79af7b307b65cf3c, processorArchitecture=MSIL">
+      <HintPath>..\packages\ini-parser.2.3.0\lib\net20\INIFileParser.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="MediaBrowser.Naming, Version=1.0.6151.30291, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\MediaBrowser.Naming.1.0.0.59\lib\portable-net45+win8\MediaBrowser.Naming.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.IO.RecyclableMemoryStream, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IO.RecyclableMemoryStream.1.1.0.0\lib\net45\Microsoft.IO.RecyclableMemoryStream.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Mono.Nat, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\ThirdParty\emby\Mono.Nat.dll</HintPath>
+    </Reference>
     <Reference Include="Mono.Posix, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Mono.Posix.4.0.0.0\lib\net40\Mono.Posix.dll</HintPath>
@@ -78,43 +90,84 @@
     <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="Browser\BrowserLauncher.cs" />
     <Compile Include="Configuration\ServerConfigurationManager.cs" />
+    <Compile Include="Devices\DeviceRepository.cs" />
+    <Compile Include="EntryPoints\ExternalPortForwarding.cs" />
     <Compile Include="EntryPoints\StartupWizard.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" />
+    <Compile Include="IO\MemoryStreamProvider.cs" />
+    <Compile Include="LiveTv\TunerHosts\SatIp\ChannelScan.cs" />
+    <Compile Include="LiveTv\TunerHosts\SatIp\Rtcp\ReportBlock.cs" />
+    <Compile Include="LiveTv\TunerHosts\SatIp\Rtcp\RtcpAppPacket.cs" />
+    <Compile Include="LiveTv\TunerHosts\SatIp\Rtcp\RtcpByePacket.cs" />
+    <Compile Include="LiveTv\TunerHosts\SatIp\Rtcp\RtcpListener.cs" />
+    <Compile Include="LiveTv\TunerHosts\SatIp\Rtcp\RtcpPacket.cs" />
+    <Compile Include="LiveTv\TunerHosts\SatIp\Rtcp\RtcpReceiverReportPacket.cs" />
+    <Compile Include="LiveTv\TunerHosts\SatIp\Rtcp\RtcpSenderReportPacket.cs" />
+    <Compile Include="LiveTv\TunerHosts\SatIp\Rtcp\RtcpSourceDescriptionPacket.cs" />
+    <Compile Include="LiveTv\TunerHosts\SatIp\Rtcp\SourceDescriptionBlock.cs" />
+    <Compile Include="LiveTv\TunerHosts\SatIp\Rtcp\SourceDescriptionItem.cs" />
+    <Compile Include="LiveTv\TunerHosts\SatIp\Rtp\RtpListener.cs" />
+    <Compile Include="LiveTv\TunerHosts\SatIp\Rtp\RtpPacket.cs" />
+    <Compile Include="LiveTv\TunerHosts\SatIp\Rtsp\RtspMethod.cs" />
+    <Compile Include="LiveTv\TunerHosts\SatIp\Rtsp\RtspRequest.cs" />
+    <Compile Include="LiveTv\TunerHosts\SatIp\Rtsp\RtspResponse.cs" />
+    <Compile Include="LiveTv\TunerHosts\SatIp\Rtsp\RtspSession.cs" />
+    <Compile Include="LiveTv\TunerHosts\SatIp\Rtsp\RtspStatusCode.cs" />
+    <Compile Include="LiveTv\TunerHosts\SatIp\SatIpDiscovery.cs" />
+    <Compile Include="LiveTv\TunerHosts\SatIp\SatIpHost.cs" />
+    <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="Security\CertificateGenerator.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="Security\ASN1.cs" />
-    <Compile Include="Security\ASN1Convert.cs" />
-    <Compile Include="Security\BitConverterLE.cs" />
-    <Compile Include="Security\CryptoConvert.cs" />
-    <Compile Include="Security\PfxGenerator.cs" />
-    <Compile Include="Security\PKCS1.cs" />
-    <Compile Include="Security\PKCS12.cs" />
-    <Compile Include="Security\PKCS7.cs" />
-    <Compile Include="Security\PKCS8.cs" />
-    <Compile Include="Security\X501Name.cs" />
-    <Compile Include="Security\X509Builder.cs" />
-    <Compile Include="Security\X509Certificate.cs" />
-    <Compile Include="Security\X509CertificateBuilder.cs" />
-    <Compile Include="Security\X509CertificateCollection.cs" />
-    <Compile Include="Security\X509Extension.cs" />
-    <Compile Include="Security\X509Extensions.cs" />
-    <Compile Include="Security\X520Attributes.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="ServerApplicationPaths.cs" />
+    <Compile Include="Social\SharingRepository.cs" />
     <Compile Include="StartupOptions.cs" />
+    <Compile Include="Sync\SyncRepository.cs" />
     <Compile Include="SystemEvents.cs" />
     <Compile Include="TextLocalizer.cs" />
     <Compile Include="UnhandledExceptionWriter.cs" />
@@ -187,6 +240,175 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0030.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0049.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0070.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0090.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0100.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0130.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0160.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0170.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0192.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0200.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0215.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0235.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0255.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0260.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0282.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0305.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0308.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0310.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0315.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0330.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0360.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0380.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0390.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0400.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0420.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0435.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0450.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0460.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0475.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0480.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0490.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0505.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0510.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0520.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0525.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0530.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0549.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0560.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0570.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0600.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0620.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0642.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0650.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0660.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0685.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0705.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0721.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0740.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0750.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0765.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0785.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0830.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0851.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0865.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0875.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0880.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0900.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0915.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0922.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0935.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0950.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\0965.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1005.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1030.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1055.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1082.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1100.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1105.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1130.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1155.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1160.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1180.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1195.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1222.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1240.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1250.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1280.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1320.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1340.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1380.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1400.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1440.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1500.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1520.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1540.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1560.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1590.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1600 OPTUS D1 FTA %28160.0E%29.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1600.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1620.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1640.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1660.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1690.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1720.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1800.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\1830.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2210.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2230.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2250.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2270.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2290.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2310.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2330.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2350.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2370.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2390.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2410.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2432.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2451.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2470.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2489.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2500.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2527.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2550.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2570.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2590.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2608.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2630.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2650.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2669.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2690.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2710.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2728.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2730.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2750.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2760.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2770.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2780.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2812.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2820.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2830.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2850.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2873.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2880.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2881.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2882.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2900.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2930.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2950.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2970.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2985.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\2990.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3020.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3045.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3070.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3100.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3125.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3150.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3169.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3195.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3225.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3255.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3285.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3300.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3325.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3355.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3380.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3400.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3420.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3450.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3460.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3475.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3490.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3520.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3527.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3550.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3560.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3592.ini" />
+    <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3594.ini" />
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/MediaBrowser.Server.Startup.Common/Migrations/DbMigration.cs b/MediaBrowser.Server.Startup.Common/Migrations/DbMigration.cs
index e095275b1..217cdfb4c 100644
--- a/MediaBrowser.Server.Startup.Common/Migrations/DbMigration.cs
+++ b/MediaBrowser.Server.Startup.Common/Migrations/DbMigration.cs
@@ -2,7 +2,7 @@
 using Emby.Server.Implementations.Persistence;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Model.Tasks;
-using MediaBrowser.Server.Implementations.Persistence;
+using MediaBrowser.Server.Startup.Common.Persistence;
 
 namespace MediaBrowser.Server.Startup.Common.Migrations
 {
diff --git a/MediaBrowser.Server.Implementations/Notifications/SqliteNotificationsRepository.cs b/MediaBrowser.Server.Startup.Common/Notifications/SqliteNotificationsRepository.cs
index f30ba3e54..b0f0dd75a 100644
--- a/MediaBrowser.Server.Implementations/Notifications/SqliteNotificationsRepository.cs
+++ b/MediaBrowser.Server.Startup.Common/Notifications/SqliteNotificationsRepository.cs
@@ -1,17 +1,17 @@
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Notifications;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Notifications;
-using MediaBrowser.Server.Implementations.Persistence;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Data;
 using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Notifications;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Notifications;
+using MediaBrowser.Server.Startup.Common.Persistence;
 
-namespace MediaBrowser.Server.Implementations.Notifications
+namespace MediaBrowser.Server.Startup.Common.Notifications
 {
     public class SqliteNotificationsRepository : BaseSqliteRepository, INotificationsRepository
     {
diff --git a/MediaBrowser.Server.Implementations/Persistence/BaseSqliteRepository.cs b/MediaBrowser.Server.Startup.Common/Persistence/BaseSqliteRepository.cs
index 233ab56fe..8dc3e91ad 100644
--- a/MediaBrowser.Server.Implementations/Persistence/BaseSqliteRepository.cs
+++ b/MediaBrowser.Server.Startup.Common/Persistence/BaseSqliteRepository.cs
@@ -1,10 +1,10 @@
-using MediaBrowser.Model.Logging;
-using System;
+using System;
 using System.Data;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Model.Logging;
 
-namespace MediaBrowser.Server.Implementations.Persistence
+namespace MediaBrowser.Server.Startup.Common.Persistence
 {
     public abstract class BaseSqliteRepository : IDisposable
     {
diff --git a/MediaBrowser.Server.Implementations/Persistence/DataExtensions.cs b/MediaBrowser.Server.Startup.Common/Persistence/DataExtensions.cs
index 179101ca2..69bf78f49 100644
--- a/MediaBrowser.Server.Implementations/Persistence/DataExtensions.cs
+++ b/MediaBrowser.Server.Startup.Common/Persistence/DataExtensions.cs
@@ -1,13 +1,12 @@
-using System.Text;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Serialization;
-using System;
+using System;
 using System.Data;
 using System.IO;
-using MediaBrowser.Common.IO;
+using System.Text;
 using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Serialization;
 
-namespace MediaBrowser.Server.Implementations.Persistence
+namespace MediaBrowser.Server.Startup.Common.Persistence
 {
     static class DataExtensions
     {
diff --git a/MediaBrowser.Server.Implementations/Persistence/IDbConnector.cs b/MediaBrowser.Server.Startup.Common/Persistence/IDbConnector.cs
index 596cf8407..773d5eaee 100644
--- a/MediaBrowser.Server.Implementations/Persistence/IDbConnector.cs
+++ b/MediaBrowser.Server.Startup.Common/Persistence/IDbConnector.cs
@@ -1,7 +1,7 @@
 using System.Data;
 using System.Threading.Tasks;
 
-namespace MediaBrowser.Server.Implementations.Persistence
+namespace MediaBrowser.Server.Startup.Common.Persistence
 {
     public interface IDbConnector
     {
diff --git a/MediaBrowser.Server.Implementations/Persistence/MediaStreamColumns.cs b/MediaBrowser.Server.Startup.Common/Persistence/MediaStreamColumns.cs
index 1d9be2e0d..0379c38f8 100644
--- a/MediaBrowser.Server.Implementations/Persistence/MediaStreamColumns.cs
+++ b/MediaBrowser.Server.Startup.Common/Persistence/MediaStreamColumns.cs
@@ -3,7 +3,7 @@ using System.Data;
 using System.Text;
 using MediaBrowser.Model.Logging;
 
-namespace MediaBrowser.Server.Implementations.Persistence
+namespace MediaBrowser.Server.Startup.Common.Persistence
 {
     public class MediaStreamColumns
     {
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteDisplayPreferencesRepository.cs b/MediaBrowser.Server.Startup.Common/Persistence/SqliteDisplayPreferencesRepository.cs
index c97ba8792..c6bd07914 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteDisplayPreferencesRepository.cs
+++ b/MediaBrowser.Server.Startup.Common/Persistence/SqliteDisplayPreferencesRepository.cs
@@ -1,19 +1,18 @@
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Controller.Persistence;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Serialization;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Data;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Common.IO;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Controller.Persistence;
+using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Serialization;
 
-namespace MediaBrowser.Server.Implementations.Persistence
+namespace MediaBrowser.Server.Startup.Common.Persistence
 {
     /// <summary>
     /// Class SQLiteDisplayPreferencesRepository
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs b/MediaBrowser.Server.Startup.Common/Persistence/SqliteExtensions.cs
index c273d4945..b99fbb5d1 100644
--- a/MediaBrowser.Server.Implementations/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.Implementations.Persistence
+namespace MediaBrowser.Server.Startup.Common.Persistence
 {
     /// <summary>
     /// Class SQLiteExtensions
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteFileOrganizationRepository.cs b/MediaBrowser.Server.Startup.Common/Persistence/SqliteFileOrganizationRepository.cs
index 7a5e00090..7942bd159 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteFileOrganizationRepository.cs
+++ b/MediaBrowser.Server.Startup.Common/Persistence/SqliteFileOrganizationRepository.cs
@@ -1,9 +1,4 @@
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Persistence;
-using MediaBrowser.Model.FileOrganization;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Querying;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Globalization;
@@ -11,8 +6,13 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Persistence;
+using MediaBrowser.Model.FileOrganization;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Querying;
 
-namespace MediaBrowser.Server.Implementations.Persistence
+namespace MediaBrowser.Server.Startup.Common.Persistence
 {
     public class SqliteFileOrganizationRepository : BaseSqliteRepository, IFileOrganizationRepository, IDisposable
     {
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Startup.Common/Persistence/SqliteItemRepository.cs
index 3dcd83da0..1fbaa0c89 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
+++ b/MediaBrowser.Server.Startup.Common/Persistence/SqliteItemRepository.cs
@@ -1,13 +1,3 @@
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.Audio;
-using MediaBrowser.Controller.Entities.Movies;
-using MediaBrowser.Controller.Entities.TV;
-using MediaBrowser.Controller.LiveTv;
-using MediaBrowser.Controller.Persistence;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Querying;
-using MediaBrowser.Model.Serialization;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -18,21 +8,28 @@ using System.Runtime.Serialization;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Emby.Server.Implementations.Playlists;
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Collections;
 using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Audio;
+using MediaBrowser.Controller.Entities.Movies;
+using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Extensions;
+using MediaBrowser.Controller.LiveTv;
+using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Controller.Playlists;
 using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Extensions;
+using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.LiveTv;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Querying;
+using MediaBrowser.Model.Serialization;
 using MediaBrowser.Server.Implementations.Devices;
+using MediaBrowser.Server.Implementations.Playlists;
 
-namespace MediaBrowser.Server.Implementations.Persistence
+namespace MediaBrowser.Server.Startup.Common.Persistence
 {
     /// <summary>
     /// Class SQLiteItemRepository
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteUserDataRepository.cs b/MediaBrowser.Server.Startup.Common/Persistence/SqliteUserDataRepository.cs
index 62d9e7634..6bc9d8801 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteUserDataRepository.cs
+++ b/MediaBrowser.Server.Startup.Common/Persistence/SqliteUserDataRepository.cs
@@ -1,8 +1,4 @@
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Persistence;
-using MediaBrowser.Model.Logging;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Globalization;
@@ -10,8 +6,12 @@ using System.IO;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Persistence;
+using MediaBrowser.Model.Logging;
 
-namespace MediaBrowser.Server.Implementations.Persistence
+namespace MediaBrowser.Server.Startup.Common.Persistence
 {
     public class SqliteUserDataRepository : BaseSqliteRepository, IUserDataRepository
     {
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteUserRepository.cs b/MediaBrowser.Server.Startup.Common/Persistence/SqliteUserRepository.cs
index 0c1367e0a..bc87321f1 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteUserRepository.cs
+++ b/MediaBrowser.Server.Startup.Common/Persistence/SqliteUserRepository.cs
@@ -1,18 +1,17 @@
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Persistence;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Serialization;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Data;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Common.IO;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Serialization;
 
-namespace MediaBrowser.Server.Implementations.Persistence
+namespace MediaBrowser.Server.Startup.Common.Persistence
 {
     /// <summary>
     /// Class SQLiteUserRepository
diff --git a/MediaBrowser.Server.Implementations/Persistence/TypeMapper.cs b/MediaBrowser.Server.Startup.Common/Persistence/TypeMapper.cs
index 2de02d817..e2af2dd38 100644
--- a/MediaBrowser.Server.Implementations/Persistence/TypeMapper.cs
+++ b/MediaBrowser.Server.Startup.Common/Persistence/TypeMapper.cs
@@ -2,7 +2,7 @@
 using System.Collections.Concurrent;
 using System.Linq;
 
-namespace MediaBrowser.Server.Implementations.Persistence
+namespace MediaBrowser.Server.Startup.Common.Persistence
 {
     /// <summary>
     /// Class TypeMapper
diff --git a/MediaBrowser.Server.Implementations/Security/AuthenticationRepository.cs b/MediaBrowser.Server.Startup.Common/Security/AuthenticationRepository.cs
index 74a552dcc..1cad1b122 100644
--- a/MediaBrowser.Server.Implementations/Security/AuthenticationRepository.cs
+++ b/MediaBrowser.Server.Startup.Common/Security/AuthenticationRepository.cs
@@ -1,17 +1,17 @@
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Security;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Querying;
-using MediaBrowser.Server.Implementations.Persistence;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Globalization;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Security;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Querying;
+using MediaBrowser.Server.Startup.Common.Persistence;
 
-namespace MediaBrowser.Server.Implementations.Security
+namespace MediaBrowser.Server.Startup.Common.Security
 {
     public class AuthenticationRepository : BaseSqliteRepository, IAuthenticationRepository
     {
diff --git a/MediaBrowser.Server.Implementations/Social/SharingRepository.cs b/MediaBrowser.Server.Startup.Common/Social/SharingRepository.cs
index dec43e4cb..63d608026 100644
--- a/MediaBrowser.Server.Implementations/Social/SharingRepository.cs
+++ b/MediaBrowser.Server.Startup.Common/Social/SharingRepository.cs
@@ -1,14 +1,14 @@
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Social;
-using MediaBrowser.Server.Implementations.Persistence;
-using System;
+using System;
 using System.Data;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Social;
+using MediaBrowser.Server.Startup.Common.Persistence;
 
-namespace MediaBrowser.Server.Implementations.Social
+namespace MediaBrowser.Server.Startup.Common.Social
 {
     public class SharingRepository : BaseSqliteRepository, ISharingRepository
     {
diff --git a/MediaBrowser.Server.Implementations/Sync/SyncRepository.cs b/MediaBrowser.Server.Startup.Common/Sync/SyncRepository.cs
index 64ed00ded..0c2715ce1 100644
--- a/MediaBrowser.Server.Implementations/Sync/SyncRepository.cs
+++ b/MediaBrowser.Server.Startup.Common/Sync/SyncRepository.cs
@@ -1,20 +1,20 @@
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Sync;
-using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Querying;
-using MediaBrowser.Model.Serialization;
-using MediaBrowser.Model.Sync;
-using MediaBrowser.Server.Implementations.Persistence;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Sync;
+using MediaBrowser.Model.Dto;
+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.Implementations.Sync
+namespace MediaBrowser.Server.Startup.Common.Sync
 {
     public class SyncRepository : BaseSqliteRepository, ISyncRepository
     {
diff --git a/MediaBrowser.Server.Startup.Common/packages.config b/MediaBrowser.Server.Startup.Common/packages.config
index fa1cc928c..838fbe667 100644
--- a/MediaBrowser.Server.Startup.Common/packages.config
+++ b/MediaBrowser.Server.Startup.Common/packages.config
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="ini-parser" version="2.3.0" targetFramework="net46" />
   <package id="MediaBrowser.Naming" version="1.0.0.59" targetFramework="net46" />
+  <package id="Microsoft.IO.RecyclableMemoryStream" version="1.1.0.0" targetFramework="net46" />
   <package id="Mono.Posix" version="4.0.0.0" targetFramework="net45" />
   <package id="Patterns.Logging" version="1.0.0.6" targetFramework="net46" />
   <package id="ServiceStack.Text" version="4.5.4" targetFramework="net46" />
diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
index eaf4f3148..4b682ed3e 100644
--- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
+++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
@@ -105,7 +105,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\MediaBrowser.Server.Implementations\Persistence\SqliteExtensions.cs">
+    <Compile Include="..\MediaBrowser.Server.Startup.Common\Persistence\SqliteExtensions.cs">
       <Link>Native\SqliteExtensions.cs</Link>
     </Compile>
     <Compile Include="..\SharedVersion.cs">
diff --git a/MediaBrowser.ServerApplication/Native/DbConnector.cs b/MediaBrowser.ServerApplication/Native/DbConnector.cs
index f403ce2ce..99c5225c0 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 MediaBrowser.Model.Logging;
-using MediaBrowser.Server.Implementations.Persistence;
+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 5bed8556e..87139cc72 100644
--- a/MediaBrowser.ServerApplication/Native/WindowsApp.cs
+++ b/MediaBrowser.ServerApplication/Native/WindowsApp.cs
@@ -12,7 +12,7 @@ using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.System;
-using MediaBrowser.Server.Implementations.Persistence;
+using MediaBrowser.Server.Startup.Common.Persistence;
 using MediaBrowser.Server.Startup.Common.FFMpeg;
 using OperatingSystem = MediaBrowser.Server.Startup.Common.OperatingSystem;