diff --git a/MediaBrowser.Model/Entities/AudioStream.cs b/MediaBrowser.Model/Entities/AudioStream.cs
new file mode 100644
index 0000000000..8a4cea4eed
--- /dev/null
+++ b/MediaBrowser.Model/Entities/AudioStream.cs
@@ -0,0 +1,26 @@
+using ProtoBuf;
+
+namespace MediaBrowser.Model.Entities
+{
+    [ProtoContract]
+    public class AudioStream
+    {
+        [ProtoMember(1)]
+        public string Codec { get; set; }
+
+        [ProtoMember(2)]
+        public string Language { get; set; }
+
+        [ProtoMember(3)]
+        public int BitRate { get; set; }
+
+        [ProtoMember(4)]
+        public int Channels { get; set; }
+
+        [ProtoMember(5)]
+        public int SampleRate { get; set; }
+
+        [ProtoMember(6)]
+        public bool IsDefault { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/Entities/ItemSpecialCounts.cs b/MediaBrowser.Model/Entities/ItemSpecialCounts.cs
index a1b3c0b610..b57be6ca8b 100644
--- a/MediaBrowser.Model/Entities/ItemSpecialCounts.cs
+++ b/MediaBrowser.Model/Entities/ItemSpecialCounts.cs
@@ -20,47 +20,4 @@ namespace MediaBrowser.Model.Entities
         [ProtoMember(4)]
         public decimal PlayedPercentage { get; set; }
     }
-
-    [ProtoContract]
-    public class AudioStream
-    {
-        [ProtoMember(1)]
-        public string Codec { get; set; }
-
-        [ProtoMember(2)]
-        public string Language { get; set; }
-
-        [ProtoMember(3)]
-        public int BitRate { get; set; }
-
-        [ProtoMember(4)]
-        public int Channels { get; set; }
-
-        [ProtoMember(5)]
-        public int SampleRate { get; set; }
-
-        [ProtoMember(6)]
-        public bool IsDefault { get; set; }
-    }
-
-    [ProtoContract]
-    public class SubtitleStream
-    {
-        [ProtoMember(1)]
-        public string Language { get; set; }
-
-        [ProtoMember(2)]
-        public bool IsDefault { get; set; }
-
-        [ProtoMember(3)]
-        public bool IsForced { get; set; }
-    }
-
-    public enum VideoType
-    {
-        VideoFile,
-        Iso,
-        DVD,
-        BluRay
-    }
 }
diff --git a/MediaBrowser.Model/Entities/SubtitleStream.cs b/MediaBrowser.Model/Entities/SubtitleStream.cs
new file mode 100644
index 0000000000..7a59d93024
--- /dev/null
+++ b/MediaBrowser.Model/Entities/SubtitleStream.cs
@@ -0,0 +1,17 @@
+using ProtoBuf;
+
+namespace MediaBrowser.Model.Entities
+{
+    [ProtoContract]
+    public class SubtitleStream
+    {
+        [ProtoMember(1)]
+        public string Language { get; set; }
+
+        [ProtoMember(2)]
+        public bool IsDefault { get; set; }
+
+        [ProtoMember(3)]
+        public bool IsForced { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/Entities/VideoType.cs b/MediaBrowser.Model/Entities/VideoType.cs
new file mode 100644
index 0000000000..56308426e3
--- /dev/null
+++ b/MediaBrowser.Model/Entities/VideoType.cs
@@ -0,0 +1,11 @@
+
+namespace MediaBrowser.Model.Entities
+{
+    public enum VideoType
+    {
+        VideoFile,
+        Iso,
+        DVD,
+        BluRay
+    }
+}
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 37597aa42c..67d6dfd764 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -45,10 +45,13 @@
     <Compile Include="DTO\VideoInfo.cs" />
     <Compile Include="DTO\VideoOutputFormats.cs" />
     <Compile Include="DTO\IBNItem.cs" />
+    <Compile Include="Entities\AudioStream.cs" />
     <Compile Include="Entities\ImageType.cs" />
     <Compile Include="Entities\IHasProviderIds.cs" />
     <Compile Include="Entities\ItemSpecialCounts.cs" />
     <Compile Include="Entities\MetadataProviders.cs" />
+    <Compile Include="Entities\SubtitleStream.cs" />
+    <Compile Include="Entities\VideoType.cs" />
     <Compile Include="Plugins\BasePluginConfiguration.cs" />
     <Compile Include="DTO\PluginInfo.cs" />
     <Compile Include="Progress\TaskProgress.cs" />