diff --git a/MediaBrowser.Controller/Library/DtoBuilder.cs b/MediaBrowser.Controller/Library/DtoBuilder.cs
index ef5cbada0..820fd8c00 100644
--- a/MediaBrowser.Controller/Library/DtoBuilder.cs
+++ b/MediaBrowser.Controller/Library/DtoBuilder.cs
@@ -367,9 +367,6 @@ namespace MediaBrowser.Controller.Library
             {
                 var folder = (Folder)item;
 
-                dto.IsRoot = folder.IsRoot;
-                dto.IsVirtualFolder = folder.IsVirtualFolder;
-
                 if (fields.Contains(ItemFields.IndexOptions))
                 {
                     dto.IndexOptions = folder.IndexByOptionStrings.ToArray();
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 9b7529023..89353b2ef 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -202,7 +202,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="MediaInfo\ffmpeg20130209.zip" />
+    <EmbeddedResource Include="MediaInfo\ffmpeg20130310.zip" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/MediaBrowser.Controller/MediaInfo/ffmpeg20130209.zip.REMOVED.git-id b/MediaBrowser.Controller/MediaInfo/ffmpeg20130209.zip.REMOVED.git-id
deleted file mode 100644
index 307afc51c..000000000
--- a/MediaBrowser.Controller/MediaInfo/ffmpeg20130209.zip.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-985770c0d2633a13719be2e5cf19554262415f62
\ No newline at end of file
diff --git a/MediaBrowser.Controller/MediaInfo/ffmpeg20130310.zip.REMOVED.git-id b/MediaBrowser.Controller/MediaInfo/ffmpeg20130310.zip.REMOVED.git-id
new file mode 100644
index 000000000..830011a04
--- /dev/null
+++ b/MediaBrowser.Controller/MediaInfo/ffmpeg20130310.zip.REMOVED.git-id
@@ -0,0 +1 @@
+a005e50576665b191cbd02b42d6260bffb764690
\ No newline at end of file
diff --git a/MediaBrowser.Model/DTO/BaseItemDto.cs b/MediaBrowser.Model/DTO/BaseItemDto.cs
index b1d3f83c2..e3034f58e 100644
--- a/MediaBrowser.Model/DTO/BaseItemDto.cs
+++ b/MediaBrowser.Model/DTO/BaseItemDto.cs
@@ -154,20 +154,6 @@ namespace MediaBrowser.Model.Dto
         [ProtoMember(25)]
         public bool IsFolder { get; set; }
 
-        /// <summary>
-        /// If the item is a Folder this will determine if it's the Root or not
-        /// </summary>
-        /// <value><c>null</c> if [is root] contains no value, <c>true</c> if [is root]; otherwise, <c>false</c>.</value>
-        [ProtoMember(26)]
-        public bool? IsRoot { get; set; }
-
-        /// <summary>
-        /// If the item is a Folder this will determine if it's a VF or not
-        /// </summary>
-        /// <value><c>null</c> if [is virtual folder] contains no value, <c>true</c> if [is virtual folder]; otherwise, <c>false</c>.</value>
-        [ProtoMember(27)]
-        public bool? IsVirtualFolder { get; set; }
-
         /// <summary>
         /// Gets or sets the parent id.
         /// </summary>
@@ -391,26 +377,6 @@ namespace MediaBrowser.Model.Dto
             return Type.Equals(type, StringComparison.OrdinalIgnoreCase);
         }
 
-        /// <summary>
-        /// Gets a value indicating whether this instance can resume.
-        /// </summary>
-        /// <value><c>true</c> if this instance can resume; otherwise, <c>false</c>.</value>
-        [IgnoreDataMember]
-        public bool CanResume
-        {
-            get { return UserData != null && UserData.PlaybackPositionTicks > 0; }
-        }
-
-        /// <summary>
-        /// Gets the resume position ticks.
-        /// </summary>
-        /// <value>The resume position ticks.</value>
-        [IgnoreDataMember]
-        public long ResumePositionTicks
-        {
-            get { return UserData == null ? 0 : UserData.PlaybackPositionTicks; }
-        }
-
         /// <summary>
         /// Gets or sets the image tags.
         /// </summary>
@@ -467,6 +433,26 @@ namespace MediaBrowser.Model.Dto
         [ProtoMember(69)]
         public string MediaType { get; set; }
 
+        /// <summary>
+        /// Gets a value indicating whether this instance can resume.
+        /// </summary>
+        /// <value><c>true</c> if this instance can resume; otherwise, <c>false</c>.</value>
+        [IgnoreDataMember]
+        public bool CanResume
+        {
+            get { return UserData != null && UserData.PlaybackPositionTicks > 0; }
+        }
+
+        /// <summary>
+        /// Gets the resume position ticks.
+        /// </summary>
+        /// <value>The resume position ticks.</value>
+        [IgnoreDataMember]
+        public long ResumePositionTicks
+        {
+            get { return UserData == null ? 0 : UserData.PlaybackPositionTicks; }
+        }
+
         /// <summary>
         /// Gets the backdrop count.
         /// </summary>
@@ -597,12 +583,26 @@ namespace MediaBrowser.Model.Dto
             get { return string.Equals(MediaType, Entities.MediaType.Game, StringComparison.OrdinalIgnoreCase); }
         }
 
+        /// <summary>
+        /// Gets a value indicating whether this instance is person.
+        /// </summary>
+        /// <value><c>true</c> if this instance is person; otherwise, <c>false</c>.</value>
         [IgnoreDataMember]
         public bool IsPerson
         {
             get { return string.Equals(Type, "Person", StringComparison.OrdinalIgnoreCase); }
         }
 
+        /// <summary>
+        /// Gets a value indicating whether this instance is root.
+        /// </summary>
+        /// <value><c>true</c> if this instance is root; otherwise, <c>false</c>.</value>
+        [IgnoreDataMember]
+        public bool IsRoot
+        {
+            get { return string.Equals(Type, "AggregateFolder", StringComparison.OrdinalIgnoreCase); }
+        }
+
         /// <summary>
         /// Occurs when [property changed].
         /// </summary>
diff --git a/MediaBrowser.Server.Implementations/Sorting/AlbumArtistComparer.cs b/MediaBrowser.Server.Implementations/Sorting/AlbumArtistComparer.cs
index 5356ecf9e..2493c0fc6 100644
--- a/MediaBrowser.Server.Implementations/Sorting/AlbumArtistComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/AlbumArtistComparer.cs
@@ -1,9 +1,8 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Sorting;
-using MediaBrowser.Model.Dto;
-using System;
 using MediaBrowser.Model.Querying;
+using System;
 
 namespace MediaBrowser.Server.Implementations.Sorting
 {
diff --git a/MediaBrowser.Server.Implementations/Sorting/AlbumComparer.cs b/MediaBrowser.Server.Implementations/Sorting/AlbumComparer.cs
index f8d319e36..f455d5c2b 100644
--- a/MediaBrowser.Server.Implementations/Sorting/AlbumComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/AlbumComparer.cs
@@ -1,9 +1,8 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Sorting;
-using MediaBrowser.Model.Dto;
-using System;
 using MediaBrowser.Model.Querying;
+using System;
 
 namespace MediaBrowser.Server.Implementations.Sorting
 {
diff --git a/MediaBrowser.Server.Implementations/Sorting/ArtistComparer.cs b/MediaBrowser.Server.Implementations/Sorting/ArtistComparer.cs
index e41185dff..c34f096a2 100644
--- a/MediaBrowser.Server.Implementations/Sorting/ArtistComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/ArtistComparer.cs
@@ -1,9 +1,8 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Sorting;
-using MediaBrowser.Model.Dto;
-using System;
 using MediaBrowser.Model.Querying;
+using System;
 
 namespace MediaBrowser.Server.Implementations.Sorting
 {
diff --git a/MediaBrowser.Server.Implementations/Sorting/CommunityRatingComparer.cs b/MediaBrowser.Server.Implementations/Sorting/CommunityRatingComparer.cs
index 5aa1ad100..bdd18a648 100644
--- a/MediaBrowser.Server.Implementations/Sorting/CommunityRatingComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/CommunityRatingComparer.cs
@@ -1,6 +1,5 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
-using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Querying;
 
 namespace MediaBrowser.Server.Implementations.Sorting
diff --git a/MediaBrowser.Server.Implementations/Sorting/DateCreatedComparer.cs b/MediaBrowser.Server.Implementations/Sorting/DateCreatedComparer.cs
index 5097ae459..9862f0a8a 100644
--- a/MediaBrowser.Server.Implementations/Sorting/DateCreatedComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/DateCreatedComparer.cs
@@ -1,8 +1,7 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
-using MediaBrowser.Model.Dto;
-using System;
 using MediaBrowser.Model.Querying;
+using System;
 
 namespace MediaBrowser.Server.Implementations.Sorting
 {
diff --git a/MediaBrowser.Server.Implementations/Sorting/DatePlayedComparer.cs b/MediaBrowser.Server.Implementations/Sorting/DatePlayedComparer.cs
index 34b0335b8..db7e455c7 100644
--- a/MediaBrowser.Server.Implementations/Sorting/DatePlayedComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/DatePlayedComparer.cs
@@ -1,8 +1,7 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
-using MediaBrowser.Model.Dto;
-using System;
 using MediaBrowser.Model.Querying;
+using System;
 
 namespace MediaBrowser.Server.Implementations.Sorting
 {
diff --git a/MediaBrowser.Server.Implementations/Sorting/PremiereDateComparer.cs b/MediaBrowser.Server.Implementations/Sorting/PremiereDateComparer.cs
index a3dd56b65..fcbc58987 100644
--- a/MediaBrowser.Server.Implementations/Sorting/PremiereDateComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/PremiereDateComparer.cs
@@ -1,8 +1,7 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
-using MediaBrowser.Model.Dto;
-using System;
 using MediaBrowser.Model.Querying;
+using System;
 
 namespace MediaBrowser.Server.Implementations.Sorting
 {
diff --git a/MediaBrowser.Server.Implementations/Sorting/ProductionYearComparer.cs b/MediaBrowser.Server.Implementations/Sorting/ProductionYearComparer.cs
index 662692952..16d531334 100644
--- a/MediaBrowser.Server.Implementations/Sorting/ProductionYearComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/ProductionYearComparer.cs
@@ -1,6 +1,5 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
-using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Querying;
 
 namespace MediaBrowser.Server.Implementations.Sorting
diff --git a/MediaBrowser.Server.Implementations/Sorting/RandomComparer.cs b/MediaBrowser.Server.Implementations/Sorting/RandomComparer.cs
index 73c636bab..b1677331a 100644
--- a/MediaBrowser.Server.Implementations/Sorting/RandomComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/RandomComparer.cs
@@ -1,8 +1,7 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
-using MediaBrowser.Model.Dto;
-using System;
 using MediaBrowser.Model.Querying;
+using System;
 
 namespace MediaBrowser.Server.Implementations.Sorting
 {
diff --git a/MediaBrowser.Server.Implementations/Sorting/RuntimeComparer.cs b/MediaBrowser.Server.Implementations/Sorting/RuntimeComparer.cs
index 576187b84..793cb265e 100644
--- a/MediaBrowser.Server.Implementations/Sorting/RuntimeComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/RuntimeComparer.cs
@@ -1,6 +1,5 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
-using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Querying;
 
 namespace MediaBrowser.Server.Implementations.Sorting
diff --git a/MediaBrowser.Server.Implementations/Sorting/SortNameComparer.cs b/MediaBrowser.Server.Implementations/Sorting/SortNameComparer.cs
index 5053b14db..873753a2b 100644
--- a/MediaBrowser.Server.Implementations/Sorting/SortNameComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/SortNameComparer.cs
@@ -1,8 +1,7 @@
 using MediaBrowser.Controller.Entities;
-using System;
 using MediaBrowser.Controller.Sorting;
-using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Querying;
+using System;
 
 namespace MediaBrowser.Server.Implementations.Sorting
 {