extract classes

59 files changed, 655 insertions, 422 deletions

diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
index 73324c3a3..78aae8375 100644
--- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
+++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
@@ -11,7 +11,7 @@
     <RootNamespace>MediaBrowser.Model</RootNamespace>
     <AssemblyName>MediaBrowser.Model</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Profile158</TargetFrameworkProfile>
+    <TargetFrameworkProfile>Profile344</TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
@@ -74,9 +74,15 @@
     <Compile Include="..\MediaBrowser.Model\ApiClient\ApiClientExtensions.cs">
       <Link>ApiClient\ApiClientExtensions.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\ApiClient\ConnectionMode.cs">
+      <Link>ApiClient\ConnectionMode.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\ApiClient\ConnectionResult.cs">
       <Link>ApiClient\ConnectionResult.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\ApiClient\ConnectionState.cs">
+      <Link>ApiClient\ConnectionState.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\ApiClient\GeneralCommandEventArgs.cs">
       <Link>ApiClient\GeneralCommandEventArgs.cs</Link>
     </Compile>
@@ -101,18 +107,30 @@
     <Compile Include="..\MediaBrowser.Model\ApiClient\SessionUpdatesEventArgs.cs">
       <Link>ApiClient\SessionUpdatesEventArgs.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\ApiClient\WakeOnLanInfo.cs">
+      <Link>ApiClient\WakeOnLanInfo.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Branding\BrandingOptions.cs">
       <Link>Branding\BrandingOptions.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Channels\AllChannelMediaQuery.cs">
+      <Link>Channels\AllChannelMediaQuery.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Channels\ChannelFeatures.cs">
       <Link>Channels\ChannelFeatures.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Channels\ChannelFolderType.cs">
+      <Link>Channels\ChannelFolderType.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Channels\ChannelInfo.cs">
       <Link>Channels\ChannelInfo.cs</Link>
     </Compile>
     <Compile Include="..\MediaBrowser.Model\Channels\ChannelItemQuery.cs">
       <Link>Channels\ChannelItemQuery.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Channels\ChannelItemSortField.cs">
+      <Link>Channels\ChannelItemSortField.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Channels\ChannelMediaContentType.cs">
       <Link>Channels\ChannelMediaContentType.cs</Link>
     </Compile>
@@ -122,6 +140,9 @@
     <Compile Include="..\MediaBrowser.Model\Channels\ChannelQuery.cs">
       <Link>Channels\ChannelQuery.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Chapters\ChapterProviderInfo.cs">
+      <Link>Chapters\ChapterProviderInfo.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Chapters\RemoteChapterInfo.cs">
       <Link>Chapters\RemoteChapterInfo.cs</Link>
     </Compile>
@@ -167,6 +188,9 @@
     <Compile Include="..\MediaBrowser.Model\Configuration\PathSubstitution.cs">
       <Link>Configuration\PathSubstitution.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Configuration\PeopleMetadataOptions.cs">
+      <Link>Configuration\PeopleMetadataOptions.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Configuration\ServerConfiguration.cs">
       <Link>Configuration\ServerConfiguration.cs</Link>
     </Compile>
@@ -227,6 +251,9 @@
     <Compile Include="..\MediaBrowser.Model\Dlna\DlnaProfileType.cs">
       <Link>Dlna\DlnaProfileType.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Dlna\EncodingContext.cs">
+      <Link>Dlna\EncodingContext.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Dlna\HeaderMatchType.cs">
       <Link>Dlna\HeaderMatchType.cs</Link>
     </Compile>
@@ -254,9 +281,15 @@
     <Compile Include="..\MediaBrowser.Model\Dlna\Profiles\DefaultProfile.cs">
       <Link>Dlna\Profiles\DefaultProfile.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Dlna\ResolutionConfiguration.cs">
+      <Link>Dlna\ResolutionConfiguration.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Dlna\ResolutionNormalizer.cs">
       <Link>Dlna\ResolutionNormalizer.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Dlna\ResolutionOptions.cs">
+      <Link>Dlna\ResolutionOptions.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Dlna\ResponseProfile.cs">
       <Link>Dlna\ResponseProfile.cs</Link>
     </Compile>
@@ -275,9 +308,15 @@
     <Compile Include="..\MediaBrowser.Model\Dlna\StreamInfo.cs">
       <Link>Dlna\StreamInfo.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Dlna\SubtitleDeliveryMethod.cs">
+      <Link>Dlna\SubtitleDeliveryMethod.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Dlna\SubtitleProfile.cs">
       <Link>Dlna\SubtitleProfile.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Dlna\SubtitleStreamInfo.cs">
+      <Link>Dlna\SubtitleStreamInfo.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Dlna\TranscodeSeekInfo.cs">
       <Link>Dlna\TranscodeSeekInfo.cs</Link>
     </Compile>
@@ -338,6 +377,9 @@
     <Compile Include="..\MediaBrowser.Model\Dto\MediaSourceInfo.cs">
       <Link>Dto\MediaSourceInfo.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Dto\MediaSourceType.cs">
+      <Link>Dto\MediaSourceType.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Dto\RatingType.cs">
       <Link>Dto\RatingType.cs</Link>
     </Compile>
@@ -362,6 +404,9 @@
     <Compile Include="..\MediaBrowser.Model\Dto\UserItemDataDto.cs">
       <Link>Dto\UserItemDataDto.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Dto\VideoStreamOptions.cs">
+      <Link>Dto\VideoStreamOptions.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Entities\BaseItemInfo.cs">
       <Link>Entities\BaseItemInfo.cs</Link>
     </Compile>
@@ -446,6 +491,12 @@
     <Compile Include="..\MediaBrowser.Model\Entities\SortOrder.cs">
       <Link>Entities\SortOrder.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Entities\SupporterInfo.cs">
+      <Link>Entities\SupporterInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\MediaBrowser.Model\Entities\TrailerType.cs">
+      <Link>Entities\TrailerType.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Entities\UserDataSaveReason.cs">
       <Link>Entities\UserDataSaveReason.cs</Link>
     </Compile>
@@ -464,9 +515,15 @@
     <Compile Include="..\MediaBrowser.Model\Events\GenericEventArgs.cs">
       <Link>Events\GenericEventArgs.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Extensions\BoolHelper.cs">
+      <Link>Extensions\BoolHelper.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Extensions\DoubleHelper.cs">
       <Link>Extensions\DoubleHelper.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Extensions\FloatHelper.cs">
+      <Link>Extensions\FloatHelper.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Extensions\IHasPropertyChangedEvent.cs">
       <Link>Extensions\IHasPropertyChangedEvent.cs</Link>
     </Compile>
@@ -632,6 +689,9 @@
     <Compile Include="..\MediaBrowser.Model\MediaInfo\IBlurayExaminer.cs">
       <Link>MediaInfo\IBlurayExaminer.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\MediaInfo\MediaProtocol.cs">
+      <Link>MediaInfo\MediaProtocol.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\MediaInfo\SubtitleFormat.cs">
       <Link>MediaInfo\SubtitleFormat.cs</Link>
     </Compile>
@@ -746,6 +806,9 @@
     <Compile Include="..\MediaBrowser.Model\Providers\SubtitleOptions.cs">
       <Link>Providers\SubtitleOptions.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Providers\SubtitleProviderInfo.cs">
+      <Link>Providers\SubtitleProviderInfo.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Querying\AllThemeMediaResult.cs">
       <Link>Querying\AllThemeMediaResult.cs</Link>
     </Compile>
@@ -875,6 +938,9 @@
     <Compile Include="..\MediaBrowser.Model\Session\SessionUserInfo.cs">
       <Link>Session\SessionUserInfo.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Session\TranscodingInfo.cs">
+      <Link>Session\TranscodingInfo.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Session\UserDataChangeInfo.cs">
       <Link>Session\UserDataChangeInfo.cs</Link>
     </Compile>
@@ -896,6 +962,9 @@
     <Compile Include="..\MediaBrowser.Model\Sync\SyncJobStatus.cs">
       <Link>Sync\SyncJobStatus.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Sync\SyncLimitType.cs">
+      <Link>Sync\SyncLimitType.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Sync\SyncQuality.cs">
       <Link>Sync\SyncQuality.cs</Link>
     </Compile>
@@ -905,6 +974,9 @@
     <Compile Include="..\MediaBrowser.Model\System\LogFile.cs">
       <Link>System\LogFile.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\System\PublicSystemInfo.cs">
+      <Link>System\PublicSystemInfo.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\System\SystemInfo.cs">
       <Link>System\SystemInfo.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model.Portable/packages.config b/MediaBrowser.Model.Portable/packages.config
index a0f393fdd..1baa00e28 100644
--- a/MediaBrowser.Model.Portable/packages.config
+++ b/MediaBrowser.Model.Portable/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Fody" version="1.19.1.0" targetFramework="portable-win+net45+sl40+wp71" developmentDependency="true" />
-  <package id="PropertyChanged.Fody" version="1.41.0.0" targetFramework="portable-net45+sl40+wp71+win" />
+  <package id="PropertyChanged.Fody" version="1.41.0.0" targetFramework="portable-net45+sl40+wp71+win" requireReinstallation="True" />
 </packages>
\ No newline at end of file
diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
index 937288567..d25245782 100644
--- a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
+++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
@@ -55,6 +55,12 @@
     <Compile Include="..\mediabrowser.model\activity\ActivityLogEntry.cs">
       <Link>Activity\ActivityLogEntry.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\ApiClient\ConnectionMode.cs">
+      <Link>ApiClient\ConnectionMode.cs</Link>
+    </Compile>
+    <Compile Include="..\MediaBrowser.Model\ApiClient\ConnectionState.cs">
+      <Link>ApiClient\ConnectionState.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\ApiClient\GeneralCommandEventArgs.cs">
       <Link>ApiClient\GeneralCommandEventArgs.cs</Link>
     </Compile>
@@ -73,18 +79,30 @@
     <Compile Include="..\MediaBrowser.Model\ApiClient\SessionUpdatesEventArgs.cs">
       <Link>ApiClient\SessionUpdatesEventArgs.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\ApiClient\WakeOnLanInfo.cs">
+      <Link>ApiClient\WakeOnLanInfo.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Branding\BrandingOptions.cs">
       <Link>Branding\BrandingOptions.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Channels\AllChannelMediaQuery.cs">
+      <Link>Channels\AllChannelMediaQuery.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Channels\ChannelFeatures.cs">
       <Link>Channels\ChannelFeatures.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Channels\ChannelFolderType.cs">
+      <Link>Channels\ChannelFolderType.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Channels\ChannelInfo.cs">
       <Link>Channels\ChannelInfo.cs</Link>
     </Compile>
     <Compile Include="..\MediaBrowser.Model\Channels\ChannelItemQuery.cs">
       <Link>Channels\ChannelItemQuery.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Channels\ChannelItemSortField.cs">
+      <Link>Channels\ChannelItemSortField.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Channels\ChannelMediaContentType.cs">
       <Link>Channels\ChannelMediaContentType.cs</Link>
     </Compile>
@@ -94,6 +112,9 @@
     <Compile Include="..\MediaBrowser.Model\Channels\ChannelQuery.cs">
       <Link>Channels\ChannelQuery.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Chapters\ChapterProviderInfo.cs">
+      <Link>Chapters\ChapterProviderInfo.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Chapters\RemoteChapterInfo.cs">
       <Link>Chapters\RemoteChapterInfo.cs</Link>
     </Compile>
@@ -139,6 +160,9 @@
     <Compile Include="..\MediaBrowser.Model\Configuration\PathSubstitution.cs">
       <Link>Configuration\PathSubstitution.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Configuration\PeopleMetadataOptions.cs">
+      <Link>Configuration\PeopleMetadataOptions.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Configuration\ServerConfiguration.cs">
       <Link>Configuration\ServerConfiguration.cs</Link>
     </Compile>
@@ -199,6 +223,9 @@
     <Compile Include="..\MediaBrowser.Model\Dlna\DlnaProfileType.cs">
       <Link>Dlna\DlnaProfileType.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Dlna\EncodingContext.cs">
+      <Link>Dlna\EncodingContext.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Dlna\HeaderMatchType.cs">
       <Link>Dlna\HeaderMatchType.cs</Link>
     </Compile>
@@ -226,9 +253,15 @@
     <Compile Include="..\MediaBrowser.Model\Dlna\Profiles\DefaultProfile.cs">
       <Link>Dlna\Profiles\DefaultProfile.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Dlna\ResolutionConfiguration.cs">
+      <Link>Dlna\ResolutionConfiguration.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Dlna\ResolutionNormalizer.cs">
       <Link>Dlna\ResolutionNormalizer.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Dlna\ResolutionOptions.cs">
+      <Link>Dlna\ResolutionOptions.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Dlna\ResponseProfile.cs">
       <Link>Dlna\ResponseProfile.cs</Link>
     </Compile>
@@ -247,9 +280,15 @@
     <Compile Include="..\MediaBrowser.Model\Dlna\StreamInfo.cs">
       <Link>Dlna\StreamInfo.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Dlna\SubtitleDeliveryMethod.cs">
+      <Link>Dlna\SubtitleDeliveryMethod.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Dlna\SubtitleProfile.cs">
       <Link>Dlna\SubtitleProfile.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Dlna\SubtitleStreamInfo.cs">
+      <Link>Dlna\SubtitleStreamInfo.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Dlna\TranscodeSeekInfo.cs">
       <Link>Dlna\TranscodeSeekInfo.cs</Link>
     </Compile>
@@ -310,6 +349,9 @@
     <Compile Include="..\MediaBrowser.Model\Dto\MediaSourceInfo.cs">
       <Link>Dto\MediaSourceInfo.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Dto\MediaSourceType.cs">
+      <Link>Dto\MediaSourceType.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Dto\RatingType.cs">
       <Link>Dto\RatingType.cs</Link>
     </Compile>
@@ -319,6 +361,9 @@
     <Compile Include="..\MediaBrowser.Model\Dto\RecommendationType.cs">
       <Link>Dto\RecommendationType.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Dto\StreamOptions.cs">
+      <Link>Dto\StreamOptions.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Dto\StudioDto.cs">
       <Link>Dto\StudioDto.cs</Link>
     </Compile>
@@ -331,6 +376,9 @@
     <Compile Include="..\MediaBrowser.Model\Dto\UserItemDataDto.cs">
       <Link>Dto\UserItemDataDto.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Dto\VideoStreamOptions.cs">
+      <Link>Dto\VideoStreamOptions.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Entities\BaseItemInfo.cs">
       <Link>Entities\BaseItemInfo.cs</Link>
     </Compile>
@@ -415,6 +463,12 @@
     <Compile Include="..\MediaBrowser.Model\Entities\SortOrder.cs">
       <Link>Entities\SortOrder.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Entities\SupporterInfo.cs">
+      <Link>Entities\SupporterInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\MediaBrowser.Model\Entities\TrailerType.cs">
+      <Link>Entities\TrailerType.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Entities\UserDataSaveReason.cs">
       <Link>Entities\UserDataSaveReason.cs</Link>
     </Compile>
@@ -433,9 +487,15 @@
     <Compile Include="..\MediaBrowser.Model\Events\GenericEventArgs.cs">
       <Link>Events\GenericEventArgs.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Extensions\BoolHelper.cs">
+      <Link>Extensions\BoolHelper.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Extensions\DoubleHelper.cs">
       <Link>Extensions\DoubleHelper.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Extensions\FloatHelper.cs">
+      <Link>Extensions\FloatHelper.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Extensions\IHasPropertyChangedEvent.cs">
       <Link>Extensions\IHasPropertyChangedEvent.cs</Link>
     </Compile>
@@ -595,6 +655,9 @@
     <Compile Include="..\MediaBrowser.Model\MediaInfo\IBlurayExaminer.cs">
       <Link>MediaInfo\IBlurayExaminer.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\MediaInfo\MediaProtocol.cs">
+      <Link>MediaInfo\MediaProtocol.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\MediaInfo\SubtitleFormat.cs">
       <Link>MediaInfo\SubtitleFormat.cs</Link>
     </Compile>
@@ -709,6 +772,9 @@
     <Compile Include="..\MediaBrowser.Model\Providers\SubtitleOptions.cs">
       <Link>Providers\SubtitleOptions.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Providers\SubtitleProviderInfo.cs">
+      <Link>Providers\SubtitleProviderInfo.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Querying\AllThemeMediaResult.cs">
       <Link>Querying\AllThemeMediaResult.cs</Link>
     </Compile>
@@ -838,6 +904,9 @@
     <Compile Include="..\MediaBrowser.Model\Session\SessionUserInfo.cs">
       <Link>Session\SessionUserInfo.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Session\TranscodingInfo.cs">
+      <Link>Session\TranscodingInfo.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Session\UserDataChangeInfo.cs">
       <Link>Session\UserDataChangeInfo.cs</Link>
     </Compile>
@@ -859,6 +928,9 @@
     <Compile Include="..\MediaBrowser.Model\Sync\SyncJobStatus.cs">
       <Link>Sync\SyncJobStatus.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Sync\SyncLimitType.cs">
+      <Link>Sync\SyncLimitType.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Sync\SyncQuality.cs">
       <Link>Sync\SyncQuality.cs</Link>
     </Compile>
@@ -868,6 +940,9 @@
     <Compile Include="..\MediaBrowser.Model\System\LogFile.cs">
       <Link>System\LogFile.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\System\PublicSystemInfo.cs">
+      <Link>System\PublicSystemInfo.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\System\SystemInfo.cs">
       <Link>System\SystemInfo.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model/ApiClient/ConnectionMode.cs b/MediaBrowser.Model/ApiClient/ConnectionMode.cs
new file mode 100644
index 000000000..f14c88a09
--- /dev/null
+++ b/MediaBrowser.Model/ApiClient/ConnectionMode.cs
@@ -0,0 +1,8 @@
+namespace MediaBrowser.Model.ApiClient
+{
+    public enum ConnectionMode
+    {
+        Local = 1,
+        Remote = 2
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/ApiClient/ConnectionResult.cs b/MediaBrowser.Model/ApiClient/ConnectionResult.cs
index 348f059b4..0b6c0bfe9 100644
--- a/MediaBrowser.Model/ApiClient/ConnectionResult.cs
+++ b/MediaBrowser.Model/ApiClient/ConnectionResult.cs
@@ -12,17 +12,4 @@ namespace MediaBrowser.Model.ApiClient
             State = ConnectionState.Unavailable;
         }
     }
-
-    public enum ConnectionState
-    {
-        Unavailable = 1,
-        ServerSignIn = 2,
-        SignedIn = 3
-    }
-
-    public enum ConnectionMode
-    {
-        Local = 1,
-        Remote = 2
-    }
 }
diff --git a/MediaBrowser.Model/ApiClient/ConnectionState.cs b/MediaBrowser.Model/ApiClient/ConnectionState.cs
new file mode 100644
index 000000000..9374c77f6
--- /dev/null
+++ b/MediaBrowser.Model/ApiClient/ConnectionState.cs
@@ -0,0 +1,9 @@
+namespace MediaBrowser.Model.ApiClient
+{
+    public enum ConnectionState
+    {
+        Unavailable = 1,
+        ServerSignIn = 2,
+        SignedIn = 3
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/ApiClient/GeneralCommandEventArgs.cs b/MediaBrowser.Model/ApiClient/GeneralCommandEventArgs.cs
index ce518a7cc..3c0b09da8 100644
--- a/MediaBrowser.Model/ApiClient/GeneralCommandEventArgs.cs
+++ b/MediaBrowser.Model/ApiClient/GeneralCommandEventArgs.cs
@@ -1,12 +1,11 @@
 using MediaBrowser.Model.Session;
-using System;
 
 namespace MediaBrowser.Model.ApiClient
 {
     /// <summary>
     /// Class SystemCommandEventArgs
     /// </summary>
-    public class GeneralCommandEventArgs : EventArgs
+    public class GeneralCommandEventArgs
     {
         /// <summary>
         /// Gets or sets the command.
diff --git a/MediaBrowser.Model/ApiClient/IServerEvents.cs b/MediaBrowser.Model/ApiClient/IServerEvents.cs
index 72b499157..88faad388 100644
--- a/MediaBrowser.Model/ApiClient/IServerEvents.cs
+++ b/MediaBrowser.Model/ApiClient/IServerEvents.cs
@@ -69,7 +69,7 @@ namespace MediaBrowser.Model.ApiClient
         /// <summary>
         /// Occurs when [system command].
         /// </summary>
-        event EventHandler<GeneralCommandEventArgs> GeneralCommand;
+        event EventHandler<GenericEventArgs<GeneralCommandEventArgs>> GeneralCommand;
         /// <summary>
         /// Occurs when [notification added].
         /// </summary>
@@ -109,7 +109,7 @@ namespace MediaBrowser.Model.ApiClient
         /// <summary>
         /// Occurs when [sessions updated].
         /// </summary>
-        event EventHandler<SessionUpdatesEventArgs> SessionsUpdated;
+        event EventHandler<GenericEventArgs<SessionUpdatesEventArgs>> SessionsUpdated;
         /// <summary>
         /// Occurs when [restart required].
         /// </summary>
@@ -118,5 +118,17 @@ namespace MediaBrowser.Model.ApiClient
         /// Occurs when [user data changed].
         /// </summary>
         event EventHandler<GenericEventArgs<UserDataChangeInfo>> UserDataChanged;
+        /// <summary>
+        /// Occurs when [playback start].
+        /// </summary>
+        event EventHandler<GenericEventArgs<SessionInfoDto>> PlaybackStart;
+        /// <summary>
+        /// Occurs when [playback stopped].
+        /// </summary>
+        event EventHandler<GenericEventArgs<SessionInfoDto>> PlaybackStopped;
+        /// <summary>
+        /// Occurs when [session ended].
+        /// </summary>
+        event EventHandler<GenericEventArgs<SessionInfoDto>> SessionEnded;
     }
 }
diff --git a/MediaBrowser.Model/ApiClient/ServerInfo.cs b/MediaBrowser.Model/ApiClient/ServerInfo.cs
index c80a0b1d3..0656337ba 100644
--- a/MediaBrowser.Model/ApiClient/ServerInfo.cs
+++ b/MediaBrowser.Model/ApiClient/ServerInfo.cs
@@ -19,15 +19,4 @@ namespace MediaBrowser.Model.ApiClient
             LocalAddress = "http://localhost:8096";
         }
     }
-
-    public class WakeOnLanInfo
-    {
-        public string MacAddress { get; set; }
-        public int Port { get; set; }
-
-        public WakeOnLanInfo()
-        {
-            Port = 9;
-        }
-    }
 }
diff --git a/MediaBrowser.Model/ApiClient/SessionUpdatesEventArgs.cs b/MediaBrowser.Model/ApiClient/SessionUpdatesEventArgs.cs
index 483ee45d0..af9a0986b 100644
--- a/MediaBrowser.Model/ApiClient/SessionUpdatesEventArgs.cs
+++ b/MediaBrowser.Model/ApiClient/SessionUpdatesEventArgs.cs
@@ -1,12 +1,11 @@
-using System;
-using MediaBrowser.Model.Session;
+using MediaBrowser.Model.Session;
 
 namespace MediaBrowser.Model.ApiClient
 {
     /// <summary>
     /// Class SessionUpdatesEventArgs
     /// </summary>
-    public class SessionUpdatesEventArgs : EventArgs
+    public class SessionUpdatesEventArgs
     {
         public SessionInfoDto[] Sessions { get; set; }
     }
diff --git a/MediaBrowser.Model/ApiClient/WakeOnLanInfo.cs b/MediaBrowser.Model/ApiClient/WakeOnLanInfo.cs
new file mode 100644
index 000000000..f7a3c4ebb
--- /dev/null
+++ b/MediaBrowser.Model/ApiClient/WakeOnLanInfo.cs
@@ -0,0 +1,13 @@
+namespace MediaBrowser.Model.ApiClient
+{
+    public class WakeOnLanInfo
+    {
+        public string MacAddress { get; set; }
+        public int Port { get; set; }
+
+        public WakeOnLanInfo()
+        {
+            Port = 9;
+        }
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Channels/AllChannelMediaQuery.cs b/MediaBrowser.Model/Channels/AllChannelMediaQuery.cs
new file mode 100644
index 000000000..c5631899e
--- /dev/null
+++ b/MediaBrowser.Model/Channels/AllChannelMediaQuery.cs
@@ -0,0 +1,61 @@
+using System.Collections.Generic;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Querying;
+
+namespace MediaBrowser.Model.Channels
+{
+    public class AllChannelMediaQuery
+    {
+        /// <summary>
+        /// Gets or sets the channel ids.
+        /// </summary>
+        /// <value>The channel ids.</value>
+        public string[] ChannelIds { get; set; }
+
+        /// <summary>
+        /// Gets or sets the user identifier.
+        /// </summary>
+        /// <value>The user identifier.</value>
+        public string UserId { get; set; }
+
+        /// <summary>
+        /// Skips over a given number of items within the results. Use for paging.
+        /// </summary>
+        /// <value>The start index.</value>
+        public int? StartIndex { get; set; }
+
+        /// <summary>
+        /// The maximum number of items to return
+        /// </summary>
+        /// <value>The limit.</value>
+        public int? Limit { get; set; }
+
+        /// <summary>
+        /// Gets or sets the content types.
+        /// </summary>
+        /// <value>The content types.</value>
+        public ChannelMediaContentType[] ContentTypes { get; set; }
+
+        /// <summary>
+        /// Gets or sets the extra types.
+        /// </summary>
+        /// <value>The extra types.</value>
+        public ExtraType[] ExtraTypes { get; set; }
+        public TrailerType[] TrailerTypes { get; set; }
+     
+        public AllChannelMediaQuery()
+        {
+            ChannelIds = new string[] { };
+
+            ContentTypes = new ChannelMediaContentType[] { };
+            ExtraTypes = new ExtraType[] { };
+            TrailerTypes = new TrailerType[] { };
+
+            Filters = new ItemFilter[] { };
+            Fields = new List<ItemFields>();
+        }
+
+        public ItemFilter[] Filters { get; set; }
+        public List<ItemFields> Fields { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Channels/ChannelFeatures.cs b/MediaBrowser.Model/Channels/ChannelFeatures.cs
index ef9ef67f2..8dfdbcd7a 100644
--- a/MediaBrowser.Model/Channels/ChannelFeatures.cs
+++ b/MediaBrowser.Model/Channels/ChannelFeatures.cs
@@ -82,15 +82,4 @@ namespace MediaBrowser.Model.Channels
             DefaultSortFields = new List<ChannelItemSortField>();
         }
     }
-
-    public enum ChannelItemSortField
-    {
-        Name = 0,
-        CommunityRating = 1,
-        PremiereDate = 2,
-        DateCreated = 3,
-        Runtime = 4,
-        PlayCount = 5,
-        CommunityPlayCount = 6
-    }
 }
diff --git a/MediaBrowser.Model/Channels/ChannelFolderType.cs b/MediaBrowser.Model/Channels/ChannelFolderType.cs
new file mode 100644
index 000000000..9261cb5cd
--- /dev/null
+++ b/MediaBrowser.Model/Channels/ChannelFolderType.cs
@@ -0,0 +1,11 @@
+namespace MediaBrowser.Model.Channels
+{
+    public enum ChannelFolderType
+    {
+        Container = 0,
+
+        MusicAlbum = 1,
+
+        PhotoAlbum = 2
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Channels/ChannelItemSortField.cs b/MediaBrowser.Model/Channels/ChannelItemSortField.cs
new file mode 100644
index 000000000..6b5015b77
--- /dev/null
+++ b/MediaBrowser.Model/Channels/ChannelItemSortField.cs
@@ -0,0 +1,13 @@
+namespace MediaBrowser.Model.Channels
+{
+    public enum ChannelItemSortField
+    {
+        Name = 0,
+        CommunityRating = 1,
+        PremiereDate = 2,
+        DateCreated = 3,
+        Runtime = 4,
+        PlayCount = 5,
+        CommunityPlayCount = 6
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Channels/ChannelMediaType.cs b/MediaBrowser.Model/Channels/ChannelMediaType.cs
index cf3239c9b..102cb6644 100644
--- a/MediaBrowser.Model/Channels/ChannelMediaType.cs
+++ b/MediaBrowser.Model/Channels/ChannelMediaType.cs
@@ -8,13 +8,4 @@
 
         Photo = 2
     }
-
-    public enum ChannelFolderType
-    {
-        Container = 0,
-
-        MusicAlbum = 1,
-
-        PhotoAlbum = 2
-    }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Model/Channels/ChannelQuery.cs b/MediaBrowser.Model/Channels/ChannelQuery.cs
index cb61f358c..3c6e43fde 100644
--- a/MediaBrowser.Model/Channels/ChannelQuery.cs
+++ b/MediaBrowser.Model/Channels/ChannelQuery.cs
@@ -1,8 +1,4 @@
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Querying;
-using System.Collections.Generic;
-
-namespace MediaBrowser.Model.Channels
+namespace MediaBrowser.Model.Channels
 {
     public class ChannelQuery
     {
@@ -36,60 +32,4 @@ namespace MediaBrowser.Model.Channels
         /// <value><c>null</c> if [is favorite] contains no value, <c>true</c> if [is favorite]; otherwise, <c>false</c>.</value>
         public bool? IsFavorite { get; set; }
     }
-
-    public class AllChannelMediaQuery
-    {
-        /// <summary>
-        /// Gets or sets the channel ids.
-        /// </summary>
-        /// <value>The channel ids.</value>
-        public string[] ChannelIds { get; set; }
-
-        /// <summary>
-        /// Gets or sets the user identifier.
-        /// </summary>
-        /// <value>The user identifier.</value>
-        public string UserId { get; set; }
-
-        /// <summary>
-        /// Skips over a given number of items within the results. Use for paging.
-        /// </summary>
-        /// <value>The start index.</value>
-        public int? StartIndex { get; set; }
-
-        /// <summary>
-        /// The maximum number of items to return
-        /// </summary>
-        /// <value>The limit.</value>
-        public int? Limit { get; set; }
-
-        /// <summary>
-        /// Gets or sets the content types.
-        /// </summary>
-        /// <value>The content types.</value>
-        public ChannelMediaContentType[] ContentTypes { get; set; }
-
-        /// <summary>
-        /// Gets or sets the extra types.
-        /// </summary>
-        /// <value>The extra types.</value>
-        public ExtraType[] ExtraTypes { get; set; }
-        public TrailerType[] TrailerTypes { get; set; }
-     
-        public AllChannelMediaQuery()
-        {
-            ChannelIds = new string[] { };
-
-            ContentTypes = new ChannelMediaContentType[] { };
-            ExtraTypes = new ExtraType[] { };
-            TrailerTypes = new TrailerType[] { };
-
-            Filters = new ItemFilter[] { };
-            Fields = new List<ItemFields>();
-        }
-
-        public ItemFilter[] Filters { get; set; }
-        public List<ItemFields> Fields { get; set; }
-    }
-
 }
diff --git a/MediaBrowser.Model/Chapters/ChapterProviderInfo.cs b/MediaBrowser.Model/Chapters/ChapterProviderInfo.cs
new file mode 100644
index 000000000..570407c57
--- /dev/null
+++ b/MediaBrowser.Model/Chapters/ChapterProviderInfo.cs
@@ -0,0 +1,8 @@
+namespace MediaBrowser.Model.Chapters
+{
+    public class ChapterProviderInfo
+    {
+        public string Name { get; set; }
+        public string Id { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Chapters/RemoteChapterInfo.cs b/MediaBrowser.Model/Chapters/RemoteChapterInfo.cs
index 52b6c1bcd..f2674c842 100644
--- a/MediaBrowser.Model/Chapters/RemoteChapterInfo.cs
+++ b/MediaBrowser.Model/Chapters/RemoteChapterInfo.cs
@@ -15,10 +15,4 @@ namespace MediaBrowser.Model.Chapters
         /// <value>The name.</value>
         public string Name { get; set; }
     }
-
-    public class ChapterProviderInfo
-    {
-        public string Name { get; set; }
-        public string Id { get; set; }
-    }
 }
diff --git a/MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs b/MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs
index 8154e764a..94d9ebabc 100644
--- a/MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs
@@ -9,6 +9,7 @@ namespace MediaBrowser.Model.Configuration
         public bool EnableIntrosFromUpcomingTrailers { get; set; }
         public bool EnableIntrosFromMoviesInLibrary { get; set; }
         public bool EnableIntrosParentalControl { get; set; }
+        public bool EnableIntrosFromSimilarMovies { get; set; }
         public string CustomIntroPath { get; set; }
         public bool EnableIntrosFromUpcomingDvdMovies { get; set; }
         public bool EnableIntrosFromUpcomingStreamingMovies { get; set; }
diff --git a/MediaBrowser.Model/Configuration/PeopleMetadataOptions.cs b/MediaBrowser.Model/Configuration/PeopleMetadataOptions.cs
new file mode 100644
index 000000000..8564d5b5b
--- /dev/null
+++ b/MediaBrowser.Model/Configuration/PeopleMetadataOptions.cs
@@ -0,0 +1,19 @@
+namespace MediaBrowser.Model.Configuration
+{
+    public class PeopleMetadataOptions
+    {
+        public bool DownloadActorMetadata { get; set; }
+        public bool DownloadDirectorMetadata { get; set; }
+        public bool DownloadProducerMetadata { get; set; }
+        public bool DownloadWriterMetadata { get; set; }
+        public bool DownloadComposerMetadata { get; set; }
+        public bool DownloadOtherPeopleMetadata { get; set; }
+        public bool DownloadGuestStarMetadata { get; set; }
+
+        public PeopleMetadataOptions()
+        {
+            DownloadActorMetadata = true;
+            DownloadDirectorMetadata = true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index ab5b5bc3b..27818e5ed 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -293,21 +293,4 @@ namespace MediaBrowser.Model.Configuration
             };
         }
     }
-
-    public class PeopleMetadataOptions
-    {
-        public bool DownloadActorMetadata { get; set; }
-        public bool DownloadDirectorMetadata { get; set; }
-        public bool DownloadProducerMetadata { get; set; }
-        public bool DownloadWriterMetadata { get; set; }
-        public bool DownloadComposerMetadata { get; set; }
-        public bool DownloadOtherPeopleMetadata { get; set; }
-        public bool DownloadGuestStarMetadata { get; set; }
-
-        public PeopleMetadataOptions()
-        {
-            DownloadActorMetadata = true;
-            DownloadDirectorMetadata = true;
-        }
-    }
 }
diff --git a/MediaBrowser.Model/Dlna/EncodingContext.cs b/MediaBrowser.Model/Dlna/EncodingContext.cs
new file mode 100644
index 000000000..f83d8ddc8
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/EncodingContext.cs
@@ -0,0 +1,8 @@
+namespace MediaBrowser.Model.Dlna
+{
+    public enum EncodingContext
+    {
+        Streaming = 0,
+        Static = 1
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/ResolutionConfiguration.cs b/MediaBrowser.Model/Dlna/ResolutionConfiguration.cs
new file mode 100644
index 000000000..8efdb0660
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/ResolutionConfiguration.cs
@@ -0,0 +1,14 @@
+namespace MediaBrowser.Model.Dlna
+{
+    public class ResolutionConfiguration
+    {
+        public int MaxWidth { get; set; }
+        public int MaxBitrate { get; set; }
+
+        public ResolutionConfiguration(int maxWidth, int maxBitrate)
+        {
+            MaxWidth = maxWidth;
+            MaxBitrate = maxBitrate;
+        }
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs b/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs
index a95de8d39..b23c0b20b 100644
--- a/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs
+++ b/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs
@@ -42,22 +42,4 @@ namespace MediaBrowser.Model.Dlna
             };
         }
     }
-
-    public class ResolutionConfiguration
-    {
-        public int MaxWidth { get; set; }
-        public int MaxBitrate { get; set; }
-
-        public ResolutionConfiguration(int maxWidth, int maxBitrate)
-        {
-            MaxWidth = maxWidth;
-            MaxBitrate = maxBitrate;
-        }
-    }
-
-    public class ResolutionOptions
-    {
-        public int? MaxWidth { get; set; }
-        public int? MaxHeight { get; set; }
-    }
 }
diff --git a/MediaBrowser.Model/Dlna/ResolutionOptions.cs b/MediaBrowser.Model/Dlna/ResolutionOptions.cs
new file mode 100644
index 000000000..6b711cfa0
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/ResolutionOptions.cs
@@ -0,0 +1,8 @@
+namespace MediaBrowser.Model.Dlna
+{
+    public class ResolutionOptions
+    {
+        public int? MaxWidth { get; set; }
+        public int? MaxHeight { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index 4d6b301d1..6231d99a4 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -514,33 +514,4 @@ namespace MediaBrowser.Model.Dlna
             }
         }
     }
-
-    public enum SubtitleDeliveryMethod
-    {
-        /// <summary>
-        /// The encode
-        /// </summary>
-        Encode = 0,
-        /// <summary>
-        /// The embed
-        /// </summary>
-        Embed = 1,
-        /// <summary>
-        /// The external
-        /// </summary>
-        External = 2,
-        /// <summary>
-        /// The HLS
-        /// </summary>
-        Hls = 3
-    }
-
-    public class SubtitleStreamInfo
-    {
-        public string Url { get; set; }
-        public string Language { get; set; }
-        public string Name { get; set; }
-        public bool IsForced { get; set; }
-        public string Format { get; set; }
-    }
 }
diff --git a/MediaBrowser.Model/Dlna/SubtitleDeliveryMethod.cs b/MediaBrowser.Model/Dlna/SubtitleDeliveryMethod.cs
new file mode 100644
index 000000000..b4e13c5ba
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/SubtitleDeliveryMethod.cs
@@ -0,0 +1,22 @@
+namespace MediaBrowser.Model.Dlna
+{
+    public enum SubtitleDeliveryMethod
+    {
+        /// <summary>
+        /// The encode
+        /// </summary>
+        Encode = 0,
+        /// <summary>
+        /// The embed
+        /// </summary>
+        Embed = 1,
+        /// <summary>
+        /// The external
+        /// </summary>
+        External = 2,
+        /// <summary>
+        /// The HLS
+        /// </summary>
+        Hls = 3
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/SubtitleStreamInfo.cs b/MediaBrowser.Model/Dlna/SubtitleStreamInfo.cs
new file mode 100644
index 000000000..1600408d6
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/SubtitleStreamInfo.cs
@@ -0,0 +1,11 @@
+namespace MediaBrowser.Model.Dlna
+{
+    public class SubtitleStreamInfo
+    {
+        public string Url { get; set; }
+        public string Language { get; set; }
+        public string Name { get; set; }
+        public bool IsForced { get; set; }
+        public string Format { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/TranscodingProfile.cs b/MediaBrowser.Model/Dlna/TranscodingProfile.cs
index 976f8e8d1..ad82d6fac 100644
--- a/MediaBrowser.Model/Dlna/TranscodingProfile.cs
+++ b/MediaBrowser.Model/Dlna/TranscodingProfile.cs
@@ -45,10 +45,4 @@ namespace MediaBrowser.Model.Dlna
             return list;
         }
     }
-
-    public enum EncodingContext
-    {
-        Streaming = 0,
-        Static = 1
-    }
 }
diff --git a/MediaBrowser.Model/Dto/MediaSourceInfo.cs b/MediaBrowser.Model/Dto/MediaSourceInfo.cs
index 46c51ed8b..368f20181 100644
--- a/MediaBrowser.Model/Dto/MediaSourceInfo.cs
+++ b/MediaBrowser.Model/Dto/MediaSourceInfo.cs
@@ -117,11 +117,4 @@ namespace MediaBrowser.Model.Dto
             return null;
         }
     }
-
-    public enum MediaSourceType
-    {
-        Default = 0,
-        Grouping = 1,
-        Cache = 2
-    }
 }
diff --git a/MediaBrowser.Model/Dto/MediaSourceType.cs b/MediaBrowser.Model/Dto/MediaSourceType.cs
new file mode 100644
index 000000000..a9cd71df5
--- /dev/null
+++ b/MediaBrowser.Model/Dto/MediaSourceType.cs
@@ -0,0 +1,9 @@
+namespace MediaBrowser.Model.Dto
+{
+    public enum MediaSourceType
+    {
+        Default = 0,
+        Grouping = 1,
+        Cache = 2
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dto/StreamOptions.cs b/MediaBrowser.Model/Dto/StreamOptions.cs
index d281148ff..5b7cdc6fb 100644
--- a/MediaBrowser.Model/Dto/StreamOptions.cs
+++ b/MediaBrowser.Model/Dto/StreamOptions.cs
@@ -64,102 +64,4 @@ namespace MediaBrowser.Model.Dto
         /// <value>The device id.</value>
         public string DeviceId { get; set; }
     }
-    
-    /// <summary>
-    /// Class VideoStreamOptions
-    /// </summary>
-    [Obsolete]
-    public class VideoStreamOptions : StreamOptions
-    {
-        /// <summary>
-        /// Gets or sets the video codec.
-        /// Omit to copy
-        /// </summary>
-        /// <value>The video codec.</value>
-        public string VideoCodec { get; set; }
-
-        /// <summary>
-        /// Gets or sets the video bit rate.
-        /// </summary>
-        /// <value>The video bit rate.</value>
-        public int? VideoBitRate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the width.
-        /// </summary>
-        /// <value>The width.</value>
-        public int? Width { get; set; }
-
-        /// <summary>
-        /// Gets or sets the height.
-        /// </summary>
-        /// <value>The height.</value>
-        public int? Height { get; set; }
-
-        /// <summary>
-        /// Gets or sets the width of the max.
-        /// </summary>
-        /// <value>The width of the max.</value>
-        public int? MaxWidth { get; set; }
-
-        /// <summary>
-        /// Gets or sets the height of the max.
-        /// </summary>
-        /// <value>The height of the max.</value>
-        public int? MaxHeight { get; set; }
-
-        /// <summary>
-        /// Gets or sets the frame rate.
-        /// </summary>
-        /// <value>The frame rate.</value>
-        public double? FrameRate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the index of the audio stream.
-        /// </summary>
-        /// <value>The index of the audio stream.</value>
-        public int? AudioStreamIndex { get; set; }
-
-        /// <summary>
-        /// Gets or sets the index of the video stream.
-        /// </summary>
-        /// <value>The index of the video stream.</value>
-        public int? VideoStreamIndex { get; set; }
-
-        /// <summary>
-        /// Gets or sets the index of the subtitle stream.
-        /// </summary>
-        /// <value>The index of the subtitle stream.</value>
-        public int? SubtitleStreamIndex { get; set; }
-
-        /// <summary>
-        /// Gets or sets the profile.
-        /// </summary>
-        /// <value>The profile.</value>
-        public string Profile { get; set; }
-
-        /// <summary>
-        /// Gets or sets the level.
-        /// </summary>
-        /// <value>The level.</value>
-        public string Level { get; set; }
-
-        /// <summary>
-        /// Gets or sets the baseline stream audio bit rate.
-        /// </summary>
-        /// <value>The baseline stream audio bit rate.</value>
-        public int? BaselineStreamAudioBitRate { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether [append baseline stream].
-        /// </summary>
-        /// <value><c>true</c> if [append baseline stream]; otherwise, <c>false</c>.</value>
-        public bool AppendBaselineStream { get; set; }
-
-        /// <summary>
-        /// Gets or sets the time stamp offset ms. Only used with HLS.
-        /// </summary>
-        /// <value>The time stamp offset ms.</value>
-        public int? TimeStampOffsetMs { get; set; }
-    }
 }
diff --git a/MediaBrowser.Model/Dto/VideoStreamOptions.cs b/MediaBrowser.Model/Dto/VideoStreamOptions.cs
new file mode 100644
index 000000000..606e928f2
--- /dev/null
+++ b/MediaBrowser.Model/Dto/VideoStreamOptions.cs
@@ -0,0 +1,102 @@
+using System;
+
+namespace MediaBrowser.Model.Dto
+{
+    /// <summary>
+    /// Class VideoStreamOptions
+    /// </summary>
+    [Obsolete]
+    public class VideoStreamOptions : StreamOptions
+    {
+        /// <summary>
+        /// Gets or sets the video codec.
+        /// Omit to copy
+        /// </summary>
+        /// <value>The video codec.</value>
+        public string VideoCodec { get; set; }
+
+        /// <summary>
+        /// Gets or sets the video bit rate.
+        /// </summary>
+        /// <value>The video bit rate.</value>
+        public int? VideoBitRate { get; set; }
+
+        /// <summary>
+        /// Gets or sets the width.
+        /// </summary>
+        /// <value>The width.</value>
+        public int? Width { get; set; }
+
+        /// <summary>
+        /// Gets or sets the height.
+        /// </summary>
+        /// <value>The height.</value>
+        public int? Height { get; set; }
+
+        /// <summary>
+        /// Gets or sets the width of the max.
+        /// </summary>
+        /// <value>The width of the max.</value>
+        public int? MaxWidth { get; set; }
+
+        /// <summary>
+        /// Gets or sets the height of the max.
+        /// </summary>
+        /// <value>The height of the max.</value>
+        public int? MaxHeight { get; set; }
+
+        /// <summary>
+        /// Gets or sets the frame rate.
+        /// </summary>
+        /// <value>The frame rate.</value>
+        public double? FrameRate { get; set; }
+
+        /// <summary>
+        /// Gets or sets the index of the audio stream.
+        /// </summary>
+        /// <value>The index of the audio stream.</value>
+        public int? AudioStreamIndex { get; set; }
+
+        /// <summary>
+        /// Gets or sets the index of the video stream.
+        /// </summary>
+        /// <value>The index of the video stream.</value>
+        public int? VideoStreamIndex { get; set; }
+
+        /// <summary>
+        /// Gets or sets the index of the subtitle stream.
+        /// </summary>
+        /// <value>The index of the subtitle stream.</value>
+        public int? SubtitleStreamIndex { get; set; }
+
+        /// <summary>
+        /// Gets or sets the profile.
+        /// </summary>
+        /// <value>The profile.</value>
+        public string Profile { get; set; }
+
+        /// <summary>
+        /// Gets or sets the level.
+        /// </summary>
+        /// <value>The level.</value>
+        public string Level { get; set; }
+
+        /// <summary>
+        /// Gets or sets the baseline stream audio bit rate.
+        /// </summary>
+        /// <value>The baseline stream audio bit rate.</value>
+        public int? BaselineStreamAudioBitRate { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether [append baseline stream].
+        /// </summary>
+        /// <value><c>true</c> if [append baseline stream]; otherwise, <c>false</c>.</value>
+        public bool AppendBaselineStream { get; set; }
+
+        /// <summary>
+        /// Gets or sets the time stamp offset ms. Only used with HLS.
+        /// </summary>
+        /// <value>The time stamp offset ms.</value>
+        public int? TimeStampOffsetMs { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Entities/ExtraType.cs b/MediaBrowser.Model/Entities/ExtraType.cs
index 92fb00731..ab8da58c0 100644
--- a/MediaBrowser.Model/Entities/ExtraType.cs
+++ b/MediaBrowser.Model/Entities/ExtraType.cs
@@ -13,12 +13,4 @@ namespace MediaBrowser.Model.Entities
         ThemeSong = 8,
         ThemeVideo = 9
     }
-
-    public enum TrailerType
-    {
-        ComingSoonToTheaters = 1,
-        ComingSoonToDvd = 2,
-        ComingSoonToStreaming = 3,
-        Archive = 4
-    }
 }
diff --git a/MediaBrowser.Model/Entities/MBRegistrationRecord.cs b/MediaBrowser.Model/Entities/MBRegistrationRecord.cs
index 3a4af19d8..00176fb34 100644
--- a/MediaBrowser.Model/Entities/MBRegistrationRecord.cs
+++ b/MediaBrowser.Model/Entities/MBRegistrationRecord.cs
@@ -11,15 +11,4 @@ namespace MediaBrowser.Model.Entities
         public bool TrialVersion { get; set; }
         public bool IsValid { get; set; }
     }
-
-    public class SupporterInfo
-    {
-        public string Email { get; set; }
-        public string SupporterKey { get; set; }
-        public DateTime? ExpirationDate { get; set; }
-        public DateTime RegistrationDate { get; set; }
-        public string PlanType { get; set; }
-        public bool IsActiveSupporter { get; set; }
-        public bool IsExpiredSupporter { get; set; }
-    }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Model/Entities/SupporterInfo.cs b/MediaBrowser.Model/Entities/SupporterInfo.cs
new file mode 100644
index 000000000..233d5615f
--- /dev/null
+++ b/MediaBrowser.Model/Entities/SupporterInfo.cs
@@ -0,0 +1,15 @@
+using System;
+
+namespace MediaBrowser.Model.Entities
+{
+    public class SupporterInfo
+    {
+        public string Email { get; set; }
+        public string SupporterKey { get; set; }
+        public DateTime? ExpirationDate { get; set; }
+        public DateTime RegistrationDate { get; set; }
+        public string PlanType { get; set; }
+        public bool IsActiveSupporter { get; set; }
+        public bool IsExpiredSupporter { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Entities/TrailerType.cs b/MediaBrowser.Model/Entities/TrailerType.cs
new file mode 100644
index 000000000..c96a05bcd
--- /dev/null
+++ b/MediaBrowser.Model/Entities/TrailerType.cs
@@ -0,0 +1,10 @@
+namespace MediaBrowser.Model.Entities
+{
+    public enum TrailerType
+    {
+        ComingSoonToTheaters = 1,
+        ComingSoonToDvd = 2,
+        ComingSoonToStreaming = 3,
+        Archive = 4
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Extensions/BoolHelper.cs b/MediaBrowser.Model/Extensions/BoolHelper.cs
new file mode 100644
index 000000000..5b61f864b
--- /dev/null
+++ b/MediaBrowser.Model/Extensions/BoolHelper.cs
@@ -0,0 +1,16 @@
+namespace MediaBrowser.Model.Extensions
+{
+    public static class BoolHelper
+    {
+        /// <summary>
+        /// Tries the parse culture invariant.
+        /// </summary>
+        /// <param name="s">The s.</param>
+        /// <param name="result">The result.</param>
+        /// <returns><c>true</c> if XXXX, <c>false</c> otherwise.</returns>
+        public static bool TryParseCultureInvariant(string s, out bool result)
+        {
+            return bool.TryParse(s, out result);
+        }
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Extensions/DoubleHelper.cs b/MediaBrowser.Model/Extensions/DoubleHelper.cs
index e6a4e0581..bcaf2d780 100644
--- a/MediaBrowser.Model/Extensions/DoubleHelper.cs
+++ b/MediaBrowser.Model/Extensions/DoubleHelper.cs
@@ -18,32 +18,4 @@ namespace MediaBrowser.Model.Extensions
             return double.TryParse(s, NumberStyles.Any, CultureInfo.InvariantCulture, out result);
         }
     }
-
-    public static class FloatHelper
-    {
-        /// <summary>
-        /// Tries the parse culture invariant.
-        /// </summary>
-        /// <param name="s">The s.</param>
-        /// <param name="result">The result.</param>
-        /// <returns><c>true</c> if XXXX, <c>false</c> otherwise.</returns>
-        public static bool TryParseCultureInvariant(string s, out float result)
-        {
-            return float.TryParse(s, NumberStyles.Any, CultureInfo.InvariantCulture, out result);
-        }
-    }
-
-    public static class BoolHelper
-    {
-        /// <summary>
-        /// Tries the parse culture invariant.
-        /// </summary>
-        /// <param name="s">The s.</param>
-        /// <param name="result">The result.</param>
-        /// <returns><c>true</c> if XXXX, <c>false</c> otherwise.</returns>
-        public static bool TryParseCultureInvariant(string s, out bool result)
-        {
-            return bool.TryParse(s, out result);
-        }
-    }
 }
diff --git a/MediaBrowser.Model/Extensions/FloatHelper.cs b/MediaBrowser.Model/Extensions/FloatHelper.cs
new file mode 100644
index 000000000..171eccf93
--- /dev/null
+++ b/MediaBrowser.Model/Extensions/FloatHelper.cs
@@ -0,0 +1,18 @@
+using System.Globalization;
+
+namespace MediaBrowser.Model.Extensions
+{
+    public static class FloatHelper
+    {
+        /// <summary>
+        /// Tries the parse culture invariant.
+        /// </summary>
+        /// <param name="s">The s.</param>
+        /// <param name="result">The result.</param>
+        /// <returns><c>true</c> if XXXX, <c>false</c> otherwise.</returns>
+        public static bool TryParseCultureInvariant(string s, out float result)
+        {
+            return float.TryParse(s, NumberStyles.Any, CultureInfo.InvariantCulture, out result);
+        }
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index b0cc3986c..dc8b3d519 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -60,7 +60,9 @@
       <Link>Properties\SharedVersion.cs</Link>
     </Compile>
     <Compile Include="Activity\ActivityLogEntry.cs" />
+    <Compile Include="ApiClient\ConnectionMode.cs" />
     <Compile Include="ApiClient\ConnectionResult.cs" />
+    <Compile Include="ApiClient\ConnectionState.cs" />
     <Compile Include="ApiClient\HttpResponseEventArgs.cs" />
     <Compile Include="ApiClient\IApiClient.cs" />
     <Compile Include="ApiClient\ApiClientExtensions.cs" />
@@ -70,28 +72,45 @@
     <Compile Include="ApiClient\ServerDiscoveryInfo.cs" />
     <Compile Include="ApiClient\ServerInfo.cs" />
     <Compile Include="ApiClient\SessionUpdatesEventArgs.cs" />
+    <Compile Include="ApiClient\WakeOnLanInfo.cs" />
     <Compile Include="Branding\BrandingOptions.cs" />
+    <Compile Include="Channels\AllChannelMediaQuery.cs" />
     <Compile Include="Channels\ChannelFeatures.cs" />
+    <Compile Include="Channels\ChannelFolderType.cs" />
     <Compile Include="Channels\ChannelInfo.cs" />
     <Compile Include="Channels\ChannelItemQuery.cs" />
+    <Compile Include="Channels\ChannelItemSortField.cs" />
     <Compile Include="Channels\ChannelMediaContentType.cs" />
     <Compile Include="Channels\ChannelMediaType.cs" />
     <Compile Include="Channels\ChannelQuery.cs" />
+    <Compile Include="Chapters\ChapterProviderInfo.cs" />
     <Compile Include="Chapters\RemoteChapterInfo.cs" />
     <Compile Include="Chapters\RemoteChapterResult.cs" />
     <Compile Include="Collections\CollectionCreationResult.cs" />
     <Compile Include="Configuration\ChannelOptions.cs" />
     <Compile Include="Configuration\ChapterOptions.cs" />
     <Compile Include="Configuration\CinemaModeConfiguration.cs" />
+    <Compile Include="Configuration\PeopleMetadataOptions.cs" />
     <Compile Include="Configuration\XbmcMetadataOptions.cs" />
     <Compile Include="Configuration\SubtitlePlaybackMode.cs" />
     <Compile Include="Connect\UserLinkType.cs" />
+    <Compile Include="Dlna\EncodingContext.cs" />
     <Compile Include="Dlna\Profiles\AndroidProfile.cs" />
     <Compile Include="Dlna\Profiles\DefaultProfile.cs" />
+    <Compile Include="Dlna\ResolutionConfiguration.cs" />
     <Compile Include="Dlna\ResolutionNormalizer.cs" />
+    <Compile Include="Dlna\ResolutionOptions.cs" />
+    <Compile Include="Dlna\SubtitleDeliveryMethod.cs" />
+    <Compile Include="Dlna\SubtitleStreamInfo.cs" />
     <Compile Include="Drawing\ImageOrientation.cs" />
+    <Compile Include="Dto\MediaSourceType.cs" />
     <Compile Include="Dto\StreamOptions.cs" />
+    <Compile Include="Dto\VideoStreamOptions.cs" />
     <Compile Include="Entities\ExtraType.cs" />
+    <Compile Include="Entities\SupporterInfo.cs" />
+    <Compile Include="Entities\TrailerType.cs" />
+    <Compile Include="Extensions\BoolHelper.cs" />
+    <Compile Include="Extensions\FloatHelper.cs" />
     <Compile Include="FileOrganization\AutoOrganizeOptions.cs" />
     <Compile Include="FileOrganization\TvFileOrganizationOptions.cs" />
     <Compile Include="Configuration\BaseApplicationConfiguration.cs" />
@@ -105,6 +124,7 @@
     <Compile Include="Configuration\MetadataPluginSummary.cs" />
     <Compile Include="Configuration\MetadataPluginType.cs" />
     <Compile Include="Dlna\SubtitleProfile.cs" />
+    <Compile Include="MediaInfo\MediaProtocol.cs" />
     <Compile Include="Notifications\NotificationOption.cs" />
     <Compile Include="Notifications\NotificationOptions.cs" />
     <Compile Include="Notifications\NotificationType.cs" />
@@ -249,6 +269,7 @@
     <Compile Include="Providers\RemoteImageResult.cs" />
     <Compile Include="Providers\RemoteSearchResult.cs" />
     <Compile Include="Providers\RemoteSubtitleInfo.cs" />
+    <Compile Include="Providers\SubtitleProviderInfo.cs" />
     <Compile Include="Querying\AllThemeMediaResult.cs" />
     <Compile Include="Querying\ArtistsQuery.cs" />
     <Compile Include="Querying\EpisodeQuery.cs" />
@@ -312,6 +333,7 @@
     <Compile Include="Session\SessionCapabilities.cs" />
     <Compile Include="Session\SessionInfoDto.cs" />
     <Compile Include="Session\SessionUserInfo.cs" />
+    <Compile Include="Session\TranscodingInfo.cs" />
     <Compile Include="Session\UserDataChangeInfo.cs" />
     <Compile Include="Sync\SyncJob.cs" />
     <Compile Include="Sync\SyncJobCreationResult.cs" />
@@ -319,9 +341,11 @@
     <Compile Include="Sync\SyncJobQuery.cs" />
     <Compile Include="Sync\SyncJobRequest.cs" />
     <Compile Include="Sync\SyncJobStatus.cs" />
+    <Compile Include="Sync\SyncLimitType.cs" />
     <Compile Include="Sync\SyncQuality.cs" />
     <Compile Include="Sync\SyncTarget.cs" />
     <Compile Include="System\LogFile.cs" />
+    <Compile Include="System\PublicSystemInfo.cs" />
     <Compile Include="Themes\AppTheme.cs" />
     <Compile Include="Themes\AppThemeInfo.cs" />
     <Compile Include="Themes\ThemeImage.cs" />
diff --git a/MediaBrowser.Model/MediaInfo/Container.cs b/MediaBrowser.Model/MediaInfo/Container.cs
index 89ce9864c..3762edf9f 100644
--- a/MediaBrowser.Model/MediaInfo/Container.cs
+++ b/MediaBrowser.Model/MediaInfo/Container.cs
@@ -6,11 +6,4 @@ namespace MediaBrowser.Model.MediaInfo
         public const string MP4 = "mp4";
         public const string MKV = "mkv";
     }
-
-    public enum MediaProtocol
-    {
-        File = 0,
-        Http = 1,
-        Rtmp = 2
-    }
 }
diff --git a/MediaBrowser.Model/MediaInfo/MediaProtocol.cs b/MediaBrowser.Model/MediaInfo/MediaProtocol.cs
new file mode 100644
index 000000000..ad63fa058
--- /dev/null
+++ b/MediaBrowser.Model/MediaInfo/MediaProtocol.cs
@@ -0,0 +1,9 @@
+namespace MediaBrowser.Model.MediaInfo
+{
+    public enum MediaProtocol
+    {
+        File = 0,
+        Http = 1,
+        Rtmp = 2
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs b/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs
index aa697fee3..0a4a52cd5 100644
--- a/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs
+++ b/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs
@@ -16,10 +16,4 @@ namespace MediaBrowser.Model.Providers
         public int? DownloadCount { get; set; }
         public bool? IsHashMatch { get; set; }
     }
-
-    public class SubtitleProviderInfo
-    {
-        public string Name { get; set; }
-        public string Id { get; set; }
-    }
 }
diff --git a/MediaBrowser.Model/Providers/SubtitleProviderInfo.cs b/MediaBrowser.Model/Providers/SubtitleProviderInfo.cs
new file mode 100644
index 000000000..ecce18bd5
--- /dev/null
+++ b/MediaBrowser.Model/Providers/SubtitleProviderInfo.cs
@@ -0,0 +1,8 @@
+namespace MediaBrowser.Model.Providers
+{
+    public class SubtitleProviderInfo
+    {
+        public string Name { get; set; }
+        public string Id { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Session/PlayerStateInfo.cs b/MediaBrowser.Model/Session/PlayerStateInfo.cs
index e196d9d59..c9afef8e0 100644
--- a/MediaBrowser.Model/Session/PlayerStateInfo.cs
+++ b/MediaBrowser.Model/Session/PlayerStateInfo.cs
@@ -56,19 +56,4 @@
         /// <value>The play method.</value>
         public PlayMethod? PlayMethod { get; set; }
     }
-
-    public class TranscodingInfo
-    {
-        public string AudioCodec { get; set; }
-        public string VideoCodec { get; set; }
-        public string Container { get; set; }
-        public int? Bitrate { get; set; }
-
-        public float? Framerate { get; set; }
-        public double? CompletionPercentage { get; set; }
-
-        public int? Width { get; set; }
-        public int? Height { get; set; }
-        public int? AudioChannels { get; set; }
-    }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Model/Session/TranscodingInfo.cs b/MediaBrowser.Model/Session/TranscodingInfo.cs
new file mode 100644
index 000000000..b3ab32a44
--- /dev/null
+++ b/MediaBrowser.Model/Session/TranscodingInfo.cs
@@ -0,0 +1,17 @@
+namespace MediaBrowser.Model.Session
+{
+    public class TranscodingInfo
+    {
+        public string AudioCodec { get; set; }
+        public string VideoCodec { get; set; }
+        public string Container { get; set; }
+        public int? Bitrate { get; set; }
+
+        public float? Framerate { get; set; }
+        public double? CompletionPercentage { get; set; }
+
+        public int? Width { get; set; }
+        public int? Height { get; set; }
+        public int? AudioChannels { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Sync/SyncJobRequest.cs b/MediaBrowser.Model/Sync/SyncJobRequest.cs
index 7728aad9b..987f396e4 100644
--- a/MediaBrowser.Model/Sync/SyncJobRequest.cs
+++ b/MediaBrowser.Model/Sync/SyncJobRequest.cs
@@ -50,9 +50,4 @@ namespace MediaBrowser.Model.Sync
             ItemIds = new List<string>();
         }
     }
-
-    public enum SyncLimitType
-    {
-        ItemCount = 0
-    }
 }
diff --git a/MediaBrowser.Model/Sync/SyncLimitType.cs b/MediaBrowser.Model/Sync/SyncLimitType.cs
new file mode 100644
index 000000000..d20f9e33d
--- /dev/null
+++ b/MediaBrowser.Model/Sync/SyncLimitType.cs
@@ -0,0 +1,7 @@
+namespace MediaBrowser.Model.Sync
+{
+    public enum SyncLimitType
+    {
+        ItemCount = 0
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/System/PublicSystemInfo.cs b/MediaBrowser.Model/System/PublicSystemInfo.cs
new file mode 100644
index 000000000..3afe72e81
--- /dev/null
+++ b/MediaBrowser.Model/System/PublicSystemInfo.cs
@@ -0,0 +1,35 @@
+namespace MediaBrowser.Model.System
+{
+    public class PublicSystemInfo
+    {
+        /// <summary>
+        /// Gets or sets the local address.
+        /// </summary>
+        /// <value>The local address.</value>
+        public string LocalAddress { get; set; }
+
+        /// <summary>
+        /// Gets or sets the wan address.
+        /// </summary>
+        /// <value>The wan address.</value>
+        public string WanAddress { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the server.
+        /// </summary>
+        /// <value>The name of the server.</value>
+        public string ServerName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the version.
+        /// </summary>
+        /// <value>The version.</value>
+        public string Version { get; set; }
+
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        public string Id { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs
index 152448330..415c619ea 100644
--- a/MediaBrowser.Model/System/SystemInfo.cs
+++ b/MediaBrowser.Model/System/SystemInfo.cs
@@ -152,37 +152,4 @@ namespace MediaBrowser.Model.System
             FailedPluginAssemblies = new List<string>();
         }
     }
-
-    public class PublicSystemInfo
-    {
-        /// <summary>
-        /// Gets or sets the local address.
-        /// </summary>
-        /// <value>The local address.</value>
-        public string LocalAddress { get; set; }
-
-        /// <summary>
-        /// Gets or sets the wan address.
-        /// </summary>
-        /// <value>The wan address.</value>
-        public string WanAddress { get; set; }
-
-        /// <summary>
-        /// Gets or sets the name of the server.
-        /// </summary>
-        /// <value>The name of the server.</value>
-        public string ServerName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the version.
-        /// </summary>
-        /// <value>The version.</value>
-        public string Version { get; set; }
-
-        /// <summary>
-        /// Gets or sets the id.
-        /// </summary>
-        /// <value>The id.</value>
-        public string Id { get; set; }
-    }
 }
diff --git a/MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs b/MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs
index 6c3eb2dc4..f2b3474b9 100644
--- a/MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs
+++ b/MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs
@@ -109,6 +109,10 @@ namespace MediaBrowser.Server.Implementations.Intros
             {
                 trailerTypes.Add(TrailerType.ComingSoonToStreaming);
             }
+            if (config.EnableIntrosFromSimilarMovies)
+            {
+                trailerTypes.Add(TrailerType.Archive);
+            }
 
             if (trailerTypes.Count > 0 && IsSupporter)
             {
diff --git a/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs b/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs
index 4dd9f756d..ed67df01e 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs
@@ -105,13 +105,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
         public bool HasChanged(IHasMetadata item, MetadataStatus status, IDirectoryService directoryService)
         {
-            var liveTvItem = item as LiveTvChannel;
-
-            if (liveTvItem != null)
-            {
-                return !liveTvItem.HasImage(ImageType.Primary) && (liveTvItem.HasProviderImage ?? true);
-            }
-            return false;
+            return GetSupportedImages(item).Any(i => !item.HasImage(i));
         }
     }
 }
diff --git a/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs b/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs
index cc289faf2..7af8546ab 100644
--- a/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs
+++ b/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs
@@ -26,7 +26,7 @@ namespace MediaBrowser.ServerApplication.FFMpeg
 
         private readonly string[] _fontUrls =
         {
-            "https://www.dropbox.com/s/pj847twf7riq0j7/ARIALUNI.7z?dl=1"
+            "https://github.com/MediaBrowser/MediaBrowser.Resources/raw/master/ffmpeg/ARIALUNI.7z"
         };
 
         public FFMpegDownloader(ILogger logger, IApplicationPaths appPaths, IHttpClient httpClient, IZipClient zipClient, IFileSystem fileSystem)
diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec
index 82e865afa..b95240dba 100644
--- a/Nuget/MediaBrowser.Common.Internal.nuspec
+++ b/Nuget/MediaBrowser.Common.Internal.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common.Internal</id>
-        <version>3.0.463</version>
+        <version>3.0.466</version>
         <title>MediaBrowser.Common.Internal</title>
         <authors>Luke</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,7 +12,7 @@
         <description>Contains common components shared by Media Browser Theater and Media Browser Server. Not intended for plugin developer consumption.</description>
         <copyright>Copyright © Media Browser 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.463" />
+            <dependency id="MediaBrowser.Common" version="3.0.466" />
             <dependency id="NLog" version="3.1.0.0" />
             <dependency id="SimpleInjector" version="2.5.2" />
             <dependency id="sharpcompress" version="0.10.2" />
diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec
index c8c2d69d2..0590378ef 100644
--- a/Nuget/MediaBrowser.Common.nuspec
+++ b/Nuget/MediaBrowser.Common.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common</id>
-        <version>3.0.463</version>
+        <version>3.0.466</version>
         <title>MediaBrowser.Common</title>
         <authors>Media Browser Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
diff --git a/Nuget/MediaBrowser.Model.Signed.nuspec b/Nuget/MediaBrowser.Model.Signed.nuspec
index 5d9637525..af8316433 100644
--- a/Nuget/MediaBrowser.Model.Signed.nuspec
+++ b/Nuget/MediaBrowser.Model.Signed.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Model.Signed</id>
-        <version>3.0.463</version>
+        <version>3.0.466</version>
         <title>MediaBrowser.Model - Signed Edition</title>
         <authors>Media Browser Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec
index 724883697..d62d6f0a3 100644
--- a/Nuget/MediaBrowser.Server.Core.nuspec
+++ b/Nuget/MediaBrowser.Server.Core.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Server.Core</id>
-        <version>3.0.463</version>
+        <version>3.0.466</version>
         <title>Media Browser.Server.Core</title>
         <authors>Media Browser Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,7 +12,7 @@
         <description>Contains core components required to build plugins for Media Browser Server.</description>
         <copyright>Copyright © Media Browser 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.463" />
+            <dependency id="MediaBrowser.Common" version="3.0.466" />
         </dependencies>
     </metadata>
     <files>